fix: resolved merge conflicts

Author: Lochit-Vinay

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -21,9 +21,9 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] Test B
 
 **Test Configuration**:
-* Firmware version:
-* Hardware:
-* SDK:
+* Python version:
+* Docker/Compose version:
+* OS:
 
 ## Checklist:
 

.github/workflows/docker-build.yml

@@ -0,0 +1,18 @@
+name: Docker Build
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build Docker image
+        run: |
+          docker build -t fireform:test .

.github/workflows/lint.yml

@@ -0,0 +1,29 @@
+name: Lint
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install linter
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+
+      - name: Run linter
+        run: |
+          ruff check src/ --output-format=github

.github/workflows/tests.yml

@@ -0,0 +1,31 @@
+name: Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install pytest
+
+      - name: Run tests
+        env:
+          PYTHONPATH: src
+        run: |
+          python -m pytest src/test/ -v --tb=short --ignore=src/test/test_model.py

.gitignore

@@ -2,4 +2,5 @@
 .idea
 venv
 .venv
-*.db
+*.db
+.vscode

Dockerfile

@@ -6,6 +6,9 @@ WORKDIR /app
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     curl \
+    libgl1 \
+    libglib2.0-0 \
+    libxcb1 \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy and install Python dependencies
@@ -15,8 +18,11 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy application code
 COPY . .
 
-# Set Python path so imports work correctly
-ENV PYTHONPATH=/app/src
+# All imports use api.*, src.* which require the root to be on the path
+ENV PYTHONPATH=/app
 
-# Keep container running for interactive use
-CMD ["tail", "-f", "/dev/null"]
+# Expose FastAPI port
+EXPOSE 8000
+
+# Start the FastAPI server (not tail -f /dev/null which does nothing)
+CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help build up down logs shell exec pull-model test clean fireform
+.PHONY: help build up down logs shell exec pull-model test clean fireform logs-app logs-ollama logs-frontend super-clean
 
 help:
 	@printf '%s\n' \
@@ -16,16 +16,25 @@ help:
 	@echo "make up           - Start all containers"
 	@echo "make down         - Stop all containers"
 	@echo "make logs         - View container logs"
+	@echo "make logs-app     - View API container logs"
+	@echo "make logs-frontend - View frontend container logs"
+	@echo "make logs-ollama  - View Ollama container logs"
 	@echo "make shell        - Open Python shell in app container"
 	@echo "make exec         - Execute Python script in container"
 	@echo "make pull-model   - Pull Mistral model into Ollama"
 	@echo "make test         - Run tests"
 	@echo "make clean        - Remove containers"
 	@echo "make super-clean  - [CAUTION] Use carefully. Cleans up ALL stopped  containers, networks, build cache..."
 
-fireform: build up
-	@echo "Launching interactive shell in the app container..."
-	docker compose exec app /bin/bash
+# Fix #382 — pull-model is now part of the main setup flow
+# Mistral is pulled automatically before you need it
+fireform: build up pull-model
+	@echo ""
+	@echo "✅ FireForm is ready!"
+	@echo "   API:      http://localhost:8000"
+	@echo "   API Docs: http://localhost:8000/docs"
+	@echo ""
+	@echo "Run 'make logs' to view live logs, 'make down' to stop."
 
 build:
 	docker compose build
@@ -45,17 +54,25 @@ logs-app:
 logs-ollama:
 	docker compose logs -f ollama
 
+logs-frontend:
+	docker compose logs -f frontend
+
 shell:
 	docker compose exec app /bin/bash
 
+# Start the FastAPI server inside the running container
+run:
+	docker compose exec app uvicorn api.main:app --host 0.0.0.0 --port 8000 --reload
+
 exec:
 	docker compose exec app python3 src/main.py
 
 pull-model:
 	docker compose exec ollama ollama pull mistral
 
+# Fix — correct test directory (was src/test/ which doesn't exist)
 test:
-	docker compose exec app python3 -m pytest src/test/
+	docker compose exec app python3 -m pytest tests/ -v
 
 clean:
 	docker compose down -v

api/db/init_db.py

@@ -1,9 +1,47 @@
-from sqlmodel import SQLModel
+import json
+import datetime
+from sqlmodel import SQLModel, Session, select
 from api.db.database import engine
 from api.db import models
+from api.db.models import Template
+
+def seed_db():
+    with Session(engine) as session:
+        # Check if we already have templates
+        statement = select(Template)
+        try:
+            results = session.exec(statement).first()
+        except Exception:
+            # Table might not exist yet if called at a weird time
+            results = None
+        
+        if not results:
+            print("Seeding database with default template...")
+            fields = {
+                "Employee's name": "string",
+                "Employee's job title": "string",
+                "Employee's department supervisor": "string",
+                "Employee's phone number": "string",
+                "Employee's email": "string",
+                "Signature": "string",
+                "Date": "string"
+            }
+            
+            # Using ID 2 as agreed to avoid any ID 1 corruption
+            default_template = Template(
+                id=2,
+                name="Manual Test Template",
+                fields=fields,
+                pdf_path="src/inputs/file_template_manual.pdf",
+                created_at=datetime.datetime.now()
+            )
+            session.add(default_template)
+            session.commit()
+            print("Database seeded successfully.")
 
 def init_db():
     SQLModel.metadata.create_all(engine)
+    seed_db()
 
 if __name__ == "__main__":
     init_db()

api/db/repositories.py

@@ -11,9 +11,14 @@ def create_template(session: Session, template: Template) -> Template:
 def get_template(session: Session, template_id: int) -> Template | None:
     return session.get(Template, template_id)
 
+
+def list_templates(session: Session) -> list[Template]:
+    statement = select(Template).order_by(Template.created_at.desc(), Template.id.desc())
+    return list(session.exec(statement))
+
 # Forms
 def create_form(session: Session, form: FormSubmission) -> FormSubmission:
     session.add(form)
     session.commit()
     session.refresh(form)
-    return form
+    return form

api/main.py

@@ -1,13 +1,39 @@
-import uuid
-from starlette.middleware.base import BaseHTTPMiddleware
+from contextlib import asynccontextmanager
+import os
+
 from fastapi import FastAPI
 from api.routes import templates, forms
-from fastapi import Request
-from fastapi.responses import JSONResponse
-from fastapi.exceptions import RequestValidationError
-from starlette.exceptions import HTTPException as StarletteHTTPException
+from api.db.init_db import init_db
+from api.errors.handlers import register_exception_handlers
+from fastapi.middleware.cors import CORSMiddleware
+from api.routes import forms, templates
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # Startup: Initialize the database and seed it if necessary
+    print("Initializing database...")
+    init_db()
+    yield
+    # Shutdown logic goes here if needed
+
+app = FastAPI(lifespan=lifespan)
+
+register_exception_handlers(app)
+
+default_origins = "http://127.0.0.1:5173"
+allowed_origins = [
+    origin.strip()
+    for origin in os.getenv("FRONTEND_ORIGINS", default_origins).split(",")
+    if origin.strip()
+]
 
-app = FastAPI()
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=allowed_origins,
+    allow_credentials=False,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
 class RequestIDMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next):
@@ -76,4 +102,4 @@ async def general_exception_handler(request: Request, exc: Exception):
 
 
 app.include_router(templates.router)
-app.include_router(forms.router)
+app.include_router(forms.router)