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,273 @@
|
||||
"""Shared test fixtures for server tests.
|
||||
|
||||
Uses SQLite async (aiosqlite) as in-memory test database.
|
||||
Overrides FastAPI's get_db dependency to inject the test session.
|
||||
"""
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from collections.abc import AsyncGenerator
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
import pytest_asyncio
|
||||
from httpx import ASGITransport, AsyncClient
|
||||
from sqlalchemy.ext.asyncio import (
|
||||
AsyncSession,
|
||||
async_sessionmaker,
|
||||
create_async_engine,
|
||||
)
|
||||
from sqlalchemy.pool import StaticPool
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Mock heavy optional dependencies that require system libraries.
|
||||
# WeasyPrint needs GTK/Pango which may not be available in test environments.
|
||||
# We mock it before any server code is imported.
|
||||
# ---------------------------------------------------------------------------
|
||||
if "weasyprint" not in sys.modules:
|
||||
_mock_weasyprint = MagicMock()
|
||||
sys.modules["weasyprint"] = _mock_weasyprint
|
||||
|
||||
# Ensure the server package is importable
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
|
||||
from src.backend.database import Base, get_db
|
||||
from src.backend.main import app
|
||||
from src.backend.api.middleware.rate_limit import RateLimitMiddleware
|
||||
from src.backend.models.orm.user import User
|
||||
from src.backend.models.orm.recipe import Recipe, RecipeVersion
|
||||
from src.backend.models.orm.task import RecipeTask, RecipeSubtask
|
||||
from src.backend.models.orm.measurement import Measurement
|
||||
from src.backend.models.orm.access_log import AccessLog
|
||||
from src.backend.models.orm.setting import SystemSetting, RecipeVersionAudit
|
||||
from src.backend.models.orm.station import Station, StationRecipeAssignment
|
||||
from src.backend.services.auth_service import hash_password, generate_api_key
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# In-memory SQLite engine for tests
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
TEST_DATABASE_URL = "sqlite+aiosqlite://"
|
||||
|
||||
test_engine = create_async_engine(
|
||||
TEST_DATABASE_URL,
|
||||
echo=False,
|
||||
connect_args={"check_same_thread": False},
|
||||
# StaticPool keeps a single connection for in-memory SQLite so that
|
||||
# create_all, fixtures, and the app share the same database.
|
||||
poolclass=StaticPool,
|
||||
)
|
||||
|
||||
TestSessionFactory = async_sessionmaker(
|
||||
test_engine,
|
||||
class_=AsyncSession,
|
||||
expire_on_commit=False,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fixtures
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest_asyncio.fixture(autouse=True)
|
||||
async def setup_database():
|
||||
"""Create all tables before each test and drop them after."""
|
||||
async with test_engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
yield
|
||||
async with test_engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.drop_all)
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def reset_rate_limits():
|
||||
"""Clear rate limit buckets between tests to avoid 429 in test suite.
|
||||
|
||||
The RateLimitMiddleware is added to the module-level ``app`` object and
|
||||
persists across tests. Walk the ASGI middleware stack to find the
|
||||
instance and clear its per-IP sliding-window dictionaries.
|
||||
"""
|
||||
middleware = app.middleware_stack
|
||||
while middleware is not None:
|
||||
if isinstance(middleware, RateLimitMiddleware):
|
||||
middleware._login_requests.clear()
|
||||
middleware._general_requests.clear()
|
||||
break
|
||||
middleware = getattr(middleware, "app", None)
|
||||
yield
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def db_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
"""Yield a fresh async session for direct DB manipulation in tests."""
|
||||
async with TestSessionFactory() as session:
|
||||
try:
|
||||
yield session
|
||||
await session.commit()
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def client(db_session: AsyncSession) -> AsyncGenerator[AsyncClient, None]:
|
||||
"""Yield an httpx AsyncClient wired to the FastAPI app with test DB."""
|
||||
|
||||
async def _override_get_db() -> AsyncGenerator[AsyncSession, None]:
|
||||
yield db_session
|
||||
|
||||
app.dependency_overrides[get_db] = _override_get_db
|
||||
|
||||
transport = ASGITransport(app=app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
yield ac
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# User factory helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
async def _create_user(
|
||||
session: AsyncSession,
|
||||
username: str,
|
||||
password: str = "TestPass123",
|
||||
display_name: str | None = None,
|
||||
roles: list[str] | None = None,
|
||||
is_admin: bool = False,
|
||||
active: bool = True,
|
||||
) -> User:
|
||||
"""Insert a user into the test DB and return it with an API key set."""
|
||||
api_key = generate_api_key()
|
||||
user = User(
|
||||
username=username,
|
||||
password_hash=hash_password(password),
|
||||
display_name=display_name or username.title(),
|
||||
roles=roles or [],
|
||||
is_admin=is_admin,
|
||||
active=active,
|
||||
api_key=api_key,
|
||||
language_pref="en",
|
||||
theme_pref="light",
|
||||
)
|
||||
session.add(user)
|
||||
await session.flush()
|
||||
await session.refresh(user)
|
||||
return user
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def admin_user(db_session: AsyncSession) -> User:
|
||||
"""An active admin user with API key."""
|
||||
return await _create_user(
|
||||
db_session,
|
||||
username="admin",
|
||||
display_name="Admin User",
|
||||
roles=["Maker", "MeasurementTec", "Metrologist"],
|
||||
is_admin=True,
|
||||
)
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def maker_user(db_session: AsyncSession) -> User:
|
||||
"""An active Maker user with API key."""
|
||||
return await _create_user(
|
||||
db_session,
|
||||
username="maker",
|
||||
display_name="Maker User",
|
||||
roles=["Maker"],
|
||||
)
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def measurement_tec_user(db_session: AsyncSession) -> User:
|
||||
"""An active MeasurementTec user with API key."""
|
||||
return await _create_user(
|
||||
db_session,
|
||||
username="measurement_tec",
|
||||
display_name="MeasurementTec User",
|
||||
roles=["MeasurementTec"],
|
||||
)
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def metrologist_user(db_session: AsyncSession) -> User:
|
||||
"""An active Metrologist user with API key."""
|
||||
return await _create_user(
|
||||
db_session,
|
||||
username="metrologist",
|
||||
display_name="Metrologist User",
|
||||
roles=["Metrologist"],
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Recipe helper
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
async def create_test_recipe(
|
||||
session: AsyncSession,
|
||||
user_id: int,
|
||||
code: str = "REC-001",
|
||||
name: str = "Test Recipe",
|
||||
) -> Recipe:
|
||||
"""Create a recipe with one version (v1 current), one task, and one subtask.
|
||||
|
||||
Returns the Recipe ORM object.
|
||||
"""
|
||||
recipe = Recipe(
|
||||
code=code,
|
||||
name=name,
|
||||
description="A recipe for testing",
|
||||
created_by=user_id,
|
||||
)
|
||||
session.add(recipe)
|
||||
await session.flush()
|
||||
|
||||
version = RecipeVersion(
|
||||
recipe_id=recipe.id,
|
||||
version_number=1,
|
||||
is_current=True,
|
||||
created_by=user_id,
|
||||
change_notes="Initial version",
|
||||
)
|
||||
session.add(version)
|
||||
await session.flush()
|
||||
|
||||
task = RecipeTask(
|
||||
version_id=version.id,
|
||||
order_index=0,
|
||||
title="Test Task",
|
||||
directive="Measure the part",
|
||||
description="First measurement task",
|
||||
)
|
||||
session.add(task)
|
||||
await session.flush()
|
||||
|
||||
subtask = RecipeSubtask(
|
||||
task_id=task.id,
|
||||
marker_number=1,
|
||||
description="Diameter measurement",
|
||||
measurement_type="diameter",
|
||||
nominal=10.0,
|
||||
utl=10.5,
|
||||
uwl=10.3,
|
||||
lwl=9.7,
|
||||
ltl=9.5,
|
||||
unit="mm",
|
||||
)
|
||||
session.add(subtask)
|
||||
await session.flush()
|
||||
|
||||
await session.refresh(recipe, attribute_names=["versions"])
|
||||
return recipe
|
||||
|
||||
|
||||
def auth_headers(user: User) -> dict[str, str]:
|
||||
"""Return headers dict with the user's API key for authenticated requests."""
|
||||
return {"X-API-Key": user.api_key}
|
||||
Reference in New Issue
Block a user