Feat/package - part 1

.devcontainer/devcontainer.json

@@ -27,20 +27,27 @@
                 "ms-python.python",
                 "ms-python.black-formatter",
                 "ms-python.pylance",
-                "ms-python.vscode-pylance",
+                "charliermarsh.ruff",
+                "tamasfe.even-better-toml",
                 // Frontend extensions
                 "dbaeumer.vscode-eslint",
                 "esbenp.prettier-vscode",
                 "ms-vscode.vscode-typescript-next"
             ],
             "settings": {
+                // Python analysis settings
                 "python.analysis.autoImportCompletions": true,
                 "python.analysis.autoImportUserSymbols": true,
                 "python.analysis.importFormat": "relative",
-                "python.analysis.importSortEnabled": true,
-                "python.analysis.importSortOrder": ["stdlib", "thirdparty", "local"],
                 "python.analysis.typeCheckingMode": "strict",
                 "python.defaultInterpreterPath": "/usr/local/bin/python",
+
+                // Python linting and formatting
+                "python.linting.enabled": true,
+                "python.linting.mypyEnabled": true,
+                "python.linting.ruffEnabled": true,
+
+                // TypeScript settings
                 "typescript.tsdk": "/pyspur/frontend/node_modules/typescript/lib",
                 "typescript.preferences.importModuleSpecifier": "non-relative",
                 "typescript.preferences.projectRoot": "/pyspur/frontend",
@@ -50,7 +57,11 @@
                 "[python]": {
                     "editor.formatOnType": true,
                     "editor.formatOnSave": true,
-                    "editor.defaultFormatter": "ms-python.black-formatter"
+                    "editor.defaultFormatter": "ms-python.black-formatter",
+                    "editor.codeActionsOnSave": {
+                        "source.organizeImports": "always",
+                        "source.fixAll.ruff": "always"
+                    }
                 },
                 "[json]": {
                     "editor.quickSuggestions": {

.dockerignore

@@ -0,0 +1,88 @@
+# Version control
+.git
+.gitignore
+
+# Dependencies
+**/node_modules
+**/__pycache__
+**/*.pyc
+**/*.pyo
+**/*.pyd
+**/*.so
+**/.Python
+**/env
+**/venv
+**/.env
+**/.env.local
+**/.env.development.local
+**/.env.test.local
+**/.env.production.local
+
+# Python specific
+**/develop-eggs
+**/eggs
+**/.eggs
+**/parts
+**/sdist
+**/var
+**/wheels
+**/*.egg-info
+**/.installed.cfg
+**/*.egg
+
+# Build outputs
+**/dist
+**/build
+**/.next
+**/out
+**/*.egg-info
+
+# Development/IDE files
+**/.idea
+**/.vscode
+**/.DS_Store
+**/*.swp
+**/*.swo
+
+# Docker files
+**/Dockerfile*
+**/.dockerignore
+docker-compose*.yml
+
+# Test files
+**/__tests__
+**/test
+**/*.test.js
+**/*.spec.js
+**/*.test.py
+**/*.spec.py
+**/coverage
+**/htmlcov
+
+# Documentation
+**/*.md
+**/docs
+
+# Logs
+**/logs
+**/*.log
+**/npm-debug.log*
+**/yarn-debug.log*
+**/yarn-error.log*
+
+# Cache
+**/.cache
+**/.npm
+**/.eslintcache
+**/.pytest_cache
+**/__pycache__
+**/.coverage
+
+# Data directories
+**/data
+**/uploads
+**/downloads
+
+# Databases
+**/*.db
+**/sqlite/*.db 

.env.example

@@ -23,9 +23,9 @@ DEBUG=False
 FRONTEND_PORT=3000
 FRONTEND_HOST=0.0.0.0
 
-# Nginx Configuration
-# This is the port that will be used to access the application
-NGINX_PORT=6080
+# Application Port Configuration
+# This is the port that will be exposed to access the PySpur application
+PYSPUR_PORT=6080
 
 # ======================
 # Database Settings

.github/workflows/release.yml

@@ -7,7 +7,6 @@ on:
 env:
   REGISTRY: ghcr.io
   BACKEND_IMAGE_NAME: ${{ github.repository }}-backend
-  FRONTEND_IMAGE_NAME: ${{ github.repository }}-frontend
 
 jobs:
   build-and-push:
@@ -36,31 +35,12 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Extract metadata (tags, labels) for Frontend
-        id: meta-frontend
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
       - name: Build and push Backend image
         uses: docker/build-push-action@v5
         with:
-          context: ./backend
-          file: ./backend/Dockerfile
+          context: .
+          file: ./Dockerfile.backend
           push: true
           target: production
           tags: ${{ steps.meta-backend.outputs.tags }}
-          labels: ${{ steps.meta-backend.outputs.labels }}
-
-      - name: Build and push Frontend image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./frontend
-          file: ./frontend/Dockerfile
-          push: true
-          target: production
-          tags: ${{ steps.meta-frontend.outputs.tags }}
-          labels: ${{ steps.meta-frontend.outputs.labels }} 
+          labels: ${{ steps.meta-backend.outputs.labels }} 

.gitignore

@@ -162,4 +162,7 @@ cython_debug/
 #.idea/
 
 .DS_Store
-.vscode
+.vscode
+
+# Ruff cache
+**/.ruff_cache/

Dockerfile.backend

@@ -0,0 +1,33 @@
+FROM python:3.12-slim AS base
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    gcc \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /pyspur/backend
+COPY backend/requirements.txt .
+RUN pip install -r requirements.txt
+
+# Development stage
+FROM base AS development
+ENV PYTHONPATH=/pyspur/backend
+# Development-specific instructions here
+
+# Frontend build stage
+FROM node:23-alpine AS frontend-builder
+WORKDIR /pyspur/frontend
+COPY frontend/package*.json ./
+RUN npm ci
+COPY frontend/ .
+RUN npm run build
+
+# Production stage
+FROM base AS production
+ENV PYTHONPATH=/pyspur/backend
+COPY backend/ .
+# Copy frontend static files from frontend build stage
+RUN mkdir -p /pyspur/backend/pyspur/static
+RUN rm -rf /pyspur/backend/pyspur/static/*
+COPY --from=frontend-builder /pyspur/frontend/out/ /pyspur/backend/pyspur/static/
+# Production-specific instructions here 

frontend/Dockerfile → Dockerfile.frontend

@@ -1,7 +1,6 @@
-# Base stage
 FROM node:23-alpine AS base
 WORKDIR /pyspur/frontend
-COPY package*.json ./
+COPY frontend/package*.json ./
 
 # Development stage
 FROM base AS development
@@ -11,6 +10,6 @@ RUN npm install
 # Production stage
 FROM base AS production
 RUN npm ci --only=production
-COPY . .
+COPY frontend/ .
 RUN npm run build
-# Production-specific instructions here
+# Production-specific instructions here 

backend/alembic.ini

@@ -3,7 +3,7 @@
 [alembic]
 # path to migration scripts
 # Use forward slashes (/) also on windows to provide an os agnostic path
-script_location = app/models/management/alembic/
+script_location = pyspur/models/management/alembic/
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time