Merge branch 'development' into staging

Author: itsskofficial

src/server/Dockerfile

@@ -56,13 +56,20 @@ RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor
 
 # Copy configuration files and server code
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY nginx.conf /etc/nginx/sites-available/sentient
 COPY . .
 
 # Fix line endings for .env and start.sh (if present)
 RUN if [ -f /app/.env ]; then dos2unix /app/.env; fi \
     && dos2unix /app/start.sh \
     && chmod +x /app/start.sh
 
+# Remove default Nginx site configuration and enable our custom one
+RUN rm -f /etc/nginx/sites-enabled/default
+
+# Enable custom Nginx site
+RUN ln -s /etc/nginx/sites-available/sentient /etc/nginx/sites-enabled/sentient
+
 # Expose port
 EXPOSE 5000
 

src/server/nginx.conf

@@ -1,42 +1,67 @@
-server {
-    if ($host = <DOMAIN_NAME>) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-    listen 80;
-    server_name <DOMAIN_NAME>;
+# This is a new file: src/server/nginx.conf
 
-    # This block is for handling Let's Encrypt certificate challenges
-    location /.well-known/acme-challenge/ {
-        root <WEB_ROOT_PATH>;
-    }
-
-    # For all other traffic, redirect to HTTPS
-    location / {
-        return 301 https://$host$request_uri;
-    }
+upstream backend_app {
+    # This points to your FastAPI/Uvicorn server running on localhost inside the container.
+    server 127.0.0.1:5000;
 }
 
 server {
-    listen 443 ssl http2;
-    server_name <DOMAIN_NAME>;
-
-    # SSL cert paths will be filled in automatically by Certbot later
-    ssl_certificate <SSL_CERT_PATH>; # managed by Certbot
-    ssl_certificate_key <SSL_CERT_KEY_PATH>; # managed by Certbot
+    # Nginx will listen on port 80 inside the container.
+    # An external load balancer (like on GCP) or Docker port mapping will handle public-facing traffic.
+    listen 80;
+    server_name _; # Catch all domains
 
+    # Increase client body size for file uploads
     client_max_body_size 10M;
 
-    location / {
-        proxy_pass http://<BACKEND_HOST>:<BACKEND_PORT>;
+    # Location block for your chat stream (and other streaming endpoints)
+    location ~ ^/(chat/message|api/search/unified)$ {
+        proxy_pass http://backend_app;
         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;
 
-        # WebSocket Headers - CRITICAL for wss:// to work
+        proxy_read_timeout 86400s; # Prevent timeout during long LLM responses
+        proxy_send_timeout 86400s;
+
+        # Crucial for Server-Sent Events (SSE) and streaming
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_request_buffering off;
+        proxy_http_version 1.1;
+        proxy_set_header Connection '';
+        chunked_transfer_encoding on;
+
+        # Headers to prevent buffering by intermediate proxies/CDNs
+        add_header Cache-Control "no-cache";
+        add_header X-Accel-Buffering "no" always;
+    }
+
+    # Location block for WebSocket connections (notifications and voice)
+    location ~ ^/(api/ws/notifications|voice) {
+        proxy_pass http://backend_app;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "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 86400s; # Keep WebSocket connections alive
+        proxy_send_timeout 86400s;
+    }
+
+    # General location block for all other API requests
+    location / {
+        proxy_pass http://backend_app;
+        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_connect_timeout 600s;
+        proxy_send_timeout    600s;
+        proxy_read_timeout    600s;
     }
 }
+