Global refactoring

Author: aledipa

.dockerignore

@@ -0,0 +1,62 @@
+# Git
+.git
+.gitignore
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Virtual environments
+venv/
+env/
+ENV/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Logs
+*.log
+logs/
+
+# Test coverage
+.coverage
+.pytest_cache/
+htmlcov/
+
+# Documentation
+docs/
+*.md
+
+# Local data (these should be mounted as volumes)
+src/data/*.db
+src/data/*.json
+
+# Temporary files
+tmp/
+temp/

.github/workflows/ci.yml

@@ -0,0 +1,78 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        python-version: [3.9, 3.10, 3.11]
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Cache pip packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install pytest pytest-cov pytest-mock
+    
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    
+    - name: Test with pytest
+      run: |
+        pytest src/tests/ --cov=src --cov-report=xml --cov-report=html
+    
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage.xml
+        flags: unittests
+        name: codecov-umbrella
+        fail_ci_if_error: false
+
+  docker:
+    runs-on: ubuntu-latest
+    needs: test
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    
+    - name: Build Docker image
+      run: |
+        docker build -t freegpt4-api:latest .
+    
+    - name: Test Docker container
+      run: |
+        docker run --rm -d --name test-container freegpt4-api:latest
+        sleep 10
+        docker logs test-container
+        docker stop test-container || true

Dockerfile

@@ -1,18 +1,65 @@
+# Multi-stage build for better optimization
+FROM python:3.12-slim as builder
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+    gcc \
+    libsqlite3-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create virtual environment
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Copy requirements and install Python dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
+
+# Production stage
 FROM python:3.12-slim
 
-WORKDIR /app/
-COPY --chown=www-data:www-data . .
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    chromium \
+    libsqlite3-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
+# Create non-root user
+RUN groupadd -r freegpt && useradd -r -g freegpt freegpt
+
+# Copy virtual environment from builder
+COPY --from=builder /opt/venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
-RUN apt update && apt install gcc chromium libsqlite3-dev -y
-RUN pip3 install --upgrade pip
-RUN pip3 install -r requirements.txt
+# Set working directory
+WORKDIR /app
 
+# Copy application code
+COPY --chown=freegpt:freegpt . .
+
+# Create data directory with proper permissions
+RUN mkdir -p /app/src/data && \
+    chown -R freegpt:freegpt /app
+
+# Switch to non-root user
+USER freegpt
+
+# Set working directory to src
 WORKDIR /app/src
 
+# Environment variables
 ENV PORT=5500
-EXPOSE "$PORT/tcp"
+ENV PYTHONPATH="/app/src"
+
+# Expose port
+EXPOSE $PORT
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost:$PORT/models || exit 1
 
-#shell form necessary
-SHELL ["python3","FreeGPT4_Server.py"]
-ENTRYPOINT ["python3","FreeGPT4_Server.py"]
-#CMD ["--cookie-file","/cookies.json"]
+# Default command
+ENTRYPOINT ["python", "FreeGPT4_Server.py"]
+CMD ["--enable-gui", "--enable-fast-api"]

__pycache__/test_simple.cpython-310-pytest-7.4.0.pyc

@@ -0,0 +1,18 @@
+[tool:pytest]
+testpaths = tests
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+addopts = 
+    -v
+    --tb=short
+    --strict-markers
+    --disable-warnings
+    --color=yes
+markers =
+    unit: Unit tests
+    integration: Integration tests
+    slow: Slow tests
+    auth: Authentication tests
+    database: Database tests
+    validation: Validation tests