.

Dockerfile

@@ -2,7 +2,7 @@
 FROM tiangolo/uvicorn-gunicorn-fastapi:python3.9
 
 
-RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 curl -y
+RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 curl nginx -y
 
 # Set the working directory to /code
 WORKDIR /code
@@ -30,11 +30,44 @@ WORKDIR $HOME/app
 # Copy the current directory contents into the container at $HOME/app setting the owner to the user
 COPY --chown=user . $HOME/app
 
-# Create a startup script for HF Spaces using echo commands
+# Create nginx configuration for WebSocket support
+USER root
+RUN cat > /etc/nginx/sites-available/default << 'EOF'
+server {
+    listen 7860;
+    server_name _;
+
+    # WebSocket support
+    location /ws {
+        proxy_pass http://localhost:8080/ws;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 86400;
+    }
+
+    # Regular HTTP requests
+    location / {
+        proxy_pass http://localhost:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
+EOF
+
+USER user
+
+# Create a startup script for HF Spaces with nginx
 RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'set -e' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo 'echo "🚀 Starting Neural OS for HF Spaces"' >> start_hf_spaces.sh && \
+    echo 'echo "🚀 Starting Neural OS for HF Spaces with nginx proxy"' >> start_hf_spaces.sh && \
     echo 'echo "===================================="' >> start_hf_spaces.sh && \
     echo 'echo "📁 Current directory: $(pwd)"' >> start_hf_spaces.sh && \
     echo 'echo "📋 Files in current directory:"' >> start_hf_spaces.sh && \
@@ -58,35 +91,32 @@ RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
     echo 'echo "✅ All required files found"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Start dispatcher in background' >> start_hf_spaces.sh && \
+    echo '# Start nginx' >> start_hf_spaces.sh && \
+    echo 'echo "🌐 Starting nginx proxy..."' >> start_hf_spaces.sh && \
+    echo 'sudo nginx -t && sudo nginx' >> start_hf_spaces.sh && \
+    echo '' >> start_hf_spaces.sh && \
+    echo '# Start dispatcher on port 8080 (behind nginx)' >> start_hf_spaces.sh && \
     echo 'echo "🎯 Starting dispatcher..."' >> start_hf_spaces.sh && \
-    echo 'python dispatcher.py --port 7860 > dispatcher.log 2>&1 &' >> start_hf_spaces.sh && \
+    echo 'python dispatcher.py --port 8080 > dispatcher.log 2>&1 &' >> start_hf_spaces.sh && \
     echo 'DISPATCHER_PID=$!' >> start_hf_spaces.sh && \
     echo 'echo "📊 Dispatcher PID: $DISPATCHER_PID"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Wait for dispatcher to start and check if it is running' >> start_hf_spaces.sh && \
+    echo '# Wait for dispatcher to start' >> start_hf_spaces.sh && \
     echo 'echo "⏳ Waiting for dispatcher to initialize..."' >> start_hf_spaces.sh && \
     echo 'sleep 5' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo 'if ! kill -0 $DISPATCHER_PID 2>/dev/null; then' >> start_hf_spaces.sh && \
-    echo '    echo "❌ Dispatcher failed to start"' >> start_hf_spaces.sh && \
-    echo '    echo "📋 Dispatcher log:"' >> start_hf_spaces.sh && \
-    echo '    cat dispatcher.log' >> start_hf_spaces.sh && \
-    echo '    exit 1' >> start_hf_spaces.sh && \
-    echo 'fi' >> start_hf_spaces.sh && \
-    echo '' >> start_hf_spaces.sh && \
     echo '# Test if dispatcher is responding' >> start_hf_spaces.sh && \
-    echo 'echo "🔍 Testing dispatcher health..."' >> start_hf_spaces.sh && \
+    echo 'echo "🔍 Testing dispatcher health (via nginx)..."' >> start_hf_spaces.sh && \
     echo 'curl -f http://localhost:7860/ > /dev/null 2>&1' >> start_hf_spaces.sh && \
     echo 'if [ $? -eq 0 ]; then' >> start_hf_spaces.sh && \
-    echo '    echo "✅ Dispatcher is responding to HTTP requests"' >> start_hf_spaces.sh && \
+    echo '    echo "✅ Nginx proxy is working"' >> start_hf_spaces.sh && \
     echo 'else' >> start_hf_spaces.sh && \
-    echo '    echo "⚠️ Dispatcher HTTP test failed, but continuing..."' >> start_hf_spaces.sh && \
+    echo '    echo "⚠️ Nginx proxy test failed"' >> start_hf_spaces.sh && \
     echo 'fi' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Start single worker' >> start_hf_spaces.sh && \
+    echo '# Start worker' >> start_hf_spaces.sh && \
     echo 'echo "🔧 Starting worker..."' >> start_hf_spaces.sh && \
-    echo 'python worker.py --worker-address localhost:8001 --dispatcher-url http://localhost:7860 > worker.log 2>&1 &' >> start_hf_spaces.sh && \
+    echo 'python worker.py --worker-address localhost:8001 --dispatcher-url http://localhost:8080 > worker.log 2>&1 &' >> start_hf_spaces.sh && \
     echo 'WORKER_PID=$!' >> start_hf_spaces.sh && \
     echo 'echo "📊 Worker PID: $WORKER_PID"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
@@ -94,18 +124,19 @@ RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'echo "⏳ Waiting for worker to initialize..."' >> start_hf_spaces.sh && \
     echo 'sleep 30' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Check if worker is still running' >> start_hf_spaces.sh && \
+    echo '# Check if worker is running' >> start_hf_spaces.sh && \
     echo 'if ! kill -0 $WORKER_PID 2>/dev/null; then' >> start_hf_spaces.sh && \
     echo '    echo "❌ Worker failed to start"' >> start_hf_spaces.sh && \
     echo '    echo "📋 Worker log:"' >> start_hf_spaces.sh && \
-    echo '    cat worker.log' >> start_hf_spaces.sh && \
+    echo '    tail -n 50 worker.log' >> start_hf_spaces.sh && \
     echo '    echo "📋 Dispatcher log:"' >> start_hf_spaces.sh && \
-    echo '    cat dispatcher.log' >> start_hf_spaces.sh && \
+    echo '    tail -n 50 dispatcher.log' >> start_hf_spaces.sh && \
     echo '    exit 1' >> start_hf_spaces.sh && \
     echo 'fi' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
     echo 'echo "✅ System ready!"' >> start_hf_spaces.sh && \
-    echo 'echo "🌍 Web interface: http://localhost:7860"' >> start_hf_spaces.sh && \
+    echo 'echo "🌍 Web interface: http://localhost:7860 (via nginx)"' >> start_hf_spaces.sh && \
+    echo 'echo "🎯 Dispatcher: http://localhost:8080 (direct)"' >> start_hf_spaces.sh && \
     echo 'echo "📊 Dispatcher PID: $DISPATCHER_PID"' >> start_hf_spaces.sh && \
     echo 'echo "📊 Worker PID: $WORKER_PID"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
@@ -113,21 +144,23 @@ RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'cleanup() {' >> start_hf_spaces.sh && \
     echo '    echo "🛑 Shutting down..."' >> start_hf_spaces.sh && \
     echo '    kill $DISPATCHER_PID $WORKER_PID 2>/dev/null || true' >> start_hf_spaces.sh && \
+    echo '    sudo nginx -s quit 2>/dev/null || true' >> start_hf_spaces.sh && \
     echo '    exit 0' >> start_hf_spaces.sh && \
     echo '}' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
     echo 'trap cleanup SIGINT SIGTERM' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Keep the script running by following the dispatcher log' >> start_hf_spaces.sh && \
-    echo 'echo "📋 Following dispatcher log (Ctrl+C to stop):"' >> start_hf_spaces.sh && \
-    echo 'tail -f dispatcher.log &' >> start_hf_spaces.sh && \
+    echo '# Keep the script running' >> start_hf_spaces.sh && \
+    echo 'echo "📋 Following logs (Ctrl+C to stop):"' >> start_hf_spaces.sh && \
+    echo 'tail -f dispatcher.log worker.log &' >> start_hf_spaces.sh && \
     echo 'TAIL_PID=$!' >> start_hf_spaces.sh && \
-    echo '' >> start_hf_spaces.sh && \
-    echo '# Wait for dispatcher (main process)' >> start_hf_spaces.sh && \
     echo 'wait $DISPATCHER_PID' >> start_hf_spaces.sh && \
-    echo '' >> start_hf_spaces.sh && \
-    echo '# Clean up tail process' >> start_hf_spaces.sh && \
     echo 'kill $TAIL_PID 2>/dev/null || true' >> start_hf_spaces.sh && \
     chmod +x start_hf_spaces.sh
 
+# Give user sudo permissions for nginx
+USER root
+RUN echo "user ALL=(ALL) NOPASSWD: /usr/sbin/nginx, /usr/sbin/nginx -t, /usr/sbin/nginx -s quit" >> /etc/sudoers
+USER user
+
 CMD ["bash", "start_hf_spaces.sh"]