fix: startup process

Dockerfile

@@ -1,25 +1,16 @@
-# Base image
-FROM python:3.10-slim
+# Use the official Python 3.10.9 image
+FROM python:3.10.9
 
-# Install necessary dependencies
-RUN apt-get update \
-    && apt-get install -y openssl \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
-
-# Set working directory
-WORKDIR /app
-
-# Copy the FastAPI application code to the container
-COPY requirements.txt .
+# Copy the current directory contents into the container at .
+COPY . .
 
-# Install Python dependencies
-RUN pip install -r requirements.txt
+# Set the working directory to /
+WORKDIR /
 
-COPY . .
+# Install requirements.txt 
+RUN pip install --no-cache-dir --upgrade -r /requirements.txt
 
-# Expose the HTTPS port
-EXPOSE 443 7860
+# Start the FastAPI app on port 7860, the default port expected by Spaces
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
 
-# Command to run FastAPI with SSL
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
+EXPOSE 7860

main.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect, Depends, HTTPException
+from fastapi import FastAPI, Response, WebSocket, WebSocketDisconnect, Depends, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 import uvicorn
 from dotenv import load_dotenv
@@ -6,6 +6,10 @@ import os
 
 # Load environment variables from .env file
 load_dotenv()
+IS_DEV = os.environ.get('ENV', 'DEV') != 'PROD'
+SECURE_TOKEN = os.getenv("SECURE_TOKEN")
+X_REQUEST_USER = os.environ.get('X_REQUEST_USER')
+X_API_KEY = os.environ.get('X_API_KEY')
 
 app = FastAPI()
 
@@ -19,15 +23,20 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# Fetch the secure token from environment variables
-SECURE_TOKEN = os.getenv("SECURE_TOKEN")
-PORT = os.getenv("PORT")
 
 # Simple token-based authentication dependency
 async def authenticate_token(token: str):
     if token != f"Bearer {SECURE_TOKEN}":
         raise HTTPException(status_code=401, detail="Invalid token")
 
+@app.get("/")
+def root():
+    return Response(status=200, data='ok')
+        
+@app.get("/health")
+def healthcheck():
+    return Response(status=200, data='ok')
+        
 # WebSocket endpoint
 @app.websocket("/ws")
 async def websocket_endpoint(websocket: WebSocket, token: str = Depends(authenticate_token)):
@@ -40,6 +49,8 @@ async def websocket_endpoint(websocket: WebSocket, token: str = Depends(authenti
     except WebSocketDisconnect:
         print("Client disconnected")
 
+def is_valid(u, p):
+    return u == X_REQUEST_USER and p == X_API_KEY
+
 if __name__ == "__main__":
-    # Run the server without TLS (insecure)
-    uvicorn.run("main:app", host="0.0.0.0", port=PORT)
+    uvicorn.run('app:app', host='0.0.0.0', port=7860, reload=True)