nova-trame 0.26.2__py3-none-any.whl → 1.0.0rc2__py3-none-any.whl

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

@@ -292,6 +292,8 @@ class NeutronDataSelector(DataSelector):
                         projection=set_state_param(self.state, self._projection, projection)
                     )
 
+        super()._setup_bindings()
+
     # These update methods notify the rest of the application when the component changes bound parameters.
     def update_facility(self, facility: str) -> None:
         self._vm.set_binding_parameters(
@@ -317,9 +319,3 @@ class NeutronDataSelector(DataSelector):
             experiment=set_state_param(self.state, (self._selected_experiment_name,), experiment),
         )
         self._vm.reset()
-
-    def set_state(self, *args: Any, **kwargs: Any) -> None:
-        raise TypeError(
-            "The set_state method has been removed. Please use update_facility, update_instrument, and "
-            "update_experiment instead."
-        )

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

@@ -9,6 +9,7 @@ from mimetypes import types_map
 from pathlib import Path
 from threading import Thread
 from typing import Any, Optional
+from warnings import warn
 
 import tornado
 from aiohttp import ClientSession, WSMsgType, web
@@ -214,17 +215,23 @@ class MatplotlibFigure(matplotlib.Figure):
         -------
         None
         """  # noqa: E501
+        self._server = get_server(None, client_type="vue3")
         self._webagg = webagg
+        if "classes" in kwargs:
+            kwargs["classes"] += " h-100 w-100 overflow-hidden"
+        else:
+            kwargs["classes"] = "h-100 w-100 overflow-hidden"
         if webagg:
-            self._port = MatplotlibFigure._get_free_port()
-            if "classes" in kwargs:
-                kwargs["classes"] += " nova-mpl"
-            else:
-                kwargs["classes"] = "nova-mpl"
+            self._initial_resize = True
+            if "id" in kwargs:
+                kwargs.pop("id")
+                warn("id parameter to MatplotlibFigure is ignored when webagg=True.", stacklevel=1)
 
-            html.Div(id=f"nova_mpl_{self._port}", **kwargs)
+            self._port = MatplotlibFigure._get_free_port()
+            self._id = f"nova_mpl_{self._port}"
+            kwargs["classes"] += " nova-mpl"
 
-            self._server = get_server(None, client_type="vue3")
+            html.Div(id=self._id, **kwargs)
 
             self._figure = figure
             self._initialized = False
@@ -236,8 +243,52 @@ class MatplotlibFigure(matplotlib.Figure):
             self.update()
         else:
             super().__init__(figure, **kwargs)
+            self._id = self._key
+
+        self._query_selector = f"window.document.querySelector('#{self._id}')"
+        self._trigger = (
+            "window.trame.trigger("
+            f"  '{self._id}_resize',"
+            f"  [{self._query_selector}.offsetHeight, {self._query_selector}.offsetWidth, window.devicePixelRatio]"
+            ");"
+        )
+        self._resize_figure = client.JSEval(exec=self._trigger).exec
+        self._resize_listener = client.JSEval(
+            exec=(
+                "window.addEventListener('resize', function() {"
+                f"  window.delay_manager.debounce('{self._id}', function() {{ {self._trigger} }}, 500);"
+                "});"
+            )
+        ).exec
+
+        @self._server.controller.trigger(f"{self._id}_resize")
+        def resize_figure(height: int, width: int, device_pixel_ratio: float) -> None:
+            if self._figure:
+                # This is the browser standard assumption for DPI.
+                dpi = 96
+
+                if self._webagg:
+                    # Reserve space for the controls injected by webagg.
+                    height -= 48
+                    width -= 4
 
-    def update(self, figure: Optional[Figure] = None) -> None:
+                    if not self._initial_resize:
+                        # Handle device pixel ratio for retina displays
+                        dpi = int(dpi * device_pixel_ratio)
+                        height = int(height * device_pixel_ratio)
+                        width = int(width * device_pixel_ratio)
+
+                    self._initial_resize = False
+
+                self._figure.set_dpi(dpi)
+                self._figure.set_size_inches(width / dpi, height / dpi)
+
+                self.update(skip_resize=True)
+
+        client.ClientTriggers(mounted=self._resize_listener)
+        client.ClientTriggers(mounted=self._resize_figure)
+
+    def update(self, figure: Optional[Figure] = None, skip_resize: bool = False) -> None:
         if self._webagg:
             if figure:
                 self._figure = figure
@@ -255,7 +306,10 @@ class MatplotlibFigure(matplotlib.Figure):
         else:
             super().update(figure)
 
-        self._server.state.flush()
+        if not skip_resize and hasattr(self, "_resize_figure"):
+            self._resize_figure()
+        else:
+            self._server.state.flush()
 
     def _setup_figure_websocket(self) -> None:
         thread = Thread(target=self._mpl_run_ws_server, daemon=True)

nova/trame/view/layouts/grid.py

@@ -19,6 +19,7 @@ class GridLayout(html.Div):
         halign: Optional[str] = None,
         valign: Optional[str] = None,
         gap: Optional[Union[int, str]] = "0em",
+        stretch: bool = False,
         **kwargs: Any,
     ) -> None:
         """Constructor for GridLayout.
@@ -42,6 +43,9 @@ class GridLayout(html.Div):
         gap : optional[str]
             The gap to place between items (works both horizontally and vertically). Can be any CSS gap value (e.g.
             "4px" or "0.25em"). Defaults to no gap between items.
+        stretch : optional[bool]
+            If True, then this layout component will stretch to attempt to fill the space of it's parent container.
+            Defaults to False.
         kwargs : Any
             Additional keyword arguments to pass to html.Div.
 
@@ -69,6 +73,8 @@ class GridLayout(html.Div):
         if isinstance(classes, list):
             classes = " ".join(classes)
         classes += " d-grid"
+        if stretch:
+            classes += " flex-1-1 overflow-y-auto"
 
         widget_style = self.get_root_styles(columns, height, width, halign, valign, gap)
         user_style = kwargs.pop("style", {})

nova/trame/view/layouts/hbox.py

@@ -18,6 +18,7 @@ class HBoxLayout(html.Div):
         valign: Optional[str] = None,
         gap: Optional[Union[int, str]] = "0em",
         vspace: Optional[Union[int, str]] = "0em",
+        stretch: bool = False,
         **kwargs: Any,
     ) -> None:
         """Constructor for HBoxLayout.
@@ -42,6 +43,9 @@ class HBoxLayout(html.Div):
         vspace : optional[str]
             The vertical gap to place between items. Can be any CSS gap value (e.g. "4px" or "0.25em"). Defaults to no
             gap between items.
+        stretch : optional[bool]
+            If True, then this layout component will stretch to attempt to fill the space of it's parent container.
+            Defaults to False.
         kwargs : Any
             Additional keyword arguments to pass to html.Div.
 
@@ -60,6 +64,8 @@ class HBoxLayout(html.Div):
         if isinstance(classes, list):
             classes = " ".join(classes)
         classes += " d-flex flex-row"
+        if stretch:
+            classes += " flex-1-1 overflow-y-auto"
 
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})

nova/trame/view/layouts/vbox.py

@@ -18,6 +18,7 @@ class VBoxLayout(html.Div):
         valign: Optional[str] = None,
         gap: Optional[Union[int, str]] = "0em",
         vspace: Optional[Union[int, str]] = "0em",
+        stretch: bool = False,
         **kwargs: Any,
     ) -> None:
         """Constructor for VBoxLayout.
@@ -42,6 +43,9 @@ class VBoxLayout(html.Div):
         vspace : optional[str]
             The vertical gap to place between items. Can be any CSS gap value (e.g. "4px" or "0.25em"). Defaults to no
             gap between items.
+        stretch : optional[bool]
+            If True, then this layout component will stretch to attempt to fill the space of it's parent container.
+            Defaults to False.
         kwargs : Any
             Additional keyword arguments to pass to html.Div.
 
@@ -60,6 +64,8 @@ class VBoxLayout(html.Div):
         if isinstance(classes, list):
             classes = " ".join(classes)
         classes += " d-flex flex-column"
+        if stretch:
+            classes += " flex-1-1 overflow-y-auto"
 
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})

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

@@ -70,8 +70,18 @@ html {
 }
 
 .v-window {
+    display: flex;
+    flex: 1 1;
     overflow-x: visible !important;
     overflow-y: visible !important;
+
+    .v-window__container {
+        flex: 1 1;
+
+        .v-window-item {
+            flex: 1 1;
+        }
+    }
 }
 
 @media only screen and (max-width: 959px) {

nova/trame/view/theme/theme.py

@@ -259,11 +259,13 @@ class ThemedApp:
 
                     with vuetify.VMain(classes="align-stretch d-flex flex-column h-screen"):
                         # [slot override example]
-                        layout.pre_content = vuetify.VSheet(classes="bg-background ")
+                        layout.pre_content = vuetify.VSheet(classes="bg-background flex-0-1 my-1 ")
                         # [slot override example complete]
-                        with vuetify.VContainer(classes="flex-0-1 overflow-hidden pt-0 pb-0", fluid=True):
-                            layout.content = html.Div(classes="h-100 overflow-y-auto pb-1 ")
-                        layout.post_content = vuetify.VSheet(classes="bg-background ")
+                        with vuetify.VContainer(classes="flex-1-1 overflow-hidden pt-0 pb-2", fluid=True):
+                            layout.content = vuetify.VCard(
+                                classes="d-flex flex-column flex-1-1 h-100 my-1 overflow-y-auto pa-1 "
+                            )
+                        layout.post_content = vuetify.VSheet(classes="bg-background flex-0-1 my-1 ")
 
                     with vuetify.VFooter(
                         app=True,

{nova_trame-0.26.2.dist-info → nova_trame-1.0.0rc2.dist-info}/METADATA

@@ -1,18 +1,19 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: nova-trame
-Version: 0.26.2
+Version: 1.0.0rc2
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Keywords: NDIP,Python,Trame,Vuetify
 Author: John Duggan
 Author-email: dugganjw@ornl.gov
 Requires-Python: >=3.10,<4.0
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: altair
 Requires-Dist: blinker (>=1.9.0,<2.0.0)
 Requires-Dist: libsass

{nova_trame-0.26.2.dist-info → nova_trame-1.0.0rc2.dist-info}/RECORD

@@ -12,27 +12,27 @@ nova/trame/view/components/execution_buttons.py,sha256=Br6uAmE5bY67TTYc5ZTHECNJ_
 nova/trame/view/components/file_upload.py,sha256=WOaFXeNNwN0DYZJr-W6vWdBiTpr7m-lq3WKJaHmeMe8,4560
 nova/trame/view/components/input_field.py,sha256=xzCmNEoB4ljGx99-gGgTV0UwriwtS8ce22zPA4QneZw,17372
 nova/trame/view/components/ornl/__init__.py,sha256=HnxzzSsxw0vQSDCVFfWsAxx1n3HnU37LMuQkfiewmSU,90
-nova/trame/view/components/ornl/neutron_data_selector.py,sha256=wVSLmRXiGOv2l-nZ0DgDwjrgTMZDu9e9ECm3k824k3o,16749
+nova/trame/view/components/ornl/neutron_data_selector.py,sha256=duiPbROIYsU6h0oZP27wSce6BJuW1mdT8mGoxY05lyw,16542
 nova/trame/view/components/progress_bar.py,sha256=zhbJwPy_HPQ8YL-ISN8sCRUQ7qY6qqo9wiV59BmvL8I,3038
 nova/trame/view/components/remote_file_input.py,sha256=mcz_bmI2rD8gdmIOKLhlzfj-XoWBwC99T9ZgQORaKqE,14674
 nova/trame/view/components/tool_outputs.py,sha256=IbYV4VjrkWAE354Bh5KH76SPsxGLIkOXChijS4-ce_Y,2408
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=z2s1janxAclpMEdDJk3z-CQ6r3KPNoR_SXPx9ppWnuQ,3481
-nova/trame/view/components/visualization/matplotlib_figure.py,sha256=q0HLaaLFjM3_V1oUk-VBHWvokFY6AQZzmnMcynTroik,12488
+nova/trame/view/components/visualization/matplotlib_figure.py,sha256=PhLZ95ofl78M2I5JMRdQeJZit9du-rW2H_km0jWF3Rg,14756
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
-nova/trame/view/layouts/grid.py,sha256=vqEX-jghs6j9_sVtijdRH7uhlD9loWNi90k2qgg4Dhg,5534
-nova/trame/view/layouts/hbox.py,sha256=cdwnGk93ec6dXAeEamRQx1WTj5T7Ygsmsy0xz130tWM,3519
+nova/trame/view/layouts/grid.py,sha256=lQVLnpmOvT2y6-gUEgmdE1VvodLxlul6i5Hov202uOo,5816
+nova/trame/view/layouts/hbox.py,sha256=RJphvkcdvcke1y_R85BR_DI54zPVRQFiU-S1m7U56LI,3801
 nova/trame/view/layouts/utils.py,sha256=Hg34VQWTG3yHBsgNvmfatR4J-uL3cko7UxSJpT-h3JI,376
-nova/trame/view/layouts/vbox.py,sha256=XRV14e32MY1HWc9FTVTv1vOatWWbhLMd0lYwZP-isTg,3520
+nova/trame/view/layouts/vbox.py,sha256=V7bzDjznUNruHd5RDlbbS8eLKxfJvS9iUHTRW8twSVM,3802
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=3-3qMc5gpaDhfuVWAF_psBH5alxwiuK-hPGhVgi2cW0,4335
+nova/trame/view/theme/assets/core_style.scss,sha256=lZK8zghy4ExmNuFI-rfq7qt2S7bqObzM_MBviOlWP5c,4481
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
 nova/trame/view/theme/assets/js/delay_manager.js,sha256=BN4OL88QsyZG4XQ1sTorHpN1rwD4GnWoVKHvl5F5ydo,776
 nova/trame/view/theme/assets/js/lodash.min.js,sha256=KCyAYJ-fsqtp_HMwbjhy6IKjlA5lrVrtWt1JdMsC57k,73016
 nova/trame/view/theme/assets/js/revo_grid.js,sha256=fbuEWO8etw-xgo9tjJGjJXdd5wL8qpgabPmrnU6Jp8k,4081
 nova/trame/view/theme/assets/vuetify_config.json,sha256=a0FSgpLYWGFlRGSMhMq61MyDFBEBwvz55G4qjkM08cs,5627
 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/theme/theme.py,sha256=gdmHWyYgLThv8_UHwstbSpBhHnlvIHdADIepxgqVy9Q,13274
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
 nova/trame/view_model/data_selector.py,sha256=jAtq5hpohQ6YiLBbgLJfNUzWZBpN2bjCG_c_FCJu2ns,3186
 nova/trame/view_model/execution_buttons.py,sha256=MfKSp95D92EqpD48C15cBo6dLO0Yld4FeRZMJNxJf7Y,3551
@@ -40,8 +40,8 @@ nova/trame/view_model/ornl/neutron_data_selector.py,sha256=PIKQyzcHpwu81DNk3d8Af
 nova/trame/view_model/progress_bar.py,sha256=6AUKHF3hfzbdsHqNEnmHRgDcBKY5TT8ywDx9S6ovnsc,2854
 nova/trame/view_model/remote_file_input.py,sha256=zWOflmCDJYYR_pacHphwzricV667GSRokh-mlxpBAOo,3646
 nova/trame/view_model/tool_outputs.py,sha256=ev6LY7fJ0H2xAJn9f5ww28c8Kpom2SYc2FbvFcoN4zg,829
-nova_trame-0.26.2.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.26.2.dist-info/METADATA,sha256=mDqDXOmyd5tFAnh7-VtPdiYu1ij7ajZcanzkgC6Ojps,1763
-nova_trame-0.26.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-nova_trame-0.26.2.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.26.2.dist-info/RECORD,,
+nova_trame-1.0.0rc2.dist-info/METADATA,sha256=4pMFtoku0PIb83aIpNWcb_OObxTfWoqW_CTF_BcSUz8,1798
+nova_trame-1.0.0rc2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nova_trame-1.0.0rc2.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-1.0.0rc2.dist-info/licenses/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-1.0.0rc2.dist-info/RECORD,,

{nova_trame-0.26.2.dist-info → nova_trame-1.0.0rc2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any