Use qualibrate config package

.gitignore

@@ -159,6 +159,6 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
-calibrations/
+calibrations/

pyproject.toml

@@ -10,6 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.9,<3.12"
 fastapi = "^0.115.2"
+# TODO: uvicorn 0.34
 uvicorn = "^0.32.0"
 pydantic = "^2.7.4"
 pydantic-settings = "^2.3.4"
@@ -19,13 +20,15 @@ tomli-w = "^1.0.0"
 qualibrate-core = "^0.2.3"
 qualibrate-runner = "^0.2.3"
 qualibrate-app = "^0.2.3"
+qualibrate-config = "^0.1.0"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.8.0"
 ruff = "^0.7.0"
 poethepoet = "^0.25.0"
 
 #[tool.poetry.group.qm-dev.dependencies]
+#qualibrate-config = {path = "../qualibrate-config", develop = true}
 #qualibrate-app = {path = "../qualibrate-app/backend", develop = true}
 #qualibrate-runner = {path = "../qualibrate-runner", develop = true}
 #qualibrate-core = {path = "../qualibrate-core", develop = true}
@@ -61,12 +64,12 @@ target-version = "py39"
 
 [tool.ruff.lint]
 select = [
-    "E",   # pycodestyle
-    "F",   # Pyflakes
-    "UP",  # pyupgrade
-    "B",   # flake8-bugbear
-    "SIM", # flake8-simplify
-    "I",   # isort
+    "E",    # pycodestyle
+    "F",    # Pyflakes
+    "UP",   # pyupgrade
+    "B",    # flake8-bugbear
+    "SIM",  # flake8-simplify
+    "I",    # isort
 ]
 
 [tool.ruff.lint.pycodestyle]

qualibrate_composite/__main__.py

@@ -1,6 +1,7 @@
 import click
+from qualibrate_config.cli.config import config_command
 
-from qualibrate_composite.cli import config_command, start_command
+from qualibrate_composite.cli import start_command
 
 
 @click.group()

qualibrate_composite/api/routes.py

@@ -2,9 +2,10 @@
 
 from fastapi import APIRouter, Body, Depends, Response, status
 from fastapi.responses import JSONResponse
+from qualibrate_config.models import QualibrateConfig
 
 from qualibrate_composite.api.auth_middleware import encoded_password
-from qualibrate_composite.config import QualibrateSettings, get_settings
+from qualibrate_composite.config import get_settings
 
 base_router = APIRouter()
 
@@ -13,7 +14,7 @@
 
 @base_router.get("/login_required")
 def login_required(
-    settings: Annotated[QualibrateSettings, Depends(get_settings)],
+    settings: Annotated[QualibrateConfig, Depends(get_settings)],
 ) -> bool:
     return settings.password is not None
 
@@ -22,7 +23,7 @@ def login_required(
 def login(
     password: Annotated[Optional[str], Body()] = None,
     *,
-    settings: Annotated[QualibrateSettings, Depends(get_settings)],
+    settings: Annotated[QualibrateConfig, Depends(get_settings)],
 ) -> Response:
     if settings.password is None or password == settings.password:
         response = Response()

qualibrate_composite/app.py

@@ -34,7 +34,11 @@
 )
 app.include_router(base_router)
 
-if _settings.runner.spawn:
+
+composite = _settings.composite
+if composite is None:
+    raise RuntimeError("There is no config for qualibrate composite")
+if composite.runner.spawn:
     try:
         from qualibrate_runner.app import app as runner_app
     except ImportError as ex:
@@ -46,7 +50,7 @@
     runner_app.add_middleware(RunnerAuthMiddleware)
     app.mount("/execution", runner_app, name="qualibrate_runner")
 
-if _settings.app.spawn:
+if composite is not None and composite.app.spawn:
     try:
         from qualibrate_app.app import app as qualibrate_app_app
     except ImportError as ex:

qualibrate_composite/cli/__init__.py

@@ -1,4 +1,8 @@
-from .config import config_command
 from .start import start_command
 
-__all__ = ["start_command", "config_command"]
+# from .config import config_command
+
+__all__ = [
+    "start_command",
+    # "config_command"
+]