style: format code with ruff

Makefile

@@ -1,9 +1,12 @@
-
 # ---------- Config ----------
 VENV_DIR   ?= .venv
 PY         ?= $(if $(wildcard $(VENV_DIR)/bin/python),$(VENV_DIR)/bin/python,python3)
 PIP        ?= $(if $(wildcard $(VENV_DIR)/bin/pip),$(VENV_DIR)/bin/pip,pip)
 UVICORN    ?= $(if $(wildcard $(VENV_DIR)/bin/uvicorn),$(VENV_DIR)/bin/uvicorn,uvicorn)
+RUFF       ?= $(if $(wildcard $(VENV_DIR)/bin/ruff),$(VENV_DIR)/bin/ruff,ruff)
+MYPY       ?= $(if $(wildcard $(VENV_DIR)/bin/mypy),$(VENV_DIR)/bin/mypy,mypy)
+PYTEST     ?= $(if $(wildcard $(VENV_DIR)/bin/pytest),$(VENV_DIR)/bin/pytest,pytest)
+
 DOCKER_IMG ?= nl2sql-copilot
 PORT       ?= 8000
 
@@ -30,29 +33,32 @@ dev-install: ## Install dev tools (ruff, mypy, pytest, coverage, uvicorn, etc.)
 	$(PIP) install -U pip wheel
 	$(PIP) install ruff mypy pytest pytest-cov uvicorn
 
+.PHONY: bootstrap
+bootstrap: venv dev-install ## Create venv and install dev tools
+
 # ---------- Quality ----------
 .PHONY: format
 format: ## Auto-format & fix with ruff
-	$(VENV_DIR)/bin/ruff format .
-	$(VENV_DIR)/bin/ruff check . --fix
+	$(RUFF) format .
+	$(RUFF) check . --fix
 
 .PHONY: lint
 lint: ## Run linting and type checking
-	$(VENV_DIR)/bin/ruff check .
-	$(VENV_DIR)/bin/mypy .
+	$(RUFF) check .
+	$(MYPY) .
 
 .PHONY: typecheck
 typecheck: ## Run type checking only
-	$(VENV_DIR)/bin/mypy .
+	$(MYPY) .
 
 # ---------- Tests ----------
 .PHONY: test
 test: ## Run pytest quietly
-	PYTHONPATH=$$PWD $(VENV_DIR)/bin/pytest -q
+	PYTHONPATH=$$PWD $(PYTEST) -q
 
 .PHONY: cov
 cov: ## Run tests with coverage
-	PYTHONPATH=$$PWD $(VENV_DIR)/bin/pytest --cov=nl2sql --cov-report=term-missing
+	PYTHONPATH=$$PWD $(PYTEST) --cov=nl2sql --cov-report=term-missing
 
 # ---------- Run ----------
 .PHONY: run

app/main.py

@@ -1,9 +1,9 @@
 from dotenv import load_dotenv
-load_dotenv()
 
-from fastapi import FastAPI # noqa: E402
-from app.routers import nl2sql # noqa: E402
+load_dotenv()
 
+from fastapi import FastAPI  # noqa: E402
+from app.routers import nl2sql  # noqa: E402
 
 
 app = FastAPI(

app/routers/nl2sql.py

@@ -36,12 +36,17 @@ _DB_MAP: Dict[str, Dict[str, object]] = {}
 # -------------------------------
 DB_MODE = os.getenv("DB_MODE", "sqlite").lower()  # "sqlite" or "postgres"
 POSTGRES_DSN = os.getenv("POSTGRES_DSN")
-DEFAULT_SQLITE_DB = os.getenv("DEFAULT_SQLITE_DB", "data/chinook.db")  # keep your current default
+DEFAULT_SQLITE_DB = os.getenv(
+    "DEFAULT_SQLITE_DB", "data/chinook.db"
+)  # keep your current default
+
 
 def _cleanup_db_map() -> None:
     """Remove expired uploaded DB files (best-effort)."""
     now = time.time()
-    expired = [k for k, v in _DB_MAP.items() if now - float(v.get("ts", 0)) > _DB_TTL_SECONDS]
+    expired = [
+        k for k, v in _DB_MAP.items() if now - float(v.get("ts", 0)) > _DB_TTL_SECONDS
+    ]
     for k in expired:
         path = _DB_MAP[k].get("path")
         try:
@@ -51,6 +56,7 @@ def _cleanup_db_map() -> None:
             pass
         _DB_MAP.pop(k, None)
 
+
 def _resolve_sqlite_path(db_id: Optional[str]) -> str:
     """Resolve a SQLite file path from db_id or fallback to default."""
     _cleanup_db_map()
@@ -58,6 +64,7 @@ def _resolve_sqlite_path(db_id: Optional[str]) -> str:
         return str(_DB_MAP[db_id]["path"])
     return DEFAULT_SQLITE_DB
 
+
 def _select_adapter(db_id: Optional[str]) -> Union[PostgresAdapter, SQLiteAdapter]:
     """
     Build a DB adapter for this request.
@@ -66,7 +73,9 @@ def _select_adapter(db_id: Optional[str]) -> Union[PostgresAdapter, SQLiteAdapte
     """
     if DB_MODE == "postgres":
         if not POSTGRES_DSN:
-            raise HTTPException(status_code=500, detail="POSTGRES_DSN is not configured")
+            raise HTTPException(
+                status_code=500, detail="POSTGRES_DSN is not configured"
+            )
         return PostgresAdapter(POSTGRES_DSN)
 
     # sqlite mode
@@ -75,12 +84,14 @@ def _select_adapter(db_id: Optional[str]) -> Union[PostgresAdapter, SQLiteAdapte
     # If not, ensure your adapter enforces PRAGMA query_only=ON and prevents DDL/DML.
     return SQLiteAdapter(sqlite_path)
 
+
 # -------------------------------
 # LLM providers & shared components (stateless)
 # -------------------------------
 def get_llm():
     return OpenAIProvider()
 
+
 _detector = AmbiguityDetector()
 _planner = Planner(get_llm())
 _generator = Generator(get_llm())
@@ -88,6 +99,7 @@ _safety = Safety()
 _verifier = Verifier()
 _repair = Repair(get_llm())
 
+
 def _build_pipeline(adapter: Union[PostgresAdapter, SQLiteAdapter]) -> Pipeline:
     """Build a fresh Pipeline with a per-request Executor bound to the chosen adapter."""
     executor = Executor(adapter)
@@ -101,6 +113,7 @@ def _build_pipeline(adapter: Union[PostgresAdapter, SQLiteAdapter]) -> Pipeline:
         repair=_repair,
     )
 
+
 # -------------------------------
 # Helpers
 # -------------------------------
@@ -108,6 +121,7 @@ def _to_dict(obj):
     """Safely convert dataclass → dict."""
     return asdict(obj) if is_dataclass(obj) else obj
 
+
 def _round_trace(t: dict) -> dict:
     """Round float fields to keep responses tidy and stable."""
     if t.get("cost_usd") is not None:
@@ -116,6 +130,7 @@ def _round_trace(t: dict) -> dict:
         t["duration_ms"] = round(t["duration_ms"], 2)
     return t
 
+
 # -------------------------------
 # Upload endpoint (SQLite only)
 # Path will be /api/nl2sql/upload_db if your root APIRouter is mounted at /api
@@ -130,16 +145,22 @@ async def upload_db(file: UploadFile = File(...)):
     - Files are stored under /tmp and cleaned by TTL.
     """
     if DB_MODE != "sqlite":
-        raise HTTPException(status_code=400, detail="DB upload is only supported in sqlite mode")
+        raise HTTPException(
+            status_code=400, detail="DB upload is only supported in sqlite mode"
+        )
 
     filename = file.filename or "db.sqlite"
     if not (filename.endswith(".db") or filename.endswith(".sqlite")):
-        raise HTTPException(status_code=400, detail="Only .db or .sqlite files are allowed")
+        raise HTTPException(
+            status_code=400, detail="Only .db or .sqlite files are allowed"
+        )
 
     data = await file.read()
     max_bytes = int(os.getenv("UPLOAD_MAX_BYTES", str(20 * 1024 * 1024)))  # 20 MB
     if len(data) > max_bytes:
-        raise HTTPException(status_code=400, detail=f"File too large (> {max_bytes} bytes)")
+        raise HTTPException(
+            status_code=400, detail=f"File too large (> {max_bytes} bytes)"
+        )
 
     db_id = str(uuid.uuid4())
     out_path = os.path.join(_DB_UPLOAD_DIR, f"{db_id}.sqlite")
@@ -152,6 +173,7 @@ async def upload_db(file: UploadFile = File(...)):
     _DB_MAP[db_id] = {"path": out_path, "ts": time.time()}
     return {"db_id": db_id}
 
+
 # -------------------------------
 # Main NL2SQL endpoint
 # Path will be /api/nl2sql if your root APIRouter is mounted at /api

demo/app.py

@@ -3,7 +3,7 @@ import requests
 import gradio as gr
 
 API_UPLOAD = "http://localhost:8000/api/v1/nl2sql/upload_db"
-API_QUERY  = "http://localhost:8000/api/v1/nl2sql"
+API_QUERY = "http://localhost:8000/api/v1/nl2sql"
 
 
 def upload_db(file_obj):
@@ -44,8 +44,12 @@ def query_to_sql(user_query, db_id, debug):
 
     # Flags summary
     ambiguous = "Yes" if d.get("ambiguous") else "No"
-    safety = ("Allowed" if d.get("safety", {}).get("allowed", True) else f"Blocked: {d.get('safety', {}).get('blocked_reason')}")
-    verification = ("Passed" if d.get("verification", {}).get("passed") else "Failed")
+    safety = (
+        "Allowed"
+        if d.get("safety", {}).get("allowed", True)
+        else f"Blocked: {d.get('safety', {}).get('blocked_reason')}"
+    )
+    verification = "Passed" if d.get("verification", {}).get("passed") else "Failed"
     repair = d.get("repair", {})
     repair_text = f"Applied: {repair.get('applied', False)}, Attempts: {repair.get('attempts', 0)}"
 
@@ -70,7 +74,9 @@ with gr.Blocks(title="NL2SQL Copilot") as demo:
     db_state = gr.State(value=None)
 
     with gr.Row():
-        db_file = gr.File(label="Upload SQLite (.db/.sqlite)", file_types=[".db", ".sqlite"])
+        db_file = gr.File(
+            label="Upload SQLite (.db/.sqlite)", file_types=[".db", ".sqlite"]
+        )
         upload_btn = gr.Button("Upload DB")
     db_msg = gr.Markdown()
     upload_btn.click(upload_db, inputs=[db_file], outputs=[db_state, db_msg])
@@ -100,9 +106,18 @@ with gr.Blocks(title="NL2SQL Copilot") as demo:
     run.click(
         query_to_sql,
         inputs=[q, db_state, debug],
-        outputs=[badges, sql_out, exp_out, res_out, trace, repair_candidates, repair_diff, timings],
+        outputs=[
+            badges,
+            sql_out,
+            exp_out,
+            res_out,
+            trace,
+            repair_candidates,
+            repair_diff,
+            timings,
+        ],
     )
 
 if __name__ == "__main__":
     # Let Gradio pick a free port by default to avoid collisions
-    demo.launch()
+    demo.launch()