From 651ed3f5169b5f8c822e0750787160fd912f9a49 Mon Sep 17 00:00:00 2001 From: Kevin Restaino Date: Mon, 8 Jan 2024 23:48:46 -0500 Subject: [PATCH] refactor: server.py --- Dockerfile | 4 ++-- docker-compose.yml.example | 13 +++++++------ web_server.py => server.py | 10 +++++----- 3 files changed, 14 insertions(+), 13 deletions(-) rename web_server.py => server.py (90%) diff --git a/Dockerfile b/Dockerfile index eb22734..7cad9ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ COPY . . # Install any needed packages specified in requirements.txt RUN pip install --no-cache-dir -r requirements.txt -# Expose port 3333 for the Flask app -EXPOSE 3333 +# Expose port 5000 for the Flask app +EXPOSE 5000 # Set the entrypoint to Python ENTRYPOINT ["python", "sptnr.py"] diff --git a/docker-compose.yml.example b/docker-compose.yml.example index 02f5a2d..061160e 100644 --- a/docker-compose.yml.example +++ b/docker-compose.yml.example @@ -9,6 +9,12 @@ services: # Uncomment the next line to build the Docker image locally # build: . + # Uncomment the next line to run the script + # entrypoint: ["python", "sptnr.py"] + + # Uncomment the next line to start the web server + # entrypoint: ["gunicorn", "-b", "0.0.0.0:5000", "web_server:sptnr_web_server"] + environment: - NAV_BASE_URL=your_navidrome_server_url - NAV_USER=your_navidrome_username @@ -20,9 +26,4 @@ services: volumes: - ./data:/usr/src/app/data ports: - - "3333:3333" - # Uncomment the next line to just run the script - # entrypoint: ["python", "sptnr.py"] - - # Uncomment the next line to start the web server - # entrypoint: ["python", "web_server.py"] + - "3333:5000" diff --git a/web_server.py b/server.py similarity index 90% rename from web_server.py rename to server.py index 4688489..c64d2dd 100644 --- a/web_server.py +++ b/server.py @@ -7,7 +7,7 @@ import functools load_dotenv() -sptnr_web_server = Flask(__name__) +sptnr = Flask(__name__) WEB_API_KEY = os.getenv("WEB_API_KEY") ENABLE_WEB_API_KEY = os.getenv("ENABLE_WEB_API_KEY", "True") == "True" LOG_DIR = "data/logs" @@ -27,7 +27,7 @@ def run_script(cmd): subprocess.run(cmd) -@sptnr_web_server.route("/process", methods=["GET", "POST"]) +@sptnr.route("/process", methods=["GET", "POST"]) @api_key_required def process_request(): cmd = ["python3", "sptnr.py"] @@ -54,7 +54,7 @@ def process_request(): return jsonify({"message": "Processing started"}) -@sptnr_web_server.route("/logs") +@sptnr.route("/logs") @api_key_required def list_logs(): try: @@ -67,7 +67,7 @@ def list_logs(): return f"An error occurred: {e}", 500 -@sptnr_web_server.route("/logs/") +@sptnr.route("/logs/") @api_key_required def view_log(filename): try: @@ -86,4 +86,4 @@ def view_log(filename): if __name__ == "__main__": - sptnr_web_server.run(debug=False, host="0.0.0.0", port=3333) + sptnr.run(debug=False, host="0.0.0.0", port=3333)