fix: resolve Dockerfile/gitignore; ignore L2CS weights (downloaded in Docker)

.gitignore

@@ -42,10 +42,10 @@ htmlcov/
 # Project specific
 focus_guard.db
 test_focus_guard.db
-<<<<<<< HEAD
-=======
 static/
->>>>>>> feature/integration2.0
+# Large weights: fetch at build/runtime (see download_l2cs_weights.py)
+checkpoints/L2CSNet_gaze360.pkl
+models/L2CS-Net/models/L2CSNet_gaze360.pkl
 __pycache__/
 docs/
 docs

Dockerfile

@@ -2,20 +2,12 @@ FROM python:3.10-slim
 
 RUN useradd -m -u 1000 user
 ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
-<<<<<<< HEAD
-=======
-
->>>>>>> feature/integration2.0
 ENV PYTHONUNBUFFERED=1
 
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-<<<<<<< HEAD
     libglib2.0-0 libsm6 libxrender1 libxext6 libxcb1 libgl1 libgles2 libegl1 libgomp1 \
-=======
-    libglib2.0-0 libsm6 libxrender1 libxext6 libxcb1 libgl1 libgomp1 \
->>>>>>> feature/integration2.0
     ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev \
     libavdevice-dev libopus-dev libvpx-dev libsrtp2-dev \
     build-essential nodejs npm git \
@@ -24,9 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu
 
 COPY requirements.txt ./
-<<<<<<< HEAD
-RUN pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu \
-    && pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
@@ -36,24 +26,10 @@ RUN npm install && npm run build && mkdir -p /app/static && cp -R dist/* /app/st
 ENV FOCUSGUARD_CACHE_DIR=/app/.cache/focusguard
 RUN python -c "from models.face_mesh import _ensure_model; _ensure_model()"
 RUN python download_l2cs_weights.py || echo "[WARN] L2CS weights not downloaded — will run without gaze model"
-=======
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-RUN npm install && npm run build && mkdir -p /app/static && cp -R dist/* /app/static/
-
-ENV FOCUSGUARD_CACHE_DIR=/app/.cache/focusguard
-RUN python -c "from models.face_mesh import _ensure_model; _ensure_model()"
->>>>>>> feature/integration2.0
 
 RUN mkdir -p /app/data && chown -R user:user /app
 
 USER user
 EXPOSE 7860
 
-<<<<<<< HEAD
 CMD ["bash", "start.sh"]
-=======
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860", "--log-level", "info"]
->>>>>>> feature/integration2.0