Refactor/cleanup and optimize codebase

.github/workflows/ci.yml

@@ -22,8 +22,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        if [ -f app/requirements_simplified.txt ]; then pip install -r app/requirements_simplified.txt; fi
+        # Install PyTorch CPU version first with the correct index
+        pip install torch==2.5.1+cpu torchvision==0.20.1+cpu --index-url https://download.pytorch.org/whl/cpu
+        # Install CI-specific requirements (CPU versions)
+        if [ -f app/requirements-ci.txt ]; then pip install -r app/requirements-ci.txt; fi
+        # Install test requirements
         if [ -f app/tests/test_requirements.txt ]; then pip install -r app/tests/test_requirements.txt; fi
+        # Install SAM model (may be needed for imports, even though tests use mocks)
+        pip install git+https://github.com/facebookresearch/segment-anything.git
 
     - name: Set test mode environment variable
       run: |
@@ -34,34 +40,40 @@ jobs:
         cd app/tests
         python run_unittests.py
 
-  web-build:
+  web-validation:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18'
-        cache: 'npm'
-        cache-dependency-path: 'web/package.json'
-
-    - name: Install dependencies
-      working-directory: ./web
-      run: npm ci
-
-    - name: Build
-      working-directory: ./web
-      run: npm run build
+    - name: Validate HTML files
+      run: |
+        echo "Validating web static files..."
+        # Check if main HTML files exist
+        test -f web/index.html || (echo "Missing index.html" && exit 1)
+        test -f web/styles.css || (echo "Missing styles.css" && exit 1)
+        test -d web/js || (echo "Missing js directory" && exit 1)
+        echo "Web files validation passed"
 
-    - name: Run linting
-      working-directory: ./web
-      run: npm run lint || true
+    - name: Check JavaScript syntax
+      run: |
+        echo "Checking JavaScript syntax..."
+        # Use Python to check basic JavaScript syntax if Node.js is available
+        if command -v node >/dev/null 2>&1; then
+          for js_file in web/js/*.js; do
+            if [ -f "$js_file" ]; then
+              echo "Checking $js_file..."
+              node -c "$js_file" || (echo "Syntax error in $js_file" && exit 1)
+            fi
+          done
+        else
+          echo "Node.js not available, skipping JS syntax check..."
+        fi
+        echo "JavaScript validation completed"
 
   docker-build:
     runs-on: ubuntu-latest
-    needs: [app-tests, web-build]
+    needs: [app-tests, web-validation]
     if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
 
     steps:
@@ -70,9 +82,11 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Build and tag Docker images
+    - name: Build and test Docker images
       run: |
+        echo "Building Docker images..."
         docker compose build
+        echo "Docker build completed successfully"
 
     # Uncomment and configure the following if you want to push to Docker Hub or another registry
     # - name: Login to Docker Hub
@@ -83,4 +97,4 @@ jobs:
     # 
     # - name: Push Docker images
     #   run: |
-    #     docker compose push
+    #     docker compose push

.gitignore

@@ -172,3 +172,9 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
+
+# SAT-Annotator specific directories
+annotations/
+uploads/
+logs/
+app/logs/

Dockerfile.app

@@ -1,13 +1,14 @@
 # Build stage
-FROM python:3.11-slim as builder
+FROM python:3.12-slim as builder
 
 WORKDIR /app
 
 # Install build dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     wget \
     git \
+    && apt-get upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -18,23 +19,23 @@ ENV PATH="/opt/venv/bin:$PATH"
 # Copy and install requirements
 COPY app/requirements.txt .
 
-# Install specific PyTorch CPU-only version to save space
+# Install PyTorch (CPU version for smaller Docker image) and other dependencies
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
-    pip install --no-cache-dir torch==2.2.0+cpu torchvision==0.17.0+cpu -f https://download.pytorch.org/whl/torch_stable.html && \
-    pip install --no-cache-dir opencv-python-headless pillow fastapi uvicorn python-multipart && \
-    pip install --no-cache-dir supervision python-jose[cryptography] && \
+    pip install --no-cache-dir torch==2.5.1+cpu torchvision==0.20.1+cpu --index-url https://download.pytorch.org/whl/cpu && \
+    pip install --no-cache-dir -r requirements.txt && \
     pip install --no-cache-dir 'git+https://github.com/facebookresearch/segment-anything.git'
 
 # Final stage
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 WORKDIR /app
 
 # Install runtime dependencies only
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     libgl1-mesa-glx \
     libglib2.0-0 \
     wget \
+    && apt-get upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -45,11 +46,20 @@ ENV PATH="/opt/venv/bin:$PATH"
 # Create necessary directories
 RUN mkdir -p /app/models /app/annotations /app/uploads
 
+# Create a non-root user for security
+RUN groupadd -r appuser && useradd -r -g appuser appuser
+
 # Download the SAM model checkpoint (only in the final stage)
-RUN wget --no-verbose https://dl.fbaipublicfiles.com/segment_anything/sam_vit_h_4b8939.pth -P /app/models/
+RUN wget --no-verbose https://dl.fbaipublicfiles.com/segment-anything/sam_vit_h_4b8939.pth -P /app/models/
 
 # Copy the application
 COPY . .
 
+# Change ownership to the non-root user
+RUN chown -R appuser:appuser /app
+
+# Switch to the non-root user
+USER appuser
+
 # Command to run the application
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

Dockerfile.web

@@ -1,20 +1,27 @@
-FROM node:22-alpine
+FROM python:3.12-slim
 
 WORKDIR /web
 
-# Install netcat for health checking
-RUN apk add --no-cache netcat-openbsd
-
-COPY web/package.json web/package-lock.json ./
-RUN npm install
+# Install basic tools and security updates
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    && apt-get upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
+# Copy static files
 COPY web .
 
-# Make the wait script executable
-COPY web/wait-for-backend.sh /wait-for-backend.sh
-RUN chmod +x /wait-for-backend.sh
+# Create a non-root user for security
+RUN groupadd -r webuser && useradd -r -g webuser webuser
+
+# Change ownership to the non-root user
+RUN chown -R webuser:webuser /web
+
+# Switch to the non-root user
+USER webuser
 
-EXPOSE 5173
+EXPOSE 8080
 
-# Use the wait script before starting the app
-CMD ["/wait-for-backend.sh", "npm", "run", "dev"]
+# Serve static files using Python's built-in server
+CMD ["python", "-m", "http.server", "8080"]