fix deprecated dict()

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -97,7 +97,9 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     SIMCORE_VCS_RELEASE_URL: AnyHttpUrl | None = Field(
         default=None,
         description="URL to release notes",
-        examples=["https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_ResistanceIsFutile10"],
+        examples=[
+            "https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_ResistanceIsFutile10"
+        ],
     )
 
     SWARM_STACK_NAME: str | None = Field(
@@ -273,9 +275,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def build_vcs_release_url_if_unset(cls, v):
         release_url = v.SIMCORE_VCS_RELEASE_URL
 
-        if release_url is None and (
-            vsc_release_tag := v.SIMCORE_VCS_RELEASE_TAG
-        ):
+        if release_url is None and (vsc_release_tag := v.SIMCORE_VCS_RELEASE_TAG):
             if vsc_release_tag == "latest":
                 release_url = (
                     "https://github.com/ITISFoundation/osparc-simcore/commits/master/"
@@ -378,7 +378,7 @@ def _export_by_alias(self, **kwargs) -> dict[str, Any]:
         def config_alias_generator(s):
             return s.lower()
 
-        data: dict[str, Any] = self.dict(**kwargs)
+        data: dict[str, Any] = self.model_dump(**kwargs)
         current_keys = list(data.keys())
 
         for key in current_keys:

services/web/server/src/simcore_service_webserver/catalog/_api.py

@@ -284,17 +284,17 @@ async def get_compatible_inputs_given_source_output(
         from_service_key, from_service_version, from_output_key, ctx
     )
 
-    from_output: ServiceOutput = ServiceOutput.construct(
-        **service_output.dict(include=ServiceOutput.__fields__.keys())
+    from_output: ServiceOutput = ServiceOutput.model_construct(
+        **service_output.model_dump(include=ServiceOutput.model_fields.keys())
     )
 
     # N inputs
     service_inputs = await list_service_inputs(service_key, service_version, ctx)
 
     def iter_service_inputs() -> Iterator[tuple[ServiceInputKey, ServiceInput]]:
         for service_input in service_inputs:
-            yield service_input.key_id, ServiceInput.construct(
-                **service_input.dict(include=ServiceInput.__fields__.keys())
+            yield service_input.key_id, ServiceInput.model_construct(
+                **service_input.model_dump(include=ServiceInput.model_fields.keys())
             )
 
     # check
@@ -352,16 +352,16 @@ async def get_compatible_outputs_given_target_input(
 
     def iter_service_outputs() -> Iterator[tuple[ServiceOutputKey, ServiceOutput]]:
         for service_output in service_outputs:
-            yield service_output.key_id, ServiceOutput.construct(
-                **service_output.dict(include=ServiceOutput.__fields__.keys())
+            yield service_output.key_id, ServiceOutput.model_construct(
+                **service_output.model_dump(include=ServiceOutput.model_fields.keys())
             )
 
     # 1 input
     service_input = await get_service_input(
         to_service_key, to_service_version, to_input_key, ctx
     )
-    to_input: ServiceInput = ServiceInput.construct(
-        **service_input.dict(include=ServiceInput.__fields__.keys())
+    to_input: ServiceInput = ServiceInput.model_construct(
+        **service_input.model_dump(include=ServiceInput.model_fields.keys())
     )
 
     # check

services/web/server/src/simcore_service_webserver/catalog/_handlers.py

@@ -160,7 +160,7 @@ async def update_service(request: Request):
         product_name=request_ctx.product_name,
         service_key=path_params.service_key,
         service_version=path_params.service_version,
-        update_data=update.dict(exclude_unset=True),
+        update_data=update.model_dump(exclude_unset=True),
         unit_registry=request_ctx.unit_registry,
     )
 
@@ -182,7 +182,7 @@ async def list_service_inputs(request: Request):
         path_params.service_key, path_params.service_version, ctx
     )
 
-    data = [m.dict(**RESPONSE_MODEL_POLICY) for m in response_model]
+    data = [m.model_dump(**RESPONSE_MODEL_POLICY) for m in response_model]
     return await asyncio.get_event_loop().run_in_executor(
         None, envelope_json_response, data
     )
@@ -210,7 +210,7 @@ async def get_service_input(request: Request):
         ctx,
     )
 
-    data = response_model.dict(**RESPONSE_MODEL_POLICY)
+    data = response_model.model_dump(**RESPONSE_MODEL_POLICY)
     return await asyncio.get_event_loop().run_in_executor(
         None, envelope_json_response, data
     )
@@ -265,7 +265,7 @@ async def list_service_outputs(request: Request):
         path_params.service_key, path_params.service_version, ctx
     )
 
-    data = [m.dict(**RESPONSE_MODEL_POLICY) for m in response_model]
+    data = [m.model_dump(**RESPONSE_MODEL_POLICY) for m in response_model]
     return await asyncio.get_event_loop().run_in_executor(
         None, envelope_json_response, data
     )
@@ -293,7 +293,7 @@ async def get_service_output(request: Request):
         ctx,
     )
 
-    data = response_model.dict(**RESPONSE_MODEL_POLICY)
+    data = response_model.model_dump(**RESPONSE_MODEL_POLICY)
     return await asyncio.get_event_loop().run_in_executor(
         None, envelope_json_response, data
     )

services/web/server/src/simcore_service_webserver/director_v2/_handlers.py

@@ -254,7 +254,7 @@ async def get_computation(request: web.Request) -> web.Response:
             for c in list_computation_tasks
         )
         return web.json_response(
-            data={"data": list_computation_tasks[0].dict(by_alias=True)},
+            data={"data": list_computation_tasks[0].model_dump(by_alias=True)},
             dumps=json_dumps,
         )
     except DirectorServiceError as exc:

services/web/server/src/simcore_service_webserver/email/_handlers.py

@@ -100,7 +100,7 @@ async def test_email(request: web.Request):
 
         return envelope_json_response(
             EmailTestPassed(
-                fixtures=body.dict(),
+                fixtures=body.model_dump(),
                 info={
                     "email-server": info,
                     "email-headers": message.items(),

services/web/server/src/simcore_service_webserver/groups/_handlers.py

@@ -374,7 +374,7 @@ async def add_scicrunch_resource(request: web.Request):
         # insert new or if exists, then update
         await repo.upsert(resource)
 
-    return envelope_json_response(resource.dict())
+    return envelope_json_response(resource.model_dump())
 
 
 @routes.get(

services/web/server/src/simcore_service_webserver/groups/api.py

@@ -32,7 +32,7 @@ async def list_all_user_groups(app: web.Application, user_id: UserID) -> list[Gr
     async with get_database_engine(app).acquire() as conn:
         groups_db = await _db.get_all_user_groups(conn, user_id=user_id)
 
-    return [Group.construct(**group.dict()) for group in groups_db]
+    return [Group.construct(**group.model_dump()) for group in groups_db]
 
 
 async def get_user_group(
@@ -199,5 +199,5 @@ async def get_group_from_gid(app: web.Application, gid: GroupID) -> Group | None
         group_db = await _db.get_group_from_gid(conn, gid=gid)
 
     if group_db:
-        return Group.construct(**group_db.dict())
+        return Group.construct(**group_db.model_dump())
     return None

services/web/server/src/simcore_service_webserver/login/plugin.py

@@ -68,7 +68,7 @@ def setup_login_storage(app: web.Application):
 def _setup_login_options(app: web.Application):
     settings: SMTPSettings = get_email_plugin_settings(app)
 
-    cfg = settings.dict()
+    cfg = settings.model_dump()
     if INDEX_RESOURCE_NAME in app.router:
         cfg["LOGIN_REDIRECT"] = f"{app.router[INDEX_RESOURCE_NAME].url_for()}"
 

services/web/server/src/simcore_service_webserver/login/settings.py

@@ -94,7 +94,10 @@ def create_from_composition(
         """
         For the LoginSettings, product-specific settings override app-specifics settings
         """
-        composed_settings = {**app_login_settings.dict(), **product_login_settings}
+        composed_settings = {
+            **app_login_settings.model_dump(),
+            **product_login_settings,
+        }
 
         if "two_factor_enabled" in composed_settings:
             # legacy safe

services/web/server/src/simcore_service_webserver/meta_modeling/_iterations.py

@@ -280,7 +280,7 @@ async def get_or_create_runnable_projects(
         project["workbench"].update(
             {
                 # converts model in dict patching first thumbnail
-                nid: n.copy(update={"thumbnail": n.thumbnail or ""}).dict(
+                nid: n.copy(update={"thumbnail": n.thumbnail or ""}).model_dump(
                     by_alias=True, exclude_unset=True
                 )
                 for nid, n in updated_nodes.items()