fixed tests with parsing of the specs

Author: Andrei Neagu

packages/models-library/src/models_library/service_settings_labels.py

@@ -226,7 +226,7 @@ def validate_volume_limits(cls, v, info: ValidationInfo) -> str | None:
                     "outputs_path": "/tmp/outputs",  # noqa: S108 nosec
                     "inputs_path": "/tmp/inputs",  # noqa: S108 nosec
                     "state_paths": ["/tmp/save_1", "/tmp_save_2"],  # noqa: S108 nosec
-                    "state_exclude": ["/tmp/strip_me/*", "*.py"],  # noqa: S108 nosec
+                    "state_exclude": ["/tmp/strip_me/*"],  # noqa: S108 nosec
                 },
                 {
                     "outputs_path": "/t_out",

packages/models-library/tests/test_service_settings_labels.py

@@ -291,7 +291,9 @@ def test_container_outgoing_permit_list_and_container_allow_internet_without_com
             )
         },
     ):
-        assert TypeAdapter(DynamicSidecarServiceLabels).validate_json(json.dumps(dict_data))
+        assert TypeAdapter(DynamicSidecarServiceLabels).validate_json(
+            json.dumps(dict_data)
+        )
 
 
 def test_container_allow_internet_no_compose_spec_not_ok():
@@ -414,7 +416,7 @@ def service_labels() -> dict[str, str]:
                 "inputs_path": "/tmp/inputs",  # noqa: S108
                 "outputs_path": "/tmp/outputs",  # noqa: S108
                 "state_paths": ["/tmp/save_1", "/tmp_save_2"],  # noqa: S108
-                "state_exclude": ["/tmp/strip_me/*", "*.py"],  # noqa: S108
+                "state_exclude": ["/tmp/strip_me/*"],  # noqa: S108
             }
         ),
         "simcore.service.compose-spec": json.dumps(

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py

@@ -57,13 +57,13 @@
 _logger = logging.getLogger(__name__)
 
 _DYNAMIC_SIDECAR_SERVICE_EXTENDABLE_SPECS: Final[tuple[list[str], ...]] = (
-    ["Labels"],
-    ["TaskTemplate", "Resources", "Limits"],
-    ["TaskTemplate", "Resources", "Reservation", "MemoryBytes"],
-    ["TaskTemplate", "Resources", "Reservation", "NanoCPUs"],
-    ["TaskTemplate", "Placement", "Constraints"],
-    ["TaskTemplate", "ContainerSpec", "Env"],
-    ["TaskTemplate", "Resources", "Reservation", "GenericResources"],
+    ["labels"],
+    ["task_template", "container_spec", "env"],
+    ["task_template", "placement", "constraints"],
+    ["task_template", "resources", "reservation", "generic_resources"],
+    ["task_template", "resources", "limits"],
+    ["task_template", "resources", "reservation", "memory_bytes"],
+    ["task_template", "resources", "reservation", "nano_cp_us"],
 )
 
 

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

@@ -43,6 +43,9 @@
 from simcore_service_director_v2.modules.dynamic_sidecar.docker_service_specs import (
     get_dynamic_sidecar_spec,
 )
+from simcore_service_director_v2.modules.dynamic_sidecar.scheduler._core._event_create_sidecars import (
+    _DYNAMIC_SIDECAR_SERVICE_EXTENDABLE_SPECS,
+)
 from simcore_service_director_v2.utils.dict_utils import nested_update
 
 
@@ -180,7 +183,7 @@ def expected_dynamic_sidecar_spec(
                     "paths_mapping": {
                         "inputs_path": "/tmp/inputs",  # noqa: S108
                         "outputs_path": "/tmp/outputs",  # noqa: S108
-                        "state_exclude": ["/tmp/strip_me/*", "*.py"],  # noqa: S108
+                        "state_exclude": ["/tmp/strip_me/*"],  # noqa: S108
                         "state_paths": ["/tmp/save_1", "/tmp_save_2"],  # noqa: S108
                     },
                     "callbacks_mapping": CallbacksMapping.model_config[
@@ -239,7 +242,7 @@ def expected_dynamic_sidecar_spec(
                     "DY_SIDECAR_PATH_OUTPUTS": "/tmp/outputs",  # noqa: S108
                     "DY_SIDECAR_PROJECT_ID": "dd1d04d9-d704-4f7e-8f0f-1ca60cc771fe",
                     "DY_SIDECAR_STATE_EXCLUDE": json_dumps(
-                        ["*.py", "/tmp/strip_me/*"]  # noqa: S108
+                        ["/tmp/strip_me/*"]  # noqa: S108
                     ),
                     "DY_SIDECAR_STATE_PATHS": json_dumps(
                         ["/tmp/save_1", "/tmp_save_2"]  # noqa: S108
@@ -614,25 +617,70 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
     another_merged_dict = nested_update(
         orig_dict,
         user_dict,
-        include=(
-            ["labels"],
-            ["task_template", "Resources", "Limits"],
-            ["task_template", "Resources", "Reservation", "MemoryBytes"],
-            ["task_template", "Resources", "Reservation", "NanoCPUs"],
-            ["task_template", "Placement", "Constraints"],
-            ["task_template", "ContainerSpec", "Env"],
-            ["task_template", "Resources", "Reservation", "GenericResources"],
-        ),
+        include=_DYNAMIC_SIDECAR_SERVICE_EXTENDABLE_SPECS,
     )
     assert another_merged_dict
 
 
-def test_regression_aio_docker_service_spec_serialization():
-    raw_json = json.loads(
-        '{"sidecar":{"Name":null,"Labels":{"io.simcore.scalable-service":"true"},"TaskTemplate":{"PluginSpec":null,"ContainerSpec":null,"NetworkAttachmentSpec":null,"Resources":null,"RestartPolicy":null,"Placement":{"Constraints":["node.labels.io.simcore.autoscaled-node==true","node.labels.io.simcore.osparc-services-ready==true"],"Preferences":null,"MaxReplicas":0,"Platforms":null},"ForceUpdate":null,"Runtime":null,"Networks":null,"LogDriver":null},"Mode":null,"UpdateConfig":null,"RollbackConfig":null,"Networks":null,"EndpointSpec":null},"service":null}'
+def test_regression_nested_update():
+    mock_service_spec = AioDockerServiceSpec.model_validate(
+        {"Labels": {"l1": "false", "l0": "a"}}
     )
-    to_validate = raw_json["sidecar"]
-    result = AioDockerServiceSpec.model_validate(to_validate)
-    assert (
-        result.model_dump(mode="json", exclude_unset=True, by_alias=True) == to_validate
+    mock_catalog_constraints = AioDockerServiceSpec.model_validate(
+        {
+            "Labels": {"l1": "true", "l2": "a"},
+            "TaskTemplate": {
+                "Placement": {
+                    "Constraints": [
+                        "c1==true",
+                        "c2==true",
+                    ],
+                },
+                "Resources": {
+                    "Limits": {"MemoryBytes": 1, "NanoCPUs": 1},
+                    "Reservations": {
+                        "GenericResources": [
+                            {"DiscreteResourceSpec": {"Kind": "VRAM", "Value": 1}}
+                        ],
+                        "MemoryBytes": 2,
+                        "NanoCPUs": 2,
+                    },
+                },
+                "ContainerSpec": {
+                    "Env": [
+                        "key-1=value-1",
+                        "key2-value2=a",
+                    ]
+                },
+            },
+        }
+    )
+    result = nested_update(
+        jsonable_encoder(mock_service_spec, exclude_unset=True, by_alias=False),
+        jsonable_encoder(mock_catalog_constraints, exclude_unset=True, by_alias=False),
+        include=_DYNAMIC_SIDECAR_SERVICE_EXTENDABLE_SPECS,
     )
+    assert AioDockerServiceSpec.model_validate(result).model_dump(
+        by_alias=True, exclude_unset=True
+    ) == {
+        "Labels": {"l1": "true", "l2": "a", "l0": "a"},
+        "TaskTemplate": {
+            "Placement": {
+                "Constraints": [
+                    "c1==true",
+                    "c2==true",
+                ],
+            },
+            "Resources": {
+                "Limits": {"MemoryBytes": 1, "NanoCPUs": 1},
+                "Reservations": {
+                    "GenericResources": [
+                        {"DiscreteResourceSpec": {"Kind": "VRAM", "Value": 1}}
+                    ],
+                    "MemoryBytes": 2,
+                    "NanoCPUs": 2,
+                },
+            },
+            "ContainerSpec": {"Env": {"key-1": "value-1", "key2-value2": "a"}},
+        },
+    }