remove deprecated from_orm

giancarloromeo · giancarloromeo · commit 39b989831718 · 2024-10-25T09:16:43.000+02:00
diff --git a/services/web/server/src/simcore_service_webserver/api_keys/_db.py b/services/web/server/src/simcore_service_webserver/api_keys/_db.py
@@ -79,7 +79,7 @@ async def get(
 
             result: ResultProxy = await conn.execute(stmt)
             row: RowProxy | None = await result.fetchone()
-            return ApiKeyInDB.from_orm(row) if row else None
+            return ApiKeyInDB.model_validate(row) if row else None
 
     async def get_or_create(
         self,
@@ -116,7 +116,7 @@ async def get_or_create(
             result = await conn.execute(insert_stmt)
             row = await result.fetchone()
             assert row  # nosec
-            return ApiKeyInDB.from_orm(row)
+            return ApiKeyInDB.model_validate(row)
 
     async def delete_by_name(
         self, *, display_name: str, user_id: UserID, product_name: ProductName
diff --git a/services/web/server/src/simcore_service_webserver/folders/_folders_db.py b/services/web/server/src/simcore_service_webserver/folders/_folders_db.py
@@ -70,7 +70,7 @@ async def create(
             .returning(*_SELECTION_ARGS)
         )
         row = await result.first()
-        return FolderDB.from_orm(row)
+        return FolderDB.model_validate(row)
 
 
 async def list_(
@@ -123,7 +123,7 @@ async def list_(
 
         result = await conn.execute(list_query)
         rows = await result.fetchall() or []
-        results: list[FolderDB] = [FolderDB.from_orm(row) for row in rows]
+        results: list[FolderDB] = [FolderDB.model_validate(row) for row in rows]
         return cast(int, total_count), results
 
 
@@ -149,7 +149,7 @@ async def get(
             raise FolderAccessForbiddenError(
                 reason=f"Folder {folder_id} does not exist.",
             )
-        return FolderDB.from_orm(row)
+        return FolderDB.model_validate(row)
 
 
 async def get_for_user_or_workspace(
@@ -185,7 +185,7 @@ async def get_for_user_or_workspace(
             raise FolderAccessForbiddenError(
                 reason=f"User does not have access to the folder {folder_id}. Or folder does not exist.",
             )
-        return FolderDB.from_orm(row)
+        return FolderDB.model_validate(row)
 
 
 async def update(
@@ -213,7 +213,7 @@ async def update(
         row = await result.first()
         if row is None:
             raise FolderNotFoundError(reason=f"Folder {folder_id} not found.")
-        return FolderDB.from_orm(row)
+        return FolderDB.model_validate(row)
 
 
 async def delete_recursively(
diff --git a/services/web/server/src/simcore_service_webserver/payments/_autorecharge_db.py b/services/web/server/src/simcore_service_webserver/payments/_autorecharge_db.py
@@ -36,7 +36,7 @@ async def get_wallet_autorecharge(
         stmt = AutoRechargeStmts.get_wallet_autorecharge(wallet_id)
         result = await conn.execute(stmt)
         row = await result.first()
-        return PaymentsAutorechargeDB.from_orm(row) if row else None
+        return PaymentsAutorechargeDB.model_validate(row) if row else None
 
 
 async def replace_wallet_autorecharge(
@@ -73,4 +73,4 @@ async def replace_wallet_autorecharge(
         result = await conn.execute(stmt)
         row = await result.first()
         assert row  # nosec
-        return PaymentsAutorechargeDB.from_orm(row)
+        return PaymentsAutorechargeDB.model_validate(row)
diff --git a/services/web/server/src/simcore_service_webserver/payments/_methods_db.py b/services/web/server/src/simcore_service_webserver/payments/_methods_db.py
@@ -105,7 +105,7 @@ async def get_successful_payment_method(
         if row is None:
             raise PaymentMethodNotFoundError(payment_method_id=payment_method_id)
 
-        return PaymentsMethodsDB.from_orm(row)
+        return PaymentsMethodsDB.model_validate(row)
 
 
 async def get_pending_payment_methods_ids(
diff --git a/services/web/server/src/simcore_service_webserver/projects/_db_utils.py b/services/web/server/src/simcore_service_webserver/projects/_db_utils.py
@@ -191,7 +191,7 @@ async def _execute_without_permission_check(
             assert isinstance(row, RowProxy)  # nosec
             try:
                 await asyncio.get_event_loop().run_in_executor(
-                    None, ProjectAtDB.from_orm, row
+                    None, ProjectAtDB.model_validate, row
                 )
 
             except ProjectInvalidRightsError:
diff --git a/services/web/server/src/simcore_service_webserver/projects/db.py b/services/web/server/src/simcore_service_webserver/projects/db.py
@@ -744,7 +744,7 @@ async def get_project_db(self, project_uuid: ProjectID) -> ProjectDB:
             row = await result.fetchone()
             if row is None:
                 raise ProjectNotFoundError(project_uuid=project_uuid)
-            return ProjectDB.from_orm(row)
+            return ProjectDB.model_validate(row)
 
     async def get_user_specific_project_data_db(
         self, project_uuid: ProjectID, private_workspace_user_id_or_none: UserID | None
@@ -772,7 +772,7 @@ async def get_user_specific_project_data_db(
             row = await result.fetchone()
             if row is None:
                 raise ProjectNotFoundError(project_uuid=project_uuid)
-            return UserSpecificProjectDataDB.from_orm(row)
+            return UserSpecificProjectDataDB.model_validate(row)
 
     async def get_pure_project_access_rights_without_workspace(
         self, user_id: UserID, project_uuid: ProjectID
@@ -818,7 +818,7 @@ async def get_pure_project_access_rights_without_workspace(
                 raise ProjectInvalidRightsError(
                     user_id=user_id, project_uuid=project_uuid
                 )
-            return UserProjectAccessRightsDB.from_orm(row)
+            return UserProjectAccessRightsDB.model_validate(row)
 
     async def replace_project(
         self,
@@ -913,7 +913,7 @@ async def patch_project(
             row = await result.fetchone()
             if row is None:
                 raise ProjectNotFoundError(project_uuid=project_uuid)
-            return ProjectDB.from_orm(row)
+            return ProjectDB.model_validate(row)
 
     async def get_project_product(self, project_uuid: ProjectID) -> ProductName:
         async with self.engine.acquire() as conn:
diff --git a/services/web/server/src/simcore_service_webserver/scicrunch/db.py b/services/web/server/src/simcore_service_webserver/scicrunch/db.py
@@ -39,7 +39,7 @@ async def list_resources(self) -> list[ResearchResource]:
             )
             res: ResultProxy = await conn.execute(stmt)
             rows: list[RowProxy] = await res.fetchall()
-            return [ResearchResource.from_orm(row) for row in rows] if rows else []
+            return [ResearchResource.model_validate(row) for row in rows] if rows else []
 
     async def get(self, rrid: str) -> ResearchResourceAtdB | None:
         async with self._engine.acquire() as conn:
diff --git a/services/web/server/src/simcore_service_webserver/users/_db.py b/services/web/server/src/simcore_service_webserver/users/_db.py
@@ -212,4 +212,4 @@ async def get_user_billing_details(
         user_billing_details = await UsersRepo.get_billing_details(conn, user_id)
         if not user_billing_details:
             raise BillingDetailsNotFoundError(user_id=user_id)
-        return UserBillingDetails.from_orm(user_billing_details)
+        return UserBillingDetails.model_validate(user_billing_details)
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_groups_db.py b/services/web/server/src/simcore_service_webserver/workspaces/_groups_db.py
@@ -61,7 +61,7 @@ async def create_workspace_group(
             .returning(literal_column("*"))
         )
         row = await result.first()
-        return WorkspaceGroupGetDB.from_orm(row)
+        return WorkspaceGroupGetDB.model_validate(row)
 
 
 async def list_workspace_groups(
@@ -84,7 +84,7 @@ async def list_workspace_groups(
     async with get_database_engine(app).acquire() as conn:
         result = await conn.execute(stmt)
         rows = await result.fetchall() or []
-        return [WorkspaceGroupGetDB.from_orm(row) for row in rows]
+        return [WorkspaceGroupGetDB.model_validate(row) for row in rows]
 
 
 async def get_workspace_group(
@@ -115,7 +115,7 @@ async def get_workspace_group(
             raise WorkspaceGroupNotFoundError(
                 workspace_id=workspace_id, group_id=group_id
             )
-        return WorkspaceGroupGetDB.from_orm(row)
+        return WorkspaceGroupGetDB.model_validate(row)
 
 
 async def update_workspace_group(
@@ -146,7 +146,7 @@ async def update_workspace_group(
             raise WorkspaceGroupNotFoundError(
                 workspace_id=workspace_id, group_id=group_id
             )
-        return WorkspaceGroupGetDB.from_orm(row)
+        return WorkspaceGroupGetDB.model_validate(row)
 
 
 async def delete_workspace_group(
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_db.py b/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_db.py
@@ -66,7 +66,7 @@ async def create_workspace(
             .returning(*_SELECTION_ARGS)
         )
         row = await result.first()
-        return WorkspaceDB.from_orm(row)
+        return WorkspaceDB.model_validate(row)
 
 
 access_rights_subquery = (
@@ -155,7 +155,7 @@ async def list_workspaces_for_user(
         result = await conn.execute(list_query)
         rows = await result.fetchall() or []
         results: list[UserWorkspaceAccessRightsDB] = [
-            UserWorkspaceAccessRightsDB.from_orm(row) for row in rows
+            UserWorkspaceAccessRightsDB.model_validate(row) for row in rows
         ]
 
         return cast(int, total_count), results
@@ -191,7 +191,7 @@ async def get_workspace_for_user(
             raise WorkspaceAccessForbiddenError(
                 reason=f"User {user_id} does not have access to the workspace {workspace_id}. Or workspace does not exist.",
             )
-        return UserWorkspaceAccessRightsDB.from_orm(row)
+        return UserWorkspaceAccessRightsDB.model_validate(row)
 
 
 async def update_workspace(
@@ -220,7 +220,7 @@ async def update_workspace(
         row = await result.first()
         if row is None:
             raise WorkspaceNotFoundError(reason=f"Workspace {workspace_id} not found.")
-        return WorkspaceDB.from_orm(row)
+        return WorkspaceDB.model_validate(row)
 
 
 async def delete_workspace(

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ async def _execute_without_permission_check(`
`191`	`191`	`assert isinstance(row, RowProxy) # nosec`
`192`	`192`	`try:`
`193`	`193`	`await asyncio.get_event_loop().run_in_executor(`
`194`		`- None, ProjectAtDB.from_orm, row`
	`194`	`+ None, ProjectAtDB.model_validate, row`
`195`	`195`	`)`
`196`	`196`
`197`	`197`	`except ProjectInvalidRightsError:`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ async def list_resources(self) -> list[ResearchResource]:`
`39`	`39`	`)`
`40`	`40`	`res: ResultProxy = await conn.execute(stmt)`
`41`	`41`	`rows: list[RowProxy] = await res.fetchall()`
`42`		`- return [ResearchResource.from_orm(row) for row in rows] if rows else []`
	`42`	`+ return [ResearchResource.model_validate(row) for row in rows] if rows else []`
`43`	`43`
`44`	`44`	`async def get(self, rrid: str) -> ResearchResourceAtdB \| None:`
`45`	`45`	`async with self._engine.acquire() as conn:`