continue fixing

Author: giancarloromeo

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

@@ -4,7 +4,7 @@
 import aiohttp
 import aiohttp.web
 from models_library.api_schemas_webserver.activity import ActivityStatusDict
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.request_keys import RQT_USERID_KEY
@@ -73,5 +73,5 @@ async def get_activity_status(request: aiohttp.web.Request):
     if not res:
         raise aiohttp.web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
-    assert parse_obj_as(ActivityStatusDict, res) is not None  # nosec
+    assert TypeAdapter(ActivityStatusDict).validate_python(res) is not None  # nosec
     return dict(res)

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

@@ -19,7 +19,7 @@
 )
 from models_library.services_resources import ServiceResourcesDict
 from models_library.users import UserID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
@@ -146,7 +146,7 @@ async def get_service_resources(
         async with session.get(url) as resp:
             resp.raise_for_status()
             dict_response = await resp.json()
-            return parse_obj_as(ServiceResourcesDict, dict_response)
+            return TypeAdapter(ServiceResourcesDict).validate_python(dict_response)
 
 
 async def get_service_access_rights(

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

@@ -11,7 +11,7 @@
     ClusterPing,
 )
 from models_library.users import UserID
-from pydantic import BaseModel, Field, parse_obj_as
+from pydantic import BaseModel, Field, TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -100,7 +100,7 @@ async def list_clusters(request: web.Request) -> web.Response:
         app=request.app,
         user_id=req_ctx.user_id,
     )
-    assert parse_obj_as(list[ClusterGet], clusters) is not None  # nosec
+    assert TypeAdapter(list[ClusterGet]).validate_python(clusters) is not None  # nosec
     return envelope_json_response(clusters)
 
 
@@ -117,7 +117,7 @@ async def get_cluster(request: web.Request) -> web.Response:
         user_id=req_ctx.user_id,
         cluster_id=path_params.cluster_id,
     )
-    assert parse_obj_as(ClusterGet, cluster) is not None  # nosec
+    assert TypeAdapter(ClusterGet).validate_python(cluster) is not None  # nosec
     return envelope_json_response(cluster)
 
 
@@ -137,7 +137,7 @@ async def update_cluster(request: web.Request) -> web.Response:
         cluster_patch=cluster_patch,
     )
 
-    assert parse_obj_as(ClusterGet, updated_cluster) is not None  # nosec
+    assert TypeAdapter(ClusterGet).validate_python(updated_cluster) is not None  # nosec
     return envelope_json_response(updated_cluster)
 
 
@@ -173,7 +173,9 @@ async def get_cluster_details(request: web.Request) -> web.Response:
         user_id=req_ctx.user_id,
         cluster_id=path_params.cluster_id,
     )
-    assert parse_obj_as(ClusterDetails, cluster_details) is not None  # nosec
+    assert (
+        TypeAdapter(ClusterDetails).validate_python(cluster_details) is not None
+    )  # nosec
     return envelope_json_response(cluster_details)
 
 

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

@@ -10,7 +10,7 @@
 from aiohttp import ClientError, ClientSession, web
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.utils.pydantic_tools_extension import FieldNotRequired
-from pydantic import BaseModel, parse_obj_as
+from pydantic import BaseModel, TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.aiohttp.requests_validation import parse_request_query_parameters_as
 from servicelib.utils import logged_gather
@@ -62,7 +62,7 @@ async def get_app_diagnostics(request: web.Request):
             top_tracemalloc=get_tracemalloc_info(top=query_params.top_tracemalloc)
         )
 
-    assert parse_obj_as(StatusDiagnosticsGet, data) is not None  # nosec
+    assert TypeAdapter(StatusDiagnosticsGet).validate_python(data) is not None  # nosec
     return envelope_json_response(data)
 
 

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

@@ -2,7 +2,7 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from models_library.wallets import WalletID, WalletInfo
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
 from ..application_settings import get_application_settings
 from ..products.api import Product
@@ -35,7 +35,9 @@ async def get_wallet_info(
         )
         if user_default_wallet_preference is None:
             raise UserDefaultWalletNotFoundError(uid=user_id)
-        project_wallet_id = parse_obj_as(WalletID, user_default_wallet_preference.value)
+        project_wallet_id = TypeAdapter(WalletID).validate_python(
+            user_default_wallet_preference.value
+        )
         await projects_api.connect_wallet_to_project(
             app,
             product_name=product_name,

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

@@ -26,7 +26,7 @@
 from models_library.projects_pipeline import ComputationTask
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from pydantic.types import PositiveInt
 from servicelib.aiohttp import status
 from servicelib.logging_utils import log_decorator
@@ -234,7 +234,7 @@ async def create_cluster(
         ),
     )
     assert isinstance(cluster, dict)  # nosec
-    assert parse_obj_as(ClusterGet, cluster) is not None  # nosec
+    assert TypeAdapter(ClusterGet).validate_python(cluster) is not None  # nosec
     return cluster
 
 
@@ -248,7 +248,7 @@ async def list_clusters(app: web.Application, user_id: UserID) -> list[DataType]
     )
 
     assert isinstance(clusters, list)  # nosec
-    assert parse_obj_as(list[ClusterGet], clusters) is not None  # nosec
+    assert TypeAdapter(list[ClusterGet]).validate_python(clusters) is not None  # nosec
     return clusters
 
 
@@ -276,7 +276,7 @@ async def get_cluster(
     )
 
     assert isinstance(cluster, dict)  # nosec
-    assert parse_obj_as(ClusterGet, cluster) is not None  # nosec
+    assert TypeAdapter(ClusterGet).validate_python(cluster) is not None  # nosec
     return cluster
 
 
@@ -304,7 +304,7 @@ async def get_cluster_details(
         },
     )
     assert isinstance(cluster, dict)  # nosec
-    assert parse_obj_as(ClusterDetails, cluster) is not None  # nosec
+    assert TypeAdapter(ClusterDetails).validate_python(cluster) is not None  # nosec
     return cluster
 
 
@@ -342,7 +342,7 @@ async def update_cluster(
     )
 
     assert isinstance(cluster, dict)  # nosec
-    assert parse_obj_as(ClusterGet, cluster) is not None  # nosec
+    assert TypeAdapter(ClusterGet).validate_python(cluster) is not None  # nosec
     return cluster
 
 

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

@@ -10,7 +10,7 @@
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.projects import ProjectID
 from models_library.services import ServicePortKey
-from pydantic import BaseModel, NonNegativeInt, parse_obj_as
+from pydantic import BaseModel, NonNegativeInt, TypeAdapter
 from pydantic.types import PositiveInt
 from servicelib.logging_utils import log_decorator
 from yarl import URL
@@ -49,7 +49,7 @@ async def list_dynamic_services(
     if services is None:
         services = []
     assert isinstance(services, list)  # nosec
-    return parse_obj_as(list[DynamicServiceGet], services)
+    return TypeAdapter(list[DynamicServiceGet]).validate_python(services)
 
 
 # NOTE: ANE https://github.com/ITISFoundation/osparc-simcore/issues/3191

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

@@ -8,7 +8,7 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from models_library.utils.json_serialization import json_dumps
-from pydantic import BaseModel, Field, ValidationError, parse_obj_as
+from pydantic import BaseModel, Field, TypeAdapter, ValidationError
 from pydantic.types import NonNegativeInt
 from servicelib.aiohttp.rest_responses import (
     create_http_error,
@@ -81,7 +81,9 @@ async def start_computation(request: web.Request) -> web.Response:
 
         if request.can_read_body:
             body = await request.json()
-            assert parse_obj_as(ComputationStart, body) is not None  # nosec
+            assert (
+                TypeAdapter(ComputationStart).validate_python(body) is not None
+            )  # nosec
 
             subgraph = body.get("subgraph", [])
             force_restart = bool(body.get("force_restart", force_restart))
@@ -161,7 +163,9 @@ async def start_computation(request: web.Request) -> web.Response:
         if project_vc_commits:
             data["ref_ids"] = project_vc_commits
 
-        assert parse_obj_as(_ComputationStarted, data) is not None  # nosec
+        assert (
+            TypeAdapter(_ComputationStarted).validate_python(data) is not None
+        )  # nosec
 
         return envelope_json_response(data, status_cls=web.HTTPCreated)
 
@@ -241,8 +245,7 @@ async def get_computation(request: web.Request) -> web.Response:
             request, project_id
         )
         _logger.debug("Project %s will get %d variants", project_id, len(project_ids))
-        list_computation_tasks = parse_obj_as(
-            list[ComputationTaskGet],
+        list_computation_tasks = TypeAdapter(list[ComputationTaskGet]).validate_python(
             await asyncio.gather(
                 *[
                     computations.get(project_id=pid, user_id=user_id)
@@ -258,7 +261,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/exporter/_formatter/_sds.py

@@ -5,7 +5,7 @@
 from typing import Any, Final
 
 from aiohttp import web
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.pools import non_blocking_process_pool_executor
 
 from ...catalog.client import get_service
@@ -79,8 +79,7 @@ async def _add_rrid_entries(
             continue
 
         rrid_entires.append(
-            parse_obj_as(
-                RRIDEntry,
+            TypeAdapter(RRIDEntry).validate_python(
                 {
                     "rrid_term": scicrunch_resource.name,
                     "rrid_identifier": scicrunch_resource.rrid,
@@ -158,8 +157,7 @@ async def create_sds_directory(
     _logger.debug("Project data: %s", project_data)
 
     # assemble params here
-    dataset_description_params = parse_obj_as(
-        DatasetDescriptionParams,
+    dataset_description_params = TypeAdapter(DatasetDescriptionParams).validate_python(
         {"name": project_data["name"], "description": project_data["description"]},
     )
 

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

@@ -6,7 +6,7 @@
 from aiopg.sa.result import ResultProxy, RowProxy
 from models_library.groups import GroupAtDB
 from models_library.users import GroupID, UserID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from simcore_postgres_database.utils_products import get_or_create_product_group
 from sqlalchemy import and_, literal_column
 from sqlalchemy.dialects.postgresql import insert
@@ -117,7 +117,7 @@ async def get_all_user_groups(conn: SAConnection, user_id: UserID) -> list[Group
         .where(user_to_groups.c.uid == user_id)
     )
     rows = await result.fetchall() or []
-    return [parse_obj_as(GroupAtDB, row) for row in rows]
+    return [TypeAdapter(GroupAtDB).validate_python(row) for row in rows]
 
 
 async def get_user_group(