fix issues

Author: giancarloromeo

services/payments/src/simcore_service_payments/services/auto_recharge_process_message.py

@@ -14,7 +14,7 @@
 from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.rabbitmq_messages import WalletCreditsMessage
 from models_library.wallets import WalletID
-from pydantic import parse_obj_as, parse_raw_as
+from pydantic import TypeAdapter, parse_obj_as
 from simcore_service_payments.db.auto_recharge_repo import AutoRechargeRepo
 from simcore_service_payments.db.payments_methods_repo import PaymentsMethodsRepo
 from simcore_service_payments.db.payments_transactions_repo import (
@@ -36,7 +36,7 @@
 
 
 async def process_message(app: FastAPI, data: bytes) -> bool:
-    rabbit_message = parse_raw_as(WalletCreditsMessage, data)
+    rabbit_message = TypeAdapter(WalletCreditsMessage).validate_json(data)
     _logger.debug("Process msg: %s", rabbit_message)
 
     settings: ApplicationSettings = app.state.settings

services/payments/src/simcore_service_payments/services/payments_gateway.py

@@ -16,8 +16,8 @@
 from fastapi.encoders import jsonable_encoder
 from httpx import URL, HTTPStatusError
 from models_library.api_schemas_webserver.wallets import PaymentID, PaymentMethodID
-from pydantic import ValidationError, parse_raw_as
-from pydantic.errors import PydanticErrorMixin
+from models_library.error_classes import OsparcErrorMixin
+from pydantic import TypeAdapter, ValidationError
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.fastapi.http_client import (
     AttachLifespanMixin,
@@ -48,11 +48,11 @@
 def _parse_raw_as_or_none(cls: type, text: str | None):
     if text:
         with suppress(ValidationError):
-            return parse_raw_as(cls, text)
+            return TypeAdapter(cls).validate_json(text)
     return None
 
 
-class PaymentsGatewayError(PydanticErrorMixin, ValueError):
+class PaymentsGatewayError(OsparcErrorMixin, ValueError):
     msg_template = "{operation_id} error {status_code}: {reason}"
 
     @classmethod

services/payments/tests/conftest.py

@@ -10,7 +10,7 @@
 import simcore_service_payments
 from faker import Faker
 from models_library.users import GroupID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.utils_secrets import generate_token_secret_key
@@ -89,4 +89,4 @@ def app_environment(
 
 @pytest.fixture
 def user_primary_group_id(faker: Faker) -> GroupID:
-    return parse_obj_as(GroupID, faker.pyint())
+    return TypeAdapter(GroupID).validate_python(faker.pyint())