continue fixing

Author: giancarloromeo

packages/models-library/src/models_library/function_services_catalog/api.py

@@ -24,7 +24,7 @@
 def iter_service_docker_data() -> Iterator[ServiceMetaDataPublished]:
     for meta_obj in catalog.iter_metadata():
         # NOTE: the originals are this way not modified from outside
-        copied_meta_obj = meta_obj.copy(deep=True)
+        copied_meta_obj = meta_obj.model_copy(deep=True)
         assert is_function_service(copied_meta_obj.key)  # nosec
         yield copied_meta_obj
 

packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py

@@ -109,7 +109,7 @@ def create_computation_cb(url, **kwargs) -> CallbackResult:
         }
     returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
-    ).copy(
+    ).model_copy(
         update={
             "id": f"{kwargs['json']['project_id']}",
             "state": state,
@@ -133,7 +133,7 @@ def get_computation_cb(url, **kwargs) -> CallbackResult:
     node_states = FULL_PROJECT_NODE_STATES
     returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
-    ).copy(
+    ).model_copy(
         update={
             "id": Path(url.path).name,
             "state": state,

packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py

@@ -46,7 +46,7 @@ async def connect_to_db(app: web.Application, settings: PostgresSettings) -> Non
     - sets an engine in app state (use `get_async_engine(app)` to retrieve)
     """
     if settings.POSTGRES_CLIENT_NAME:
-        settings = settings.copy(
+        settings = settings.model_copy(
             update={"POSTGRES_CLIENT_NAME": settings.POSTGRES_CLIENT_NAME + "-asyncpg"}
         )
 

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_base_scheduler.py

@@ -460,7 +460,7 @@ async def _get_changed_tasks_from_backend(
         return [
             (
                 task,
-                task.copy(update={"state": backend_state}),
+                task.model_copy(update={"state": backend_state}),
             )
             for task, backend_state in zip(
                 processing_tasks, tasks_backend_status, strict=True

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py

@@ -502,7 +502,7 @@ async def test_mark_all_services_in_wallet_for_removal(
 ) -> None:
     for wallet_id in [WalletID(1), WalletID(2)]:
         for _ in range(2):
-            new_scheduler_data = scheduler_data.copy(deep=True)
+            new_scheduler_data = scheduler_data.model_copy(deep=True)
             new_scheduler_data.node_uuid = faker.uuid4(cast_to=None)
             new_scheduler_data.service_name = ServiceName(
                 f"fake_{new_scheduler_data.node_uuid}"

services/director-v2/tests/unit/test_utils_computation.py

@@ -265,7 +265,7 @@ def test_get_pipeline_state_from_task_states(
     fake_task: CompTaskAtDB,
 ):
     tasks: list[CompTaskAtDB] = [
-        fake_task.copy(deep=True, update={"state": s}) for s in task_states
+        fake_task.model_copy(deep=True, update={"state": s}) for s in task_states
     ]
 
     pipeline_state: RunningState = get_pipeline_state_from_task_states(tasks)

services/director-v2/tests/unit/test_utils_dags.py

@@ -428,7 +428,7 @@ def pipeline_test_params(
 
     # resolved the expected output
 
-    resolved_expected_pipeline_details = expected_pipeline_details_output.copy(
+    resolved_expected_pipeline_details = expected_pipeline_details_output.model_copy(
         update={
             "adjacency_list": {
                 NodeID(node_name_to_uuid_map[node_a]): [

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

@@ -93,7 +93,7 @@ async def get_or_create_api_key(
         api_key=api_key,
         api_secret=api_secret,
     )
-    return ApiKeyGet.construct(
+    return ApiKeyGet.model_construct(
         display_name=row.display_name, api_key=row.api_key, api_secret=row.api_secret
     )
 

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

@@ -86,7 +86,7 @@ async def from_catalog_service_api_model(
 
         if ureg and (unit_html := get_html_formatted_unit(port, ureg)):
             # we know data is ok since it was validated above
-            return ServiceInputGet.construct(
+            return ServiceInputGet.model_construct(
                 key_id=input_key,
                 unit_long=unit_html.long,
                 unit_short=unit_html.short,
@@ -123,7 +123,7 @@ async def from_catalog_service_api_model(
         unit_html: UnitHtmlFormat | None
         if ureg and (unit_html := get_html_formatted_unit(port, ureg)):
             # we know data is ok since it was validated above
-            return ServiceOutputGet.construct(
+            return ServiceOutputGet.model_construct(
                 key_id=output_key,
                 unit_long=unit_html.long,
                 unit_short=unit_html.short,

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.model_dump()) for group in groups_db]
+    return [Group.model_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.model_dump())
+        return Group.model_construct(**group_db.model_dump())
     return None