staticdash 2026.4__py3-none-any.whl → 2026.6__py3-none-any.whl

staticdash/dashboard.py

@@ -12,6 +12,7 @@ import io
 import base64
 import matplotlib
 from matplotlib import rc_context
+import json
 
 def split_paragraphs_preserving_math(text):
     """
@@ -54,13 +55,15 @@ class AbstractPage:
     def add_text(self, text, width=None):
         self.elements.append(("text", text, width))
 
-    def add_plot(self, plot, width=None, height=None, width_px=None, align="center"):
-        # Keep backward-compatible: `width` is a fraction (0..1) of page width.
-        # `height` is pixels (existing behavior). New optional `width_px`
-        # (pixels) can be supplied to control plot width. `align` controls
-        # horizontal alignment: 'left', 'center' (default), or 'right'.
-        # We store a tuple (plot, height_px, width_px, align) for forward-compatibility.
-        self.elements.append(("plot", (plot, height, width_px, align), width))
+    def add_plot(self, plot, el_width=None, height=None, width=None, align="center"):
+        # `el_width` is the fractional width (0..1) used for layout columns.
+        # `height` and `width` are pixel dimensions for the rendered figure/image.
+        # `align` controls horizontal alignment: 'left', 'center' (default), or 'right'.
+        # We store a tuple (plot, height, width, align) and keep `el_width` as
+        # the element-level fractional width for compatibility with page layout.
+        specified_height = height
+        specified_width = width
+        self.elements.append(("plot", (plot, specified_height, specified_width, align), el_width))
 
     def add_table(self, df, table_id=None, sortable=True, width=None):
         self.elements.append(("table", df, width))
@@ -156,16 +159,16 @@ class Page(AbstractPage):
                 header_tag = {1: h1, 2: h2, 3: h3, 4: h4}[level]
                 elem = header_tag(text)
             elif kind == "plot":
-                # content may be stored as (figure, height), (figure, height, width_px)
-                # or (figure, height, width_px, align)
+                # content may be stored as (figure, height), (figure, height, width)
+                # or (figure, height, width, align)
                 specified_height = None
-                specified_width_px = None
+                specified_width = None
                 specified_align = "center"
                 if isinstance(content, (list, tuple)):
                     if len(content) == 4:
-                        fig, specified_height, specified_width_px, specified_align = content
+                        fig, specified_height, specified_width, specified_align = content
                     elif len(content) == 3:
-                        fig, specified_height, specified_width_px = content
+                        fig, specified_height, specified_width = content
                     elif len(content) == 2:
                         fig, specified_height = content
                     else:
@@ -203,27 +206,48 @@ class Page(AbstractPage):
                         try:
                             if specified_height is not None:
                                 fig.update_layout(height=specified_height)
-                            if specified_width_px is not None:
-                                fig.update_layout(width=specified_width_px)
+                            if specified_width is not None:
+                                fig.update_layout(width=specified_width)
                         except Exception:
                             pass
 
-                        # If a local vendored Plotly exists, rely on the head script.
-                        # Otherwise include Plotly from CDN so the inline newPlot call works.
-                        vendor_plotly = os.path.join(os.path.dirname(__file__), "assets", "vendor", "plotly", "plotly.min.js")
-                        include_plotly = False
-                        if not os.path.exists(vendor_plotly):
-                            include_plotly = "cdn"
-                        plotly_html = fig.to_html(full_html=False, include_plotlyjs=include_plotly, config={'responsive': True})
-
-                        # Wrap the Plotly HTML in a container with explicit pixel sizing
-                        container_style = "width:100%;"
-                        if specified_width_px is not None:
-                            container_style = f"width:{specified_width_px}px;"
-                        if specified_height is not None:
-                            container_style = container_style + f" height:{specified_height}px;"
+                        # Defer Plotly.newPlot until the Plotly bundle is available
+                        # by embedding the figure JSON and calling newPlot from a
+                        # small loader that polls for `window.Plotly`.
+                        try:
+                            fig_json = fig.to_json()
+                        except Exception:
+                            # Fallback: use the html fragment (older path)
+                            plotly_html = fig.to_html(full_html=False, include_plotlyjs=False, config={'responsive': True})
+                            container_style = "width:100%;"
+                            if specified_width is not None:
+                                container_style = f"width:{specified_width}px;"
+                            if specified_height is not None:
+                                container_style = container_style + f" height:{specified_height}px;"
+                            plot_wrapped = f'<div style="{container_style}">{plotly_html}</div>'
+                        else:
+                            fig_json = fig_json.replace('</script>', '<\\/script>')
+                            div_id = f'plot-{uuid.uuid4()}'
+                            container_style = "width:100%;"
+                            if specified_width is not None:
+                                container_style = f"width:{specified_width}px;"
+                            if specified_height is not None:
+                                container_style = container_style + f" height:{specified_height}px;"
+
+                            plot_div = f'<div id="{div_id}" class="plotly-graph-div" style="{container_style}"></div>'
+                            loader = (
+                                '<script type="text/javascript">(function(){' \
+                                f'var fig = {fig_json};' \
+                                'function tryPlot(){' \
+                                'if(window.Plotly && typeof window.Plotly.newPlot === "function"){' \
+                                f'Plotly.newPlot("{div_id}", fig.data, fig.layout, {json.dumps({"responsive": True})});' \
+                                '} else { setTimeout(tryPlot, 50); }' \
+                                '}' \
+                                'if(document.readyState === "complete"){ tryPlot(); } else { window.addEventListener("load", tryPlot); }' \
+                                '})();</script>'
+                            )
+                            plot_wrapped = plot_div + loader
 
-                        plot_wrapped = f'<div style="{container_style}">{plotly_html}</div>'
                         # Apply alignment wrapper
                         if specified_align not in ("left", "right", "center"):
                             specified_align = "center"
@@ -241,7 +265,7 @@ class Page(AbstractPage):
                         try:
                             if specified_height is not None:
                                 fig.update_layout(height=orig_height)
-                            if specified_width_px is not None:
+                            if specified_width is not None:
                                 fig.update_layout(width=orig_width)
                         except Exception:
                             pass
@@ -258,12 +282,12 @@ class Page(AbstractPage):
                         except Exception:
                             dpi = None
                         try:
-                            if dpi is not None and (specified_height is not None or specified_width_px is not None):
+                            if dpi is not None and (specified_height is not None or specified_width is not None):
                                 orig_size = fig.get_size_inches()
                                 new_w = orig_size[0]
                                 new_h = orig_size[1]
-                                if specified_width_px is not None:
-                                    new_w = specified_width_px / dpi
+                                if specified_width is not None:
+                                    new_w = specified_width / dpi
                                 if specified_height is not None:
                                     new_h = specified_height / dpi
                                 fig.set_size_inches(new_w, new_h)
@@ -285,8 +309,8 @@ class Page(AbstractPage):
                         img_style = "max-width:100%;"
                         if specified_height is not None:
                             img_style = img_style + f" height:{specified_height}px;"
-                        if specified_width_px is not None:
-                            img_style = img_style + f" width:{specified_width_px}px;"
+                        if specified_width is not None:
+                            img_style = img_style + f" width:{specified_width}px;"
 
                         if specified_align not in ("left", "right", "center"):
                             specified_align = "center"
@@ -378,12 +402,15 @@ class MiniPage(AbstractPage):
                 header_tag = {1: h1, 2: h2, 3: h3, 4: h4}[level]
                 elem = header_tag(text)
             elif kind == "plot":
-                # content may be stored as (figure, height) or (figure, height, width_px)
+                # content may be stored as (figure, height, width, align)
                 specified_height = None
-                specified_width_px = None
+                specified_width = None
+                specified_align = "center"
                 if isinstance(content, (list, tuple)):
-                    if len(content) == 3:
-                        fig, specified_height, specified_width_px = content
+                    if len(content) == 4:
+                        fig, specified_height, specified_width, specified_align = content
+                    elif len(content) == 3:
+                        fig, specified_height, specified_width = content
                     elif len(content) == 2:
                         fig, specified_height = content
                     else:
@@ -418,22 +445,47 @@ class MiniPage(AbstractPage):
                         try:
                             if specified_height is not None:
                                 fig.update_layout(height=specified_height)
-                            if specified_width_px is not None:
-                                fig.update_layout(width=specified_width_px)
+                            if specified_width is not None:
+                                fig.update_layout(width=specified_width)
                         except Exception:
                             pass
 
-                        vendor_plotly = os.path.join(os.path.dirname(__file__), "assets", "vendor", "plotly", "plotly.min.js")
-                        include_plotly = False
-                        if not os.path.exists(vendor_plotly):
-                            include_plotly = "cdn"
-                        plotly_html = fig.to_html(full_html=False, include_plotlyjs=include_plotly, config={'responsive': True})
-                        container_style = "width:100%;"
-                        if specified_width_px is not None:
-                            container_style = f"width:{specified_width_px}px;"
-                        if specified_height is not None:
-                            container_style = container_style + f" height:{specified_height}px;"
-                        plot_wrapped = f'<div style="{container_style}">{plotly_html}</div>'
+                        # Defer Plotly.newPlot until the Plotly bundle is available
+                        # by embedding the figure JSON and calling newPlot from a
+                        # small loader that polls for `window.Plotly`.
+                        try:
+                            fig_json = fig.to_json()
+                        except Exception:
+                            # Fallback: use the html fragment (older path)
+                            plotly_html = fig.to_html(full_html=False, include_plotlyjs=False, config={'responsive': True})
+                            container_style = "width:100%;"
+                            if specified_width is not None:
+                                container_style = f"width:{specified_width}px;"
+                            if specified_height is not None:
+                                container_style = container_style + f" height:{specified_height}px;"
+                            plot_wrapped = f'<div style="{container_style}">{plotly_html}</div>'
+                        else:
+                            fig_json = fig_json.replace('</script>', '<\\/script>')
+                            div_id = f'plot-{uuid.uuid4()}'
+                            container_style = "width:100%;"
+                            if specified_width is not None:
+                                container_style = f"width:{specified_width}px;"
+                            if specified_height is not None:
+                                container_style = container_style + f" height:{specified_height}px;"
+
+                            plot_div = f'<div id="{div_id}" class="plotly-graph-div" style="{container_style}"></div>'
+                            loader = (
+                                '<script type="text/javascript">(function(){' \
+                                f'var fig = {fig_json};' \
+                                'function tryPlot(){' \
+                                'if(window.Plotly && typeof window.Plotly.newPlot === "function"){' \
+                                f'Plotly.newPlot("{div_id}", fig.data, fig.layout, {json.dumps({"responsive": True})});' \
+                                '} else { setTimeout(tryPlot, 50); }' \
+                                '}' \
+                                'if(document.readyState === "complete"){ tryPlot(); } else { window.addEventListener("load", tryPlot); }' \
+                                '})();</script>'
+                            )
+                            plot_wrapped = plot_div + loader
                         if specified_align not in ("left", "right", "center"):
                             specified_align = "center"
                         if specified_align == "center":
@@ -448,7 +500,7 @@ class MiniPage(AbstractPage):
                         try:
                             if specified_height is not None:
                                 fig.update_layout(height=orig_height)
-                            if specified_width_px is not None:
+                            if specified_width is not None:
                                 fig.update_layout(width=orig_width)
                         except Exception:
                             pass
@@ -465,12 +517,12 @@ class MiniPage(AbstractPage):
                         except Exception:
                             dpi = None
                         try:
-                            if dpi is not None and (specified_height is not None or specified_width_px is not None):
+                            if dpi is not None and (specified_height is not None or specified_width is not None):
                                 orig_size = fig.get_size_inches()
                                 new_w = orig_size[0]
                                 new_h = orig_size[1]
-                                if specified_width_px is not None:
-                                    new_w = specified_width_px / dpi
+                                if specified_width is not None:
+                                    new_w = specified_width / dpi
                                 if specified_height is not None:
                                     new_h = specified_height / dpi
                                 fig.set_size_inches(new_w, new_h)
@@ -492,8 +544,8 @@ class MiniPage(AbstractPage):
                         img_style = "max-width:100%;"
                         if specified_height is not None:
                             img_style = img_style + f" height:{specified_height}px;"
-                        if specified_width_px is not None:
-                            img_style = img_style + f" width:{specified_width_px}px;"
+                        if specified_width is not None:
+                            img_style = img_style + f" width:{specified_width}px;"
                         if specified_align not in ("left", "right", "center"):
                             specified_align = "center"
                         if specified_align == "center":

{staticdash-2026.4.dist-info → staticdash-2026.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: staticdash
-Version: 2026.4
+Version: 2026.6
 Summary: A lightweight static HTML dashboard generator with Plotly and pandas support.
 Author-email: Brian Day <brian.day1@gmail.com>
 License: CC0-1.0

{staticdash-2026.4.dist-info → staticdash-2026.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 staticdash/__init__.py,sha256=MQGR6LAqx2aFEA64MZz1ADxwpXLPn3VYNVIyjt9qx4Q,268
-staticdash/dashboard.py,sha256=pR1AmmisyBAiPTUHlijPwF2E6bQJjU-9ZhWGTcVSeC0,42833
+staticdash/dashboard.py,sha256=7XCwSKzmY9K-DwSikzykQGtbsxzxEfqAaTJlUP-KuGE,46106
 staticdash/assets/css/style.css,sha256=AOYdkw-nK_WvV6im_Y34gz4rJZWifk5o-mRmCKwMP60,7014
 staticdash/assets/js/script.js,sha256=7xBRlz_19wybbNVwAcfuKNXtDEojGB4EB0Yj4klsoTA,6998
 staticdash/assets/vendor/mathjax/tex-mml-chtml.js,sha256=MASABpB4tYktI2Oitl4t-78w_lyA-D7b_s9GEP0JOGI,1173007
@@ -13,7 +13,7 @@ staticdash/assets/vendor/prism/components/prism-json.min.js,sha256=lW2GuqWufsQQZ
 staticdash/assets/vendor/prism/components/prism-markup.min.js,sha256=h5_J0lbDUtmA4FOFf6cHMwhTuL-2fOKE6mYaJN7FdW4,2850
 staticdash/assets/vendor/prism/components/prism-python.min.js,sha256=7UOFaFvPLUk1yNu6tL3hZgPaEyngktK_NsPa3WfpqFw,2113
 staticdash/assets/vendor/prism/components/prism-sql.min.js,sha256=P8X4zmmVDsc63JcvBh30Kq6nj6pIZHCRNOoq3Ag_OjM,3261
-staticdash-2026.4.dist-info/METADATA,sha256=FhGqUb1OWQuzZ_Jjtip3xV5gQjzJRHBV2pDuOTe2Y6A,2521
-staticdash-2026.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-staticdash-2026.4.dist-info/top_level.txt,sha256=3MzZU6SptkUkjcHV1cvPji0H4aRzPphLHnpStgGEcxM,11
-staticdash-2026.4.dist-info/RECORD,,
+staticdash-2026.6.dist-info/METADATA,sha256=gYrNTyhXOQWigyRspfiGBRzPJ7qfV17nooCMRFUdH-o,2521
+staticdash-2026.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+staticdash-2026.6.dist-info/top_level.txt,sha256=3MzZU6SptkUkjcHV1cvPji0H4aRzPphLHnpStgGEcxM,11
+staticdash-2026.6.dist-info/RECORD,,