openseries 2.1.0__tar.gz → 2.1.2__tar.gz

{openseries-2.1.0 → openseries-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openseries
-Version: 2.1.0
+Version: 2.1.2
 Summary: Tools for analyzing financial timeseries.
 License-Expression: BSD-3-Clause
 License-File: LICENSE.md

{openseries-2.1.0 → openseries-2.1.2}/openseries/report.py

@@ -21,7 +21,6 @@ if TYPE_CHECKING:  # pragma: no cover
 
 from pandas import DataFrame, Index, Series, Timestamp, concat
 from plotly.io import to_html  # type: ignore[import-untyped]
-from plotly.offline import plot  # type: ignore[import-untyped]
 from plotly.subplots import make_subplots  # type: ignore[import-untyped]
 
 from .load_plotly import load_plotly_dict
@@ -418,7 +417,168 @@ def _prepare_table_data(
     return cleanedtablevalues, columns, aligning, color_lst
 
 
-def _build_mobile_layout_figure(
+def _configure_figure_layout(
+    figure: Figure,
+    copied: OpenFrame,
+    *,
+    add_logo: bool,
+    vertical_legend: bool,
+    title: str | None,
+) -> None:
+    """Configure figure layout with logo, legend, and title.
+
+    Args:
+        figure: Plotly figure to configure.
+        copied: Copied OpenFrame data.
+        add_logo: Whether to add logo.
+        vertical_legend: Whether to use vertical legend.
+        title: Optional title for the figure.
+    """
+    fig, logo = load_plotly_dict()
+
+    if add_logo:
+        logo_copy = logo.copy()
+        figure.add_layout_image(logo_copy)
+
+    figure.update_layout(fig.get("layout"))
+    colorway: list[str] = cast("dict[str, list[str]]", fig["layout"]).get(
+        "colorway",
+        [],
+    )
+
+    if vertical_legend:
+        legend = {
+            "yanchor": "bottom",
+            "y": -0.04,
+            "xanchor": "right",
+            "x": 0.98,
+            "orientation": "v",
+        }
+    else:
+        legend = {
+            "yanchor": "bottom",
+            "y": -0.2,
+            "xanchor": "right",
+            "x": 0.98,
+            "orientation": "h",
+        }
+
+    layout_updates: dict[str, object] = {
+        "legend": legend,
+        "colorway": colorway[: copied.item_count],
+        "autosize": True,
+        "margin": {"l": 50, "r": 50, "t": 80, "b": 50, "pad": 10},
+    }
+
+    figure.update_layout(**layout_updates)
+
+    figure.update_xaxes(gridcolor="#EEEEEE", automargin=True, tickangle=-45)
+    figure.update_yaxes(tickformat=".2%", gridcolor="#EEEEEE", automargin=True)
+    title_size = 36
+
+    if title:
+        figure.update_layout(
+            {"title": {"text": f"<b>{title}</b><br>", "font": {"size": title_size}}},
+        )
+
+
+def _get_bar_dataframe(
+    copied: OpenFrame,
+    bar_freq: LiteralBizDayFreq,
+) -> DataFrame:
+    """Get bar chart DataFrame based on year fraction.
+
+    Args:
+        copied: Copied OpenFrame data.
+        bar_freq: The date offset string for bar plot frequency.
+
+    Returns:
+        Bar chart DataFrame.
+    """
+    quarter_of_year = 0.25
+    if copied.yearfrac < quarter_of_year:
+        tmp = copied.from_deepcopy()
+        return tmp.value_to_ret().tsdf.iloc[1:]
+    return calendar_period_returns(data=copied, freq=bar_freq)
+
+
+def _build_desktop_figure(
+    copied: OpenFrame,
+    bdf: DataFrame,
+    cleanedtablevalues: list[list[str]],
+    columns: list[str],
+    aligning: list[str],
+    color_lst: list[str],
+) -> Figure:
+    """Build the desktop figure with plots and table.
+
+    Args:
+        copied: Copied OpenFrame data.
+        bdf: Bar chart DataFrame.
+        cleanedtablevalues: Table cell values.
+        columns: Table column headers.
+        aligning: Table cell alignment.
+        color_lst: Table cell colors.
+
+    Returns:
+        Desktop figure with plots and table.
+    """
+    figure = make_subplots(
+        rows=2,
+        cols=2,
+        specs=[
+            [{"type": "xy"}, {"rowspan": 2, "type": "table"}],
+            [{"type": "xy"}, None],
+        ],
+    )
+
+    for item, lbl in enumerate(copied.columns_lvl_zero):
+        figure.add_scatter(
+            x=copied.tsdf.index,
+            y=copied.tsdf.iloc[:, item],
+            hovertemplate="%{y:.2%}<br>%{x|%Y-%m-%d}",
+            line={"width": 2.5, "dash": "solid"},
+            mode="lines",
+            name=lbl,
+            showlegend=True,
+            row=1,
+            col=1,
+        )
+
+    for item in range(copied.item_count):
+        col_name = cast("tuple[str, ValueType]", bdf.iloc[:, item].name)
+        figure.add_bar(
+            x=bdf.index,
+            y=bdf.iloc[:, item],
+            hovertemplate="%{y:.2%}<br>%{x}",
+            name=col_name[0],
+            showlegend=False,
+            row=2,
+            col=1,
+        )
+
+    figure.add_table(
+        header={
+            "values": columns,
+            "align": "center",
+            "fill_color": "grey",
+            "font": {"color": "white"},
+        },
+        cells={
+            "values": cleanedtablevalues,
+            "align": aligning,
+            "height": 25,
+            "fill_color": color_lst,
+            "font": {"color": ["white"] + ["black"] * len(columns)},
+        },
+        row=1,
+        col=2,
+    )
+
+    return figure
+
+
+def _build_mobile_figure(
     copied: OpenFrame,
     bdf: DataFrame,
     *,
@@ -426,7 +586,7 @@ def _build_mobile_layout_figure(
     vertical_legend: bool,
     title: str | None,
 ) -> Figure:
-    """Build a mobile-optimized vertical layout figure with only charts.
+    """Build the mobile figure with charts only.
 
     Args:
         copied: Copied OpenFrame data.
@@ -436,7 +596,7 @@ def _build_mobile_layout_figure(
         title: Optional title for the figure.
 
     Returns:
-        Mobile layout figure (without table).
+        Mobile layout figure.
     """
     plot_height = 400
     bar_height = 350
@@ -482,26 +642,105 @@ def _build_mobile_layout_figure(
             col=1,
         )
 
-    _configure_figure_layout(
-        figure_mobile,
-        copied,
-        add_logo=add_logo,
-        vertical_legend=vertical_legend,
-        title=title,
-        mobile=True,
-        total_min_height=total_min_height,
+    fig, logo = load_plotly_dict()
+
+    if add_logo:
+        logo_copy = logo.copy()
+        logo_copy["x"] = 0.99
+        logo_copy["xanchor"] = "right"
+        figure_mobile.add_layout_image(logo_copy)
+
+    figure_mobile.update_layout(fig.get("layout"))
+    colorway: list[str] = cast("dict[str, list[str]]", fig["layout"]).get(
+        "colorway",
+        [],
     )
 
+    if vertical_legend:
+        legend = {
+            "yanchor": "bottom",
+            "y": -0.04,
+            "xanchor": "right",
+            "x": 0.98,
+            "orientation": "v",
+        }
+    else:
+        legend = {
+            "yanchor": "bottom",
+            "y": -0.2,
+            "xanchor": "right",
+            "x": 0.98,
+            "orientation": "h",
+        }
+
+    layout_updates: dict[str, object] = {
+        "legend": legend,
+        "colorway": colorway[: copied.item_count],
+        "autosize": False,
+        "height": total_min_height,
+        "margin": {"l": 50, "r": 50, "t": 80, "b": 50, "pad": 10},
+    }
+
+    figure_mobile.update_layout(**layout_updates)
+
+    figure_mobile.update_xaxes(
+        gridcolor="#EEEEEE",
+        automargin=True,
+        tickangle=-45,
+        row=1,
+        col=1,
+    )
+    figure_mobile.update_xaxes(
+        gridcolor="#EEEEEE",
+        automargin=True,
+        tickangle=-45,
+        row=2,
+        col=1,
+    )
+    figure_mobile.update_yaxes(
+        tickformat=".2%",
+        gridcolor="#EEEEEE",
+        automargin=True,
+        row=1,
+        col=1,
+    )
+    figure_mobile.update_yaxes(
+        tickformat=".2%",
+        gridcolor="#EEEEEE",
+        automargin=True,
+        row=2,
+        col=1,
+    )
+
+    plot_height = 400
+    bar_height = 350
+    spacing = 0.08
+    plot_domain_top = 1.0
+    plot_domain_bottom = 1.0 - (plot_height / total_min_height)
+    bar_domain_top = plot_domain_bottom - spacing
+    bar_domain_bottom = bar_domain_top - (bar_height / total_min_height)
+
+    figure_mobile.update_layout(
+        yaxis_domain=[plot_domain_bottom, plot_domain_top],
+        yaxis2_domain=[bar_domain_bottom, bar_domain_top],
+    )
+
+    title_size = 24
+    if title:
+        figure_mobile.update_layout(
+            {"title": {"text": f"<b>{title}</b><br>", "font": {"size": title_size}}},
+        )
+
     return figure_mobile
 
 
-def _generate_html_table(
+def _generate_html_table_string(
     cleanedtablevalues: list[list[str]],
     columns: list[str],
     aligning: list[str],
     color_lst: list[str],
 ) -> str:
-    """Generate an HTML table from table data.
+    """Generate HTML table string for mobile layout.
 
     Args:
         cleanedtablevalues: Table cell values.
@@ -562,148 +801,28 @@ def _generate_html_table(
     return table_html
 
 
-def _configure_figure_layout(
-    figure: Figure,
-    copied: OpenFrame,
-    *,
-    add_logo: bool,
-    vertical_legend: bool,
-    title: str | None,
-    mobile: bool = False,
-    total_min_height: int | None = None,
-    table_min_height: int | None = None,
-) -> None:
-    """Configure figure layout with logo, legend, and title.
+def _get_output_directory(directory: Path | None) -> Path:
+    """Get the output directory path.
 
     Args:
-        figure: Plotly figure to configure.
-        copied: Copied OpenFrame data.
-        add_logo: Whether to add logo.
-        vertical_legend: Whether to use vertical legend.
-        title: Optional title for the figure.
-        mobile: Whether this is a mobile layout. Defaults to False.
-        total_min_height: Minimum total height for mobile layout in pixels.
-        table_min_height: Minimum height for table subplot in pixels.
-    """
-    fig, logo = load_plotly_dict()
-
-    if add_logo:
-        figure.add_layout_image(logo)
-
-    figure.update_layout(fig.get("layout"))
-    colorway: list[str] = cast("dict[str, list[str]]", fig["layout"]).get(
-        "colorway",
-        [],
-    )
-
-    if vertical_legend:
-        legend = {
-            "yanchor": "bottom",
-            "y": -0.04,
-            "xanchor": "right",
-            "x": 0.98,
-            "orientation": "v",
-        }
-    else:
-        legend = {
-            "yanchor": "bottom",
-            "y": -0.2,
-            "xanchor": "right",
-            "x": 0.98,
-            "orientation": "h",
-        }
+        directory: Optional directory path.
 
-    if mobile:
-        if vertical_legend:
-            legend = {
-                "yanchor": "top",
-                "y": 1.02,
-                "xanchor": "left",
-                "x": 0,
-                "orientation": "h",
-            }
-        else:
-            legend = {
-                "yanchor": "top",
-                "y": 1.02,
-                "xanchor": "left",
-                "x": 0,
-                "orientation": "h",
-            }
-
-    layout_updates: dict[str, object] = {
-        "legend": legend,
-        "colorway": colorway[: copied.item_count],
-        "autosize": True,
-        "margin": {"l": 50, "r": 50, "t": 80, "b": 50, "pad": 10},
-    }
-
-    if mobile and total_min_height is not None:
-        layout_updates["height"] = total_min_height
-        layout_updates["autosize"] = False
-
-    figure.update_layout(**layout_updates)
-
-    if mobile:
-        figure.update_xaxes(
-            gridcolor="#EEEEEE",
-            automargin=True,
-            tickangle=-45,
-            row=1,
-            col=1,
-        )
-        figure.update_xaxes(
-            gridcolor="#EEEEEE",
-            automargin=True,
-            tickangle=-45,
-            row=2,
-            col=1,
-        )
-        figure.update_yaxes(
-            tickformat=".2%",
-            gridcolor="#EEEEEE",
-            automargin=True,
-            row=1,
-            col=1,
-        )
-        figure.update_yaxes(
-            tickformat=".2%",
-            gridcolor="#EEEEEE",
-            automargin=True,
-            row=2,
-            col=1,
-        )
-        if table_min_height is not None and total_min_height is not None:
-            plot_height = 400
-            bar_height = 350
-            spacing = 0.08
-            plot_domain_top = 1.0
-            plot_domain_bottom = 1.0 - (plot_height / total_min_height)
-            bar_domain_top = plot_domain_bottom - spacing
-            bar_domain_bottom = bar_domain_top - (bar_height / total_min_height)
-
-            figure.update_layout(
-                yaxis_domain=[plot_domain_bottom, plot_domain_top],
-                yaxis2_domain=[bar_domain_bottom, bar_domain_top],
-            )
-        title_size = 24
-    else:
-        figure.update_xaxes(gridcolor="#EEEEEE", automargin=True, tickangle=-45)
-        figure.update_yaxes(tickformat=".2%", gridcolor="#EEEEEE", automargin=True)
-        title_size = 36
-
-    if title:
-        figure.update_layout(
-            {"title": {"text": f"<b>{title}</b><br>", "font": {"size": title_size}}},
-        )
+    Returns:
+        Resolved directory path.
+    """
+    if directory:
+        return Path(directory).resolve()
+    if Path.home().joinpath("Documents").exists():
+        return Path.home() / "Documents"
+    return Path(stack()[2].filename).parent
 
 
-def _generate_responsive_html(
+def _generate_responsive_html_string(
     html_desktop: str,
     html_mobile: str,
     div_id_desktop: str,
     div_id_mobile: str,
-    table_html: str | None = None,
+    table_html: str,
 ) -> str:
     """Generate responsive HTML wrapper with CSS and JavaScript.
 
@@ -712,20 +831,21 @@ def _generate_responsive_html(
         html_mobile: Mobile layout HTML.
         div_id_desktop: Desktop container div ID.
         div_id_mobile: Mobile container div ID.
-        table_html: Optional HTML table for mobile layout.
+        table_html: HTML table string for mobile layout.
 
     Returns:
         Responsive HTML string.
     """
     desktop_style = "width:100%;"
     mobile_style = "width:100%; display:none;"
-    match_media = 'window.matchMedia("(max-width: 960px)").matches'
+    match_media = (
+        '(window.matchMedia("(max-width: 960px)").matches || '
+        '"ontouchstart" in window || navigator.maxTouchPoints > 0)'
+    )
     desktop_get = f'document.getElementById("{div_id_desktop}_container")'
     mobile_get = f'document.getElementById("{div_id_mobile}_container")'
 
-    mobile_content = html_mobile
-    if table_html:
-        mobile_content += f"\n{table_html}"
+    mobile_content = html_mobile + f"\n{table_html}"
 
     return (
         f'<div id="{div_id_desktop}_container" '
@@ -738,7 +858,7 @@ def _generate_responsive_html(
         f"</div>\n"
         "<style>\n"
         "body { overflow-y: auto; }\n"
-        "@media (max-width: 960px) {\n"
+        "@media (max-width: 960px), (pointer: coarse), (hover: none) {\n"
         "    .plotly-desktop { display: none !important; }\n"
         "    .plotly-mobile { display: block !important; "
         "overflow: visible !important; }\n"
@@ -762,13 +882,55 @@ def _generate_responsive_html(
         "    .plotly-mobile [style*='overflow'] { "
         "overflow: visible !important; overflow-y: visible !important; }\n"
         "}\n"
-        "@media (min-width: 961px) {\n"
+        "@media (min-width: 961px) and (pointer: fine) and (hover: hover) {\n"
         "    .plotly-desktop { display: block !important; }\n"
         "    .plotly-mobile { display: none !important; }\n"
+        "    .plotly-desktop .js-plotly-plot { "
+        "overflow: hidden !important; overflow-y: hidden !important; "
+        "overflow-x: hidden !important; }\n"
+        "    .plotly-desktop .js-plotly-plot > div { "
+        "overflow: hidden !important; overflow-y: hidden !important; "
+        "overflow-x: hidden !important; max-height: 100% !important; }\n"
+        "    .plotly-desktop .js-plotly-plot svg { "
+        "overflow: hidden !important; }\n"
+        "    .plotly-desktop * { "
+        "overflow-y: hidden !important; }\n"
+        '    .plotly-desktop [style*="overflow"] { '
+        "overflow: hidden !important; overflow-y: hidden !important; }\n"
+        "    .plotly-desktop .scrollbar-kit { "
+        "display: none !important; visibility: hidden !important; "
+        "opacity: 0 !important; }\n"
+        "    .plotly-desktop .scrollbar-slider { "
+        "display: none !important; visibility: hidden !important; "
+        "opacity: 0 !important; }\n"
+        "    .plotly-desktop .scrollbar-glyph { "
+        "display: none !important; visibility: hidden !important; "
+        "opacity: 0 !important; }\n"
         "}\n"
         "</style>\n"
         "<script>\n"
         "(function() {\n"
+        "    function adjustLogoPosition(container) {\n"
+        "        if (!container) return;\n"
+        "        var plots = container.querySelectorAll('.js-plotly-plot');\n"
+        "        plots.forEach(function(plot) {\n"
+        "            var svg = plot.querySelector('svg');\n"
+        "            if (!svg) return;\n"
+        "            var images = svg.querySelectorAll('image[xref=\"paper\"]');\n"
+        "            images.forEach(function(img) {\n"
+        "                var isNarrow = window.matchMedia("
+        "'(max-width: 960px)').matches;\n"
+        "                if (isNarrow) {\n"
+        "                    img.setAttribute('x', '0.99');\n"
+        "                    img.setAttribute('xanchor', 'right');\n"
+        "                } else {\n"
+        "                    img.setAttribute('x', '0.01');\n"
+        "                    img.removeAttribute('xanchor');\n"
+        "                }\n"
+        "            });\n"
+        "        });\n"
+        "    }\n"
+        "\n"
         "    function updateLayout() {\n"
         f"        var isMobile = {match_media};\n"
         f"        var desktopContainer = {desktop_get};\n"
@@ -789,50 +951,272 @@ def _generate_responsive_html(
         'desktopContainer.style.display = "block";\n'
         "            if (mobileContainer) "
         'mobileContainer.style.display = "none";\n'
+        "            disableTableScrolling(desktopContainer);\n"
+        "            setTimeout(function() { "
+        "adjustTableSize(desktopContainer); "
+        "adjustLogoPosition(desktopContainer); }, 100);\n"
         "        }\n"
+        "        adjustLogoPosition(desktopContainer);\n"
+        "    }\n"
+        "\n"
+        "    function adjustTableSize(container) {\n"
+        "        if (!container) return;\n"
+        "        \n"
+        "        function forceNoScroll() {\n"
+        "            var scrollbarKits = container.querySelectorAll("
+        "'.scrollbar-kit');\n"
+        "            scrollbarKits.forEach(function(el) {\n"
+        "                el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                el.style.setProperty('opacity', '0', 'important');\n"
+        "            });\n"
+        "            \n"
+        "            var scrollbarSliders = container.querySelectorAll("
+        "'.scrollbar-slider');\n"
+        "            scrollbarSliders.forEach(function(el) {\n"
+        "                el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                el.style.setProperty('opacity', '0', 'important');\n"
+        "            });\n"
+        "            \n"
+        "            var scrollbarGlyphs = container.querySelectorAll("
+        "'.scrollbar-glyph');\n"
+        "            scrollbarGlyphs.forEach(function(el) {\n"
+        "                el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                el.style.setProperty('opacity', '0', 'important');\n"
+        "            });\n"
+        "            \n"
+        "            var allElements = container.querySelectorAll('*');\n"
+        "            allElements.forEach(function(el) {\n"
+        "                var computed = window.getComputedStyle(el);\n"
+        "                if (computed.overflowY === 'auto' || "
+        "computed.overflowY === 'scroll' || computed.overflow === 'auto' || "
+        "computed.overflow === 'scroll') {\n"
+        "                    el.style.setProperty('overflow', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('overflow-y', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('overflow-x', 'hidden', "
+        "'important');\n"
+        "                }\n"
+        "                if (el.scrollHeight > el.clientHeight && "
+        "el.clientHeight > 0) {\n"
+        "                    el.style.setProperty('max-height', "
+        "el.clientHeight + 'px', 'important');\n"
+        "                    el.style.setProperty('overflow', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('overflow-y', 'hidden', "
+        "'important');\n"
+        "                }\n"
+        "            });\n"
+        "        }\n"
+        "        \n"
+        "        var plots = container.querySelectorAll('.js-plotly-plot');\n"
+        "        plots.forEach(function(plot) {\n"
+        "            var svg = plot.querySelector('svg');\n"
+        "            if (!svg) return;\n"
+        "            var tableGroup = svg.querySelector('g[class*=\"table\"]');\n"
+        "            if (!tableGroup) return;\n"
+        "            var plotRect = plot.getBoundingClientRect();\n"
+        "            if (plotRect.height === 0) return;\n"
+        "            \n"
+        "            function adjustTable() {\n"
+        "                try {\n"
+        "                    forceNoScroll();\n"
+        "                    \n"
+        "                    var availableHeight = plotRect.height - 100;\n"
+        "                    if (availableHeight <= 0) return;\n"
+        "                    \n"
+        "                    var rows = tableGroup.querySelectorAll("
+        "'g[class*=\"row\"]');\n"
+        "                    if (rows.length === 0) return;\n"
+        "                    \n"
+        "                    var rowCount = rows.length;\n"
+        "                    var calculatedRowHeight = availableHeight / rowCount;\n"
+        "                    var minRowHeight = 18;\n"
+        "                    var maxRowHeight = 35;\n"
+        "                    var rowHeight = Math.max(minRowHeight, "
+        "Math.min(maxRowHeight, calculatedRowHeight));\n"
+        "                    \n"
+        "                    var baseFontSize = 12;\n"
+        "                    var fontScale = rowHeight / 25;\n"
+        "                    var fontSize = baseFontSize * fontScale;\n"
+        "                    var minFontSize = 9;\n"
+        "                    var maxFontSize = 14;\n"
+        "                    fontSize = Math.max(minFontSize, "
+        "Math.min(maxFontSize, fontSize));\n"
+        "                    \n"
+        "                    rows.forEach(function(row, rowIndex) {\n"
+        "                        var yPos = rowIndex * rowHeight;\n"
+        "                        var rects = row.querySelectorAll('rect');\n"
+        "                        var texts = row.querySelectorAll('text');\n"
+        "                        \n"
+        "                        rects.forEach(function(rect) {\n"
+        "                            var currentHeight = "
+        "parseFloat(rect.getAttribute('height') || '25');\n"
+        "                            if (currentHeight > 0) {\n"
+        "                                rect.setAttribute('height', "
+        "rowHeight.toString());\n"
+        "                                var currentY = "
+        "parseFloat(rect.getAttribute('y') || '0');\n"
+        "                                var rowBaseY = Math.floor(currentY / "
+        "currentHeight) * rowHeight;\n"
+        "                                rect.setAttribute('y', "
+        "rowBaseY.toString());\n"
+        "                            }\n"
+        "                        });\n"
+        "                        \n"
+        "                        texts.forEach(function(text) {\n"
+        "                            text.setAttribute('font-size', "
+        "fontSize.toString());\n"
+        "                        });\n"
+        "                    });\n"
+        "                    \n"
+        "                    var existingTransform = "
+        "tableGroup.getAttribute('transform') || '';\n"
+        "                    var translateMatch = "
+        "existingTransform.match(/translate\\(([^)]+)\\)/);\n"
+        "                    var translate = translateMatch ? "
+        "translateMatch[0] : 'translate(0,0)';\n"
+        "                    tableGroup.setAttribute('transform', translate);\n"
+        "                    \n"
+        "                    forceNoScroll();\n"
+        "                } catch (e) {\n"
+        "                    console.log('Table adjustment error:', e);\n"
+        "                }\n"
+        "            }\n"
+        "            \n"
+        "            setTimeout(adjustTable, 200);\n"
+        "            setTimeout(adjustTable, 600);\n"
+        "            setTimeout(adjustTable, 1200);\n"
+        "            setTimeout(adjustTable, 2000);\n"
+        "        });\n"
         "    }\n"
         "\n"
         "    function disableTableScrolling(container) {\n"
         "        if (!container) return;\n"
+        "        var isDesktop = container.classList && "
+        "container.classList.contains('plotly-desktop');\n"
+        "        var overflowValue = isDesktop ? 'hidden' : 'visible';\n"
         "        var plots = container.querySelectorAll('.js-plotly-plot');\n"
         "        plots.forEach(function(plot) {\n"
         "            var allElements = plot.querySelectorAll('*');\n"
         "            allElements.forEach(function(el) {\n"
-        "                var style = window.getComputedStyle(el);\n"
-        "                var overflow = style.overflow;\n"
-        "                var overflowY = style.overflowY;\n"
-        "                if (overflow === 'auto' || overflow === 'scroll' || "
+        "                if (el.tagName === 'DIV' || el.tagName === 'SVG') {\n"
+        "                    var style = window.getComputedStyle(el);\n"
+        "                    var overflow = style.overflow;\n"
+        "                    var overflowY = style.overflowY;\n"
+        "                    if (overflow === 'auto' || overflow === 'scroll' || "
         "overflowY === 'auto' || overflowY === 'scroll') {\n"
-        "                    el.style.setProperty('overflow', 'visible', "
-        "'important');\n"
-        "                    el.style.setProperty('overflow-y', 'visible', "
-        "'important');\n"
-        "                    el.style.setProperty('overflow-x', 'visible', "
-        "'important');\n"
+        "                        el.style.setProperty('overflow', "
+        "overflowValue, 'important');\n"
+        "                        el.style.setProperty('overflow-y', "
+        "overflowValue, 'important');\n"
+        "                        el.style.setProperty('overflow-x', "
+        "overflowValue, 'important');\n"
+        "                    }\n"
         "                }\n"
         "            });\n"
-        "            plot.style.setProperty('overflow', 'visible', 'important');\n"
-        "            plot.style.setProperty('overflow-y', 'visible', "
+        "            plot.style.setProperty('overflow', overflowValue, "
+        "'important');\n"
+        "            plot.style.setProperty('overflow-y', overflowValue, "
         "'important');\n"
         "            var plotDivs = plot.querySelectorAll('div');\n"
         "            plotDivs.forEach(function(div) {\n"
-        "                div.style.setProperty('overflow', 'visible', "
+        "                div.style.setProperty('overflow', overflowValue, "
         "'important');\n"
-        "                div.style.setProperty('overflow-y', 'visible', "
+        "                div.style.setProperty('overflow-y', overflowValue, "
         "'important');\n"
         "            });\n"
         "            var svgs = plot.querySelectorAll('svg');\n"
         "            svgs.forEach(function(svg) {\n"
-        "                svg.style.setProperty('overflow', 'visible', 'important');\n"
-        "                svg.setAttribute('overflow', 'visible');\n"
+        "                svg.style.setProperty('overflow', overflowValue, "
+        "'important');\n"
+        "                svg.setAttribute('overflow', overflowValue);\n"
         "            });\n"
         "        });\n"
         "    }\n"
         "\n"
         "    function setupScrollObserver(container) {\n"
         "        if (!container) return;\n"
+        "        var isDesktop = container.classList && "
+        "container.classList.contains('plotly-desktop');\n"
+        "        \n"
+        "        function preventScrollbars() {\n"
+        "            if (isDesktop) {\n"
+        "                var scrollbarKits = container.querySelectorAll("
+        "'.scrollbar-kit');\n"
+        "                scrollbarKits.forEach(function(el) {\n"
+        "                    el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                    el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('opacity', '0', 'important');\n"
+        "                });\n"
+        "                \n"
+        "                var scrollbarSliders = container.querySelectorAll("
+        "'.scrollbar-slider');\n"
+        "                scrollbarSliders.forEach(function(el) {\n"
+        "                    el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                    el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('opacity', '0', 'important');\n"
+        "                });\n"
+        "                \n"
+        "                var scrollbarGlyphs = container.querySelectorAll("
+        "'.scrollbar-glyph');\n"
+        "                scrollbarGlyphs.forEach(function(el) {\n"
+        "                    el.style.setProperty('display', 'none', "
+        "'important');\n"
+        "                    el.style.setProperty('visibility', 'hidden', "
+        "'important');\n"
+        "                    el.style.setProperty('opacity', '0', 'important');\n"
+        "                });\n"
+        "                \n"
+        "                var plots = container.querySelectorAll('.js-plotly-plot');\n"
+        "                plots.forEach(function(plot) {\n"
+        "                    var allElements = plot.querySelectorAll('*');\n"
+        "                    allElements.forEach(function(el) {\n"
+        "                        if (el.tagName === 'DIV' || "
+        "el.tagName === 'SVG') {\n"
+        "                            var style = window.getComputedStyle(el);\n"
+        "                            if (style.overflow === 'auto' || "
+        "style.overflow === 'scroll' || style.overflowY === 'auto' || "
+        "style.overflowY === 'scroll') {\n"
+        "                                el.style.setProperty('overflow', "
+        "'hidden', 'important');\n"
+        "                                el.style.setProperty('overflow-y', "
+        "'hidden', 'important');\n"
+        "                                el.style.setProperty('overflow-x', "
+        "'hidden', 'important');\n"
+        "                            }\n"
+        "                        }\n"
+        "                    });\n"
+        "                    plot.style.setProperty('overflow', 'hidden', "
+        "'important');\n"
+        "                    var svg = plot.querySelector('svg');\n"
+        "                    if (svg) {\n"
+        "                        svg.style.setProperty('overflow', 'hidden', "
+        "'important');\n"
+        "                        svg.setAttribute('overflow', 'hidden');\n"
+        "                    }\n"
+        "                });\n"
+        "                adjustTableSize(container);\n"
+        "            } else {\n"
+        "                disableTableScrolling(container);\n"
+        "            }\n"
+        "        }\n"
+        "        \n"
         "        var observer = new MutationObserver(function(mutations) {\n"
-        "            disableTableScrolling(container);\n"
+        "            preventScrollbars();\n"
         "        });\n"
         "        observer.observe(container, {\n"
         "            childList: true,\n"
@@ -840,13 +1224,25 @@ def _generate_responsive_html(
         "            attributes: true,\n"
         "            attributeFilter: ['style', 'class']\n"
         "        });\n"
+        "        preventScrollbars();\n"
         "        return observer;\n"
         "    }\n"
         "\n"
-        "    window.addEventListener('resize', updateLayout);\n"
+        "    window.addEventListener('resize', function() {\n"
+        "        updateLayout();\n"
+        "        setTimeout(function() {\n"
+        f"            var desktopContainer = {desktop_get};\n"
+        "            if (desktopContainer && "
+        'desktopContainer.style.display !== "none") {\n'
+        "                adjustTableSize(desktopContainer);\n"
+        "                adjustLogoPosition(desktopContainer);\n"
+        "            }\n"
+        "        }, 100);\n"
+        "    });\n"
         "    updateLayout();\n"
         "    var checkInterval = setInterval(function() {\n"
         f"        var mobileContainer = {mobile_get};\n"
+        f"        var desktopContainer = {desktop_get};\n"
         "        if (mobileContainer && "
         'mobileContainer.style.display !== "none") {\n'
         "            disableTableScrolling(mobileContainer);\n"
@@ -855,6 +1251,15 @@ def _generate_responsive_html(
         "setupScrollObserver(mobileContainer);\n"
         "            }\n"
         "        }\n"
+        "        if (desktopContainer && "
+        'desktopContainer.style.display !== "none") {\n'
+        "            adjustTableSize(desktopContainer);\n"
+        "            adjustLogoPosition(desktopContainer);\n"
+        "            if (!desktopContainer._scrollObserver) {\n"
+        "                desktopContainer._scrollObserver = "
+        "setupScrollObserver(desktopContainer);\n"
+        "            }\n"
+        "        }\n"
         "    }, 50);\n"
         "    setTimeout(function() { clearInterval(checkInterval); }, 2000);\n"
         "})();\n"
@@ -862,124 +1267,6 @@ def _generate_responsive_html(
     )
 
 
-def _generate_output(
-    figure: Figure,
-    figure_mobile: Figure | None,
-    filename: str,
-    output_type: LiteralPlotlyOutput,
-    *,
-    auto_open: bool,
-    include_plotlyjs: LiteralPlotlyJSlib,
-    plotfile: Path,
-    table_html: str | None = None,
-) -> str:
-    """Generate output string based on output type.
-
-    Args:
-        figure: Plotly figure (desktop layout).
-        figure_mobile: Optional Plotly figure (mobile layout).
-        filename: Output filename.
-        output_type: Type of output to generate.
-        auto_open: Whether to auto-open file.
-        include_plotlyjs: How to include plotly.js.
-        plotfile: Path to plot file.
-        table_html: Optional HTML table string for mobile layout.
-
-    Returns:
-        Output string (filename or HTML div).
-    """
-    fig, _ = load_plotly_dict()
-
-    if output_type == "file":
-        if figure_mobile is not None:
-            div_id_desktop = filename.split(sep=".")[0] + "_desktop"
-            div_id_mobile = filename.split(sep=".")[0] + "_mobile"
-
-            html_desktop = to_html(
-                fig=figure,
-                div_id=div_id_desktop,
-                auto_play=False,
-                full_html=False,
-                include_plotlyjs=include_plotlyjs,
-                config=fig["config"],
-            )
-
-            html_mobile = to_html(
-                fig=figure_mobile,
-                div_id=div_id_mobile,
-                auto_play=False,
-                full_html=False,
-                include_plotlyjs=False,
-                config=fig["config"],
-            )
-
-            responsive_html = _generate_responsive_html(
-                html_desktop=html_desktop,
-                html_mobile=html_mobile,
-                div_id_desktop=div_id_desktop,
-                div_id_mobile=div_id_mobile,
-                table_html=table_html,
-            )
-
-            with plotfile.open(mode="w", encoding="utf-8") as f:
-                f.write(responsive_html)
-
-            if auto_open:
-                webbrowser.open(f"file://{plotfile.resolve()}")
-
-            return str(plotfile)
-        plot(
-            figure_or_data=figure,
-            filename=str(plotfile),
-            auto_open=auto_open,
-            auto_play=False,
-            link_text="",
-            include_plotlyjs=include_plotlyjs,
-            output_type=output_type,
-            config=fig["config"],
-        )
-        return str(plotfile)
-
-    div_id = filename.split(sep=".")[0]
-    if figure_mobile is not None:
-        div_id_mobile = div_id + "_mobile"
-        html_desktop = to_html(
-            fig=figure,
-            div_id=div_id,
-            auto_play=False,
-            full_html=False,
-            include_plotlyjs=include_plotlyjs,
-            config=fig["config"],
-        )
-        html_mobile = to_html(
-            fig=figure_mobile,
-            div_id=div_id_mobile,
-            auto_play=False,
-            full_html=False,
-            include_plotlyjs=False,
-            config=fig["config"],
-        )
-        return _generate_responsive_html(
-            html_desktop=html_desktop,
-            html_mobile=html_mobile,
-            div_id_desktop=div_id,
-            div_id_mobile=div_id_mobile,
-            table_html=table_html,
-        )
-
-    return cast(
-        "str",
-        to_html(
-            fig=figure,
-            div_id=div_id,
-            auto_play=False,
-            full_html=False,
-            include_plotlyjs=include_plotlyjs,
-            config=fig["config"],
-        ),
-    )
-
-
 def report_html(
     data: OpenFrame,
     bar_freq: LiteralBizDayFreq = "BYE",
@@ -1009,7 +1296,7 @@ def report_html(
             Defaults to False.
         add_logo: If True a Captor logo is added to the plot. Defaults to True.
         vertical_legend: Determines whether to vertically align the legend's
-            labels. Defaults to True.
+            labels. Defaults to False.
 
     Returns:
         Plotly Figure and a div section or a HTML filename with location.
@@ -1022,47 +1309,6 @@ def report_html(
         copied.yearfrac
     )
 
-    figure = make_subplots(
-        rows=2,
-        cols=2,
-        specs=[
-            [{"type": "xy"}, {"rowspan": 2, "type": "table"}],
-            [{"type": "xy"}, None],
-        ],
-    )
-
-    for item, lbl in enumerate(copied.columns_lvl_zero):
-        figure.add_scatter(
-            x=copied.tsdf.index,
-            y=copied.tsdf.iloc[:, item],
-            hovertemplate="%{y:.2%}<br>%{x|%Y-%m-%d}",
-            line={"width": 2.5, "dash": "solid"},
-            mode="lines",
-            name=lbl,
-            showlegend=True,
-            row=1,
-            col=1,
-        )
-
-    quarter_of_year = 0.25
-    if copied.yearfrac < quarter_of_year:
-        tmp = copied.from_deepcopy()
-        bdf = tmp.value_to_ret().tsdf.iloc[1:]
-    else:
-        bdf = calendar_period_returns(data=copied, freq=bar_freq)
-
-    for item in range(copied.item_count):
-        col_name = cast("tuple[str, ValueType]", bdf.iloc[:, item].name)
-        figure.add_bar(
-            x=bdf.index,
-            y=bdf.iloc[:, item],
-            hovertemplate="%{y:.2%}<br>%{x}",
-            name=col_name[0],
-            showlegend=False,
-            row=2,
-            col=1,
-        )
-
     formats = [
         "{:.2%}",
         "{:.2%}",
@@ -1097,30 +1343,17 @@ def report_html(
         copied=copied,
     )
 
-    figure.add_table(
-        header={
-            "values": columns,
-            "align": "center",
-            "fill_color": "grey",
-            "font": {"color": "white"},
-        },
-        cells={
-            "values": cleanedtablevalues,
-            "align": aligning,
-            "height": 25,
-            "fill_color": color_lst,
-            "font": {"color": ["white"] + ["black"] * len(columns)},
-        },
-        row=1,
-        col=2,
+    bdf = _get_bar_dataframe(copied, bar_freq)
+    figure = _build_desktop_figure(
+        copied=copied,
+        bdf=bdf,
+        cleanedtablevalues=cleanedtablevalues,
+        columns=columns,
+        aligning=aligning,
+        color_lst=color_lst,
     )
 
-    if directory:
-        dirpath = Path(directory).resolve()
-    elif Path.home().joinpath("Documents").exists():
-        dirpath = Path.home() / "Documents"
-    else:
-        dirpath = Path(stack()[1].filename).parent
+    dirpath = _get_output_directory(directory)
 
     if not filename:
         filename = "".join(choice(ascii_letters) for _ in range(6)) + ".html"
@@ -1128,15 +1361,14 @@ def report_html(
     plotfile = dirpath / filename
 
     _configure_figure_layout(
-        figure,
-        copied,
+        figure=figure,
+        copied=copied,
         add_logo=add_logo,
         vertical_legend=vertical_legend,
         title=title,
-        mobile=False,
     )
 
-    figure_mobile = _build_mobile_layout_figure(
+    figure_mobile = _build_mobile_figure(
         copied=copied,
         bdf=bdf,
         add_logo=add_logo,
@@ -1144,22 +1376,78 @@ def report_html(
         title=title,
     )
 
-    table_html = _generate_html_table(
+    table_html = _generate_html_table_string(
         cleanedtablevalues=cleanedtablevalues,
         columns=columns,
         aligning=aligning,
         color_lst=color_lst,
     )
 
-    string_output = _generate_output(
-        figure,
-        figure_mobile,
-        filename,
-        output_type,
-        auto_open=auto_open,
-        include_plotlyjs=include_plotlyjs,
-        plotfile=plotfile,
-        table_html=table_html,
-    )
+    fig, _ = load_plotly_dict()
+
+    if output_type == "file":
+        div_id_desktop = filename.split(sep=".")[0] + "_desktop"
+        div_id_mobile = filename.split(sep=".")[0] + "_mobile"
+
+        html_desktop = to_html(
+            fig=figure,
+            div_id=div_id_desktop,
+            auto_play=False,
+            full_html=False,
+            include_plotlyjs=include_plotlyjs,
+            config=fig["config"],
+        )
+
+        html_mobile = to_html(
+            fig=figure_mobile,
+            div_id=div_id_mobile,
+            auto_play=False,
+            full_html=False,
+            include_plotlyjs=False,
+            config=fig["config"],
+        )
+
+        responsive_html = _generate_responsive_html_string(
+            html_desktop=html_desktop,
+            html_mobile=html_mobile,
+            div_id_desktop=div_id_desktop,
+            div_id_mobile=div_id_mobile,
+            table_html=table_html,
+        )
+
+        with plotfile.open(mode="w", encoding="utf-8") as f:
+            f.write(responsive_html)
+
+        if auto_open:
+            webbrowser.open(f"file://{plotfile.resolve()}")
+
+        string_output = str(plotfile)
+    else:
+        div_id = filename.split(sep=".")[0]
+        div_id_mobile = div_id + "_mobile"
+        html_desktop = to_html(
+            fig=figure,
+            div_id=div_id,
+            auto_play=False,
+            full_html=False,
+            include_plotlyjs=include_plotlyjs,
+            config=fig["config"],
+        )
+        html_mobile = to_html(
+            fig=figure_mobile,
+            div_id=div_id_mobile,
+            auto_play=False,
+            full_html=False,
+            include_plotlyjs=False,
+            config=fig["config"],
+        )
+
+        string_output = _generate_responsive_html_string(
+            html_desktop=html_desktop,
+            html_mobile=html_mobile,
+            div_id_desktop=div_id,
+            div_id_mobile=div_id_mobile,
+            table_html=table_html,
+        )
 
     return figure, string_output

{openseries-2.1.0 → openseries-2.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openseries"
-version = "2.1.0"
+version = "2.1.2"
 description = "Tools for analyzing financial timeseries."
 authors = [
     { name = "Martin Karrin", email = "martin.karrin@captor.se" },
@@ -63,22 +63,21 @@ dependencies = [
 [tool.poetry.group.dev.dependencies]
 mypy = "1.19.0"
 pandas-stubs = ">=2.1.2"
-pre-commit = ">=4.4.0"
-pytest = ">=9.0.0"
+pre-commit = ">=4.5.0"
+pytest = ">=9.0.2"
 pytest-cov = ">=7.0.0"
 pytest-xdist = ">=3.8.0"
-ruff = "0.14.8"
+ruff = "0.14.9"
 types-openpyxl = ">=3.1.2"
 scipy-stubs = ">=1.14.1.0"
 types-python-dateutil = ">=2.8.2"
 types-requests = ">=2.20.0"
 
 [tool.poetry.group.docs.dependencies]
-myst-parser = ">=4.0.1"
-sphinx = ">=8.2.3"
+sphinx = ">=9.0.4"
 sphinx-autobuild = ">=2025.8.25"
-sphinx-autodoc-typehints = ">=3.5.2"
-sphinx-rtd-theme = ">=3.0.2"
+sphinx-autodoc-typehints = ">=3.6.0"
+sphinx-rtd-theme = ">=3.1.0rc1"
 
 [build-system]
 requires = ["poetry-core>=2.2.1"]