diff --git a/.gitignore b/.gitignore index 3896acd..7490eaa 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,8 @@ src/frontend/flask_app/static/css/tailwind.css # Node node_modules/ +src/frontend/flask_app/package.json +src/frontend/flask_app/package-lock.json # Flask-Babel compiled *.mo @@ -70,3 +72,4 @@ nul # Competitor analysis (local only) Concorrente/ +docker-compose.override.yml diff --git a/src/backend/config.py b/src/backend/config.py index ea23376..4281430 100644 --- a/src/backend/config.py +++ b/src/backend/config.py @@ -57,8 +57,13 @@ class Settings(BaseSettings): # Path(__file__) = src/backend/config.py → parents[2] = project root return Path(__file__).resolve().parents[2] / self.upload_dir - # ../../.env reaches the project root from src/backend/. - model_config = {"env_file": "../../.env", "env_file_encoding": "utf-8", "extra": "ignore"} + # Always resolve .env against the project root regardless of cwd + # (pydantic-settings would otherwise treat the path as cwd-relative). + model_config = { + "env_file": str(Path(__file__).resolve().parents[2] / ".env"), + "env_file_encoding": "utf-8", + "extra": "ignore", + } settings = Settings() diff --git a/src/backend/models/orm/__init__.py b/src/backend/models/orm/__init__.py index 90c0a87..5753c76 100644 --- a/src/backend/models/orm/__init__.py +++ b/src/backend/models/orm/__init__.py @@ -5,6 +5,7 @@ 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 __all__ = [ "User", @@ -16,4 +17,6 @@ __all__ = [ "AccessLog", "SystemSetting", "RecipeVersionAudit", + "Station", + "StationRecipeAssignment", ]