nova-trame 0.23.0__py3-none-any.whl → 0.23.1__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -47,6 +47,10 @@ class DataSelectorModel:
 
                 if len(path_parts) > 1:
                     dirs.clear()
+                elif path_parts != ["."]:
+                    # Subdirectories are fully queried upon being opened, so we only need to query one item to determine
+                    # if the target directory has any children.
+                    dirs[:] = dirs[:1]
 
                 # Only create a new entry for top-level directories
                 if len(path_parts) == 1 and path_parts[0] != ".":  # This indicates a top-level directory

nova/trame/view/components/data_selector.py

@@ -1,5 +1,6 @@
 """View Implementation for DataSelector."""
 
+from asyncio import ensure_future, sleep
 from typing import Any, List, Optional, cast
 
 from trame.app import get_server
@@ -8,7 +9,7 @@ from trame.widgets import vuetify3 as vuetify
 
 from nova.mvvm.trame_binding import TrameBinding
 from nova.trame.model.data_selector import DataSelectorModel, DataSelectorState
-from nova.trame.view.layouts import GridLayout, VBoxLayout
+from nova.trame.view.layouts import GridLayout, HBoxLayout, VBoxLayout
 from nova.trame.view_model.data_selector import DataSelectorViewModel
 
 from .input_field import InputField
@@ -25,6 +26,7 @@ class DataSelector(datagrid.VGrid):
         directory: str,
         extensions: Optional[List[str]] = None,
         prefix: str = "",
+        refresh_rate: int = 30,
         select_strategy: str = "all",
         **kwargs: Any,
     ) -> None:
@@ -43,6 +45,9 @@ class DataSelector(datagrid.VGrid):
         prefix : str, optional
             A subdirectory within the selected top-level folder to show files. If not specified, the user will be shown
             a folder browser and will be able to see all files in the selected top-level folder.
+        refresh_rate : int, optional
+            The number of seconds between attempts to automatically refresh the file list. Set to zero to disable this
+            feature. Defaults to 30 seconds.
         select_strategy : str, optional
             The selection strategy to pass to the `VDataTable component <https://trame.readthedocs.io/en/latest/trame.widgets.vuetify3.html#trame.widgets.vuetify3.VDataTable>`__.
             If unset, the `all` strategy will be used.
@@ -73,6 +78,7 @@ class DataSelector(datagrid.VGrid):
         self._directory = directory
         self._extensions = extensions if extensions is not None else []
         self._prefix = prefix
+        self._refresh_rate = refresh_rate
         self._select_strategy = select_strategy
 
         self._revogrid_id = f"nova__dataselector_{self._next_id}_rv"
@@ -91,9 +97,17 @@ class DataSelector(datagrid.VGrid):
 
         self.create_ui(**kwargs)
 
+        ensure_future(self._refresh_loop())
+
     def create_ui(self, *args: Any, **kwargs: Any) -> None:
         with VBoxLayout(classes="nova-data-selector", height="100%") as self._layout:
-            self._layout.filter = html.Div()
+            with HBoxLayout(valign="center"):
+                self._layout.filter = html.Div(classes="flex-1-1")
+                with vuetify.VBtn(
+                    classes="mx-1", density="compact", icon=True, variant="text", click=self.refresh_contents
+                ):
+                    vuetify.VIcon("mdi-refresh")
+                    vuetify.VTooltip("Refresh Contents", activator="parent")
 
             with GridLayout(columns=2, classes="flex-1-0 h-0", valign="start"):
                 if not self._prefix:
@@ -185,6 +199,9 @@ class DataSelector(datagrid.VGrid):
 
         self._vm.update_view()
 
+    def refresh_contents(self) -> None:
+        self._vm.update_view(refresh_directories=True)
+
     def reset(self, _: Any = None) -> None:
         self._reset_state()
         self._reset_rv_grid()
@@ -194,3 +211,11 @@ class DataSelector(datagrid.VGrid):
             "The old DataSelector component has been renamed to NeutronDataSelector. Please import it from "
             "`nova.trame.view.components.ornl`."
         )
+
+    async def _refresh_loop(self) -> None:
+        if self._refresh_rate > 0:
+            while True:
+                await sleep(self._refresh_rate)
+
+                self.refresh_contents()
+                self.state.dirty(self._datafiles_name)

nova/trame/view/components/ornl/neutron_data_selector.py

@@ -32,6 +32,7 @@ class NeutronDataSelector(DataSelector):
         instrument: str = "",
         extensions: Optional[List[str]] = None,
         prefix: str = "",
+        refresh_rate: int = 30,
         select_strategy: str = "all",
         **kwargs: Any,
     ) -> None:
@@ -54,6 +55,9 @@ class NeutronDataSelector(DataSelector):
         prefix : str, optional
             A subdirectory within the user's chosen experiment to show files. If not specified, the user will be shown a
             folder browser and will be able to see all files in the experiment that they have access to.
+        refresh_rate : int, optional
+            The number of seconds between attempts to automatically refresh the file list. Set to zero to disable this
+            feature. Defaults to 30 seconds.
         select_strategy : str, optional
             The selection strategy to pass to the `VDataTable component <https://trame.readthedocs.io/en/latest/trame.widgets.vuetify3.html#trame.widgets.vuetify3.VDataTable>`__.
             If unset, the `all` strategy will be used.
@@ -76,7 +80,7 @@ class NeutronDataSelector(DataSelector):
         self._instruments_name = f"nova__neutrondataselector_{self._next_id}_instruments"
         self._experiments_name = f"nova__neutrondataselector_{self._next_id}_experiments"
 
-        super().__init__(v_model, "", extensions, prefix, select_strategy, **kwargs)
+        super().__init__(v_model, "", extensions, prefix, refresh_rate, select_strategy, **kwargs)
 
     def create_ui(self, **kwargs: Any) -> None:
         super().create_ui(**kwargs)

nova/trame/view_model/data_selector.py

@@ -16,7 +16,7 @@ class DataSelectorViewModel:
 
         self.datafiles: List[Dict[str, Any]] = []
         self.directories: List[Dict[str, Any]] = []
-        self.expanded: List[str] = []
+        self.expanded: Dict[str, List[str]] = {}
 
         self.state_bind = binding.new_bind(self.model.state, callback_after_update=self.on_state_updated)
         self.directories_bind = binding.new_bind()
@@ -44,9 +44,16 @@ class DataSelectorViewModel:
         current_level["children"] = new_directories
 
         # Mark this directory as expanded and display the new content
-        self.expanded.append(paths[-1])
+        self.expanded[paths[-1]] = paths
         self.directories_bind.update_in_view(self.directories)
 
+    def reexpand_directories(self) -> None:
+        paths_to_expand = self.expanded.values()
+        self.expanded = {}
+
+        for paths in paths_to_expand:
+            self.expand_directory(paths)
+
     def on_state_updated(self, results: Dict[str, Any]) -> None:
         pass
 
@@ -54,10 +61,11 @@ class DataSelectorViewModel:
         self.model.set_subdirectory(subdirectory_path)
         self.update_view()
 
-    def update_view(self) -> None:
+    def update_view(self, refresh_directories: bool = False) -> None:
         self.state_bind.update_in_view(self.model.state)
-        if not self.directories:
+        if not self.directories or refresh_directories:
             self.directories = self.model.get_directories()
+            self.reexpand_directories()
         self.directories_bind.update_in_view(self.directories)
 
         self.datafiles = [

nova/trame/view_model/ornl/neutron_data_selector.py

@@ -25,7 +25,7 @@ class NeutronDataSelectorViewModel(DataSelectorViewModel):
     def reset(self) -> None:
         self.model.set_subdirectory("")
         self.directories = self.model.get_directories()
-        self.expanded = []
+        self.expanded = {}
         self.reset_bind.update_in_view(None)
 
     def on_state_updated(self, results: Dict[str, Any]) -> None:
@@ -43,9 +43,9 @@ class NeutronDataSelectorViewModel(DataSelectorViewModel):
                     self.reset()
         self.update_view()
 
-    def update_view(self) -> None:
+    def update_view(self, refresh_directories: bool = False) -> None:
         self.facilities_bind.update_in_view(self.model.get_facilities())
         self.instruments_bind.update_in_view(self.model.get_instruments())
         self.experiments_bind.update_in_view(self.model.get_experiments())
 
-        super().update_view()
+        super().update_view(refresh_directories)

{nova_trame-0.23.0.dist-info → nova_trame-0.23.1.dist-info}/METADATA

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

{nova_trame-0.23.0.dist-info → nova_trame-0.23.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/data_selector.py,sha256=jXu2tRmk0sI6fSbBs-bSggEiRw99M5d8NwpvPOk9nDs,4182
+nova/trame/model/data_selector.py,sha256=8eaIVGak6XOAQMxdUotOsiXisW14sSRd1V0oViglJVQ,4448
 nova/trame/model/ornl/neutron_data_selector.py,sha256=nfjXwT93JcPjJwyDynoP_stDVAfjUs7neeVZTk_04gc,6424
 nova/trame/model/remote_file_input.py,sha256=9KAf31ZHzpsh_aXUrNcF81Q5jvUZDWCzW1QATKls-Jk,3675
 nova/trame/view/components/__init__.py,sha256=60BeS69aOrFnkptjuD17rfPE1f4Z35iBH56TRmW5MW8,451
-nova/trame/view/components/data_selector.py,sha256=uahrLdTRKrec-g8L-xIYW0OG_dCnFuKJxq69ROf2c6I,8532
+nova/trame/view/components/data_selector.py,sha256=d5UDF7ENBNifmLyIecx8VyINRY4vSxlQHyJ2a5G7IOY,9606
 nova/trame/view/components/execution_buttons.py,sha256=fIkrWKI3jFZqk3GHhtmYh3nK2c-HOXpD3D3zd_TUpi0,4049
 nova/trame/view/components/file_upload.py,sha256=7VcpfA6zmiqMDLkwVPlb35Tf0IUTBN1xsHpoUFnSr1w,3111
 nova/trame/view/components/input_field.py,sha256=q6WQ_N-BOlimUL9zgazDlsDfK28FrrKjH4he8e_HzRA,16088
 nova/trame/view/components/ornl/__init__.py,sha256=HnxzzSsxw0vQSDCVFfWsAxx1n3HnU37LMuQkfiewmSU,90
-nova/trame/view/components/ornl/neutron_data_selector.py,sha256=RZAowBxRaxlVsHTsukHTX0reveWG1K6ib8zb1kKL9Ow,6631
+nova/trame/view/components/ornl/neutron_data_selector.py,sha256=8B0BVXzVtMApnbMGD6ms6G4gdv5l-dIWM6YlHcBgnoc,6878
 nova/trame/view/components/progress_bar.py,sha256=fCfPw4MPAvORaeFOXugreok4GLpDVZGMkqvnv-AhMxg,2967
 nova/trame/view/components/remote_file_input.py,sha256=ByrBFj8svyWezcardCWrS_4Ag3fgTYNg_11lDW1FIA8,9669
 nova/trame/view/components/tool_outputs.py,sha256=-6pDURd2l_FK_8EWa9BI3KhU_KJXJ6uyJ_rW4nQVc08,2337
@@ -31,14 +31,14 @@ nova/trame/view/theme/assets/vuetify_config.json,sha256=a0FSgpLYWGFlRGSMhMq61MyD
 nova/trame/view/theme/exit_button.py,sha256=Kqv1GVJZGrSsj6_JFjGU3vm3iNuMolLC2T1x2IsdmV0,3094
 nova/trame/view/theme/theme.py,sha256=8JqSrEbhxK1SccXE1_jUdel9Wtc2QNObVEwtbVWG_QY,13146
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/data_selector.py,sha256=8XBCc12CcQfctOyz5zAOZTIXddKfpzIp8A_yZI-MpFc,2499
+nova/trame/view_model/data_selector.py,sha256=yDyYceZAUIxv4hhJGAPdIo54zHmrwqkxNZh7F2sRlw0,2810
 nova/trame/view_model/execution_buttons.py,sha256=MfKSp95D92EqpD48C15cBo6dLO0Yld4FeRZMJNxJf7Y,3551
-nova/trame/view_model/ornl/neutron_data_selector.py,sha256=CtVva_MXWGRG_KclE4ln8XJP_dfy6-5unE3pjEStOpE,2074
+nova/trame/view_model/ornl/neutron_data_selector.py,sha256=WTuz9QO4WzbOftTH0uP9Qxn7nYdsnIoixu1hWHKCVNU,2128
 nova/trame/view_model/progress_bar.py,sha256=6AUKHF3hfzbdsHqNEnmHRgDcBKY5TT8ywDx9S6ovnsc,2854
 nova/trame/view_model/remote_file_input.py,sha256=ojEOJ8ZPkajpbAaZi9VLj7g-uBjhb8BMrTdMmwf_J6A,3367
 nova/trame/view_model/tool_outputs.py,sha256=ev6LY7fJ0H2xAJn9f5ww28c8Kpom2SYc2FbvFcoN4zg,829
-nova_trame-0.23.0.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.23.0.dist-info/METADATA,sha256=vKtoLVHkJVqpA4yqwZZmjWWoYdPk1avkhUc5B8KuF80,1688
-nova_trame-0.23.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-nova_trame-0.23.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.23.0.dist-info/RECORD,,
+nova_trame-0.23.1.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.23.1.dist-info/METADATA,sha256=VVMLgB8JhBIzt_FbCAEUIjPh3Zu8gEqQy091t3Fpd8E,1688
+nova_trame-0.23.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+nova_trame-0.23.1.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.23.1.dist-info/RECORD,,