continue fixing

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -63,7 +63,7 @@
 from models_library.utils.json_serialization import json_dumps
 from models_library.wallets import ZERO_CREDITS, WalletID, WalletInfo
 from models_library.workspaces import UserWorkspaceAccessRightsDB
-from pydantic import ByteSize, parse_obj_as
+from pydantic import ByteSize, TypeAdapter
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.common_headers import (
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
@@ -376,7 +376,9 @@ async def _get_default_pricing_and_hardware_info(
 _MACHINE_TOTAL_RAM_SAFE_MARGIN_RATIO: Final[
     float
 ] = 0.1  # NOTE: machines always have less available RAM than advertised
-_SIDECARS_OPS_SAFE_RAM_MARGIN: Final[ByteSize] = parse_obj_as(ByteSize, "1GiB")
+_SIDECARS_OPS_SAFE_RAM_MARGIN: Final[ByteSize] = TypeAdapter(ByteSize).validate_python(
+    "1GiB"
+)
 _CPUS_SAFE_MARGIN: Final[float] = 1.4
 _MIN_NUM_CPUS: Final[float] = 0.5
 
@@ -633,8 +635,8 @@ async def _start_dynamic_service(
                 )
                 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 connect_wallet_to_project(
                     request.app,
@@ -1507,8 +1509,12 @@ async def is_service_deprecated(
         app, user_id, service_key, service_version, product_name
     )
     if deprecation_date := service.get("deprecated"):
-        deprecation_date = parse_obj_as(datetime.datetime, deprecation_date)
-        deprecation_date_bool: bool = datetime.datetime.utcnow() > deprecation_date
+        deprecation_date = TypeAdapter(datetime.datetime).validate_python(
+            deprecation_date
+        )
+        deprecation_date_bool: bool = (
+            datetime.datetime.now(datetime.timezone.utc) > deprecation_date
+        )
         return deprecation_date_bool
     return False
 
@@ -1543,8 +1549,8 @@ async def get_project_node_resources(
     db = ProjectDBAPI.get_from_app_context(app)
     try:
         project_node = await db.get_project_node(project_id, node_id)
-        node_resources = parse_obj_as(
-            ServiceResourcesDict, project_node.required_resources
+        node_resources = TypeAdapter(ServiceResourcesDict).validate_python(
+            project_node.required_resources
         )
         if not node_resources:
             # get default resources
@@ -1573,8 +1579,8 @@ async def update_project_node_resources(
     try:
         # validate the resource are applied to the same container names
         current_project_node = await db.get_project_node(project_id, node_id)
-        current_resources = parse_obj_as(
-            ServiceResourcesDict, current_project_node.required_resources
+        current_resources = TypeAdapter(ServiceResourcesDict).validate_python(
+            current_project_node.required_resources
         )
         if not current_resources:
             # NOTE: this can happen after the migration
@@ -1594,7 +1600,9 @@ async def update_project_node_resources(
             required_resources=jsonable_encoder(resources),
             check_update_allowed=True,
         )
-        return parse_obj_as(ServiceResourcesDict, project_node.required_resources)
+        return TypeAdapter(ServiceResourcesDict).validate_python(
+            project_node.required_resources
+        )
     except ProjectNodesNodeNotFoundError as exc:
         raise NodeNotFoundError(
             project_uuid=f"{project_id}", node_uuid=f"{node_id}"
@@ -1863,4 +1871,4 @@ async def get_project_inactivity(
             project_settings.PROJECTS_INACTIVITY_INTERVAL.total_seconds()
         ),
     )
-    return parse_obj_as(GetProjectInactivityResponse, project_inactivity)
+    return TypeAdapter(GetProjectInactivityResponse).validate_python(project_inactivity)

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

@@ -1,15 +1,15 @@
 from datetime import timedelta
 
 from aiohttp import web
-from pydantic import ByteSize, Field, NonNegativeInt, parse_obj_as
+from pydantic import ByteSize, Field, NonNegativeInt, TypeAdapter
 from settings_library.base import BaseCustomSettings
 
 from .._constants import APP_SETTINGS_KEY
 
 
 class ProjectsSettings(BaseCustomSettings):
     PROJECTS_MAX_COPY_SIZE_BYTES: ByteSize = Field(
-        parse_obj_as(ByteSize, "30Gib"),
+        TypeAdapter(ByteSize).validate_python("30Gib"),
         description="defines the maximum authorized project data size"
         " when copying a project (disable with 0)",
     )

services/web/server/src/simcore_service_webserver/projects/utils.py

@@ -7,7 +7,7 @@
 
 from models_library.projects_nodes_io import NodeIDStr
 from models_library.services import ServiceKey
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.decorators import safe_return
 from yarl import URL
 
@@ -378,7 +378,9 @@ def default_copy_project_name(name: str) -> str:
         new_copy_index = 1
         if current_copy_index := match.group(2):
             # we receive something of type "(23)"
-            new_copy_index = parse_obj_as(int, current_copy_index.strip("()")) + 1
+            new_copy_index = (
+                TypeAdapter(int).validate_python(current_copy_index.strip("()")) + 1
+            )
         return f"{match.group(1)}({new_copy_index})"
     return f"{name} (Copy)"
 

services/web/server/src/simcore_service_webserver/resource_usage/_client.py

@@ -22,7 +22,7 @@
 from models_library.resource_tracker import PricingPlanId, PricingUnitId
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import NonNegativeInt, parse_obj_as
+from pydantic import NonNegativeInt, TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
 from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings
 from yarl import URL
@@ -98,7 +98,7 @@ async def get_default_service_pricing_plan(
         async with session.get(url) as response:
             response.raise_for_status()
             body: dict = await response.json()
-            return parse_obj_as(PricingPlanGet, body)
+            return TypeAdapter(PricingPlanGet).validate_python(body)
 
 
 async def get_pricing_plan_unit(
@@ -123,7 +123,7 @@ async def get_pricing_plan_unit(
         async with session.get(url) as response:
             response.raise_for_status()
             body: dict = await response.json()
-            return parse_obj_as(PricingUnitGet, body)
+            return TypeAdapter(PricingUnitGet).validate_python(body)
 
 
 async def sum_total_available_credits_in_the_wallet(

services/web/server/src/simcore_service_webserver/resource_usage/_service_runs_handlers.py

@@ -22,7 +22,15 @@
 from models_library.rest_pagination_utils import paginate_data
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import BaseModel, ConfigDict, Field, Json, NonNegativeInt, field_validator
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    Json,
+    NonNegativeInt,
+    TypeAdapter,
+    field_validator,
+)
 from servicelib.aiohttp.requests_validation import parse_request_query_parameters_as
 from servicelib.aiohttp.typing_extension import Handler
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
@@ -156,8 +164,8 @@ async def list_resource_usage_services(request: web.Request):
         wallet_id=query_params.wallet_id,
         offset=query_params.offset,
         limit=query_params.limit,
-        order_by=parse_obj_as(OrderBy, query_params.order_by),
-        filters=parse_obj_as(ServiceResourceUsagesFilters | None, query_params.filters),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
+        order_by=TypeAdapter(OrderBy).validate_python(query_params.order_by),
+        filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(query_params.filters),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
     )
 
     page = Page[dict[str, Any]].model_validate(
@@ -170,7 +178,7 @@ async def list_resource_usage_services(request: web.Request):
         )
     )
     return web.Response(
-        text=page.json(**RESPONSE_MODEL_POLICY),
+        text=page.model_dump_json(**RESPONSE_MODEL_POLICY),
         content_type=MIMETYPE_APPLICATION_JSON,
     )
 
@@ -234,7 +242,7 @@ async def export_resource_usage_services(request: web.Request):
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
         wallet_id=query_params.wallet_id,
-        order_by=parse_obj_as(OrderBy | None, query_params.order_by),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
-        filters=parse_obj_as(ServiceResourceUsagesFilters | None, query_params.filters),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
+        order_by=TypeAdapter(OrderBy | None).validate_python(query_params.order_by),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
+        filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(query_params.filters),  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
     )
     raise web.HTTPFound(location=f"{download_url}")

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

@@ -8,7 +8,7 @@
 
 from aiohttp import web
 from models_library.utils.pydantic_tools_extension import FieldNotRequired
-from pydantic import BaseModel, parse_obj_as
+from pydantic import BaseModel, TypeAdapter
 from servicelib.aiohttp import status
 
 from .._constants import APP_PUBLIC_CONFIG_PER_PRODUCT, APP_SETTINGS_KEY
@@ -104,7 +104,8 @@ async def get_scheduled_maintenance(request: web.Request):
 
     if maintenance_data := await redis_client.get(hash_key):
         assert (  # nosec
-            parse_obj_as(_ScheduledMaintenanceGet, maintenance_data) is not None
+            TypeAdapter(_ScheduledMaintenanceGet).validate_python(maintenance_data)
+            is not None
         )
         return envelope_json_response(maintenance_data)
 

services/web/server/src/simcore_service_webserver/scicrunch/service_client.py

@@ -8,7 +8,7 @@
 import logging
 
 from aiohttp import ClientSession, client_exceptions, web
-from pydantic import HttpUrl, ValidationError, parse_obj_as
+from pydantic import HttpUrl, TypeAdapter, ValidationError
 from servicelib.aiohttp.client_session import get_client_session
 from yarl import URL
 
@@ -90,8 +90,8 @@ def get_search_web_url(self, rrid: str) -> str:
 
     def get_resolver_web_url(self, rrid: str) -> HttpUrl:
         # example https://scicrunch.org/resolver/RRID:AB_90755
-        output: HttpUrl = parse_obj_as(
-            HttpUrl, f"{self.settings.SCICRUNCH_RESOLVER_BASE_URL}/{rrid}"
+        output: HttpUrl = TypeAdapter(HttpUrl).validate_python(
+            f"{self.settings.SCICRUNCH_RESOLVER_BASE_URL}/{rrid}"
         )
         return output
 

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

@@ -1,5 +1,5 @@
 from aiohttp import web
-from pydantic import Field, HttpUrl, SecretStr, parse_obj_as
+from pydantic import Field, HttpUrl, SecretStr, TypeAdapter
 from settings_library.base import BaseCustomSettings
 
 from .._constants import APP_SETTINGS_KEY
@@ -11,7 +11,7 @@
 class SciCrunchSettings(BaseCustomSettings):
 
     SCICRUNCH_API_BASE_URL: HttpUrl = Field(
-        default=parse_obj_as(HttpUrl, f"{SCICRUNCH_DEFAULT_URL}/api/1"),
+        default=TypeAdapter(HttpUrl).validate_python(f"{SCICRUNCH_DEFAULT_URL}/api/1"),
         description="Base url to scicrunch API's entrypoint",
     )
 
@@ -20,7 +20,9 @@ class SciCrunchSettings(BaseCustomSettings):
     SCICRUNCH_API_KEY: SecretStr
 
     SCICRUNCH_RESOLVER_BASE_URL: HttpUrl = Field(
-        default=parse_obj_as(HttpUrl, f"{SCICRUNCH_DEFAULT_URL}/resolver"),
+        default=TypeAdapter(HttpUrl).validate_python(
+            f"{SCICRUNCH_DEFAULT_URL}/resolver"
+        ),
         description="Base url to scicrunch resolver entrypoint",
     )
 

services/web/server/src/simcore_service_webserver/security/_authz_db.py

@@ -7,7 +7,7 @@
 from models_library.basic_types import IdInt
 from models_library.products import ProductName
 from models_library.users import UserID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from simcore_postgres_database.models.groups import user_to_groups
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.users import UserRole
@@ -35,8 +35,12 @@ async def get_active_user_or_none(engine: Engine, email: str) -> AuthInfoDict |
             )
         )
         row = await result.fetchone()
-        assert row is None or parse_obj_as(IdInt, row.id) is not None  # nosec
-        assert row is None or parse_obj_as(UserRole, row.role) is not None  # nosec
+        assert (
+            row is None or TypeAdapter(IdInt).validate_python(row.id) is not None
+        )  # nosec
+        assert (
+            row is None or TypeAdapter(UserRole).validate_python(row.role) is not None
+        )  # nosec
 
         return AuthInfoDict(id=row.id, role=row.role) if row else None
 

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

@@ -14,7 +14,7 @@
 )
 from models_library.projects_nodes_io import LocationID
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import AnyUrl, BaseModel, ByteSize, parse_obj_as
+from pydantic import AnyUrl, BaseModel, ByteSize, TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -74,7 +74,7 @@ def _from_storage_url(request: web.Request, storage_url: AnyUrl) -> AnyUrl:
         f"/v0/storage{storage_url.path.removeprefix(prefix)}", encoded=True
     ).with_scheme(request.headers.get(X_FORWARDED_PROTO, request.url.scheme))
 
-    webserver_url: AnyUrl = parse_obj_as(AnyUrl, f"{converted_url}")
+    webserver_url: AnyUrl = TypeAdapter(AnyUrl).validate_python(f"{converted_url}")
     return webserver_url