revert adapter pattern

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_webserver/projects_nodes.py

@@ -1,7 +1,7 @@
 # mypy: disable-error-code=truthy-function
-from typing import Any, Final, Literal, TypeAlias
+from typing import Any, Literal, TypeAlias
 
-from pydantic import ConfigDict, Field, TypeAdapter
+from pydantic import ConfigDict, Field
 
 from ..api_schemas_directorv2.dynamic_services import RetrieveDataOut
 from ..basic_types import PortInt
@@ -127,9 +127,6 @@ class NodeGet(OutputSchema):
     )
 
 
-NodeGetAdapter: Final[TypeAdapter[NodeGet]] = TypeAdapter(NodeGet)
-
-
 class NodeGetIdle(OutputSchema):
     service_state: Literal["idle"]
     service_uuid: NodeID
@@ -148,9 +145,6 @@ def from_node_id(cls, node_id: NodeID) -> "NodeGetIdle":
     )
 
 
-NodeGetIdleAdapter: Final[TypeAdapter[NodeGetIdle]] = TypeAdapter(NodeGetIdle)
-
-
 class NodeGetUnknown(OutputSchema):
     service_state: Literal["unknown"]
     service_uuid: NodeID

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

@@ -6,11 +6,7 @@
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
 )
-from models_library.api_schemas_webserver.projects_nodes import (
-    NodeGet,
-    NodeGetAdapter,
-    NodeGetIdle,
-)
+from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.projects_nodes_io import NodeID
 from pydantic import TypeAdapter
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
@@ -48,7 +44,7 @@ async def get_status(
             # in case of legacy version
             # we need to transfer the correct format!
             if "data" in dict_response:
-                return NodeGetAdapter.validate_python(dict_response["data"])
+                return TypeAdapter(NodeGet).validate_python(dict_response["data"])
 
             return TypeAdapter(DynamicServiceGet).validate_python(dict_response)
         except UnexpectedStatusError as e:
@@ -67,7 +63,7 @@ async def run_dynamic_service(
 
         # legacy services
         if "data" in dict_response:
-            return NodeGetAdapter.validate_python(dict_response["data"])
+            return TypeAdapter(NodeGet).validate_python(dict_response["data"])
 
         return TypeAdapter(DynamicServiceGet).validate_python(dict_response)
 

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

@@ -14,11 +14,7 @@
     DynamicServiceStart,
     DynamicServiceStop,
 )
-from models_library.api_schemas_webserver.projects_nodes import (
-    NodeGet,
-    NodeGetAdapter,
-    NodeGetIdle,
-)
+from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.users import UserID
@@ -64,7 +60,7 @@ def service_status_new_style() -> DynamicServiceGet:
 
 @pytest.fixture
 def service_status_legacy() -> NodeGet:
-    return NodeGetAdapter.validate_python(
+    return TypeAdapter(NodeGet).validate_python(
         NodeGet.model_config["json_schema_extra"]["examples"][1]
     )
 

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

@@ -14,12 +14,7 @@
     DynamicServiceStart,
     DynamicServiceStop,
 )
-from models_library.api_schemas_webserver.projects_nodes import (
-    NodeGet,
-    NodeGetAdapter,
-    NodeGetIdle,
-    NodeGetIdleAdapter,
-)
+from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.projects_nodes_io import NodeID
 from models_library.services_enums import ServiceState
 from pydantic import NonNegativeInt, TypeAdapter
@@ -172,7 +167,7 @@ async def test_set_service_status_task_uid(
     "status, expected_poll_interval",
     [
         (
-            NodeGetAdapter.validate_python(
+            TypeAdapter(NodeGet).validate_python(
                 NodeGet.model_config["json_schema_extra"]["examples"][1]
             ),
             _LOW_RATE_POLL_INTERVAL,
@@ -185,7 +180,7 @@ async def test_set_service_status_task_uid(
             for o in DynamicServiceGet.model_config["json_schema_extra"]["examples"]
         ],
         (
-            NodeGetIdleAdapter.validate_python(
+            TypeAdapter(NodeGetIdle).validate_python(
                 NodeGetIdle.model_config["json_schema_extra"]["example"]
             ),
             _LOW_RATE_POLL_INTERVAL,
@@ -202,7 +197,7 @@ def _get_node_get_from(service_state: ServiceState) -> NodeGet:
     dict_data = NodeGet.model_config["json_schema_extra"]["examples"][1]
     assert "service_state" in dict_data
     dict_data["service_state"] = service_state
-    return NodeGetAdapter.validate_python(dict_data)
+    return TypeAdapter(NodeGet).validate_python(dict_data)
 
 
 def _get_dynamic_service_get_from(
@@ -215,7 +210,7 @@ def _get_dynamic_service_get_from(
 
 
 def _get_node_get_idle() -> NodeGetIdle:
-    return NodeGetIdleAdapter.validate_python(
+    return TypeAdapter(NodeGetIdle).validate_python(
         NodeGetIdle.model_config["json_schema_extra"]["example"]
     )
 

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

@@ -20,12 +20,7 @@
     DynamicServiceStart,
     DynamicServiceStop,
 )
-from models_library.api_schemas_webserver.projects_nodes import (
-    NodeGet,
-    NodeGetAdapter,
-    NodeGetIdle,
-    NodeGetIdleAdapter,
-)
+from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.projects_nodes_io import NodeID
 from pydantic import NonNegativeInt, TypeAdapter
 from pytest_mock import MockerFixture
@@ -82,7 +77,7 @@ def _get_node_get_with(state: str, node_id: NodeID = _DEFAULT_NODE_ID) -> NodeGe
             ("service_uuid", f"{node_id}"),
         ],
     )
-    return NodeGetAdapter.validate_python(dict_data)
+    return TypeAdapter(NodeGet).validate_python(dict_data)
 
 
 def _get_dynamic_service_get_legacy_with(
@@ -127,7 +122,7 @@ def _get_node_get_idle(node_id: NodeID = _DEFAULT_NODE_ID) -> NodeGetIdle:
             ("service_uuid", f"{node_id}"),
         ],
     )
-    return NodeGetIdleAdapter.validate_python(dict_data)
+    return TypeAdapter(NodeGetIdle).validate_python(dict_data)
 
 
 class _ResponseTimeline: