Adriano
1a0431366f
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>
94 lines
3.0 KiB
Python
94 lines
3.0 KiB
Python
"""Pydantic schemas for RecipeTask and RecipeSubtask operations."""
|
|
from typing import Any, Optional
|
|
|
|
from pydantic import BaseModel, ConfigDict, Field
|
|
|
|
|
|
class SubtaskCreate(BaseModel):
|
|
"""Schema for creating a subtask."""
|
|
marker_number: int = Field(..., ge=1)
|
|
description: str = Field(..., min_length=1, max_length=500)
|
|
measurement_type: Optional[str] = Field(None, max_length=100)
|
|
nominal: Optional[float] = None
|
|
utl: Optional[float] = None
|
|
uwl: Optional[float] = None
|
|
lwl: Optional[float] = None
|
|
ltl: Optional[float] = None
|
|
unit: str = Field("mm", max_length=20)
|
|
image_path: Optional[str] = Field(None, max_length=500)
|
|
|
|
|
|
class SubtaskUpdate(BaseModel):
|
|
"""Schema for updating a subtask."""
|
|
marker_number: Optional[int] = Field(None, ge=1)
|
|
description: Optional[str] = Field(None, min_length=1, max_length=500)
|
|
measurement_type: Optional[str] = Field(None, max_length=100)
|
|
nominal: Optional[float] = None
|
|
utl: Optional[float] = None
|
|
uwl: Optional[float] = None
|
|
lwl: Optional[float] = None
|
|
ltl: Optional[float] = None
|
|
unit: Optional[str] = Field(None, max_length=20)
|
|
image_path: Optional[str] = Field(None, max_length=500)
|
|
|
|
|
|
class SubtaskResponse(BaseModel):
|
|
"""Schema for subtask response."""
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
task_id: int
|
|
marker_number: int
|
|
description: str
|
|
measurement_type: Optional[str] = None
|
|
nominal: Optional[float] = None
|
|
utl: Optional[float] = None
|
|
uwl: Optional[float] = None
|
|
lwl: Optional[float] = None
|
|
ltl: Optional[float] = None
|
|
unit: str
|
|
image_path: Optional[str] = None
|
|
|
|
|
|
class TaskCreate(BaseModel):
|
|
"""Schema for creating a task."""
|
|
title: str = Field(..., min_length=1, max_length=255)
|
|
directive: Optional[str] = None
|
|
description: Optional[str] = None
|
|
file_path: Optional[str] = Field(None, max_length=500)
|
|
file_type: Optional[str] = Field(None, pattern="^(image|pdf)$")
|
|
annotations_json: Optional[dict[str, Any]] = None
|
|
subtasks: list[SubtaskCreate] = []
|
|
|
|
|
|
class TaskUpdate(BaseModel):
|
|
"""Schema for updating a task."""
|
|
title: Optional[str] = Field(None, min_length=1, max_length=255)
|
|
directive: Optional[str] = None
|
|
description: Optional[str] = None
|
|
file_path: Optional[str] = Field(None, max_length=500)
|
|
file_type: Optional[str] = Field(None, pattern="^(image|pdf)$")
|
|
annotations_json: Optional[dict[str, Any]] = None
|
|
|
|
|
|
class TaskResponse(BaseModel):
|
|
"""Schema for task response."""
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
version_id: int
|
|
recipe_id: Optional[int] = None
|
|
order_index: int
|
|
title: str
|
|
directive: Optional[str] = None
|
|
description: Optional[str] = None
|
|
file_path: Optional[str] = None
|
|
file_type: Optional[str] = None
|
|
annotations_json: Optional[dict[str, Any]] = None
|
|
subtasks: list[SubtaskResponse] = []
|
|
|
|
|
|
class TaskReorderRequest(BaseModel):
|
|
"""Schema for reordering tasks."""
|
|
task_ids: list[int] = Field(..., min_length=1)
|