nova-mvvm 0.14.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

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

@@ -28,6 +28,7 @@ from ..interface import (
     LinkedObjectType,
     Worker,
 )
+from ..pydantic_utils import ERROR_FIELD_NAME
 from .trame_worker import TrameWorker
 
 
@@ -176,12 +177,26 @@ 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 not isinstance(state_obj, State) and not isinstance(state_obj, dict):
+            # TODO: it would be preferred to disallow non-Pydantic objects from use, but
+            # until that is complete we need to skip error tracking for them.
+            return
+
         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:
@@ -207,6 +222,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:
@@ -234,6 +252,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
@@ -248,6 +267,7 @@ 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})
 
@@ -260,8 +280,10 @@ class StateConnection:
                 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.14.0.dist-info → nova_mvvm-0.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nova-mvvm
-Version: 0.14.0
+Version: 0.15.1
 Summary: A Python Package for Model-View-ViewModel pattern
 Author-email: Sergey Yakubov <yakubovs@ornl.gov>, John Duggan <dugganjw@ornl.gov>, Greg Watson <watsongr@ornl.gov>
 License-Expression: MIT

{nova_mvvm-0.14.0.dist-info → nova_mvvm-0.15.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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/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
@@ -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=m3pcadwhDEmcvEQ24BvU65vpUFjX3QoZQlQmeVcPwmg,12481
+nova/mvvm/trame_binding/binding.py,sha256=7Ogl8g08Hq-_zYZFUsZaJbm8tJA73U5kqlXF-BTtLJ4,13637
 nova/mvvm/trame_binding/trame_worker.py,sha256=JmrneFU11Hi8TtY558R3yIWW8UGiUeVNO7HvM1uWTVs,3778
-nova_mvvm-0.14.0.dist-info/METADATA,sha256=xspULchDL9PyMWCDu2oa2uzpdIhDEQ6yZgIp7ItuV5I,1090
-nova_mvvm-0.14.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nova_mvvm-0.14.0.dist-info/licenses/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
-nova_mvvm-0.14.0.dist-info/RECORD,,
+nova_mvvm-0.15.1.dist-info/METADATA,sha256=LyeUs6BddhyvtvBReHmo7ED9qEJvn68Fs8jX5K7iS2g,1090
+nova_mvvm-0.15.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nova_mvvm-0.15.1.dist-info/licenses/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
+nova_mvvm-0.15.1.dist-info/RECORD,,