nova-trame 0.20.4__py3-none-any.whl → 0.22.0__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -2,7 +2,7 @@
 
 import os
 from pathlib import Path
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional
 from warnings import warn
 
 from natsort import natsorted
@@ -140,7 +140,7 @@ class DataSelectorModel:
 
         return natsorted(experiments)
 
-    def sort_directories(self, directories: List[Any]) -> List[Any]:
+    def sort_directories(self, directories: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
         # Sort the current level of dictionaries
         sorted_dirs = natsorted(directories, key=lambda x: x["title"])
 
@@ -164,9 +164,11 @@ class DataSelectorModel:
 
         return Path(self.state.custom_directory)
 
-    def get_directories(self) -> List[str]:
+    def get_directories(self, base_path: Optional[Path] = None) -> List[Dict[str, Any]]:
         using_custom_directory = self.state.facility == CUSTOM_DIRECTORIES_LABEL
-        if using_custom_directory:
+        if base_path:
+            pass
+        elif using_custom_directory:
             base_path = self.get_custom_directory_path()
         else:
             base_path = self.get_experiment_directory_path()
@@ -176,34 +178,31 @@ class DataSelectorModel:
 
         directories = []
         try:
-            if using_custom_directory:
-                for entry in os.listdir(base_path):
-                    path = base_path / entry
-                    if os.path.isdir(path):
-                        directories.append({"path": str(path), "title": entry})
-            else:
-                for dirpath, _, _ in os.walk(base_path):
-                    # Get the relative path from the start path
-                    path_parts = os.path.relpath(dirpath, base_path).split(os.sep)
-
-                    # Only create a new entry for top-level directories
-                    if len(path_parts) == 1 and path_parts[0] != ".":  # This indicates a top-level directory
-                        current_dir = {"path": dirpath, "title": path_parts[0]}
-                        directories.append(current_dir)
-
-                    # Add subdirectories to the corresponding parent directory
-                    elif len(path_parts) > 1:
-                        current_level: Any = directories
-                        for part in path_parts[:-1]:  # Parent directories
-                            for item in current_level:
-                                if item["title"] == part:
-                                    if "children" not in item:
-                                        item["children"] = []
-                                    current_level = item["children"]
-                                    break
-
-                        # Add the last part (current directory) as a child
-                        current_level.append({"path": dirpath, "title": path_parts[-1]})
+            for dirpath, dirs, _ in os.walk(base_path):
+                # Get the relative path from the start path
+                path_parts = os.path.relpath(dirpath, base_path).split(os.sep)
+
+                if len(path_parts) > 1:
+                    dirs.clear()
+
+                # Only create a new entry for top-level directories
+                if len(path_parts) == 1 and path_parts[0] != ".":  # This indicates a top-level directory
+                    current_dir = {"path": dirpath, "title": path_parts[0]}
+                    directories.append(current_dir)
+
+                # Add subdirectories to the corresponding parent directory
+                elif len(path_parts) > 1:
+                    current_level: Any = directories
+                    for part in path_parts[:-1]:  # Parent directories
+                        for item in current_level:
+                            if item["title"] == part:
+                                if "children" not in item:
+                                    item["children"] = []
+                                current_level = item["children"]
+                                break
+
+                    # Add the last part (current directory) as a child
+                    current_level.append({"path": dirpath, "title": path_parts[-1]})
         except OSError:
             pass
 
@@ -212,17 +211,18 @@ class DataSelectorModel:
     def get_datafiles(self) -> List[str]:
         datafiles = []
 
+        if self.state.experiment:
+            base_path = Path("/") / self.state.facility / self.get_instrument_dir() / self.state.experiment
+        elif self.state.custom_directory:
+            base_path = Path(self.state.custom_directory)
+        else:
+            return []
+
         try:
             if self.state.prefix:
-                datafile_path = str(
-                    Path("/")
-                    / self.state.facility
-                    / self.get_instrument_dir()
-                    / self.state.experiment
-                    / self.state.prefix
-                )
+                datafile_path = str(base_path / self.state.prefix)
             else:
-                datafile_path = self.state.directory
+                datafile_path = str(base_path / self.state.directory)
 
             for entry in os.scandir(datafile_path):
                 if entry.is_file():

nova/trame/view/components/data_selector.py

@@ -133,8 +133,10 @@ class DataSelector(datagrid.VGrid):
                             activatable=True,
                             active_strategy="single-independent",
                             classes="flex-1-0 h-0 overflow-y-auto",
+                            fluid=True,
                             item_value="path",
                             items=(self._directories_name,),
+                            click_open=(self._vm.expand_directory, "[$event.path]"),
                             update_activated=(self._vm.set_directory, "$event"),
                         )
                         vuetify.VListItem("No directories found", classes="flex-0-1 text-center", v_else=True)

nova/trame/view/components/progress_bar.py

@@ -45,6 +45,26 @@ class ProgressBar:
             v_show=(f"{self.id}.show_progress",),
         ):
             html.H5(v_text=f"{self.id}.details")
+            with vuetify.VMenu(
+                max_width=900,
+                location="bottom",
+                no_click_animation=True,
+                close_on_content_click=False,
+                open_on_hover=True,
+                v_show=False,
+            ):
+                with vuetify.Template(v_slot_activator="{ props }"):
+                    vuetify.VIcon(
+                        "mdi-information",
+                        v_show=f"{self.id}.show_full_details",
+                        v_bind="props",
+                        classes="ml-2",
+                        color="primary",
+                    )
+
+                with vuetify.VCard(classes="bg-grey"):
+                    vuetify.VCardText(f"{{{{ {self.id}.full_details }}}}", classes="display-linebreaks")
+
         with vuetify.VProgressLinear(
             height="25",
             model_value="100",

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

@@ -16,6 +16,18 @@ html {
     display: none !important;
 }
 
+.display-linebreaks {
+    white-space: pre-wrap;
+}
+
+.nova-data-selector {
+    .v-list-group {
+        .v-treeview-item {
+            --indent-padding: 1em !important;
+        }
+    }
+}
+
 .nova-data-selector revo-grid {
     font-family: 'Roboto', sans-serif;
     font-size: 0.75rem !important;
@@ -209,3 +221,6 @@ html {
         }
     }
 }
+
+
+.v-progress-linear__content { pointer-events: all !important; }

nova/trame/view_model/data_selector.py

@@ -1,6 +1,7 @@
 """View model implementation for the DataSelector widget."""
 
 import os
+from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from nova.mvvm.interface import BindingInterface
@@ -14,6 +15,8 @@ class DataSelectorViewModel:
         self.model = model
 
         self.datafiles: List[Dict[str, Any]] = []
+        self.directories: List[Dict[str, Any]] = []
+        self.expanded: List[str] = []
 
         self.state_bind = binding.new_bind(self.model.state, callback_after_update=self.on_state_updated)
         self.facilities_bind = binding.new_bind()
@@ -23,6 +26,30 @@ class DataSelectorViewModel:
         self.datafiles_bind = binding.new_bind()
         self.reset_bind = binding.new_bind()
 
+    def expand_directory(self, paths: List[str]) -> None:
+        if paths[-1] in self.expanded:
+            return
+
+        # Query for the new subdirectories to display in the view
+        new_directories = self.model.get_directories(Path(paths[-1]))
+
+        # Find the entry in the existing directories that corresponds to the directory to expand
+        current_level: Dict[str, Any] = {}
+        children: List[Dict[str, Any]] = self.directories
+        for current_path in paths:
+            if current_level:
+                children = current_level["children"]
+
+            for entry in children:
+                if current_path == entry["path"]:
+                    current_level = entry
+                    break
+        current_level["children"] = new_directories
+
+        # Mark this directory as expanded and display the new content
+        self.expanded.append(paths[-1])
+        self.directories_bind.update_in_view(self.directories)
+
     def set_directory(self, directory_path: str = "") -> None:
         self.model.set_directory(directory_path)
         self.update_view()
@@ -33,6 +60,8 @@ class DataSelectorViewModel:
 
     def reset(self) -> None:
         self.model.set_directory("")
+        self.directories = self.model.get_directories()
+        self.expanded = []
         self.reset_bind.update_in_view(None)
 
     def on_state_updated(self, results: Dict[str, Any]) -> None:
@@ -55,7 +84,7 @@ class DataSelectorViewModel:
         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())
-        self.directories_bind.update_in_view(self.model.get_directories())
+        self.directories_bind.update_in_view(self.directories)
 
         self.datafiles = [
             {"path": datafile, "title": os.path.basename(datafile)} for datafile in self.model.get_datafiles()

nova/trame/view_model/progress_bar.py

@@ -1,6 +1,7 @@
 """Module for the JobProgress ViewModel."""
 
-from typing import Any
+import json
+from typing import Any, Dict, Tuple
 
 import blinker
 from pydantic import BaseModel
@@ -10,7 +11,7 @@ from nova.common.signals import Signal, get_signal_id
 from nova.mvvm.interface import BindingInterface
 
 
-def details_from_state(state: WorkState) -> str:
+def details_from_state(state: WorkState, details: Dict[str, Any]) -> Tuple[str, str]:
     work_state_map = {
         WorkState.NOT_STARTED: "job not started",
         WorkState.UPLOADING_DATA: "uploading data",
@@ -24,9 +25,12 @@ def details_from_state(state: WorkState) -> str:
         WorkState.CANCELING: "canceling job",
     }
     if state in work_state_map:
-        return work_state_map[state]
+        state_str = work_state_map[state]
     else:
-        return state.value
+        state_str = state.value
+
+    full_details_dict = json.dumps(details.get("original_dict", {}), indent=4)
+    return state_str, full_details_dict
 
 
 class ProgressState(BaseModel):
@@ -34,11 +38,13 @@ class ProgressState(BaseModel):
 
     progress: str = ""
     details: str = ""
+    full_details: str = ""
     show_progress: bool = False
+    show_full_details: bool = False
     show_failed: bool = False
     show_ok: bool = False
 
-    def update_from_workstate(self, state: WorkState) -> None:
+    def update_from_workstate(self, state: WorkState, details: Dict[str, Any]) -> None:
         progress = "0"
         match state:
             case WorkState.UPLOADING_DATA:
@@ -58,7 +64,8 @@ class ProgressState(BaseModel):
         self.show_failed = state == WorkState.ERROR
         self.show_ok = state == WorkState.FINISHED
         self.progress = progress
-        self.details = details_from_state(state)
+        self.details, self.full_details = details_from_state(state, details)
+        self.show_full_details = self.full_details != "{}"
 
 
 class ProgressBarViewModel:
@@ -70,6 +77,6 @@ class ProgressBarViewModel:
         self.progress_signal = blinker.signal(get_signal_id(id, Signal.PROGRESS))
         self.progress_signal.connect(self.update_state, weak=False)
 
-    async def update_state(self, _sender: Any, state: WorkState, details: str) -> None:
-        self.progress_state.update_from_workstate(state)
+    async def update_state(self, _sender: Any, state: WorkState, details: Dict[str, Any]) -> None:
+        self.progress_state.update_from_workstate(state, details)
         self.progress_state_bind.update_in_view(self.progress_state)

{nova_trame-0.20.4.dist-info → nova_trame-0.22.0.dist-info}/METADATA

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

{nova_trame-0.20.4.dist-info → nova_trame-0.22.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/data_selector.py,sha256=p-4SuK4IQpsd_JrzZ-tysba7GYpjIyAbsxLcBgrw5h4,8997
+nova/trame/model/data_selector.py,sha256=UnLBCp_jJ523QxTR3R8iun2Ogq4D0G0lxmtW9e_zwOM,8938
 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=sAA0v9lLhqkuC4WqRYe8c_banXz8ZOZEgf24NzG5Kjk,11097
+nova/trame/view/components/data_selector.py,sha256=lgZjyT_jc3eE19HNgz_Hdog5bWvXZJ3IfxxiSBkZ7hE,11222
 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/progress_bar.py,sha256=Sh5cOPaMWrFq8KTWEDui1dIbK53BPtGG2RZOSKEaoJ4,2186
+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
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
@@ -19,7 +19,7 @@ nova/trame/view/layouts/hbox.py,sha256=qlOMp_iOropIkC9Jxa6D89b7OPv0pNvJ73tUEzddy
 nova/trame/view/layouts/utils.py,sha256=Hg34VQWTG3yHBsgNvmfatR4J-uL3cko7UxSJpT-h3JI,376
 nova/trame/view/layouts/vbox.py,sha256=hzhzPu99R2fAclMe-FwHZseJWk7iailZ31bKdGhi1hk,3514
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=7tU0EVIg9egxq1XjhqNFq_nUwSFSHAhqivgLdbf9oj4,3829
+nova/trame/view/theme/assets/core_style.scss,sha256=lK86Fp55oAMDh1eUHA-DTeGGZi0uUYOseIyJUTj-0A0,4081
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
 nova/trame/view/theme/assets/js/delay_manager.js,sha256=mRV6KoO8-Bxq3tG5Bh9CQYy-CRVbkj3IYlqNb-Og7cI,526
 nova/trame/view/theme/assets/js/lodash.min.js,sha256=KCyAYJ-fsqtp_HMwbjhy6IKjlA5lrVrtWt1JdMsC57k,73016
@@ -27,13 +27,13 @@ nova/trame/view/theme/assets/js/revo_grid.js,sha256=WBsmoslu9qI5DHZkHkJam2AVgdiB
 nova/trame/view/theme/assets/vuetify_config.json,sha256=a0FSgpLYWGFlRGSMhMq61MyDFBEBwvz55G4qjkM08cs,5627
 nova/trame/view/theme/theme.py,sha256=0KzBJgAZRwlnwzCIf7gUjDY-gbhON7b2h3CMh2_9HY4,11746
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/data_selector.py,sha256=llI7u8121R78dkecS4D2OI604LWlpByWn7OL9cckI9Q,2561
+nova/trame/view_model/data_selector.py,sha256=RyMHml1K_pupH4JtXnGxAaYTYYwNoEVus7Abdpqwueo,3698
 nova/trame/view_model/execution_buttons.py,sha256=MfKSp95D92EqpD48C15cBo6dLO0Yld4FeRZMJNxJf7Y,3551
-nova/trame/view_model/progress_bar.py,sha256=L7ED6TDn5v2142iu-qt3i-jUg_5JEhLyC476t2OtohU,2467
+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.20.4.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.20.4.dist-info/METADATA,sha256=48Ob64yY74oD4ppjh9h_Kf01diDGKDx1uKdHzIZaIUM,1603
-nova_trame-0.20.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-nova_trame-0.20.4.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.20.4.dist-info/RECORD,,
+nova_trame-0.22.0.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.22.0.dist-info/METADATA,sha256=7ySWYYUkEE99UeZnMvMMwskNWHHhHjrrNv0_5dYRU0s,1603
+nova_trame-0.22.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+nova_trame-0.22.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.22.0.dist-info/RECORD,,