fixed tests in dynamic-scheduler

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services_service.py

@@ -33,7 +33,7 @@ class CommonServiceDetails(BaseModel):
 
 
 class ServiceDetails(CommonServiceDetails):
-    basepath: Path = Field(
+    basepath: Path | None = Field(
         default=None,
         description="predefined path where the dynamic service should be served. If empty, the service shall use the root endpoint.",
         alias="service_basepath",
@@ -68,7 +68,7 @@ class RunningDynamicServiceDetails(ServiceDetails):
     internal_port: PortInt = Field(
         ..., description="the service swarm internal port", alias="service_port"
     )
-    published_port: PortInt = Field(
+    published_port: PortInt | None = Field(
         default=None,
         description="the service swarm published port if any",
         deprecated=True,

packages/models-library/src/models_library/api_schemas_webserver/projects_nodes.py

@@ -103,7 +103,7 @@ class NodeGet(OutputSchema):
                 "service_basepath": "/x/E1O2E-LAH",
                 "service_state": "pending",
                 "service_message": "no suitable node (insufficient resources on 1 node)",
-                "user_id": 123,
+                "user_id": "123",
             }
         }
     )

packages/models-library/src/models_library/utils/serialization.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 from typing import Any
 
 from models_library.utils.pydantic_fields_extension import get_type
@@ -15,6 +16,9 @@ def model_dump_with_secrets(
 
         field_data = data[field_name]
 
+        if isinstance(field_data, timedelta):
+            data[field_name] = field_data.total_seconds()
+
         if isinstance(field_data, SecretStr):
             if show_secrets:
                 data[field_name] = field_data.get_secret_value()

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from models_library.errors_classes import OsparcErrorMixin
 
 
-class BaseDynamicSchedulerRPCError(PydanticErrorMixin, Exception):
+class BaseDynamicSchedulerRPCError(OsparcErrorMixin, Exception):
     ...
 
 

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

@@ -44,7 +44,7 @@ def _default_factory():
                     field_name,
                 )
                 return None
-
+            _logger.warning("Validation errors=%s", err.errors())
             raise DefaultFromEnvFactoryError(errors=err.errors()) from err
 
     return _default_factory

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/cli.py

@@ -1,8 +1,6 @@
 import logging
-import os
 
 import typer
-from settings_library.rabbit import RabbitSettings
 from settings_library.utils_cli import (
     create_settings_command,
     create_version_callback,
@@ -40,19 +38,7 @@ def echo_dotenv(ctx: typer.Context, *, minimal: bool = True):
     # Nonetheless, if the caller of this CLI has already some **valid** env vars in the environment we want to use them ...
     # and that is why we use `os.environ`.
 
-    settings = ApplicationSettings.create_from_envs(
-        DYNAMIC_SCHEDULER_RABBITMQ=os.environ.get(
-            "DYNAMIC_SCHEDULER_RABBITMQ",
-            RabbitSettings.create_from_envs(
-                RABBIT_HOST=os.environ.get("RABBIT_HOST", "replace-with-rabbit-host"),
-                RABBIT_SECURE=os.environ.get("RABBIT_SECURE", "0"),
-                RABBIT_USER=os.environ.get("RABBIT_USER", "replace-with-rabbit-user"),
-                RABBIT_PASSWORD=os.environ.get(
-                    "RABBIT_PASSWORD", "replace-with-rabbit-user"
-                ),
-            ),
-        ),
-    )
+    settings = ApplicationSettings.create_from_envs()
 
     print_as_envfile(
         settings,

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py

@@ -1,7 +1,7 @@
 import datetime
 from functools import cached_property
 
-from pydantic import Field, parse_obj_as, validator
+from pydantic import Field, field_validator, parse_obj_as, validator
 from settings_library.application import BaseApplicationSettings
 from settings_library.basic_types import LogLevel, VersionTag
 from settings_library.director_v2 import DirectorV2Settings
@@ -43,6 +43,23 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         ),
     )
 
+    # TODO: this should be a common validator put in some common library and not here to allow reuse
+    # wherever we used timedelta this should be in place otherwise it will fail where we overwrite the
+    # values via env vars
+    # GCR we need to talk where to place this one
+    @field_validator("DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT", mode="before")
+    @classmethod
+    def interpret_t_as_seconds(
+        cls, v: datetime.timedelta | str | float
+    ) -> datetime.timedelta | float | str:
+        if isinstance(v, str):
+            try:
+                return float(v)
+            except ValueError:
+                # returns format like "1:00:00"
+                return v
+        return v
+
     @cached_property
     def LOG_LEVEL(self):  # noqa: N802
         return self.DYNAMIC_SCHEDULER__LOGLEVEL

services/dynamic-scheduler/tests/unit/test_cli.py

@@ -1,8 +1,11 @@
+# pylint:disable=redefined-outer-name
 # pylint:disable=unused-argument
 
 import os
+import traceback
 
 import pytest
+from click.testing import Result
 from pytest_simcore.helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_dynamic_scheduler._meta import API_VERSION
@@ -11,20 +14,45 @@
 from typer.testing import CliRunner
 
 
+@pytest.fixture
+def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
+    docker_compose_service_dynamic_scheduler_env_vars: EnvVarsDict,
+) -> EnvVarsDict:
+    return setenvs_from_dict(
+        monkeypatch,
+        {
+            **docker_compose_service_dynamic_scheduler_env_vars,
+            "RABBIT_HOST": "rabbit-host",
+            "RABBIT_SECURE": "0",
+            "RABBIT_USER": "rabbit-user",
+            "RABBIT_PASSWORD": "rabbit-password",
+        },
+    )
+
+
+def _format_cli_error(result: Result) -> str:
+    assert result.exception
+    tb_message = "\n".join(traceback.format_tb(result.exception.__traceback__))
+    return f"Below exception was raised by the cli:\n{tb_message}\n{result.stdout}"
+
+
 def test_cli_help_and_version(cli_runner: CliRunner):
     # simcore-service-dynamic-scheduler --help
     result = cli_runner.invoke(cli_main, "--help")
-    assert result.exit_code == os.EX_OK, result.output
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
 
     result = cli_runner.invoke(cli_main, "--version")
-    assert result.exit_code == os.EX_OK, result.output
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
     assert result.stdout.strip() == API_VERSION
 
 
-def test_echo_dotenv(cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch):
+def test_echo_dotenv(
+    app_environment: EnvVarsDict, cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch
+):
     # simcore-service-dynamic-scheduler echo-dotenv
     result = cli_runner.invoke(cli_main, "echo-dotenv")
-    assert result.exit_code == os.EX_OK, result.output
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
 
     environs = load_dotenv(result.stdout)
 
@@ -36,7 +64,7 @@ def test_echo_dotenv(cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch):
 def test_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
     # simcore-service-dynamic-scheduler settings --show-secrets --as-json
     result = cli_runner.invoke(cli_main, ["settings", "--show-secrets", "--as-json"])
-    assert result.exit_code == os.EX_OK, result.output
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
 
     print(result.output)
     settings = ApplicationSettings.parse_raw(result.output)