nova-trame 0.20.3__py3-none-any.whl → 0.21.0__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -212,17 +212,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/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,10 @@ html {
     display: none !important;
 }
 
+.display-linebreaks {
+    white-space: pre-wrap;
+}
+
 .nova-data-selector revo-grid {
     font-family: 'Roboto', sans-serif;
     font-size: 0.75rem !important;
@@ -209,3 +213,6 @@ html {
         }
     }
 }
+
+
+.v-progress-linear__content { pointer-events: all !important; }

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.3.dist-info → nova_trame-0.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nova-trame
-Version: 0.20.3
+Version: 0.21.0
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify
@@ -22,7 +22,7 @@ Requires-Dist: nova-common (>=0.2.0)
 Requires-Dist: nova-mvvm
 Requires-Dist: pydantic
 Requires-Dist: tomli
-Requires-Dist: tornado
+Requires-Dist: tornado (>=6.5.0)
 Requires-Dist: trame
 Requires-Dist: trame-datagrid
 Requires-Dist: trame-matplotlib

{nova_trame-0.20.3.dist-info → nova_trame-0.21.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=wIskRs3IzRgfXPT3jBJFYAAy3vy8wfX-gTyUNbmh89w,9101
 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/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=K-0lz-bHSeIqKWWx-e6YyRiGMhxW850rT811M_Z9A4g,3947
 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
@@ -29,11 +29,11 @@ nova/trame/view/theme/theme.py,sha256=0KzBJgAZRwlnwzCIf7gUjDY-gbhON7b2h3CMh2_9HY
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
 nova/trame/view_model/data_selector.py,sha256=llI7u8121R78dkecS4D2OI604LWlpByWn7OL9cckI9Q,2561
 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.3.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.20.3.dist-info/METADATA,sha256=YkdgejRswQE5ey3htm_-qBKM8Q8506LAWK5C735IoS8,1593
-nova_trame-0.20.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-nova_trame-0.20.3.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.20.3.dist-info/RECORD,,
+nova_trame-0.21.0.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.21.0.dist-info/METADATA,sha256=5CG-2qrSc-0EGDteFilNzFjbtlm_k8oZTYx8XLPv63o,1603
+nova_trame-0.21.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+nova_trame-0.21.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.21.0.dist-info/RECORD,,