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

nova/mvvm/_internal/pydantic_utils.py

@@ -75,10 +75,15 @@ def get_nested_pydantic_field(model: BaseModel, field_path: str) -> FieldInfo:
 
     for field in fields:
         if "[" in field:
+            original_model = current_model
             base = field.split("[")[0]
             current_model = getattr(current_model, base)
             for _ in range(field.count("[")):
                 current_model = current_model[0]
+            # If the nested field we've found is not a Pydantic model, then it won't have any field information. In this
+            # case, we need to revert to returning the base field as it will instead contain field info.
+            if not issubclass(type(current_model), BaseModel):
+                return original_model.__class__.model_fields[base]
             continue
         if issubclass(type(getattr(current_model, field)), BaseModel):
             current_model = getattr(current_model, field)

nova/mvvm/pydantic_utils.py

@@ -2,7 +2,7 @@
 
 import logging
 import re
-from typing import Any
+from typing import Any, List
 
 from pydantic import ValidationError
 from pydantic.fields import FieldInfo
@@ -83,10 +83,24 @@ def validate_pydantic_parameter(name: str, value: Any) -> str | bool:
         else:
             current_model = getattr(current_model, field)
     final_field = fields[-1]
+    indices = []
+    if "[" in final_field:
+        # If the final field is nested, then we need to parse the base field name and all indices in order to modify it.
+        indices = re.findall(r"\[(\d+)\]", final_field)
+        indices = [int(num) for num in indices]
+        final_field = final_field.split("[")[0]
+
     # copy model so we do not modify the current one
     model = current_model.copy(deep=True)
     # force set field value
-    setattr(model, final_field, value)
+    if indices:
+        # Now we use the base field name and indices to modify the nested field.
+        target_field: List = getattr(model, final_field)
+        for i in indices[:-1]:
+            target_field = target_field[i]
+        target_field[indices[-1]] = value
+    else:
+        setattr(model, final_field, value)
     # validate changed model
     try:
         model.__class__(**model.model_dump(warnings=False))

nova/mvvm/trame_binding/binding.py

@@ -186,6 +186,11 @@ class StateConnection:
             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:
                 state_obj[name_in_state] = value

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nova-mvvm
-Version: 0.15.0
+Version: 0.16.0
 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.15.0.dist-info → nova_mvvm-0.16.0.dist-info}/RECORD

@@ -2,8 +2,8 @@ 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=t8niOvGoA87TUjT4adbgMdoFL9mDaNjLkV1xXyWlDK8,3229
-nova/mvvm/_internal/pydantic_utils.py,sha256=anYYyB1Bkg8GgWB3Jn-6iRit0PYR-_2w3paKsD9z4sY,2947
+nova/mvvm/pydantic_utils.py,sha256=-bMde4ffDf7OflypIRNxlsAmV5hCaX2of0pzQrtuHbI,3837
+nova/mvvm/_internal/pydantic_utils.py,sha256=jL1PjMAVlrLR-RUDgw44g-EYYVbw4MEqOkul_dMMsPg,3346
 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
@@ -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=hKIeIUAp9Zzc4UtGtzD6UBwQltfh5i79pEzpWHLRS7E,13369
+nova/mvvm/trame_binding/binding.py,sha256=7Ogl8g08Hq-_zYZFUsZaJbm8tJA73U5kqlXF-BTtLJ4,13637
 nova/mvvm/trame_binding/trame_worker.py,sha256=JmrneFU11Hi8TtY558R3yIWW8UGiUeVNO7HvM1uWTVs,3778
-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,,
+nova_mvvm-0.16.0.dist-info/METADATA,sha256=q1BkW6dIrGgRQ7AjMKnnw9ClUtuAL1m-fJH9VFRpuRU,1090
+nova_mvvm-0.16.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nova_mvvm-0.16.0.dist-info/licenses/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
+nova_mvvm-0.16.0.dist-info/RECORD,,