more docker changes

.dockerignore

@@ -0,0 +1,26 @@
+# Dependencies
+**/node_modules
+**/__pycache__
+**/*.pyc
+
+# Build outputs
+frontend/.next
+frontend/out
+**/*.pyo
+**/*.pyd
+
+# Environment and IDE
+.env*
+.vscode
+.idea
+*.swp
+*.swo
+
+# Git
+.git
+.gitignore
+
+# Logs
+**/logs
+**/*.log
+npm-debug.log* 

Dockerfile

@@ -1,79 +1,56 @@
-FROM node:20-slim as frontend-builder
-
-# Set working directory for frontend
-WORKDIR /app/frontend
-
-# Copy frontend files
-COPY frontend/package*.json ./
-RUN npm install
-
-COPY frontend/ ./
-RUN npm run build
-
-# Python backend stage
 FROM python:3.10-slim
 
+WORKDIR /app
+
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     build-essential \
     curl \
-    gcc \
-    g++ \
     git \
-    python3-dev \
+    cmake \
+    pkg-config \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Node.js for serving the frontend
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+# Install Node.js
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
 
-# Set working directory
-WORKDIR /app
-
-# Copy frontend build from previous stage
-COPY --from=frontend-builder /app/frontend/.next ./.next
-COPY --from=frontend-builder /app/frontend/public ./public
-COPY --from=frontend-builder /app/frontend/package*.json ./
+# Upgrade pip and install wheel
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel
 
-# Copy backend files
-COPY requirements.txt .
-COPY packages.txt .
-COPY app.py .
-COPY en.txt .
-COPY frankenstein5k.md .
-COPY gatsby5k.md .
+# Install backend requirements
+COPY backend/requirements.txt .
+RUN pip install --no-cache-dir --prefer-binary -r requirements.txt
 
-# Create constraints file for pre-built wheels
-RUN echo "spacy==3.7.2\n\
-numpy==1.26.4\n\
-Cython==0.29.37\n\
---prefer-binary" > constraints.txt
+# Set up frontend
+WORKDIR /app/frontend
 
-# Install Python dependencies
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r requirements.txt -c constraints.txt
+# Install frontend dependencies
+COPY frontend/package*.json ./
+RUN npm install
 
-# Install frontend runtime dependencies
-RUN npm install --production
+# Copy all frontend files (except those in .dockerignore)
+COPY frontend/ ./
 
-# Expose port
-EXPOSE 7860
+# Set build environment
+ENV NEXT_PUBLIC_API_URL=http://localhost:7860 \
+    NEXT_TELEMETRY_DISABLED=1 \
+    NODE_ENV=production \
+    DISABLE_ESLINT_PLUGIN=true
 
-# Set environment variables
-ENV PYTHONUNBUFFERED=1
-ENV NODE_ENV=production
+# Build frontend
+RUN npm run build
 
-# Start both services using a shell script
-COPY <<EOF ./start.sh
-#!/bin/bash
-# Start the Next.js frontend in the background
-npm start &
-# Start the Python backend
-python app.py
-EOF
+# Set up backend and supervisor
+WORKDIR /app
+COPY backend/ ./backend/
+COPY supervisord.conf /etc/supervisor/conf.d/
+COPY docker-entrypoint.sh /
 
-RUN chmod +x ./start.sh
+RUN pip install supervisor && \
+    mkdir -p /var/log/supervisor && \
+    chmod +x /docker-entrypoint.sh
 
-# Command to run both services
-CMD ["./start.sh"] 
+EXPOSE 7860
+ENTRYPOINT ["/docker-entrypoint.sh"] 

docker-entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# If running in Hugging Face Spaces (SPACE_ID is set)
+if [ -n "$SPACE_ID" ]; then
+    export NEXT_PUBLIC_API_URL="https://$SPACE_ID.hf.space"
+else
+    # Local development
+    export NEXT_PUBLIC_API_URL="http://localhost:7860"
+fi
+
+# Start supervisor
+exec supervisord -c /etc/supervisor/conf.d/supervisord.conf 

frontend/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
+    "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
@@ -18,11 +18,8 @@
         "name": "next"
       }
     ],
-    "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],
-      "@/lib/*": ["src/lib/*"],
-      "@/components/*": ["src/components/*"]
+      "@/*": ["./src/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],

supervisord.conf

@@ -0,0 +1,20 @@
+[supervisord]
+nodaemon=true
+user=root
+
+[program:backend]
+directory=/app/backend
+command=uvicorn main:app --host 0.0.0.0 --port 7860
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/supervisor/backend.err.log
+stdout_logfile=/var/log/supervisor/backend.out.log
+
+[program:frontend]
+directory=/app/frontend
+command=npm start -- -p 7860
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/supervisor/frontend.err.log
+stdout_logfile=/var/log/supervisor/frontend.out.log
+environment=PORT=7860