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>
97 lines
3.0 KiB
YAML
97 lines
3.0 KiB
YAML
services:
|
|
mysql:
|
|
image: mysql:8.0
|
|
container_name: tmflow-mysql
|
|
restart: unless-stopped
|
|
environment:
|
|
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD:-root_password_change_me}
|
|
MYSQL_DATABASE: ${DB_NAME:-tiemeasureflow}
|
|
MYSQL_USER: ${DB_USER:-tmflow}
|
|
MYSQL_PASSWORD: ${DB_PASSWORD:-change_me_in_production}
|
|
volumes:
|
|
- mysql_data:/var/lib/mysql
|
|
command: >
|
|
--authentication-policy=mysql_native_password
|
|
--character-set-server=utf8mb4
|
|
--collation-server=utf8mb4_unicode_ci
|
|
healthcheck:
|
|
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
networks:
|
|
- tmflow-net
|
|
|
|
server:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
container_name: tmflow-server
|
|
restart: unless-stopped
|
|
env_file:
|
|
- .env
|
|
environment:
|
|
DB_HOST: mysql
|
|
UPLOAD_DIR: uploads
|
|
volumes:
|
|
- upload_data:/app/uploads
|
|
depends_on:
|
|
mysql:
|
|
condition: service_healthy
|
|
labels:
|
|
- "traefik.enable=true"
|
|
- "traefik.http.routers.tmflow-api.rule=Host(`tieflow.tielogic.xyz`) && (PathPrefix(`/api/`) || PathPrefix(`/uploads/`))"
|
|
- "traefik.http.routers.tmflow-api.entrypoints=web,websecure"
|
|
- "traefik.http.routers.tmflow-api.tls=true"
|
|
- "traefik.http.routers.tmflow-api.tls.certresolver=mytlschallenge"
|
|
- "traefik.http.routers.tmflow-api.priority=100"
|
|
- "traefik.http.services.tmflow-api.loadbalancer.server.port=8000"
|
|
networks:
|
|
- tmflow-net
|
|
- traefik-net
|
|
|
|
client:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile.frontend
|
|
container_name: tmflow-client
|
|
restart: unless-stopped
|
|
env_file:
|
|
- .env
|
|
environment:
|
|
API_SERVER_URL: http://server:8000
|
|
depends_on:
|
|
- server
|
|
labels:
|
|
- "traefik.enable=true"
|
|
- "traefik.http.routers.tmflow-web.rule=Host(`tieflow.tielogic.xyz`)"
|
|
- "traefik.http.routers.tmflow-web.entrypoints=web,websecure"
|
|
- "traefik.http.routers.tmflow-web.tls=true"
|
|
- "traefik.http.routers.tmflow-web.tls.certresolver=mytlschallenge"
|
|
- "traefik.http.routers.tmflow-web.priority=10"
|
|
- "traefik.http.services.tmflow-web.loadbalancer.server.port=5000"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.SSLRedirect=true"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.STSSeconds=315360000"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.browserXSSFilter=true"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.contentTypeNosniff=true"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.forceSTSHeader=true"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.STSIncludeSubdomains=true"
|
|
- "traefik.http.middlewares.tmflow-headers.headers.STSPreload=true"
|
|
- "traefik.http.routers.tmflow-web.middlewares=tmflow-headers"
|
|
networks:
|
|
- tmflow-net
|
|
- traefik-net
|
|
|
|
volumes:
|
|
mysql_data:
|
|
driver: local
|
|
upload_data:
|
|
driver: local
|
|
|
|
networks:
|
|
tmflow-net:
|
|
driver: bridge
|
|
traefik-net:
|
|
external: true
|
|
name: root_default
|