revert all other typeadapter patters

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_dynamic_sidecar/containers.py

@@ -1,6 +1,6 @@
-from typing import Final, TypeAlias
+from typing import TypeAlias
 
-from pydantic import BaseModel, ConfigDict, NonNegativeFloat, TypeAdapter
+from pydantic import BaseModel, ConfigDict, NonNegativeFloat
 
 
 class ActivityInfo(BaseModel):
@@ -15,7 +15,4 @@ class ActivityInfo(BaseModel):
     )
 
 
-ActivityInfoAdapter: Final[TypeAdapter[ActivityInfo]] = TypeAdapter(ActivityInfo)
-
-
 ActivityInfoOrNone: TypeAlias = ActivityInfo | None

packages/models-library/src/models_library/projects_nodes_io.py

@@ -7,7 +7,7 @@
 """
 
 from pathlib import Path
-from typing import Annotated, Final, TypeAlias
+from typing import Annotated, TypeAlias
 from uuid import UUID
 
 from common_library.pydantic_basic_types import ConstrainedStr
@@ -44,9 +44,6 @@
 SimcoreS3FileID: TypeAlias = Annotated[
     str, StringConstraints(pattern=SIMCORE_S3_FILE_ID_RE)
 ]
-SimcoreS3FileIDTypeAdapter: Final[TypeAdapter[SimcoreS3FileID]] = TypeAdapter(
-    SimcoreS3FileID
-)
 
 
 class SimcoreS3DirectoryID(ConstrainedStr):

packages/models-library/src/models_library/services_creation.py

@@ -1,14 +1,9 @@
-from typing import Any, Final
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, TypeAdapter
 
 from .services_resources import ServiceResourcesDict
-from .services_types import (
-    ServiceKey,
-    ServiceKeyAdapter,
-    ServiceVersion,
-    ServiceVersionAdapter,
-)
+from .services_types import ServiceKey, ServiceVersion
 from .wallets import WalletID
 
 
@@ -41,18 +36,13 @@ class CreateServiceMetricsAdditionalParams(BaseModel):
                 "user_email": "[email protected]",
                 "project_name": "_!New Study",
                 "node_name": "the service of a lifetime _ *!",
-                "service_key": ServiceKeyAdapter.validate_python(
+                "service_key": TypeAdapter(ServiceKey).validate_python(
                     "simcore/services/dynamic/test"
                 ),
-                "service_version": ServiceVersionAdapter.validate_python("0.0.1"),
+                "service_version": TypeAdapter(ServiceVersion).validate_python("0.0.1"),
                 "service_resources": {},
                 "service_additional_metadata": {},
                 "pricing_unit_cost_id": None,
             }
         }
     )
-
-
-CreateServiceMetricsAdditionalParamsAdapter: Final[
-    TypeAdapter[CreateServiceMetricsAdditionalParams]
-] = TypeAdapter(CreateServiceMetricsAdditionalParams)

packages/models-library/src/models_library/services_io.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Any, Final, TypeAlias
+from typing import Annotated, Any, TypeAlias
 
 from pydantic import (
     BaseModel,
@@ -8,7 +8,6 @@
     StrictFloat,
     StrictInt,
     StringConstraints,
-    TypeAdapter,
     ValidationInfo,
     field_validator,
 )
@@ -258,6 +257,3 @@ def from_json_schema(cls, port_schema: dict[str, Any]) -> "ServiceOutput":
         """Creates output port model from a json-schema"""
         data = cls._from_json_schema_base_implementation(port_schema)
         return cls.model_validate(data)
-
-
-ServiceOutputAdapter: Final[TypeAdapter[ServiceOutput]] = TypeAdapter(ServiceOutput)

packages/models-library/src/models_library/services_types.py

@@ -1,8 +1,8 @@
-from typing import Annotated, Final, TypeAlias
+from typing import Annotated, TypeAlias
 from uuid import uuid4
 
 import arrow
-from pydantic import StringConstraints, TypeAdapter, ValidationInfo
+from pydantic import StringConstraints, ValidationInfo
 
 from .basic_regex import PROPERTY_KEY_RE, SIMPLE_VERSION_RE
 from .services_regex import (
@@ -18,7 +18,6 @@
 FileName: TypeAlias = Annotated[str, StringConstraints(pattern=FILENAME_RE)]
 
 ServiceKey: TypeAlias = Annotated[str, StringConstraints(pattern=SERVICE_KEY_RE)]
-ServiceKeyAdapter: Final[TypeAdapter[ServiceKey]] = TypeAdapter(ServiceKey)
 
 ServiceKeyEncoded: TypeAlias = Annotated[
     str, StringConstraints(pattern=SERVICE_ENCODED_KEY_RE)
@@ -33,7 +32,6 @@
 ]
 
 ServiceVersion: TypeAlias = Annotated[str, StringConstraints(pattern=SIMPLE_VERSION_RE)]
-ServiceVersionAdapter: Final[TypeAdapter[ServiceVersion]] = TypeAdapter(ServiceVersion)
 
 
 class RunID(str):

services/director-v2/tests/unit/test_modules_dynamic_sidecar_client_api_thin.py

@@ -9,10 +9,7 @@
 from faker import Faker
 from fastapi import FastAPI, status
 from httpx import Response
-from models_library.services_creation import (
-    CreateServiceMetricsAdditionalParams,
-    CreateServiceMetricsAdditionalParamsAdapter,
-)
+from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from models_library.sidecar_volumes import VolumeCategory, VolumeStatus
 from pydantic import AnyHttpUrl, parse_obj_as
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -285,7 +282,9 @@ async def test_put_volumes(
             "post_containers_tasks",
             "/containers",
             {
-                "metrics_params": CreateServiceMetricsAdditionalParamsAdapter.validate_python(
+                "metrics_params": TypeAdapter(
+                    CreateServiceMetricsAdditionalParams
+                ).validate_python(
                     CreateServiceMetricsAdditionalParams.model_config[
                         "json_schema_extra"
                     ]["example"],

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/containers.py

@@ -10,10 +10,9 @@
 from fastapi import Query, Request, status
 from models_library.api_schemas_dynamic_sidecar.containers import (
     ActivityInfo,
-    ActivityInfoAdapter,
     ActivityInfoOrNone,
 )
-from pydantic import ValidationError
+from pydantic import TypeAdapter, ValidationError
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 
 from ..core.docker_utils import docker_client
@@ -175,7 +174,7 @@ async def get_containers_activity(
         return ActivityInfo(seconds_inactive=_INACTIVE_FOR_LONG_TIME)
 
     try:
-        return ActivityInfoAdapter.validate_json(inactivity_response)
+        return TypeAdapter(ActivityInfo).validate_json(inactivity_response)
     except ValidationError:
         _logger.warning(
             "Could not parse command result '%s' as '%s'",

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/storage.py

@@ -15,8 +15,6 @@
 
 _LIVENESS_TIMEOUT: Final[timedelta] = timedelta(seconds=5)
 
-AnyUrlTypeAdapter = TypeAdapter(AnyUrl)
-
 
 class _AuthTuple(NamedTuple):
     username: str
@@ -35,7 +33,7 @@ def _get_auth_or_none(storage_auth_settings: StorageAuthSettings) -> _AuthTuple
 
 
 def _get_url(storage_auth_settings: StorageAuthSettings) -> str:
-    url: AnyUrl = AnyUrlTypeAdapter.validate_python(
+    url: AnyUrl = TypeAdapter(AnyUrl).validate_python(
         f"{storage_auth_settings.api_base_url}/"
     )
     return f"{url}"

services/dynamic-sidecar/tests/conftest.py

@@ -18,12 +18,10 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes import NodeID
 from models_library.services import RunID
-from models_library.services_creation import (
-    CreateServiceMetricsAdditionalParams,
-    CreateServiceMetricsAdditionalParamsAdapter,
-)
+from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from models_library.users import UserID
 from models_library.utils.json_serialization import json_dumps
+from pydantic import TypeAdapter
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import (
     EnvVarsDict,
@@ -333,7 +331,7 @@ def mock_stop_heart_beat_task(mocker: MockerFixture) -> AsyncMock:
 
 @pytest.fixture
 def mock_metrics_params(faker: Faker) -> CreateServiceMetricsAdditionalParams:
-    return CreateServiceMetricsAdditionalParamsAdapter.validate_python(
+    return TypeAdapter(CreateServiceMetricsAdditionalParams).validate_python(
         CreateServiceMetricsAdditionalParams.model_config["json_schema_extra"][
             "example"
         ],

services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py

@@ -21,7 +21,7 @@
 from fastapi import FastAPI
 from models_library.api_schemas_storage import S3BucketName
 from models_library.projects import ProjectID
-from models_library.projects_nodes_io import NodeID, SimcoreS3FileIDTypeAdapter
+from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import AnyUrl, TypeAdapter
 from pytest_mock import MockerFixture
@@ -199,7 +199,7 @@ async def restore_legacy_state_archives(
                 user_id=user_id,
                 store_id=SIMCORE_LOCATION,
                 store_name=None,
-                s3_object=SimcoreS3FileIDTypeAdapter.validate_python(s3_path),
+                s3_object=TypeAdapter(SimcoreS3FileID).validate_python(s3_path),
                 path_to_upload=legacy_archive_zip,
                 io_log_redirect_cb=None,
             )