continue upgrading

Author: giancarloromeo

services/invitations/src/simcore_service_invitations/services/invitations.py

@@ -26,8 +26,8 @@ class _ContentWithShortNames(InvitationContent):
     @classmethod
     def serialize(cls, model_obj: InvitationContent) -> str:
         """Exports to json using *short* aliases and values in order to produce shorter codes"""
-        model_w_short_aliases_json: str = cls.construct(
-            **model_obj.dict(exclude_unset=True)
+        model_w_short_aliases_json: str = cls.model_construct(
+            **model_obj.model_dump(exclude_unset=True)
         ).model_dump_json(exclude_unset=True, by_alias=True)
         # NOTE: json arguments try to minimize the amount of data
         # serialized. The CONS is that it relies on models in the code
@@ -38,9 +38,9 @@ def serialize(cls, model_obj: InvitationContent) -> str:
     @classmethod
     def deserialize(cls, raw_json: str) -> InvitationContent:
         """Parses a json string and returns InvitationContent model"""
-        model_w_short_aliases = cls.parse_raw(raw_json)
-        return InvitationContent.construct(
-            **model_w_short_aliases.dict(exclude_unset=True)
+        model_w_short_aliases = cls.model_validate_json(raw_json)
+        return InvitationContent.model_construct(
+            **model_w_short_aliases.model_dump(exclude_unset=True)
         )
 
     model_config = ConfigDict(

services/invitations/tests/unit/test_cli.py

@@ -8,6 +8,7 @@
 import pytest
 from faker import Faker
 from models_library.products import ProductName
+from pydantic import TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_invitations._meta import API_VERSION
@@ -71,7 +72,10 @@ def test_invite_user_and_check_invitation(
         env=environs,
     )
     assert result.exit_code == os.EX_OK, result.output
-    assert expected == InvitationInputs.parse_raw(result.stdout).dict()
+    assert (
+        expected
+        == TypeAdapter(InvitationInputs).validate_json(result.stdout).model_dump()
+    )
 
 
 def test_echo_dotenv(cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch):
@@ -93,5 +97,5 @@ def test_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
     assert result.exit_code == os.EX_OK, result.output
 
     print(result.output)
-    settings = ApplicationSettings.parse_raw(result.output)
+    settings = TypeAdapter(ApplicationSettings).validate_json(result.output)
     assert settings == ApplicationSettings.create_from_envs()