removed adapter pattern

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services.py

@@ -1,6 +1,6 @@
-from typing import Final, TypeAlias
+from typing import TypeAlias
 
-from pydantic import BaseModel, ByteSize, ConfigDict, Field, TypeAdapter
+from pydantic import BaseModel, ByteSize, ConfigDict, Field
 
 from ..resource_tracker import HardwareInfo, PricingInfo
 from ..services import ServicePortKey
@@ -75,9 +75,6 @@ class DynamicServiceCreate(ServiceDetails):
 
 
 DynamicServiceGet: TypeAlias = RunningDynamicServiceDetails
-DynamicServiceGetAdapter: Final[TypeAdapter[DynamicServiceGet]] = TypeAdapter(
-    DynamicServiceGet
-)
 
 
 class GetProjectInactivityResponse(BaseModel):

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v2/_public_client.py

@@ -2,10 +2,7 @@
 from typing import Any
 
 from fastapi import FastAPI, status
-from models_library.api_schemas_directorv2.dynamic_services import (
-    DynamicServiceGet,
-    DynamicServiceGetAdapter,
-)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
 )
@@ -15,6 +12,7 @@
     NodeGetIdle,
 )
 from models_library.projects_nodes_io import NodeID
+from pydantic import TypeAdapter
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.fastapi.http_client import AttachLifespanMixin, HasClientSetupInterface
 from servicelib.fastapi.http_client_thin import UnexpectedStatusError
@@ -52,7 +50,7 @@ async def get_status(
             if "data" in dict_response:
                 return NodeGetAdapter.validate_python(dict_response["data"])
 
-            return DynamicServiceGetAdapter.validate_python(dict_response)
+            return TypeAdapter(DynamicServiceGet).validate_python(dict_response)
         except UnexpectedStatusError as e:
             if (
                 e.response.status_code  # type: ignore[attr-defined] # pylint:disable=no-member
@@ -71,7 +69,7 @@ async def run_dynamic_service(
         if "data" in dict_response:
             return NodeGetAdapter.validate_python(dict_response["data"])
 
-        return DynamicServiceGetAdapter.validate_python(dict_response)
+        return TypeAdapter(DynamicServiceGet).validate_python(dict_response)
 
     async def stop_dynamic_service(
         self,

services/dynamic-scheduler/tests/unit/api_rpc/test_api_rpc__services.py

@@ -9,10 +9,7 @@
 from faker import Faker
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
-from models_library.api_schemas_directorv2.dynamic_services import (
-    DynamicServiceGet,
-    DynamicServiceGetAdapter,
-)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
     DynamicServiceStartAdapter,
@@ -26,6 +23,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.users import UserID
+from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.rabbitmq import RabbitMQRPCClient, RPCServerError
@@ -60,7 +58,7 @@ def node_not_found(faker: Faker) -> NodeID:
 
 @pytest.fixture
 def service_status_new_style() -> DynamicServiceGet:
-    return DynamicServiceGetAdapter.validate_python(
+    return TypeAdapter(DynamicServiceGet).validate_python(
         DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
     )
 

services/dynamic-scheduler/tests/unit/service_tracker/test__api.py

@@ -9,10 +9,7 @@
 import pytest
 from faker import Faker
 from fastapi import FastAPI
-from models_library.api_schemas_directorv2.dynamic_services import (
-    DynamicServiceGet,
-    DynamicServiceGetAdapter,
-)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
     DynamicServiceStop,
@@ -25,7 +22,7 @@
 )
 from models_library.projects_nodes_io import NodeID
 from models_library.services_enums import ServiceState
-from pydantic import NonNegativeInt
+from pydantic import NonNegativeInt, TypeAdapter
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.deferred_tasks import TaskUID
 from servicelib.utils import limited_gather
@@ -181,7 +178,10 @@ async def test_set_service_status_task_uid(
             _LOW_RATE_POLL_INTERVAL,
         ),
         *[
-            (DynamicServiceGetAdapter.validate_python(o), NORMAL_RATE_POLL_INTERVAL)
+            (
+                TypeAdapter(DynamicServiceGet).validate_python(o),
+                NORMAL_RATE_POLL_INTERVAL,
+            )
             for o in DynamicServiceGet.model_config["json_schema_extra"]["examples"]
         ],
         (
@@ -211,7 +211,7 @@ def _get_dynamic_service_get_from(
     dict_data = DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
     assert "state" in dict_data
     dict_data["state"] = service_state
-    return DynamicServiceGetAdapter.validate_python(dict_data)
+    return TypeAdapter(DynamicServiceGet).validate_python(dict_data)
 
 
 def _get_node_get_idle() -> NodeGetIdle:

services/dynamic-scheduler/tests/unit/status_monitor/test_services_status_monitor__monitor.py

@@ -15,10 +15,7 @@
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
 from httpx import Request, Response
-from models_library.api_schemas_directorv2.dynamic_services import (
-    DynamicServiceGet,
-    DynamicServiceGetAdapter,
-)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
     DynamicServiceStop,
@@ -30,7 +27,7 @@
     NodeGetIdleAdapter,
 )
 from models_library.projects_nodes_io import NodeID
-from pydantic import NonNegativeInt
+from pydantic import NonNegativeInt, TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from settings_library.rabbit import RabbitSettings
@@ -102,7 +99,7 @@ def _get_dynamic_service_get_legacy_with(
             ("node_uuid", f"{node_id}"),
         ],
     )
-    return DynamicServiceGetAdapter.validate_python(dict_data)
+    return TypeAdapter(DynamicServiceGet).validate_python(dict_data)
 
 
 def _get_dynamic_service_get_new_style_with(
@@ -119,7 +116,7 @@ def _get_dynamic_service_get_new_style_with(
             ("node_uuid", f"{node_id}"),
         ],
     )
-    return DynamicServiceGetAdapter.validate_python(dict_data)
+    return TypeAdapter(DynamicServiceGet).validate_python(dict_data)
 
 
 def _get_node_get_idle(node_id: NodeID = _DEFAULT_NODE_ID) -> NodeGetIdle: