continue fixing

Author: giancarloromeo

packages/settings-library/src/settings_library/basic_types.py

@@ -3,7 +3,7 @@
 #       This is a minor evil to avoid the maintenance burden that creates
 #       an extra dependency to a larger models_library (intra-repo library)
 
-from enum import Enum
+from enum import StrEnum
 from typing import Annotated, TypeAlias
 
 from pydantic import Field, StringConstraints
@@ -16,14 +16,14 @@
 VersionTag: TypeAlias = Annotated[str, StringConstraints(pattern=r"^v\d$")]
 
 
-class LogLevel(str, Enum):
+class LogLevel(StrEnum):
     DEBUG = "DEBUG"
     INFO = "INFO"
     WARNING = "WARNING"
     ERROR = "ERROR"
 
 
-class BootMode(str, Enum):
+class BootMode(StrEnum):
     """
     Values taken by SC_BOOT_MODE environment variable
     set in Dockerfile and used during docker/boot.sh
@@ -36,7 +36,7 @@ class BootMode(str, Enum):
     DEVELOPMENT = "development"
 
 
-class BuildTargetEnum(str, Enum):
+class BuildTargetEnum(StrEnum):
     """
     Values taken by SC_BUILD_TARGET environment variable
     set in Dockerfile that defines the stage targeted in the

services/director-v2/src/simcore_service_director_v2/core/application.py

@@ -9,6 +9,7 @@
 from servicelib.fastapi.profiler_middleware import ProfilerMiddleware
 from servicelib.fastapi.tracing import setup_tracing
 from servicelib.logging_utils import config_all_loggers
+from settings_library.basic_types import BootMode
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME, PROJECT_NAME, SUMMARY
 from ..api.entrypoints import api_router
@@ -127,12 +128,12 @@ def create_base_app(settings: AppSettings | None = None) -> FastAPI:
         logging.getLogger(name).setLevel(quiet_level)
 
     app = FastAPI(
-        debug=settings.SC_BOOT_MODE.is_devel_mode(),
+        debug=settings.SC_BOOT_MODE == BootMode.DEVELOPMENT,
         title=PROJECT_NAME,
         description=SUMMARY,
         version=API_VERSION,
         openapi_url=f"/api/{API_VTAG}/openapi.json",
-        **get_common_oas_options(settings.SC_BOOT_MODE.is_devel_mode()),
+        **get_common_oas_options(settings.SC_BOOT_MODE == BootMode.DEVELOPMENT),
     )
     override_fastapi_openapi_method(app)
     app.state.settings = settings

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py

@@ -103,8 +103,8 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):
         ),
     )
 
-    DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: PositiveFloat = Field(
-        60.0 * _MINUTE,
+    DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: timedelta = Field(
+        timedelta(hours=1),
         description=(
             "When saving and restoring the state of a dynamic service, depending on the payload "
             "some services take longer or shorter to save and restore. Across the "

services/director-v2/tests/unit/test_core_settings.py

@@ -43,7 +43,7 @@ def test_enforce_r_clone_requirement(monkeypatch: pytest.MonkeyPatch) -> None:
 def test_settings_with_project_env_devel(project_env_devel_environment: dict[str, Any]):
     # loads from environ
     settings = AppSettings.create_from_envs()
-    print("captured settings: \n", settings.json(indent=2))
+    print("captured settings: \n", settings.model_dump_json(indent=2))
 
     assert settings.SC_BOOT_MODE == BootModeEnum.DEBUG
     assert settings.LOG_LEVEL == LogLevel.DEBUG
@@ -60,7 +60,7 @@ def test_settings_with_repository_env_devel(
     )  # defined in docker-compose
 
     settings = AppSettings.create_from_envs()
-    print("captured settings: \n", settings.json(indent=2))
+    print("captured settings: \n", settings.model_dump_json(indent=2))
     assert settings