fix deprecated

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_services.py

@@ -286,7 +286,7 @@ async def service_retrieve_data_on_ports(
         )
 
         # validate and return
-        return RetrieveDataOutEnveloped.parse_obj(response.json())
+        return RetrieveDataOutEnveloped.model_validate(response.json())
 
 
 @router.post(

services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py

@@ -275,7 +275,7 @@ def compose_spec_submitted(self) -> bool:
     )
 
     instrumentation: ServicesInstrumentation = Field(
-        default_factory=lambda: ServicesInstrumentation.parse_obj({}),
+        default_factory=lambda: ServicesInstrumentation.model_validate({}),
         description="keeps track times for various operations",
     )
 

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/clusters.py

@@ -108,9 +108,9 @@ async def _compute_user_access_rights(
     ) and (primary_grp_rights := cluster.access_rights.get(primary_group_row.gid)):
         return primary_grp_rights
 
-    solved_rights = CLUSTER_NO_RIGHTS.dict()
+    solved_rights = CLUSTER_NO_RIGHTS.model_dump()
     for group_row in filter(lambda ugrp: ugrp[1] != GroupType.PRIMARY, user_groups):
-        grp_access = cluster.access_rights.get(group_row.gid, CLUSTER_NO_RIGHTS).dict()
+        grp_access = cluster.access_rights.get(group_row.gid, CLUSTER_NO_RIGHTS).model_dump()
         for operation in ["read", "write", "delete"]:
             solved_rights[operation] |= grp_access[operation]
     return ClusterAccessRights(**solved_rights)
@@ -250,14 +250,14 @@ async def update_cluster(  # pylint: disable=too-many-branches
             if updated_cluster.access_rights:
                 for grp, rights in resolved_access_rights.items():
                     insert_stmt = pg_insert(cluster_to_groups).values(
-                        **rights.dict(by_alias=True), gid=grp, cluster_id=the_cluster.id
+                        **rights.model_dump(by_alias=True), gid=grp, cluster_id=the_cluster.id
                     )
                     on_update_stmt = insert_stmt.on_conflict_do_update(
                         index_elements=[
                             cluster_to_groups.c.cluster_id,
                             cluster_to_groups.c.gid,
                         ],
-                        set_=rights.dict(by_alias=True),
+                        set_=rights.model_dump(by_alias=True),
                     )
                     await conn.execute(on_update_stmt)
 

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_pipelines.py

@@ -39,14 +39,14 @@ async def upsert_pipeline(
             dag_adjacency_list=nx.to_dict_of_lists(dag_graph),
             state=RunningState.PUBLISHED if publish else RunningState.NOT_STARTED,
         )
-        insert_stmt = insert(comp_pipeline).values(**pipeline_at_db.dict(by_alias=True))
+        insert_stmt = insert(comp_pipeline).values(**pipeline_at_db.model_dump(by_alias=True))
         # FIXME: This is not a nice thing. this part of the information should be kept in comp_runs.
         update_exclusion_policy = set()
         if not dag_graph.nodes():
             update_exclusion_policy.add("dag_adjacency_list")
         on_update_stmt = insert_stmt.on_conflict_do_update(
             index_elements=[comp_pipeline.c.project_id],
-            set_=pipeline_at_db.dict(
+            set_=pipeline_at_db.model_dump(
                 by_alias=True, exclude_unset=True, exclude=update_exclusion_policy
             ),
         )

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks/_utils.py

@@ -105,7 +105,7 @@ def _compute_node_requirements(
             node_defined_resources[resource_name] = node_defined_resources.get(
                 resource_name, 0
             ) + min(resource_value.limit, resource_value.reservation)
-    return NodeRequirements.parse_obj(node_defined_resources)
+    return NodeRequirements.model_validate(node_defined_resources)
 
 
 def _compute_node_boot_mode(node_resources: ServiceResourcesDict) -> BootMode:
@@ -187,7 +187,7 @@ async def _generate_task_image(
         data.update(envs=_compute_node_envs(node_labels))
     if node_extras and node_extras.container_spec:
         data.update(command=node_extras.container_spec.command)
-    return Image.parse_obj(data)
+    return Image.model_validate(data)
 
 
 async def _get_pricing_and_hardware_infos(
@@ -430,7 +430,7 @@ async def generate_tasks_list_from_project(
         task_db = CompTaskAtDB(
             project_id=project.uuid,
             node_id=NodeID(node_id),
-            schema=NodeSchema.parse_obj(
+            schema=NodeSchema.model_validate(
                 node_details.dict(
                     exclude_unset=True, by_alias=True, include={"inputs", "outputs"}
                 )

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects_networks.py

@@ -28,7 +28,7 @@ async def get_projects_networks(self, project_id: ProjectID) -> ProjectsNetworks
     async def upsert_projects_networks(
         self, project_id: ProjectID, networks_with_aliases: NetworksWithAliases
     ) -> None:
-        projects_networks_to_insert = ProjectsNetworks.parse_obj(
+        projects_networks_to_insert = ProjectsNetworks.model_validate(
             {"project_uuid": project_id, "networks_with_aliases": networks_with_aliases}
         )
 

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/user_preferences_frontend.py

@@ -31,5 +31,5 @@ async def get_user_preference(
         return (
             None
             if preference_payload is None
-            else preference_class.parse_obj(preference_payload)
+            else preference_class.model_validate(preference_payload)
         )

services/director-v2/src/simcore_service_director_v2/modules/director_v0.py

@@ -83,7 +83,7 @@ async def get_service_extras(
             f"/service_extras/{urllib.parse.quote_plus(service_key)}/{service_version}",
         )
         if resp.status_code == status.HTTP_200_OK:
-            return ServiceExtras.parse_obj(unenvelope_or_raise_error(resp))
+            return ServiceExtras.model_validate(unenvelope_or_raise_error(resp))
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     @log_decorator(logger=logger)
@@ -94,7 +94,7 @@ async def get_running_service_details(
             "GET", f"running_interactive_services/{service_uuid}"
         )
         if resp.status_code == status.HTTP_200_OK:
-            return RunningDynamicServiceDetails.parse_obj(
+            return RunningDynamicServiceDetails.model_validate(
                 unenvelope_or_raise_error(resp)
             )
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
@@ -109,7 +109,7 @@ async def get_service_labels(
         )
         resp.raise_for_status()
         if resp.status_code == status.HTTP_200_OK:
-            return SimcoreServiceLabels.parse_obj(unenvelope_or_raise_error(resp))
+            return SimcoreServiceLabels.model_validate(unenvelope_or_raise_error(resp))
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     @log_decorator(logger=logger)

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_public.py

@@ -495,7 +495,7 @@ async def get_service_activity(
             dynamic_sidecar_endpoint
         )
         decoded_response = response.json()
-        return ActivityInfo.parse_obj(decoded_response) if decoded_response else None
+        return ActivityInfo.model_validate(decoded_response) if decoded_response else None
 
     async def free_reserved_disk_space(
         self, dynamic_sidecar_endpoint: AnyHttpUrl

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/settings.py

@@ -304,7 +304,7 @@ def _merge_resources_in_settings(
 
     # merge all resources
     empty_resource_entry: SimcoreServiceSettingLabelEntry = (
-        SimcoreServiceSettingLabelEntry.parse_obj(
+        SimcoreServiceSettingLabelEntry.model_validate(
             {
                 "name": "Resources",
                 "type": "Resources",
@@ -406,7 +406,7 @@ def _get_boot_options(
 
     boot_options = json.loads(boot_options_encoded)["boot-options"]
     log.debug("got boot_options=%s", boot_options)
-    return {k: BootOption.parse_obj(v) for k, v in boot_options.items()}
+    return {k: BootOption.model_validate(v) for k, v in boot_options.items()}
 
 
 def _assemble_env_vars_for_boot_options(
@@ -511,7 +511,7 @@ async def merge_settings_before_use(
     )
     settings = _patch_target_service_into_env_vars(settings)
 
-    return SimcoreServiceSettingsLabel.parse_obj(settings)
+    return SimcoreServiceSettingsLabel.model_validate(settings)
 
 
 __all__ = ["merge_settings_before_use", "update_service_params_from_settings"]