nova-trame 0.19.0.dev6__py3-none-any.whl → 0.19.0.dev8__py3-none-any.whl

nova/trame/view/components/data_selector.py

@@ -8,7 +8,7 @@ from trame.widgets import vuetify3 as vuetify
 
 from nova.mvvm.trame_binding import TrameBinding
 from nova.trame.model.data_selector import DataSelectorModel
-from nova.trame.view.layouts import GridLayout
+from nova.trame.view.layouts import GridLayout, VBoxLayout
 from nova.trame.view_model.data_selector import DataSelectorViewModel
 
 from .input_field import InputField
@@ -16,7 +16,7 @@ from .input_field import InputField
 vuetify.enable_lab()
 
 
-class DataSelector(vuetify.VDataTable):
+class DataSelector(vuetify.VDataTableVirtual):
     """Allows the user to select datafiles from an IPTS experiment."""
 
     def __init__(
@@ -78,7 +78,7 @@ class DataSelector(vuetify.VDataTable):
         self.create_ui(facility, instrument, **kwargs)
 
     def create_ui(self, facility: str, instrument: str, **kwargs: Any) -> None:
-        with html.Div(classes="nova-data-selector"):
+        with VBoxLayout(classes="nova-data-selector", height="100%"):
             with GridLayout(columns=3):
                 columns = 3
                 if facility == "":
@@ -98,24 +98,24 @@ class DataSelector(vuetify.VDataTable):
                     type="autocomplete",
                 )
 
-            with GridLayout(columns=2, valign="start"):
+            with GridLayout(columns=2, classes="flex-1-0 h-0", valign="start"):
                 if not self._prefix:
-                    with html.Div():
-                        vuetify.VListSubheader("Available Directories", classes="justify-center px-0")
+                    with html.Div(classes="d-flex flex-column h-100 overflow-hidden"):
+                        vuetify.VListSubheader("Available Directories", classes="flex-0-1 justify-center px-0")
                         vuetify.VTreeview(
                             v_if=(f"{self._directories_name}.length > 0",),
                             activatable=True,
                             active_strategy="single-independent",
-                            classes="overflow-y-auto",
+                            classes="flex-1-0 h-0 overflow-y-auto",
                             item_value="path",
                             items=(self._directories_name,),
-                            style="max-height: 460px",
                             update_activated=(self._vm.set_directory, "$event"),
                         )
-                        vuetify.VListItem("No directories found", classes="text-center", v_else=True)
+                        vuetify.VListItem("No directories found", classes="flex-0-1 text-center", v_else=True)
 
                 super().__init__(
                     v_model=self._v_model,
+                    classes="h-100 overflow-y-auto",
                     headers=("[{ align: 'left', key: 'title', title: 'Available Datafiles' }]",),
                     item_title="title",
                     item_value="path",
@@ -123,6 +123,8 @@ class DataSelector(vuetify.VDataTable):
                     show_select=True,
                     **kwargs,
                 )
+                if self._label:
+                    self.label = self._label
                 self.items = (self._datafiles_name,)
                 if "update_modelValue" not in kwargs:
                     self.update_modelValue = f"flushState('{self._v_model.split('.')[0]}')"
@@ -130,11 +132,9 @@ class DataSelector(vuetify.VDataTable):
             with cast(
                 vuetify.VSelect,
                 InputField(
-                    v_show=f"{self._v_model}.length > 0",
                     v_model=self._v_model,
-                    classes="nova-readonly",
+                    classes="flex-0-1 nova-readonly",
                     clearable=True,
-                    label=self._label,
                     readonly=True,
                     type="select",
                     click_clear=f"{self._v_model} = []; flushState('{self._v_model.split('.')[0]}');",

nova/trame/view/components/file_upload.py

@@ -48,7 +48,9 @@ class FileUpload(vuetify.VBtn):
             ref=self._ref_name,
             # Serialize the content in a way that will work with nova-mvvm and then push it to the server.
             update_modelValue=(
-                f"{self._v_model}.arrayBuffer().then((contents) => {{ trigger('decode_blob', [contents]); }});"
+                f"{self._v_model}.arrayBuffer().then((contents) => {{"
+                f"trigger('decode_blob_{self._id}', [contents]); "
+                "});"
             ),
         )
         self.remote_file_input = RemoteFileInput(
@@ -61,7 +63,7 @@ class FileUpload(vuetify.VBtn):
                     vuetify.VListItem("From Local Machine", click=f"trame.refs.{self._ref_name}.click()")
                     vuetify.VListItem("From Analysis Cluster", click=self.remote_file_input.open_dialog)
 
-        @self.server.controller.trigger("decode_blob")
+        @self.server.controller.trigger(f"decode_blob_{self._id}")
         def _decode_blob(contents: bytes) -> None:
             self.remote_file_input.decode_file(contents)
 

nova/trame/view/components/input_field.py

@@ -4,6 +4,7 @@ import logging
 import os
 import re
 from enum import Enum
+from inspect import isclass
 from typing import Any, Dict, Optional, Union
 
 from trame.app import get_server
@@ -70,7 +71,11 @@ class InputField:
                     "rules": (f"[(v) => trigger('validate_pydantic_field', ['{field}', v, index])]",),
                 }
 
-                if field_type in ["autocomplete", "combobox", "select"] and issubclass(field_info.annotation, Enum):
+                if (
+                    field_type in ["autocomplete", "combobox", "select"]
+                    and isclass(field_info.annotation)
+                    and issubclass(field_info.annotation, Enum)
+                ):
                     args |= {"items": str([option.value for option in field_info.annotation])}
 
             if debounce > 0 and throttle > 0:

nova/trame/view/components/visualization/matplotlib_figure.py

@@ -275,7 +275,7 @@ class MatplotlibFigure(matplotlib.Figure):
             ready_%(port)d(
                 function() {
                     var websocket_type = mpl.get_websocket_type();
-                    var websocket = new websocket_type(`ws://${window.location.host}/mpl/%(port)d`);
+                    var websocket = new websocket_type('mpl/%(port)d');
 
                     var fig = new mpl.figure(
                         // A unique numeric identifier for the figure

nova/trame/view/layouts/grid.py

@@ -16,6 +16,7 @@ class GridLayout(html.Div):
         width: Optional[Union[int, str]] = None,
         halign: Optional[str] = None,
         valign: Optional[str] = None,
+        gap: Optional[Union[int, str]] = "0em",
         **kwargs: Any,
     ) -> None:
         """Constructor for GridLayout.
@@ -64,7 +65,7 @@ class GridLayout(html.Div):
             classes = " ".join(classes)
         classes += " d-grid"
 
-        style = self.get_root_styles(columns, height, width, halign, valign) | kwargs.pop("style", {})
+        style = self.get_root_styles(columns, height, width, halign, valign, gap) | kwargs.pop("style", {})
 
         super().__init__(classes=classes, style=style, **kwargs)
 
@@ -75,9 +76,11 @@ class GridLayout(html.Div):
         width: Optional[Union[int, str]],
         halign: Optional[str],
         valign: Optional[str],
+        gap: Optional[Union[int, str]],
     ) -> dict[str, str]:
         height = f"{height}px" if isinstance(height, int) else height
         width = f"{width}px" if isinstance(width, int) else width
+        gap = f"{gap}px" if isinstance(gap, int) else gap
 
         styles = {
             "grid-template-columns": f"repeat({columns}, 1fr)",
@@ -91,6 +94,8 @@ class GridLayout(html.Div):
             styles["justify-items"] = halign
         if valign:
             styles["align-items"] = valign
+        if gap:
+            styles["gap"] = gap
 
         return styles
 

nova/trame/view/layouts/hbox.py

@@ -14,6 +14,8 @@ class HBoxLayout(html.Div):
         width: Optional[Union[int, str]] = None,
         halign: Optional[str] = None,
         valign: Optional[str] = None,
+        gap: Optional[Union[int, str]] = "0em",
+        vspace: Optional[Union[int, str]] = "0em",
         **kwargs: Any,
     ) -> None:
         """Constructor for HBoxLayout.
@@ -51,7 +53,7 @@ class HBoxLayout(html.Div):
             classes = " ".join(classes)
         classes += " d-flex flex-row"
 
-        style = self.get_root_styles(height, width, halign, valign) | kwargs.pop("style", {})
+        style = self.get_root_styles(height, width, halign, valign, gap, vspace) | kwargs.pop("style", {})
 
         super().__init__(classes=classes, style=style, **kwargs)
 
@@ -61,9 +63,13 @@ class HBoxLayout(html.Div):
         width: Optional[Union[int, str]],
         halign: Optional[str],
         valign: Optional[str],
+        gap: Optional[Union[int, str]],
+        vspace: Optional[Union[int, str]],
     ) -> dict:
         height = f"{height}px" if isinstance(height, int) else height
         width = f"{width}px" if isinstance(width, int) else width
+        gap = f"{gap}px" if isinstance(gap, int) else gap
+        vspace = f"{vspace}px" if isinstance(vspace, int) else vspace
 
         styles = {}
 
@@ -75,5 +81,9 @@ class HBoxLayout(html.Div):
             styles["justify-content"] = halign
         if valign:
             styles["align-items"] = valign
+        if gap:
+            styles["gap"] = gap
+        if vspace:
+            styles["margin-bottom"] = vspace
 
         return styles

nova/trame/view/layouts/vbox.py

@@ -14,6 +14,8 @@ class VBoxLayout(html.Div):
         width: Optional[Union[int, str]] = None,
         halign: Optional[str] = None,
         valign: Optional[str] = None,
+        gap: Optional[Union[int, str]] = "0em",
+        vspace: Optional[Union[int, str]] = "0em",
         **kwargs: Any,
     ) -> None:
         """Constructor for VBoxLayout.
@@ -51,7 +53,7 @@ class VBoxLayout(html.Div):
             classes = " ".join(classes)
         classes += " d-flex flex-column"
 
-        style = self.get_root_styles(height, width, halign, valign) | kwargs.pop("style", {})
+        style = self.get_root_styles(height, width, halign, valign, gap, vspace) | kwargs.pop("style", {})
 
         super().__init__(classes=classes, style=style, **kwargs)
 
@@ -61,9 +63,13 @@ class VBoxLayout(html.Div):
         width: Optional[Union[int, str]],
         halign: Optional[str],
         valign: Optional[str],
+        gap: Optional[Union[int, str]],
+        vspace: Optional[Union[int, str]],
     ) -> dict:
         height = f"{height}px" if isinstance(height, int) else height
         width = f"{width}px" if isinstance(width, int) else width
+        gap = f"{gap}px" if isinstance(gap, int) else gap
+        vspace = f"{vspace}px" if isinstance(vspace, int) else vspace
 
         styles = {}
 
@@ -75,5 +81,9 @@ class VBoxLayout(html.Div):
             styles["align-items"] = halign
         if valign:
             styles["justify-content"] = valign
+        if gap:
+            styles["gap"] = gap
+        if vspace:
+            styles["margin-bottom"] = vspace
 
         return styles

nova/trame/view/theme/assets/core_style.scss

@@ -12,6 +12,16 @@ html {
     box-shadow: none !important;
 }
 
+.v-tab.v-btn {
+    height: 30px !important;
+    min-width: fit-content !important;
+    padding: 10px !important;
+}
+
+.v-checkbox .v-selection-control {
+    min-height: 0px !important;
+}
+
 .mpl-message, .ui-dialog-titlebar {
     display: none !important;
 }
@@ -26,6 +36,11 @@ html {
     }
 }
 
+.v-window {
+    overflow-x: visible !important;
+    overflow-y: visible !important;
+}
+
 @media only screen and (max-width: 959px) {
     .d-grid {
         grid-template-columns: repeat(1, 1fr) !important;
@@ -72,7 +87,7 @@ html {
     }
 
     .v-data-table {
-        td {
+        th, td {
             vertical-align: middle;
         }
 
@@ -103,7 +118,6 @@ html {
         text-transform: none;
     }
 
-
     .v-label {
         font-size: 0.75rem;
     }

nova/trame/view/theme/assets/vuetify_config.json

@@ -56,7 +56,8 @@
         },
         "VFileInput": {
             "color": "primary",
-            "prependIcon": false
+            "prependIcon": false,
+            "variant": "outlined"
         },
         "VLabel": {
             "style": {
@@ -91,7 +92,8 @@
             "color": "primary"
         },
         "VSelect": {
-            "color": "primary"
+            "color": "primary",
+            "variant": "outlined"
         },
         "VSlider": {
             "color": "primary"
@@ -106,10 +108,12 @@
             "color": "primary"
         },
         "VTextarea": {
-            "color": "primary"
+            "color": "primary",
+            "variant": "outlined"
         },
         "VTextField": {
-            "color": "primary"
+            "color": "primary",
+            "variant": "outlined"
         },
         "VWindowItem": {
             "reverseTransition": "fade-transition",
@@ -167,6 +171,9 @@
                     "VDataTable": {
                         "density": "compact"
                     },
+                    "VDataTableVirtual": {
+                        "density": "compact"
+                    },
                     "VFileInput": {
                         "variant": "outlined"
                     },
@@ -178,8 +185,7 @@
                     },
                     "VTextField": {
                         "VBtn": {
-                            "size": "default",
-                            "variant": "outlined"
+                            "size": "default"
                         },
                         "variant": "outlined"
                     },

nova/trame/view/theme/theme.py

@@ -219,7 +219,6 @@ class ThemedApp:
 
                                 with vuetify.VList(width=200):
                                     vuetify.VListSubheader("Select Theme")
-                                    vuetify.VDivider()
 
                                     for theme in self.vuetify_config.get("theme", {}).get("themes", {}).values():
                                         with vuetify.VListItem(click=partial(self.set_theme, theme["value"])):

{nova_trame-0.19.0.dev6.dist-info → nova_trame-0.19.0.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nova-trame
-Version: 0.19.0.dev6
+Version: 0.19.0.dev8
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify

{nova_trame-0.19.0.dev6.dist-info → nova_trame-0.19.0.dev8.dist-info}/RECORD

@@ -3,30 +3,30 @@ nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
 nova/trame/model/data_selector.py,sha256=6tH5E7PmPMc6Cc7utFqe7MUpKsUP15_2jU0plygeqn0,7168
 nova/trame/model/remote_file_input.py,sha256=9KAf31ZHzpsh_aXUrNcF81Q5jvUZDWCzW1QATKls-Jk,3675
 nova/trame/view/components/__init__.py,sha256=u8yzshFp_TmuC1g9TRxKjy_BdGWMIzPQouI52hzcr2U,234
-nova/trame/view/components/data_selector.py,sha256=ikA_wSepGxrN2Egqmy7yGm00_OBhO-Pqun0DVYrehsM,8159
-nova/trame/view/components/file_upload.py,sha256=_P-FJM2hHm7x0IcrPJhUQa1L43g7_P78Z3oJO2LqLck,3051
-nova/trame/view/components/input_field.py,sha256=ncVVSzdJwH_-KP24I2rCqcb6v3J2hPhNTXr8Lb1EZ_U,15931
+nova/trame/view/components/data_selector.py,sha256=lOzAz7LbETpaFKZkFo_pAiMzZw9qtnHjwNmZXqgGF8o,8287
+nova/trame/view/components/file_upload.py,sha256=7VcpfA6zmiqMDLkwVPlb35Tf0IUTBN1xsHpoUFnSr1w,3111
+nova/trame/view/components/input_field.py,sha256=Wf-WuYm9SmbHXYy1cvYy8zDWe5rhvLcUHmwqmBvqVxk,16074
 nova/trame/view/components/remote_file_input.py,sha256=MnsUttZaCy8vEpOmRqXMsWa6PiC-RTRb-hJnnH0rBZc,9644
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=foZCMoqbuahT5dtqIQvm8C4ZJcY9P211eJEcpQJltmM,3421
-nova/trame/view/components/visualization/matplotlib_figure.py,sha256=yop7Kd_MylUiCwEial2jOYESbvchrYhrpSmRowUhePY,12003
+nova/trame/view/components/visualization/matplotlib_figure.py,sha256=xxgEAE2boc-sIFEIsbJxQZQ5biBMBXT0U8Il5299VNc,11974
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
-nova/trame/view/layouts/grid.py,sha256=k-QHuH31XeAVDuMKUMoAMVnAM-Yavq7kdLYOC1ZrGTQ,5021
-nova/trame/view/layouts/hbox.py,sha256=r5irhFX6YWTWN4V4NwNQx6mheyM8p6PVcJbrbhvOAwo,2625
-nova/trame/view/layouts/vbox.py,sha256=Q4EvrtGJORyNF6AnCLGXToy8XU6yofiO5_kt7hK-AYs,2626
+nova/trame/view/layouts/grid.py,sha256=CPutDeiJnLsKiG2mBtIDAnHJX-NJE92vhFiFyraV0R8,5220
+nova/trame/view/layouts/hbox.py,sha256=NE11FV0W7QKfqIdz4MUOTIWsgCr8jrJDtUCcgw1K0HM,3060
+nova/trame/view/layouts/vbox.py,sha256=HkWpU6LiqdZMwl9KRosvxX_4lAxgjiRS5q9acIBUyfE,3061
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=hfXhS6l2nBhU-Sm62YlUYDF_ufiYl56J8d0Cv1AMqKQ,2610
+nova/trame/view/theme/assets/core_style.scss,sha256=zmZH0ElAZsNRVwofjwmBRbznzv93Yue5MdryVgxsgfA,2886
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
 nova/trame/view/theme/assets/js/delay_manager.js,sha256=vmb34DZ5YCQIlRW9Tf2M_uvJW6HFCmtlKZ5e_TPR8yg,536
 nova/trame/view/theme/assets/js/lodash.debounce.min.js,sha256=GLzlQH04WDUNYN7i39ttHHejSdu-CpAvfWgDgKDn-OY,4448
 nova/trame/view/theme/assets/js/lodash.throttle.min.js,sha256=9csqjX-M-LVGJnF3z4ha1R_36O5AfkFE8rPHkxmt3tE,4677
-nova/trame/view/theme/assets/vuetify_config.json,sha256=HuR23Ds1dATt5fFUFMolFoLRjINLzg7AiLgQpQvuabc,5567
-nova/trame/view/theme/theme.py,sha256=OFUtq1IWriFcDu-346J67ZrSES8IOI9PTY_4Vwg7bZQ,11820
+nova/trame/view/theme/assets/vuetify_config.json,sha256=r3WK52tsZTH01g6I8YAQgiBy5jWI41Np5qz07Yc-nxI,5767
+nova/trame/view/theme/theme.py,sha256=HUeuVfzEgeYW65W-LcvXzfYNRHu6aQibGwwgHGyh3OA,11765
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
 nova/trame/view_model/data_selector.py,sha256=Bpkfjd78ZIkexHNF_aA9PfizRBzkeOuoSE7ZsBFcSOs,1749
 nova/trame/view_model/remote_file_input.py,sha256=ojEOJ8ZPkajpbAaZi9VLj7g-uBjhb8BMrTdMmwf_J6A,3367
-nova_trame-0.19.0.dev6.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.19.0.dev6.dist-info/METADATA,sha256=nyFmfkbSXWeqJ9VEiPzTsupXrcy6yyNMRAh9p5v1oXE,1451
-nova_trame-0.19.0.dev6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-nova_trame-0.19.0.dev6.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.19.0.dev6.dist-info/RECORD,,
+nova_trame-0.19.0.dev8.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.19.0.dev8.dist-info/METADATA,sha256=s41Ymyc13ZwxRZKLfWjJUqexigW68nDVnYqEvo8Wyhw,1451
+nova_trame-0.19.0.dev8.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+nova_trame-0.19.0.dev8.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.19.0.dev8.dist-info/RECORD,,