Adriano
b075115cef
- Add file proxy route in maker blueprint (X-API-Key auth for browser requests) - Persist file_path/annotations_json to DB via RecipeCreate/RecipeUpdate schemas - Fix canvas sizing using grandparent container instead of Fabric.js wrapper div - Defer canvas init with requestAnimationFrame for x-show timing - Add PDF.js support in annotation-editor and annotation-viewer - Fix annotations_json double-serialization (parse string to object before send) - Handle FastAPI 422 validation error arrays in api_client and JS error display - Update template URLs to use /maker/api/files/ proxy path Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
136 lines
4.5 KiB
Python
136 lines
4.5 KiB
Python
"""API Client - wrapper for HTTP requests to FastAPI server."""
|
|
from typing import Any
|
|
|
|
import requests
|
|
from flask import 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
|
|
|
|
@property
|
|
def _headers(self) -> dict[str, str]:
|
|
"""Build request headers with API key from session."""
|
|
headers = {"Content-Type": "application/json"}
|
|
api_key = session.get("api_key")
|
|
if api_key:
|
|
headers["X-API-Key"] = api_key
|
|
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", "")}
|
|
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)}"
|
|
}
|
|
|
|
|
|
api_client = APIClient()
|