updates datcore-adapter

Author: pcrespov

services/datcore-adapter/src/simcore_service_datcore_adapter/core/settings.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing import Annotated
 
+from common_library.basic_types import DEFAULT_FACTORY
 from models_library.basic_types import BootModeEnum, LogLevel
 from pydantic import AliasChoices, Field, TypeAdapter, field_validator
 from pydantic.networks import AnyUrl
@@ -34,32 +35,39 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         ),
     ] = LogLevel.INFO
 
-    PENNSIEVE: PennsieveSettings = Field(
-        json_schema_extra={"auto_default_from_env": True}
-    )
+    PENNSIEVE: Annotated[
+        PennsieveSettings, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
 
-    DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
-        default=False,
-        validation_alias=AliasChoices(
-            "DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED",
-            "LOG_FORMAT_LOCAL_DEV_ENABLED",
+    DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED: Annotated[
+        bool,
+        Field(
+            validation_alias=AliasChoices(
+                "DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED",
+                "LOG_FORMAT_LOCAL_DEV_ENABLED",
+            ),
+            description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
         ),
-        description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
-    )
-    DATCORE_ADAPTER_LOG_FILTER_MAPPING: dict[
-        LoggerName, list[MessageSubstring]
-    ] = Field(
-        default_factory=dict,
-        validation_alias=AliasChoices(
-            "DATCORE_ADAPTER_LOG_FILTER_MAPPING", "LOG_FILTER_MAPPING"
+    ] = False
+    DATCORE_ADAPTER_LOG_FILTER_MAPPING: Annotated[
+        dict[LoggerName, list[MessageSubstring]],
+        Field(
+            default_factory=dict,
+            validation_alias=AliasChoices(
+                "DATCORE_ADAPTER_LOG_FILTER_MAPPING", "LOG_FILTER_MAPPING"
+            ),
+            description="is a dictionary that maps specific loggers (such as 'uvicorn.access' or 'gunicorn.access') to a list of log message patterns that should be filtered out.",
         ),
-        description="is a dictionary that maps specific loggers (such as 'uvicorn.access' or 'gunicorn.access') to a list of log message patterns that should be filtered out.",
-    )
+    ] = DEFAULT_FACTORY
+
     DATCORE_ADAPTER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
-    DATCORE_ADAPTER_TRACING: TracingSettings | None = Field(
-        description="settings for opentelemetry tracing",
-        json_schema_extra={"auto_default_from_env": True},
-    )
+    DATCORE_ADAPTER_TRACING: Annotated[
+        TracingSettings | None,
+        Field(
+            description="settings for opentelemetry tracing",
+            json_schema_extra={"auto_default_from_env": True},
+        ),
+    ]
 
     @cached_property
     def debug(self) -> bool:

services/datcore-adapter/tests/unit/conftest.py

@@ -65,7 +65,7 @@ def pennsieve_mock_dataset_packages(mocks_dir: Path) -> dict[str, Any]:
 
 @pytest.fixture()
 def minimal_app(
-    app_envs: None,
+    app_environment: None,
 ) -> FastAPI:
     from simcore_service_datcore_adapter.main import the_app
 
@@ -79,7 +79,7 @@ def client(minimal_app: FastAPI) -> TestClient:
 
 
 @pytest.fixture
-def app_envs(
+def app_environment(
     mock_env_devel_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
 ) -> EnvVarsDict:
     return setenvs_from_dict(
@@ -93,7 +93,7 @@ def app_envs(
 
 @pytest.fixture()
 async def initialized_app(
-    app_envs: None, minimal_app: FastAPI
+    app_environment: None, minimal_app: FastAPI
 ) -> AsyncIterator[FastAPI]:
     async with LifespanManager(minimal_app):
         yield minimal_app

services/datcore-adapter/tests/unit/test_core_settings.py

@@ -0,0 +1,42 @@
+# pylint: disable=unused-variable
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+
+
+import pytest
+from pytest_simcore.helpers.monkeypatch_envs import (
+    EnvVarsDict,
+    delenvs_from_dict,
+    setenvs_from_dict,
+)
+from simcore_service_datcore_adapter.core.settings import ApplicationSettings
+
+
+@pytest.fixture
+def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+    external_envfile_dict: EnvVarsDict,
+) -> EnvVarsDict:
+    """
+    NOTE: To run against repo.config in osparc-config repo
+
+    ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+    pytest --external-envfile=.secrets tests/unit/test_core_settings.py
+
+    """
+    if external_envfile_dict:
+        delenvs_from_dict(monkeypatch, app_environment, raising=False)
+        return setenvs_from_dict(
+            monkeypatch,
+            {**external_envfile_dict},
+        )
+    return app_environment
+
+
+def test_unit_app_environment(app_environment: EnvVarsDict):
+    assert app_environment
+    settings = ApplicationSettings.create_from_envs()
+    print("captured settings: \n", settings.model_dump_json(indent=2, warnings="none"))
+
+    assert settings.PENNSIEVE