nova-trame 0.8.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

nova/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

nova/trame/view/components/input_field.py

@@ -2,9 +2,8 @@
 
 import logging
 import re
-from typing import Any, Dict
+from typing import Any, Dict, Optional, Union
 
-from mvvm_lib.pydantic_utils import get_field_info
 from trame.app import get_server
 from trame.widgets import client
 from trame.widgets import vuetify3 as vuetify
@@ -12,6 +11,8 @@ from trame_client.widgets.core import AbstractElement
 from trame_server.controller import Controller
 from trame_server.state import State
 
+from nova.mvvm.pydantic_utils import get_field_info
+
 logger = logging.getLogger(__name__)
 
 
@@ -19,24 +20,28 @@ class InputField:
     """Factory class for generating Vuetify input components."""
 
     @staticmethod
-    def create_boilerplate_properties(v_model: str | None) -> dict:
+    def create_boilerplate_properties(v_model: Optional[Union[tuple[str, Any], str]]) -> dict:
         if not v_model:
             return {}
-        object_name_in_state = v_model.split(".")[0]
+        if isinstance(v_model, tuple):
+            field = v_model[0]
+        else:
+            field = v_model
+        object_name_in_state = field.split(".")[0]
         field_info = None
         try:
-            field_name = ".".join(v_model.split(".")[1:])
+            field_name = ".".join(field.split(".")[1:])
             if "[" in field_name:
                 index_field_name = re.sub(r"\[.*?\]", "[0]", field_name)
-                field_info = get_field_info(index_field_name)
+                field_info = get_field_info(f"{object_name_in_state}.{index_field_name}")
                 if "[" in field_name and "[index]" not in field_name:
                     field_info = None
                     logger.warning(
-                        f"{v_model}: validation ignored. We currently only "
+                        f"{field}: validation ignored. We currently only "
                         f"support single loop with index variable that should be called 'index'"
                     )
             else:
-                field_info = get_field_info(field_name)
+                field_info = get_field_info(field)
         except Exception as _:
             pass
         label = ""
@@ -58,12 +63,16 @@ class InputField:
             }
             if field_info:
                 args |= {
-                    "rules": (f"[(v) => trigger('validate_pydantic_field', ['{field_name}', v, index])]",),
+                    "rules": (f"[(v) => trigger('validate_pydantic_field', ['{field}', v, index])]",),
                 }
         return args
 
     def __new__(
-        cls, v_model: str | None = None, required: bool = False, type: str = "text", **kwargs: Any
+        cls,
+        v_model: Optional[Union[tuple[str, Any], str]] = None,
+        required: bool = False,
+        type: str = "text",
+        **kwargs: Any,
     ) -> AbstractElement:
         """Constructor for InputField.
 

nova/trame/view/components/remote_file_input.py

@@ -3,12 +3,12 @@
 from functools import partial
 from typing import Any, Optional, cast
 
-from mvvm_lib.trame_binding import TrameBinding
 from trame.app import get_server
 from trame.widgets import client, html
 from trame.widgets import vuetify3 as vuetify
 from trame_client.widgets.core import AbstractElement
 
+from nova.mvvm.trame_binding import TrameBinding
 from nova.trame.model.remote_file_input import RemoteFileInputModel
 from nova.trame.view.components import InputField
 from nova.trame.view_model.remote_file_input import RemoteFileInputViewModel
@@ -30,7 +30,6 @@ class RemoteFileInput:
         dialog_props: Optional[dict[str, Any]] = None,
         extensions: Optional[list[str]] = None,
         input_props: Optional[dict[str, Any]] = None,
-        label: str = "",
     ) -> None:
         """Constructor for RemoteFileInput.
 
@@ -51,9 +50,7 @@ class RemoteFileInput:
         extensions : list[str], optional
             Only files with these extensions will be shown by default. The user can still choose to view all files.
         input_props : dict[str, typing.Any], optional
-            Props to be passed to InputField. Must not include label prop, use the top-level label parameter instead.
-        label : str
-            Label shown in the input field and the dialog title.
+            Props to be passed to InputField.
 
         Raises
         ------
@@ -75,7 +72,6 @@ class RemoteFileInput:
         self.dialog_props = dict(dialog_props) if dialog_props else {}
         self.extensions = extensions if extensions else []
         self.input_props = dict(input_props) if input_props else {}
-        self.label = label
 
         if "__events" not in self.input_props:
             self.input_props["__events"] = []
@@ -93,11 +89,10 @@ class RemoteFileInput:
             AbstractElement,
             InputField(
                 v_model=self.v_model,
-                label=self.label,
                 change=(self.vm.select_file, "[$event.target.value]"),
                 **self.input_props,
             ),
-        ):
+        ) as input:
             self.vm.init_view()
 
             with vuetify.Template(v_slot_append=True):
@@ -111,7 +106,7 @@ class RemoteFileInput:
                         **self.dialog_props,
                     ):
                         with vuetify.VCard(classes="pa-4"):
-                            vuetify.VCardTitle(self.label)
+                            vuetify.VCardTitle(input.label)
                             vuetify.VTextField(
                                 v_model=self.v_model,
                                 classes="mb-4 px-4",

nova/trame/view/theme/theme.py

@@ -9,7 +9,6 @@ from typing import Optional
 
 import sass
 from mergedeep import Strategy, merge
-from mvvm_lib.pydantic_utils import validate_pydantic_parameter
 from trame.app import get_server
 from trame.assets.local import LocalFileManager
 from trame.ui.vuetify3 import VAppLayout
@@ -19,6 +18,7 @@ from trame_client.widgets import html
 from trame_server.core import Server
 from trame_server.state import State
 
+from nova.mvvm.pydantic_utils import validate_pydantic_parameter
 from nova.trame.view.utilities.local_storage import LocalStorageManager
 
 THEME_PATH = Path(__file__).parent
@@ -257,6 +257,6 @@ class ThemedApp:
             def validate_pydantic_field(name: str, value: str, index: int) -> bool:
                 if "[index]" in name:
                     name = name.replace("[index]", f"[{str(index)}]")
-                return validate_pydantic_parameter(name, value, index)
+                return validate_pydantic_parameter(name, value)
 
             return layout

nova/trame/view_model/remote_file_input.py

@@ -2,8 +2,7 @@
 
 from typing import Any, Union
 
-from mvvm_lib.interface import BindingInterface
-
+from nova.mvvm.interface import BindingInterface
 from nova.trame.model.remote_file_input import RemoteFileInputModel
 
 

{nova_trame-0.8.0.dist-info → nova_trame-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nova-trame
-Version: 0.8.0
+Version: 0.10.0
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: libsass (>=0.23.0,<0.24.0)
 Requires-Dist: mergedeep (>=1.3.4,<2.0.0)
-Requires-Dist: mvvm-lib (>=0.4.0)
+Requires-Dist: nova-mvvm (>=0.6.1,<0.7.0)
 Requires-Dist: pydantic (>=2.10.1,<3.0.0)
 Requires-Dist: tomli (>=2.0.2,<3.0.0)
 Requires-Dist: trame (>=3.6.3,<4.0.0)

{nova_trame-0.8.0.dist-info → nova_trame-0.10.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-nova/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
 nova/trame/model/remote_file_input.py,sha256=GRvWepYcFPjyrMOCI-mgr8GvDSYNag2oGqG-QY1Jfbw,3280
 nova/trame/view/components/__init__.py,sha256=fopr6mVqcpDcVYK9ue7SLUHyswgvRPcFESTq86mu1R8,128
-nova/trame/view/components/input_field.py,sha256=kAjFrB5q8uGhaO-hXcKz9eJEGZgzXS0rqD3eHiY5TXY,11125
-nova/trame/view/components/remote_file_input.py,sha256=RkQ6vO6HoLIWTqglPcf0DBK55F3svv_mYa8l2yexo-A,8465
+nova/trame/view/components/input_field.py,sha256=ooTP0TafjY6Pp8d5zNP45ciRkSl_AHqYHx5h8nCUZrs,11355
+nova/trame/view/components/remote_file_input.py,sha256=FaS1TxFBdNp8xB6CicC5iAX4kSdwePwRCiyTas0d_Tc,8233
 nova/trame/view/components/visualization/__init__.py,sha256=kDX1fkbtAgXSGlqhlMNhYYoYrq-hfS636smjgLsh6gg,84
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=foZCMoqbuahT5dtqIQvm8C4ZJcY9P211eJEcpQJltmM,3421
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
@@ -14,11 +14,11 @@ nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBP
 nova/trame/view/theme/assets/core_style.scss,sha256=AktysiiCYLeiTzCTtYwkksiUVmqb4S23RlDcW8L1ebI,518
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
 nova/trame/view/theme/assets/vuetify_config.json,sha256=1EwlDUHZiM45MWgnHSQKgLH_d0IZ1iaXjl3eXxGc2EI,4832
-nova/trame/view/theme/theme.py,sha256=ow91Zwq3w_hGCRb5a28RX4gFlEhDHjW6NZTpuLGqi-8,11408
+nova/trame/view/theme/theme.py,sha256=lHeXZPGiS1Ezn3aiKpoEyarLgxOyatWOzYSApX9VI3M,11402
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/remote_file_input.py,sha256=tXBw9M1ZKXwm-deHdoRB9uz8CEX9ym7qGtlZUpcZeFw,2986
-nova_trame-0.8.0.dist-info/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
-nova_trame-0.8.0.dist-info/METADATA,sha256=j4W4tnLR-wLVgQ4XoMZVvt2NOBbw78UJYCPppsBRkwo,1370
-nova_trame-0.8.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-nova_trame-0.8.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.8.0.dist-info/RECORD,,
+nova/trame/view_model/remote_file_input.py,sha256=EU8jrU_3_BQqvta5-owSotHG0LAxLbTp6INqk3TdIZc,2986
+nova_trame-0.10.0.dist-info/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
+nova_trame-0.10.0.dist-info/METADATA,sha256=bdwSpdOSWKJeNaaXp_hpAx0MUrDruXIjUimtgaJy7V4,1379
+nova_trame-0.10.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+nova_trame-0.10.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.10.0.dist-info/RECORD,,