nova-trame 0.19.0.dev3__py3-none-any.whl → 0.19.0.dev5__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -129,6 +129,17 @@ class DataSelectorModel:
 
         return sorted(experiments)
 
+    def sort_directories(self, directories: List[Any]) -> List[Any]:
+        # Sort the current level of dictionaries
+        sorted_dirs = sorted(directories, key=lambda x: x["title"])
+
+        # Process each sorted item to sort their children
+        for item in sorted_dirs:
+            if "children" in item and isinstance(item["children"], list):
+                item["children"] = self.sort_directories(item["children"])
+
+        return sorted_dirs
+
     def get_directories(self) -> List[Any]:
         if not self.state.experiment:
             return []
@@ -162,7 +173,7 @@ class DataSelectorModel:
         except OSError:
             pass
 
-        return directories
+        return self.sort_directories(directories)
 
     def get_datafiles(self) -> List[str]:
         datafiles = []

nova/trame/view/components/data_selector.py

@@ -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():
+        with html.Div(classes="nova-data-selector"):
             with GridLayout(columns=3):
                 columns = 3
                 if facility == "":
@@ -98,7 +98,7 @@ class DataSelector(vuetify.VDataTable):
                     type="autocomplete",
                 )
 
-            with GridLayout(columns=3, valign="start"):
+            with GridLayout(columns=2, valign="start"):
                 if not self._prefix:
                     with html.Div():
                         vuetify.VListSubheader("Available Directories", classes="justify-center px-0")
@@ -106,16 +106,17 @@ class DataSelector(vuetify.VDataTable):
                             v_if=(f"{self._directories_name}.length > 0",),
                             activatable=True,
                             active_strategy="single-independent",
+                            classes="overflow-y-auto",
                             item_value="path",
                             items=(self._directories_name,),
+                            style="max-height: 500px",
                             update_activated=(self._vm.set_directory, "$event"),
                         )
-                        vuetify.VListItem("No directories found", v_else=True)
+                        vuetify.VListItem("No directories found", classes="text-center", v_else=True)
 
                 super().__init__(
                     v_model=self._v_model,
-                    column_span=3 if self._prefix else 2,
-                    headers=("[{ align: 'center', key: 'title', title: 'Available Datafiles' }]",),
+                    headers=("[{ align: 'left', key: 'title', title: 'Available Datafiles' }]",),
                     item_title="title",
                     item_value="path",
                     select_strategy=self._select_strategy,
@@ -129,17 +130,18 @@ class DataSelector(vuetify.VDataTable):
             with cast(
                 vuetify.VSelect,
                 InputField(
-                    v_if=f"{self._v_model}.length > 0",
+                    v_show=f"{self._v_model}.length > 0",
                     v_model=self._v_model,
                     classes="nova-readonly",
                     clearable=True,
                     label=self._label,
                     readonly=True,
                     type="select",
+                    click_clear=f"{self._v_model} = []; flushState('{self._v_model.split('.')[0]}');",
                 ),
             ):
                 with vuetify.Template(raw_attrs=['v-slot:selection="{ item, index }"']):
-                    vuetify.VChip("{{ item.title }}", v_if="index < 2")
+                    vuetify.VChip("{{ item.title.split('/').reverse()[0] }}", v_if="index < 2")
                     html.Span(
                         f"(+{{{{ {self._v_model}.length - 2 }}}} others)", v_if="index === 2", classes="text-caption"
                     )

nova/trame/view/components/file_upload.py

@@ -16,8 +16,9 @@ class FileUpload(vuetify.VBtn):
         Parameters
         ----------
         v_model : str
-            The state variable to set when the user uploads their file. If uploaded from the user's machine, then the
-            state variable will contain the file contents.
+            The state variable to set when the user uploads their file. The state variable will contain a latin1-decoded
+            version of the file contents. If your file is binary or requires a different string encoding, then you can
+            call `encode('latin1')` on the file contents to get the underlying bytes.
         base_paths: list[str], optional
             Passed to :ref:`RemoteFileInput <api_remotefileinput>`.
         label : str, optional
@@ -47,10 +48,7 @@ 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}.text().then((contents) => {{"
-                f"  {self._v_model} = contents;"
-                f"  flushState('{self._v_model.split('.')[0]}');"
-                "});"
+                f"{self._v_model}.arrayBuffer().then((contents) => {{ trigger('decode_blob', [contents]); }});"
             ),
         )
         self.remote_file_input = RemoteFileInput(
@@ -63,6 +61,10 @@ 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")
+        def _decode_blob(contents: bytes) -> None:
+            self.remote_file_input.decode_file(contents)
+
     def select_file(self, value: str) -> None:
         """Programmatically set the RemoteFileInput path.
 

nova/trame/view/components/remote_file_input.py

@@ -202,8 +202,12 @@ class RemoteFileInput:
         self.vm.valid_selection_bind.connect(self.vm.get_valid_selection_state_name())
 
     def read_file(self, file_path: str) -> None:
-        with open(file_path, mode="r") as file:
-            self.set_v_model(file.read())
+        with open(file_path, mode="rb") as file:
+            self.decode_file(file.read())
+
+    def decode_file(self, bytestream: bytes) -> None:
+        decoded_content = bytestream.decode("latin1")
+        self.set_v_model(decoded_content)
 
     def select_file(self, value: str) -> None:
         """Programmatically set the v_model value."""

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

@@ -48,6 +48,25 @@ html {
         border-radius: 4px;
     }
 
+    .nova-data-selector {
+        .v-data-table__td {
+            max-width: 100px;
+            overflow: hidden;
+            padding: 0 !important;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .v-data-table-footer {
+            justify-content: center;
+
+            .v-data-table-footer__items-per-page,
+            .v-data-table-footer__info {
+                display: none;
+            }
+        }
+    }
+
     .v-data-table {
         td {
             vertical-align: middle;

{nova_trame-0.19.0.dev3.dist-info → nova_trame-0.19.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nova-trame
-Version: 0.19.0.dev3
+Version: 0.19.0.dev5
 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.dev3.dist-info → nova_trame-0.19.0.dev5.dist-info}/RECORD

@@ -1,12 +1,12 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/data_selector.py,sha256=8BnnPvdYZTmCOJFuWOs_RhQ1NvYqWFdPmWP09WWP5oA,6689
+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=IkRu3BKwiEDrE9E2-GApUuajlb3YOsFmQbJsyNRnmfk,7929
-nova/trame/view/components/file_upload.py,sha256=XbiSx2txpdohwxGyP-ecTbIgMPv6siUARJ7nXhXaiAc,2827
+nova/trame/view/components/data_selector.py,sha256=VbZtgSgb6jRXJmj31uYqVdMjpcHyioDW_1RD3yLGMDw,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/remote_file_input.py,sha256=lFchhhoMo9EgSr7pSlh2LEm8NZO1XXrBcfh_BLGZBV0,9492
+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
@@ -15,7 +15,7 @@ nova/trame/view/layouts/grid.py,sha256=k-QHuH31XeAVDuMKUMoAMVnAM-Yavq7kdLYOC1ZrG
 nova/trame/view/layouts/hbox.py,sha256=r5irhFX6YWTWN4V4NwNQx6mheyM8p6PVcJbrbhvOAwo,2625
 nova/trame/view/layouts/vbox.py,sha256=Q4EvrtGJORyNF6AnCLGXToy8XU6yofiO5_kt7hK-AYs,2626
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=bP9tv5B3vivjEMXFPTGJ7rXc1aXjnOXsvnkaBUyRmUs,2095
+nova/trame/view/theme/assets/core_style.scss,sha256=dez2vI7dPfjYQGHJSKiKCCsLTidAQsAcynidNYN4VBk,2547
 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
@@ -25,8 +25,8 @@ nova/trame/view/theme/theme.py,sha256=OFUtq1IWriFcDu-346J67ZrSES8IOI9PTY_4Vwg7bZ
 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.dev3.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.19.0.dev3.dist-info/METADATA,sha256=4VzPhPq4jNYEE_EXPMNQKYh71P-7rNOe__U4_g7YeD8,1451
-nova_trame-0.19.0.dev3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-nova_trame-0.19.0.dev3.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.19.0.dev3.dist-info/RECORD,,
+nova_trame-0.19.0.dev5.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.19.0.dev5.dist-info/METADATA,sha256=jq6kH6P8wTV1xtLC_6p-WGhunujfdYwijEK_lqutRl0,1451
+nova_trame-0.19.0.dev5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+nova_trame-0.19.0.dev5.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.19.0.dev5.dist-info/RECORD,,