refactor

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/_common/base_display_model.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable
 from typing import Any, Self, TypeAlias
 
-from pydantic import BaseModel, PrivateAttr, TypeAdapter
+from pydantic import BaseModel, PrivateAttr
 
 CompleteModelDict: TypeAlias = dict[str, Any]
 
@@ -12,44 +12,27 @@ class BaseUpdatableDisplayModel(BaseModel):
         default_factory=dict
     )
 
-    def _get_on_change_callbacks_to_run(
-        self, updates: CompleteModelDict
-    ) -> list[Callable]:
+    def _get_on_change_callbacks_to_run(self, update_obj: Self) -> list[Callable]:
         callbaks_to_run: list[Callable] = []
-        for attribute, callback in self._on_value_change_subscribers.items():
-
-            if (
-                attribute in updates
-                and attribute in self.__dict__
-                and _are_values_different(
-                    self.__dict__[attribute],
-                    updates[attribute],
-                    self.__class__.model_fields[attribute].annotation,
-                )
-            ):
+
+        for attribute_name, callback in self._on_value_change_subscribers.items():
+            if getattr(self, attribute_name) != getattr(update_obj, attribute_name):
                 callbaks_to_run.append(callback)
 
-        for attribute, callback in self._on_type_change_subscribers.items():
-            if (
-                attribute in updates
-                and attribute in self.__dict__
-                and _are_types_different(
-                    self.__dict__[attribute],
-                    updates[attribute],
-                    self.__class__.model_fields[attribute].annotation,
-                )
+        for attribute_name, callback in self._on_type_change_subscribers.items():
+            if type(getattr(self, attribute_name)) is not type(
+                getattr(update_obj, attribute_name)
             ):
                 callbaks_to_run.append(callback)
 
         return callbaks_to_run
 
     def update(self, update_obj: Self) -> None:
-        callbacks_to_run = self._get_on_change_callbacks_to_run(update_obj.__dict__)
+        callbacks_to_run = self._get_on_change_callbacks_to_run(update_obj)
 
-        current = self.__dict__
-        for attribute_name, value in update_obj.__dict__.items():
-            if attribute_name in current and current[attribute_name] != value:
-                setattr(self, attribute_name, value)
+        for attribute_name, update_value in update_obj.__dict__.items():
+            if getattr(self, attribute_name) != update_value:
+                setattr(self, attribute_name, update_value)
 
         for callback in callbacks_to_run:
             callback()
@@ -70,26 +53,3 @@ def on_value_change(self, attribute: str, callback: Callable) -> None:
         self._raise_if_attribute_not_declared_in_model(attribute)
 
         self._on_value_change_subscribers[attribute] = callback
-
-
-def _are_values_different(
-    current_value: BaseUpdatableDisplayModel | dict,
-    update_value: dict,
-    annotation: type | None,
-) -> bool:
-    if isinstance(current_value, BaseUpdatableDisplayModel):
-        return current_value != TypeAdapter(annotation).validate_python(update_value)
-
-    return current_value != update_value
-
-
-def _are_types_different(
-    current_value: BaseUpdatableDisplayModel | dict,
-    update_value: dict,
-    annotation: type | None,
-) -> bool:
-    if isinstance(current_value, BaseUpdatableDisplayModel):
-        return type(current_value) is not type(
-            TypeAdapter(annotation).validate_python(update_value)
-        )
-    return type(current_value) is not type(update_value)

services/dynamic-scheduler/tests/unit/api_frontend/_common/test_base_display_model.py

@@ -49,7 +49,11 @@ class RenderOnPropertyTypeChange(BaseUpdatableDisplayModel):
                 "age": 30,
                 "companion": {"name": "Fluffy", "species": "cat"},
             },
-            {"age": 30, "companion": {"name": "Fido", "species": "dog"}},
+            {
+                "name": "Alice",
+                "age": 30,
+                "companion": {"name": "Fido", "species": "dog"},
+            },
             {
                 "name": "Alice",
                 "age": 30,
@@ -87,7 +91,11 @@ class RenderOnPropertyTypeChange(BaseUpdatableDisplayModel):
                 "age": 30,
                 "companion": {"name": "Fluffy", "species": "cat"},
             },
-            {"age": 31, "companion": {"name": "Fido", "species": "dog"}},
+            {
+                "name": "Alice",
+                "age": 31,
+                "companion": {"name": "Fido", "species": "dog"},
+            },
             {
                 "name": "Alice",
                 "age": 31,
@@ -125,7 +133,7 @@ class RenderOnPropertyTypeChange(BaseUpdatableDisplayModel):
                 "age": 30,
                 "companion": {"name": "Fluffy", "species": "cat"},
             },
-            {"age": 31, "companion": {"name": "Charlie", "age": 25}},
+            {"name": "Alice", "age": 31, "companion": {"name": "Charlie", "age": 25}},
             {"name": "Alice", "age": 31, "companion": {"name": "Charlie", "age": 25}},
             {"companion": 1},
             {},
@@ -147,16 +155,16 @@ def test_base_updatable_display_model(
     subscribed_on_type_changed: dict[str, Mock] = {}
     for attribute in on_type_change:
         mock = Mock()
-        person.on_type_change("companion", mock)
+        person.on_type_change(attribute, mock)
         subscribed_on_type_changed[attribute] = mock
 
     subscribed_on_value_change: dict[str, Mock] = {}
     for attribute in on_value_change:
         mock = Mock()
-        person.on_value_change("companion", mock)
+        person.on_value_change(attribute, mock)
         subscribed_on_value_change[attribute] = mock
 
-    person.update(update_dict)
+    person.update(TypeAdapter(class_).validate_python(update_dict))
     assert person.model_dump() == expected_dict
 
     for attribute, mock in subscribed_on_type_changed.items():