use model_validate

Author: giancarloromeo

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

@@ -143,7 +143,7 @@ def to_simcore_runtime_docker_labels(self) -> dict[DockerLabelKey, str]:
         """returns a dictionary of strings as required by docker"""
         return {
             to_simcore_runtime_docker_label_key(k): f"{v}"
-            for k, v in sorted(self.model_copy().model_dump().items())
+            for k, v in sorted(self.model_dump().items())
         }
 
     @classmethod

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_compose_specs.py

@@ -128,9 +128,9 @@ def _update_paths_mappings(
         )
         env_vars["DY_SIDECAR_PATH_INPUTS"] = f"{path_mappings.inputs_path}"
         env_vars["DY_SIDECAR_PATH_OUTPUTS"] = f"{path_mappings.outputs_path}"
-        env_vars[
-            "DY_SIDECAR_STATE_PATHS"
-        ] = f"{json_dumps( { f'{p}' for p in path_mappings.state_paths } )}"
+        env_vars["DY_SIDECAR_STATE_PATHS"] = (
+            f"{json_dumps( { f'{p}' for p in path_mappings.state_paths } )}"
+        )
 
         service_content["environment"] = _EnvironmentSection.export_as_list(env_vars)
 
@@ -241,15 +241,17 @@ def _update_container_labels(
             spec_service_key, default_limits
         )
 
-        label_keys = StandardSimcoreDockerLabels.model_construct(
-            user_id=user_id,
-            project_id=project_id,
-            node_id=node_id,
-            simcore_user_agent=simcore_user_agent,
-            product_name=product_name,
-            swarm_stack_name=swarm_stack_name,
-            memory_limit=ByteSize(container_limits["memory"]),
-            cpu_limit=container_limits["cpu"],
+        label_keys = StandardSimcoreDockerLabels.model_validate(
+            {
+                "user_id": user_id,
+                "project_id": project_id,
+                "node_id": node_id,
+                "simcore_user_agent": simcore_user_agent,
+                "product_name": product_name,
+                "swarm_stack_name": swarm_stack_name,
+                "memory_limit": ByteSize(container_limits["memory"]),
+                "cpu_limit": container_limits["cpu"],
+            }
         )
         docker_labels = [
             f"{k}={v}" for k, v in label_keys.to_simcore_runtime_docker_labels().items()

services/director-v2/src/simcore_service_director_v2/utils/dask.py

@@ -315,17 +315,19 @@ def compute_task_labels(
         ValidationError
     """
     product_name = run_metadata.get("product_name", UNDEFINED_DOCKER_LABEL)
-    standard_simcore_labels = StandardSimcoreDockerLabels.model_construct(
-        user_id=user_id,
-        project_id=project_id,
-        node_id=node_id,
-        product_name=product_name,
-        simcore_user_agent=run_metadata.get(
-            "simcore_user_agent", UNDEFINED_DOCKER_LABEL
-        ),
-        swarm_stack_name=UNDEFINED_DOCKER_LABEL,  # NOTE: there is currently no need for this label in the comp backend
-        memory_limit=node_requirements.ram,
-        cpu_limit=node_requirements.cpu,
+    standard_simcore_labels = StandardSimcoreDockerLabels.model_validate(
+        {
+            "user_id": user_id,
+            "project_id": project_id,
+            "node_id": node_id,
+            "product_name": product_name,
+            "simcore_user_agent": run_metadata.get(
+                "simcore_user_agent", UNDEFINED_DOCKER_LABEL
+            ),
+            "swarm_stack_name": UNDEFINED_DOCKER_LABEL,  # NOTE: there is currently no need for this label in the comp backend
+            "memory_limit": node_requirements.ram,
+            "cpu_limit": node_requirements.cpu,
+        }
     ).to_simcore_runtime_docker_labels()
     return standard_simcore_labels | TypeAdapter(ContainerLabelsDict).validate_python(
         {
@@ -633,7 +635,7 @@ def check_if_cluster_is_able_to_run_pipeline(
 
 
 async def wrap_client_async_routine(
-    client_coroutine: Coroutine[Any, Any, Any] | Any | None
+    client_coroutine: Coroutine[Any, Any, Any] | Any | None,
 ) -> Any:
     """Dask async behavior does not go well with Pylance as it returns
     a union of types. this wrapper makes both mypy and pylance happy"""