Upload 2 files

Dockerfile

@@ -1,11 +1,28 @@
-FROM python:3.10-slim
+FROM python:3.9
+
+# Create non-root user
+RUN useradd -m -u 1000 user
+
 WORKDIR /app
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
-EXPOSE 7860
-EXPOSE 8000
+
+# Copy requirements first for better caching
+COPY --chown=user ./requirements.txt requirements.txt
+
+# Install dependencies
+RUN pip install --no-cache-dir --upgrade -r requirements.txt
+
+# Copy application files
+COPY --chown=user . /app
+
+# Switch to non-root user
+USER user
+
+# Set environment variables
 ENV PYTHONUNBUFFERED=1
-RUN useradd -m appuser
-USER appuser
+ENV PYSCOUT_MODE=api
+ENV HOST=0.0.0.0
+ENV PORT=7860
+
+# Run the application
 ENTRYPOINT ["python", "docker_entrypoint.py"]
+

docker_entrypoint.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python3
-"""
-Docker entrypoint script that decides which component to run based on environment variables.
-"""
 import os
 import sys
 import subprocess
@@ -12,7 +9,6 @@ def run_command(cmd):
     print(f"Running command: {' '.join(cmd)}")
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
     
-    # Stream the output
     for line in process.stdout:
         sys.stdout.write(line)
         sys.stdout.flush()
@@ -21,7 +17,6 @@ def run_command(cmd):
     return process.returncode
 
 def check_required_files():
-    """Check if all required files exist"""
     required_files = [
         "pyscout_api.py",
         "deepinfra_client.py",
@@ -38,7 +33,6 @@ def check_required_files():
     return True
 
 def wait_for_mongodb():
-    """Wait for MongoDB to be available"""
     import time
     import pymongo
     
@@ -51,7 +45,7 @@ def wait_for_mongodb():
     for attempt in range(max_attempts):
         try:
             client = pymongo.MongoClient(mongo_uri, serverSelectionTimeoutMS=5000)
-            client.admin.command('ping')  # Simple command to check connection
+            client.admin.command('ping')
             print(f"MongoDB connection successful after {attempt+1} attempts")
             return True
         except Exception as e:
@@ -62,41 +56,24 @@ def wait_for_mongodb():
     return False
 
 def main():
-    """Main entry point for the Docker container"""
     if not check_required_files():
         sys.exit(1)
     
-    # Determine which component to run based on environment variable
-    mode = os.environ.get("PYSCOUT_MODE", "api").lower()
+    # Always run in API mode with fixed host and port
+    print("Starting PyScoutAI API server")
+    wait_for_mongodb()
     
-    if mode == "api":
-        print("Starting PyScoutAI API server")
-        wait_for_mongodb()
-        cmd = ["python", "pyscout_api.py"]
-        return run_command(cmd)
-        
-    elif mode == "ui":
-        print("Starting Gradio UI")
-        cmd = ["python", "app.py"]
-        return run_command(cmd)
-        
-    elif mode == "all":
-        print("Starting both API server and UI")
-        # Start API server in background
-        api_process = subprocess.Popen(["python", "pyscout_api.py"])
-        time.sleep(5)  # Wait for API to start
-        
-        # Start UI in foreground
-        ui_cmd = ["python", "app.py"]
-        ui_code = run_command(ui_cmd)
-        
-        # Kill API process when UI exits
-        api_process.terminate()
-        return ui_code
-        
-    else:
-        print(f"ERROR: Unknown mode '{mode}'. Valid options: api, ui, all")
-        return 1
+    host = os.environ.get("HOST", "0.0.0.0")
+    port = int(os.environ.get("PORT", "7860"))
+    
+    cmd = [
+        "uvicorn", 
+        "pyscout_api:app", 
+        "--host", host,
+        "--port", str(port)
+    ]
+    
+    return run_command(cmd)
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())