nova-mvvm 0.13.2__py3-none-any.whl → 0.15.0__py3-none-any.whl

nova/mvvm/_internal/pydantic_utils.py

@@ -83,6 +83,6 @@ def get_nested_pydantic_field(model: BaseModel, field_path: str) -> FieldInfo:
         if issubclass(type(getattr(current_model, field)), BaseModel):
             current_model = getattr(current_model, field)
         else:
-            return current_model.model_fields[field]
+            return current_model.__class__.model_fields[field]
 
     raise Exception(f"Cannot find field {field_path}")

nova/mvvm/_internal/pyqt_communicator.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, ValidationError
 from typing_extensions import override
 
 from .._internal.pydantic_utils import get_errored_fields_from_validation_error, get_updated_fields
-from .._internal.utils import check_binding, rsetattr
+from .._internal.utils import check_binding, check_model_type, rsetattr
 from ..bindings_map import bindings_map
 from ..interface import Communicator, ConnectCallbackType
 
@@ -84,6 +84,8 @@ class PyQtCommunicator(Communicator):
             return None
 
     @override
-    def update_in_view(self, value: Any) -> Any:
+    def update_in_view(self, value: Any) -> None:
         """Update a View (GUI) when called by a ViewModel."""
+        if issubclass(type(value), BaseModel):
+            check_model_type(self.viewmodel_linked_object, value)
         return self.pyqtobject.signal.emit(value)

nova/mvvm/_internal/utils.py

@@ -1,6 +1,7 @@
 """Internal common functions tp be used within the package."""
 
 import re
+from types import NoneType
 from typing import Any, Dict
 
 from nova.mvvm import bindings_map
@@ -98,3 +99,10 @@ def check_binding(linked_object: LinkedObjectType, name: str) -> None:
     for communicator in bindings_map.values():
         if communicator.viewmodel_linked_object and communicator.viewmodel_linked_object is linked_object:
             raise ValueError(f"cannot connect to binding {name}: object already connected")
+
+
+def check_model_type(old_value: Any, new_value: Any) -> None:
+    old_type = type(old_value)
+    new_type = type(new_value)
+    if old_type is not NoneType and old_type is not new_type:
+        raise TypeError(f"update_in_view expected a value of type '{old_type}' but received '{new_type}'.")

nova/mvvm/panel_binding/binding.py

@@ -9,7 +9,7 @@ from typing_extensions import override
 
 from .. import bindings_map
 from .._internal.pydantic_utils import get_errored_fields_from_validation_error, get_updated_fields
-from .._internal.utils import check_binding, rgetattr, rsetattr
+from .._internal.utils import check_binding, check_model_type, rgetattr, rsetattr
 from ..interface import BindingInterface, ConnectCallbackType, Worker
 
 
@@ -114,6 +114,8 @@ class Communicator:
 
     # Update the view based on the provided value
     def update_in_view(self, value: Any) -> None:
+        if issubclass(type(value), BaseModel):
+            check_model_type(self.viewmodel_linked_object, value)
         if is_callable(self.connector):
             cast(Callable, self.connector)(value)
         elif self.viewmodel_linked_object:

nova/mvvm/pydantic_utils.py

@@ -12,6 +12,8 @@ from ._internal.pydantic_utils import get_nested_pydantic_field
 
 logger = logging.getLogger(__name__)
 
+ERROR_FIELD_NAME = "pydantic_errors"
+
 
 def get_field_info(field_name: str) -> FieldInfo:
     """

nova/mvvm/trame_binding/binding.py

@@ -10,7 +10,14 @@ from trame_server.state import State
 from typing_extensions import override
 
 from .._internal.pydantic_utils import get_errored_fields_from_validation_error, get_updated_fields
-from .._internal.utils import check_binding, normalize_field_name, rget_list_of_fields, rgetattr, rsetattr
+from .._internal.utils import (
+    check_binding,
+    check_model_type,
+    normalize_field_name,
+    rget_list_of_fields,
+    rgetattr,
+    rsetattr,
+)
 from ..bindings_map import bindings_map
 from ..interface import (
     BindingInterface,
@@ -21,6 +28,7 @@ from ..interface import (
     LinkedObjectType,
     Worker,
 )
+from ..pydantic_utils import ERROR_FIELD_NAME
 from .trame_worker import TrameWorker
 
 
@@ -132,6 +140,8 @@ class CallBackConnection:
             self.viewmodel_callback_after_update({"updated": updates, "errored": errors, "error": None})
 
     def update_in_view(self, value: Any) -> None:
+        if issubclass(type(value), BaseModel):
+            check_model_type(self.viewmodel_linked_object, value)
         self.callback(value)
 
     def get_callback(self) -> ConnectCallbackType:
@@ -167,12 +177,21 @@ class StateConnection:
         return update
 
     def _set_variable_in_state(self, name_in_state: str, value: Any) -> None:
+        if "." in name_in_state:
+            base_name, name_in_state = name_in_state.split(".", maxsplit=1)
+            if self.state[base_name] is None:
+                self.state[base_name] = {}
+            state_obj = self.state[base_name]
+        else:
+            base_name = name_in_state
+            state_obj = self.state
+
         if is_async():
             with self.state:
-                self.state[name_in_state] = value
+                state_obj[name_in_state] = value
                 self.state.dirty(name_in_state)
         else:
-            self.state[name_in_state] = value
+            state_obj[name_in_state] = value
             self.state.dirty(name_in_state)
 
     def _get_name_in_state(self, attribute_name: str) -> str:
@@ -198,6 +217,9 @@ class StateConnection:
             name_in_state = self._get_name_in_state(attribute_name)
             self.state.setdefault(name_in_state, None)
 
+        # Set the initial error state.
+        self._set_variable_in_state(f"{state_variable_name}.{ERROR_FIELD_NAME}", [])
+
         # this updates ViewModel on state change
         if self.viewmodel_linked_object:
             if self.linked_object_attributes:
@@ -225,6 +247,7 @@ class StateConnection:
                                 updated = False
                         except ValidationError as e:
                             errors = get_errored_fields_from_validation_error(e)
+                            self._set_variable_in_state(f"{state_variable_name}.{ERROR_FIELD_NAME}", errors)
                             error = e
                             updated = True
                             self.has_errors = True
@@ -239,19 +262,23 @@ class StateConnection:
                     if self.has_errors and not errors:
                         updated = True
                         self.has_errors = False
+                        self._set_variable_in_state(f"{state_variable_name}.{ERROR_FIELD_NAME}", [])
                     if updated:
                         await self._handle_callback({"updated": updates, "errored": errors, "error": error})
 
     def update_in_view(self, value: Any) -> None:
         if issubclass(type(value), BaseModel):
+            check_model_type(self.viewmodel_linked_object, value)
             value = value.model_dump()
         if self.linked_object_attributes:
             for attribute_name in self.linked_object_attributes:
                 name_in_state = self._get_name_in_state(attribute_name)
                 value_to_change = rgetattr(value, attribute_name)
                 self._set_variable_in_state(name_in_state, value_to_change)
+            self._set_variable_in_state(f"{name_in_state}.{ERROR_FIELD_NAME}", [])
         elif self.state_variable_name:
             self._set_variable_in_state(self.state_variable_name, value)
+            self._set_variable_in_state(f"{self.state_variable_name}.{ERROR_FIELD_NAME}", [])
 
     def get_callback(self) -> ConnectCallbackType:
         return None

{nova_mvvm-0.13.2.dist-info → nova_mvvm-0.15.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: nova-mvvm
-Version: 0.13.2
+Version: 0.15.0
 Summary: A Python Package for Model-View-ViewModel pattern
-Author-email: "Yakubov, Sergey" <yakubovs@ornl.gov>
+Author-email: Sergey Yakubov <yakubovs@ornl.gov>, John Duggan <dugganjw@ornl.gov>, Greg Watson <watsongr@ornl.gov>
 License-Expression: MIT
 License-File: LICENSE
 Keywords: MVVM,python

{nova_mvvm-0.13.2.dist-info → nova_mvvm-0.15.0.dist-info}/RECORD

@@ -2,12 +2,12 @@ nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/mvvm/__init__.py,sha256=fo1bT27jjUYzVoFJXuwokXcyFtOYj8eQ_BHkPgtI4Rg,149
 nova/mvvm/bindings_map.py,sha256=SIVNPGHxDf91P9UxcPmuAHx1GNxZk66JUc-fYPcp-kc,417
 nova/mvvm/interface.py,sha256=l4l339BiB46s6KX-2RH1Q3Hxc8pKYdCvCOkhse4zOkw,5812
-nova/mvvm/pydantic_utils.py,sha256=kQ17-Thp_4FMQca6nJ_UNWbctssqHGY3FtZolUIZGQ0,3191
-nova/mvvm/_internal/pydantic_utils.py,sha256=kHZLR5Noc581kz-OYRO6EW-jyjB443BF_wVoXY5jBRA,2937
-nova/mvvm/_internal/pyqt_communicator.py,sha256=kcEaXCjJZXymNBM-8x5Yk22SUQFrQ7c5yV1-GDYf3DM,3797
-nova/mvvm/_internal/utils.py,sha256=2YDUvAmJjjb89ROE4n4GWD4Qqz-rRqVP4ICDGnIcFNc,3303
+nova/mvvm/pydantic_utils.py,sha256=t8niOvGoA87TUjT4adbgMdoFL9mDaNjLkV1xXyWlDK8,3229
+nova/mvvm/_internal/pydantic_utils.py,sha256=anYYyB1Bkg8GgWB3Jn-6iRit0PYR-_2w3paKsD9z4sY,2947
+nova/mvvm/_internal/pyqt_communicator.py,sha256=G_Srttxn7EEwz9EageFxnOgg_P-gfPPhNpoR55btHd0,3929
+nova/mvvm/_internal/utils.py,sha256=LpZ3LALcB9BzG1yIh0Qt0kBXGdctacDMVmSm8H8Py1c,3626
 nova/mvvm/panel_binding/__init__.py,sha256=HHDlUyP-LuRePcHS1s8tq3niuG3f3n8gdSRb7Rwtc4o,100
-nova/mvvm/panel_binding/binding.py,sha256=Fz_t2XHoU8hfbf-nDDypk4V_KHH7T7OqYFCl65k4XEE,6352
+nova/mvvm/panel_binding/binding.py,sha256=rLkxnqjLpZvvRHJVx8PLfJpLSEg3Q0FSRPov81o8e6Y,6483
 nova/mvvm/pyqt5_binding/__init__.py,sha256=JbKOFJNIObJReotRHlN5-vi7oSMyc_v8K_uHjeJLcHg,62
 nova/mvvm/pyqt5_binding/binding.py,sha256=Nki03KgafysfJFQ86evYvL8lprbrYNajFNgfihk7KA4,1462
 nova/mvvm/pyqt5_binding/pyqt5_worker.py,sha256=bf0Yj2cnX3xljFHQmWy6B9bCildhNSVEDXSqahprCXU,2133
@@ -15,9 +15,9 @@ nova/mvvm/pyqt6_binding/__init__.py,sha256=plms0W4kJjFpZReGOC7lE3SYX1ceGTLbdAJ1G
 nova/mvvm/pyqt6_binding/binding.py,sha256=uZNHx23Pf9DwGf3qKfQdmjOhmaXcppNd8pjkh363WP4,1365
 nova/mvvm/pyqt6_binding/pyqt6_worker.py,sha256=y8g_mfPC1xIcpyKq7ZZqxrn9Txp5gPJrsBjAwS5FHhY,2133
 nova/mvvm/trame_binding/__init__.py,sha256=uTdEW9VxtVubSbTLpoD3pC8a-KMgbKkZFlRbucvuQSE,62
-nova/mvvm/trame_binding/binding.py,sha256=H5iTOY5FwN1UZnxPXiYmOt36hv88e_4XzyYF1NK6KH4,12255
+nova/mvvm/trame_binding/binding.py,sha256=hKIeIUAp9Zzc4UtGtzD6UBwQltfh5i79pEzpWHLRS7E,13369
 nova/mvvm/trame_binding/trame_worker.py,sha256=JmrneFU11Hi8TtY558R3yIWW8UGiUeVNO7HvM1uWTVs,3778
-nova_mvvm-0.13.2.dist-info/METADATA,sha256=A5hCBiCeMxcBRB60XLsiIXt5UCjJMstF7C2eKdyVkuk,1027
-nova_mvvm-0.13.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nova_mvvm-0.13.2.dist-info/licenses/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
-nova_mvvm-0.13.2.dist-info/RECORD,,
+nova_mvvm-0.15.0.dist-info/METADATA,sha256=BfmKRWdHZ0gdiOvQXJQ_4YcuWxAYv-LuKQ6rHBhF7Go,1090
+nova_mvvm-0.15.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nova_mvvm-0.15.0.dist-info/licenses/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
+nova_mvvm-0.15.0.dist-info/RECORD,,