continue fixing

Author: giancarloromeo

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
@@ -33,7 +33,7 @@ async def list_dynamic_services(
     project_id: str | None = None,
 ) -> list[DynamicServiceGet]:
     params = _Params(user_id=user_id, project_id=project_id)
-    params_dict = params.dict(exclude_none=True)
+    params_dict = params.model_dump(exclude_none=True)
     settings: DirectorV2Settings = get_plugin_settings(app)
     if params_dict:  # Update query doesnt work with no params to unwrap
         backend_url = (settings.base_url / "dynamic_services").update_query(
@@ -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/exporter/_formatter/_sds.py

@@ -5,7 +5,6 @@
 from typing import Any, Final
 
 from aiohttp import web
-from pydantic import parse_obj_as
 from servicelib.pools import non_blocking_process_pool_executor
 
 from ...catalog.client import get_service
@@ -79,8 +78,7 @@ async def _add_rrid_entries(
             continue
 
         rrid_entires.append(
-            parse_obj_as(
-                RRIDEntry,
+            RRIDEntry.model_validate(
                 {
                     "rrid_term": scicrunch_resource.name,
                     "rrid_identifier": scicrunch_resource.rrid,
@@ -158,8 +156,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 = DatasetDescriptionParams.model_validate(
         {"name": project_data["name"], "description": project_data["description"]},
     )
 

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

@@ -6,7 +6,6 @@
 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 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 +116,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 [GroupAtDB.model_validate(row) for row in rows]
 
 
 async def get_user_group(
@@ -409,5 +408,5 @@ async def get_group_from_gid(conn: SAConnection, gid: GroupID) -> GroupAtDB | No
     row: ResultProxy = await conn.execute(groups.select().where(groups.c.gid == gid))
     result = await row.first()
     if result:
-        return GroupAtDB.from_orm(result)
+        return GroupAtDB.model_validate(result)
     return None

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

@@ -10,7 +10,7 @@
     ApiInvitationInputs,
 )
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import AnyHttpUrl, parse_obj_as
+from pydantic import AnyHttpUrl
 from yarl import URL
 
 from .._constants import APP_SETTINGS_KEY
@@ -86,7 +86,7 @@ async def extract_invitation(
             url=self._url_vtag("/invitations:extract"),
             json={"invitation_url": invitation_url},
         )
-        return parse_obj_as(ApiInvitationContent, await response.json())
+        return ApiInvitationContent.model_validate(await response.json())
 
     async def generate_invitation(
         self, params: ApiInvitationInputs
@@ -95,7 +95,7 @@ async def generate_invitation(
             url=self._url_vtag("/invitations"),
             json=jsonable_encoder(params),
         )
-        return parse_obj_as(ApiInvitationContentAndLink, await response.json())
+        return ApiInvitationContentAndLink.model_validate(await response.json())
 
 
 #

services/web/server/src/simcore_service_webserver/invitations/_core.py

@@ -9,7 +9,7 @@
     ApiInvitationInputs,
 )
 from models_library.emails import LowerCaseEmailStr
-from pydantic import AnyHttpUrl, ValidationError, parse_obj_as
+from pydantic import AnyHttpUrl, TypeAdapter, ValidationError
 from servicelib.aiohttp import status
 
 from ..groups.api import is_user_by_email_in_group
@@ -92,7 +92,7 @@ async def validate_invitation_url(
 
     with _handle_exceptions_as_invitations_errors():
         try:
-            valid_url = parse_obj_as(AnyHttpUrl, invitation_url)
+            valid_url = TypeAdapter(AnyHttpUrl).validate_python(invitation_url)
         except ValidationError as err:
             raise InvalidInvitationError(reason=MSG_INVALID_INVITATION_URL) from err
 
@@ -143,7 +143,7 @@ async def extract_invitation(
 
     with _handle_exceptions_as_invitations_errors():
         try:
-            valid_url = parse_obj_as(AnyHttpUrl, invitation_url)
+            valid_url = TypeAdapter(AnyHttpUrl).validate_python(invitation_url)
         except ValidationError as err:
             raise InvalidInvitationError(reason=MSG_INVALID_INVITATION_URL) from err
 

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

@@ -8,7 +8,7 @@
 from typing import Final
 
 from aiohttp import web
-from pydantic import Field, SecretStr, parse_obj_as
+from pydantic import Field, SecretStr, TypeAdapter
 from settings_library.base import BaseCustomSettings
 from settings_library.basic_types import PortInt, VersionTag
 from settings_library.utils_service import (
@@ -19,7 +19,7 @@
 
 from .._constants import APP_SETTINGS_KEY
 
-_INVITATION_VTAG_V1: Final[VersionTag] = parse_obj_as(VersionTag, "v1")
+_INVITATION_VTAG_V1: Final[VersionTag] = TypeAdapter(VersionTag).validate_python("v1")
 
 
 class InvitationsSettings(BaseCustomSettings, MixinServiceSettings):

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

@@ -4,7 +4,7 @@
 from aiohttp.web import RouteTableDef
 from models_library.authentification import TwoFactorAuthentificationMethod
 from models_library.emails import LowerCaseEmailStr
-from pydantic import BaseModel, Field, PositiveInt, SecretStr, parse_obj_as
+from pydantic import BaseModel, Field, PositiveInt, SecretStr, TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.logging_utils import get_log_record_extra, log_context
@@ -137,9 +137,9 @@ async def login(request: web.Request):
             value=user_2fa_authentification_method,
         )
     else:
-        user_2fa_authentification_method = parse_obj_as(
-            TwoFactorAuthentificationMethod, user_2fa_preference.value
-        )
+        user_2fa_authentification_method = TypeAdapter(
+            TwoFactorAuthentificationMethod
+        ).validate_python(user_2fa_preference.value)
 
     if user_2fa_authentification_method == TwoFactorAuthentificationMethod.DISABLED:
         return await login_granted_response(request, user=user)

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

@@ -9,7 +9,7 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from models_library.utils.json_serialization import json_dumps
 from PIL.Image import Image
-from pydantic import EmailStr, PositiveInt, ValidationError, parse_obj_as
+from pydantic import EmailStr, PositiveInt, TypeAdapter, ValidationError
 from servicelib.utils_secrets import generate_passcode
 
 from ..email.utils import send_email_from_template
@@ -66,7 +66,9 @@ async def send_account_request_email_to_support(
     support_email = product.support_email
     email_template_path = await get_product_template_path(request, template_name)
     try:
-        user_email = parse_obj_as(LowerCaseEmailStr, request_form.get("email", None))
+        user_email = TypeAdapter(LowerCaseEmailStr).validate_python(
+            request_form.get("email", None)
+        )
     except ValidationError:
         user_email = None
 
@@ -80,7 +82,7 @@ async def send_account_request_email_to_support(
             context={
                 "host": request.host,
                 "name": "support-team",
-                "product": product.dict(
+                "product": product.model_dump(
                     include={
                         "name",
                         "display_name",

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

@@ -12,9 +12,9 @@
     Field,
     PositiveInt,
     SecretStr,
+    TypeAdapter,
     ValidationError,
-    parse_obj_as,
-    validator,
+    field_validator,
 )
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -73,7 +73,7 @@ def _parse_extra_credits_in_usd_or_none(
 ) -> PositiveInt | None:
     with suppress(ValidationError, JSONDecodeError):
         confirmation_data = confirmation.get("data", "EMPTY") or "EMPTY"
-        invitation = InvitationData.parse_raw(confirmation_data)
+        invitation = InvitationData.model_validate_json(confirmation_data)
         return invitation.extra_credits_in_usd
     return None
 
@@ -110,7 +110,11 @@ async def _handle_confirm_change_email(
     # update and consume confirmation token
     await db.delete_confirmation_and_update_user(
         user_id=user_id,
-        updates={"email": parse_obj_as(LowerCaseEmailStr, confirmation["data"])},
+        updates={
+            "email": TypeAdapter(LowerCaseEmailStr).validate_python(
+                confirmation["data"]
+            )
+        },
         confirmation=confirmation,
     )
 
@@ -265,9 +269,7 @@ class ResetPasswordConfirmation(InputSchema):
     password: SecretStr
     confirm: SecretStr
 
-    _password_confirm_match = validator("confirm", allow_reuse=True)(
-        check_confirm_password_match
-    )
+    _password_confirm_match = field_validator("confirm")(check_confirm_password_match)
 
 
 @routes.post("/v0/auth/reset-password/{code}", name="auth_reset_password_allowed")

services/web/server/src/simcore_service_webserver/payments/_methods_api.py

@@ -15,7 +15,7 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import HttpUrl, parse_obj_as
+from pydantic import HttpUrl, TypeAdapter
 from servicelib.logging_utils import log_decorator
 from simcore_postgres_database.models.payments_methods import InitPromptAckFlowState
 from yarl import URL
@@ -97,7 +97,7 @@ async def _fake_init_creation_of_wallet_payment_method(
     return PaymentMethodInitiated(
         wallet_id=wallet_id,
         payment_method_id=payment_method_id,
-        payment_method_form_url=parse_obj_as(HttpUrl, f"{form_link}"),
+        payment_method_form_url=TypeAdapter(HttpUrl).validate_python(f"{form_link}"),
     )