Merge pull request #1 from GitHK/upgrade-dynamic-sceduler

Adding fixes for dynamic-scheduler

Author: giancarloromeo

packages/common-library/requirements/_test.in

@@ -10,6 +10,7 @@
 
 coverage
 faker
+pydantic-settings
 pytest
 pytest-asyncio
 pytest-cov

packages/common-library/requirements/_test.txt

@@ -1,8 +1,12 @@
+annotated-types==0.7.0
+    # via
+    #   -c requirements/_base.txt
+    #   pydantic
 coverage==7.6.1
     # via
     #   -r requirements/_test.in
     #   pytest-cov
-faker==30.1.0
+faker==30.3.0
     # via -r requirements/_test.in
 icdiff==2.0.7
     # via pytest-icdiff
@@ -16,6 +20,17 @@ pluggy==1.5.0
     # via pytest
 pprintpp==0.4.0
     # via pytest-icdiff
+pydantic==2.9.2
+    # via
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -c requirements/_base.txt
+    #   pydantic-settings
+pydantic-core==2.23.4
+    # via
+    #   -c requirements/_base.txt
+    #   pydantic
+pydantic-settings==2.5.2
+    # via -r requirements/_test.in
 pytest==8.3.3
     # via
     #   -r requirements/_test.in
@@ -44,7 +59,9 @@ pytest-sugar==1.0.0
 python-dateutil==2.9.0.post0
     # via faker
 python-dotenv==1.0.1
-    # via -r requirements/_test.in
+    # via
+    #   -r requirements/_test.in
+    #   pydantic-settings
 six==1.16.0
     # via python-dateutil
 termcolor==2.5.0
@@ -53,3 +70,5 @@ typing-extensions==4.12.2
     # via
     #   -c requirements/_base.txt
     #   faker
+    #   pydantic
+    #   pydantic-core

packages/common-library/requirements/_tools.txt

@@ -1,6 +1,6 @@
 astroid==3.3.5
     # via pylint
-black==24.8.0
+black==24.10.0
     # via -r requirements/../../../requirements/devenv.txt
 build==1.2.2.post1
     # via pip-tools

packages/common-library/src/common_library/pydantic_networks_extension.py

@@ -1,5 +1,12 @@
 from typing import Annotated, TypeAlias
+
 from pydantic import AfterValidator, AnyHttpUrl
 
 
-AnyHttpUrlLegacy: TypeAlias = Annotated[str, AnyHttpUrl, AfterValidator(lambda u: u.rstrip("/"))]
+def _strip_last_slash(url: str) -> str:
+    return url.rstrip("/")
+
+
+AnyHttpUrlLegacy: TypeAlias = Annotated[
+    str, AnyHttpUrl, AfterValidator(_strip_last_slash)
+]

packages/common-library/src/common_library/pydantic_settings_validators.py

@@ -0,0 +1,20 @@
+import datetime
+
+from pydantic import field_validator
+
+
+def _get_float_string_as_seconds(
+    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
+
+
+def validate_timedelta_in_legacy_mode(field: str):
+    """Transforms a float/int number into a valid datetime as it used to work in the past"""
+    return field_validator(field, mode="before")(_get_float_string_as_seconds)

packages/common-library/src/common_library/serialization.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 from typing import Any
 
 from common_library.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/common-library/tests/test_errors_classes.py

@@ -38,8 +38,7 @@ class B12(B1, ValueError):
 
 def test_error_codes_and_msg_template():
     class MyBaseError(OsparcErrorMixin, Exception):
-        def __init__(self, **ctx: Any) -> None:
-            super().__init__(**ctx)  # Do not forget this for base exceptions!
+        pass
 
     class MyValueError(MyBaseError, ValueError):
         msg_template = "Wrong value {value}"

packages/common-library/tests/test_pydantic_settings_validators.py

@@ -0,0 +1,42 @@
+from datetime import timedelta
+
+import pytest
+from common_library.pydantic_settings_validators import (
+    validate_timedelta_in_legacy_mode,
+)
+from faker import Faker
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+
+
+def test_validate_timedelta_in_legacy_mode(
+    monkeypatch: pytest.MonkeyPatch, faker: Faker
+):
+    class Settings(BaseSettings):
+        APP_NAME: str
+        REQUEST_TIMEOUT: timedelta = Field(default=timedelta(seconds=40))
+
+        _legacy_parsing_request_timeout = validate_timedelta_in_legacy_mode(
+            "REQUEST_TIMEOUT"
+        )
+
+        model_config = SettingsConfigDict()
+
+    app_name = faker.pystr()
+    env_vars: dict[str, str | bool] = {"APP_NAME": app_name}
+
+    # without timedelta
+    setenvs_from_dict(monkeypatch, env_vars)
+    settings = Settings()
+    print(settings.model_dump())
+    assert app_name == settings.APP_NAME
+    assert timedelta(seconds=40) == settings.REQUEST_TIMEOUT
+
+    # with timedelta in seconds
+    env_vars["REQUEST_TIMEOUT"] = "5555"
+    setenvs_from_dict(monkeypatch, env_vars)
+    settings = Settings()
+    print(settings.model_dump())
+    assert app_name == settings.APP_NAME
+    assert timedelta(seconds=5555) == settings.REQUEST_TIMEOUT

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",
             }
         }
     )