chore(v2): restructure monorepo to src/ layout with uv
Aligns the repo with the python-project-spec-design.md template chosen for V2.0.0. Big move, no logic changes. The 3 pre-existing test failures (test_recipes::test_update_recipe, test_recipes:: test_recipe_versioning, test_tasks::test_reorder_tasks, plus the client test_save_measurement_proxy) survive unchanged. Layout changes - server/ -> src/backend/ - server/middleware/ -> src/backend/api/middleware/ - server/routers/ -> src/backend/api/routers/ - server/models/ -> src/backend/models/orm/ - server/schemas/ -> src/backend/models/api/ - server/uploads/ -> uploads/ (project root, mounted volume) - server/tests/ -> src/backend/tests/ - client/ -> src/frontend/flask_app/ (Flask kept; React deroga is documented in CLAUDE.md, justified by tablet UX, USB caliper/barcode workflow and Fabric.js integration) Tooling - pyproject.toml: monorepo with [project] core deps and optional-dependencies server / client / dev. Replaces both server/requirements.txt and client/requirements.txt. - uv.lock + .python-version (3.11) committed for reproducible builds. - Dockerfile (root, backend) and Dockerfile.frontend rewritten to use uv sync --frozen --no-dev --extra server|client; legacy Dockerfiles preserved as Dockerfile.legacy for reference but excluded from build context via .dockerignore. - docker-compose.dev.yml + docker-compose.yml: build context now ".", dockerfile pointing to the root files. Code adjustments forced by the move - Every "from config|database|models|schemas|services|routers|middleware import ..." rewritten to its src.backend.* equivalent (50+ files including indented inline imports inside test bodies). - src/backend/migrations/env.py: insert project root into sys.path so alembic can resolve src.backend.* imports regardless of cwd. - src/backend/config.py: env_file ../../.env (was ../.env), upload_path resolves project root via parents[2]. - src/backend/tests/conftest.py + tests: import ... from src.backend.* instead of bare names; old per-directory pytest.ini files removed in favor of root pyproject.toml [tool.pytest.ini_options]. - .gitignore: uploads/ at root, src/frontend/flask_app/static/css/ tailwind.css path; .dockerignore tightened. - CLAUDE.md: rewrote sections "Layout del repository", "Comandi di Sviluppo", "Database & Migrations", "Test", "i18n", and all path references throughout the architecture sections. Verified - uv lock resolves 77 packages; uv sync --extra server --extra client --extra dev installs cleanly. - uv run pytest: 171 passed, 4 pre-existing failures. - uv run alembic -c src/backend/migrations/alembic.ini check loads config and metadata (errors only on the absent local MySQL). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,161 @@
|
||||
"""API Client - wrapper for HTTP requests to FastAPI server."""
|
||||
from typing import Any
|
||||
|
||||
import requests
|
||||
from flask import has_request_context, request, session
|
||||
|
||||
from config import Config
|
||||
|
||||
|
||||
class APIClient:
|
||||
"""HTTP client for TieMeasureFlow API server."""
|
||||
|
||||
def __init__(self):
|
||||
self.base_url = Config.API_SERVER_URL.rstrip("/")
|
||||
self.timeout = 30
|
||||
|
||||
@staticmethod
|
||||
def _real_client_ip() -> str | None:
|
||||
"""Best-effort tablet IP for downstream rate limiting.
|
||||
|
||||
Behind Nginx + ProxyFix, ``request.remote_addr`` already resolves to
|
||||
the tablet IP. Outside a request context (background tasks, tests),
|
||||
return None so we don't forge a bogus header.
|
||||
"""
|
||||
if not has_request_context():
|
||||
return None
|
||||
return request.remote_addr
|
||||
|
||||
@property
|
||||
def _headers(self) -> dict[str, str]:
|
||||
"""Build request headers with API key + real client IP from session."""
|
||||
headers = {"Content-Type": "application/json"}
|
||||
api_key = session.get("api_key")
|
||||
if api_key:
|
||||
headers["X-API-Key"] = api_key
|
||||
client_ip = self._real_client_ip()
|
||||
if client_ip:
|
||||
headers["X-Forwarded-For"] = client_ip
|
||||
headers["X-Real-IP"] = client_ip
|
||||
return headers
|
||||
|
||||
def _handle_response(self, response: requests.Response) -> dict[str, Any]:
|
||||
"""Parse response and return normalized dict.
|
||||
|
||||
Returns:
|
||||
- If 2xx and not 204: response JSON
|
||||
- If 204 No Content: empty dict
|
||||
- If 4xx/5xx: {"error": True, "status_code": ..., "detail": "..."}
|
||||
"""
|
||||
if response.ok:
|
||||
if response.status_code == 204:
|
||||
return {}
|
||||
return response.json()
|
||||
|
||||
# Non-OK response (4xx/5xx)
|
||||
try:
|
||||
error_body = response.json()
|
||||
detail = error_body.get("detail", str(error_body))
|
||||
# FastAPI 422 returns detail as a list of validation errors
|
||||
if isinstance(detail, list):
|
||||
detail = "; ".join(
|
||||
e.get("msg", str(e)) for e in detail if isinstance(e, dict)
|
||||
) or str(detail)
|
||||
except Exception:
|
||||
detail = response.text or f"HTTP {response.status_code}"
|
||||
|
||||
return {
|
||||
"error": True,
|
||||
"status_code": response.status_code,
|
||||
"detail": detail
|
||||
}
|
||||
|
||||
def get(self, endpoint: str, params: dict | None = None) -> dict[str, Any]:
|
||||
"""GET request to API server."""
|
||||
try:
|
||||
response = requests.get(
|
||||
f"{self.base_url}{endpoint}",
|
||||
headers=self._headers,
|
||||
params=params,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
return self._handle_response(response)
|
||||
except (requests.ConnectionError, requests.Timeout) as e:
|
||||
return {
|
||||
"error": True,
|
||||
"status_code": 0,
|
||||
"detail": f"Errore di connessione al server: {str(e)}"
|
||||
}
|
||||
|
||||
def post(self, endpoint: str, data: dict | None = None, files: dict | None = None) -> dict[str, Any]:
|
||||
"""POST request to API server."""
|
||||
try:
|
||||
if files:
|
||||
headers = {"X-API-Key": session.get("api_key", "")}
|
||||
client_ip = self._real_client_ip()
|
||||
if client_ip:
|
||||
headers["X-Forwarded-For"] = client_ip
|
||||
headers["X-Real-IP"] = client_ip
|
||||
response = requests.post(
|
||||
f"{self.base_url}{endpoint}",
|
||||
headers=headers,
|
||||
data=data,
|
||||
files=files,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
else:
|
||||
response = requests.post(
|
||||
f"{self.base_url}{endpoint}",
|
||||
headers=self._headers,
|
||||
json=data,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
return self._handle_response(response)
|
||||
except (requests.ConnectionError, requests.Timeout) as e:
|
||||
return {
|
||||
"error": True,
|
||||
"status_code": 0,
|
||||
"detail": f"Errore di connessione al server: {str(e)}"
|
||||
}
|
||||
|
||||
def put(self, endpoint: str, data: dict | None = None) -> dict[str, Any]:
|
||||
"""PUT request to API server."""
|
||||
try:
|
||||
response = requests.put(
|
||||
f"{self.base_url}{endpoint}",
|
||||
headers=self._headers,
|
||||
json=data,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
return self._handle_response(response)
|
||||
except (requests.ConnectionError, requests.Timeout) as e:
|
||||
return {
|
||||
"error": True,
|
||||
"status_code": 0,
|
||||
"detail": f"Errore di connessione al server: {str(e)}"
|
||||
}
|
||||
|
||||
def delete(self, endpoint: str) -> dict[str, Any]:
|
||||
"""DELETE request to API server."""
|
||||
try:
|
||||
response = requests.delete(
|
||||
f"{self.base_url}{endpoint}",
|
||||
headers=self._headers,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
return self._handle_response(response)
|
||||
except (requests.ConnectionError, requests.Timeout) as e:
|
||||
return {
|
||||
"error": True,
|
||||
"status_code": 0,
|
||||
"detail": f"Errore di connessione al server: {str(e)}"
|
||||
}
|
||||
|
||||
# --- Domain helpers ---
|
||||
|
||||
def get_station_recipes(self, station_code: str) -> dict[str, Any]:
|
||||
"""Return the list of active recipes assigned to the given station."""
|
||||
return self.get(f"/api/stations/by-code/{station_code}/recipes")
|
||||
|
||||
|
||||
api_client = APIClient()
|
||||
Reference in New Issue
Block a user