openbb-charting 2.2.2__tar.gz → 2.2.4__tar.gz

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openbb-charting
-Version: 2.2.2
+Version: 2.2.4
 Summary: Charting extension for OpenBB
 License: AGPL-3.0-only
 Author: OpenBB Team
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: pywry
 Requires-Dist: nbformat (>=5.9.2,<6.0.0)
 Requires-Dist: numpy (>=1,<2)
-Requires-Dist: openbb-core (>=1.3.2,<2.0.0)
+Requires-Dist: openbb-core (>=1.3.5,<2.0.0)
 Requires-Dist: pandas-ta (>=0.3.14b,<0.4.0)
 Requires-Dist: plotly (>=5.17.0,<6.0.0)
 Requires-Dist: pywry (>=0.6.1,<0.7.0) ; extra == "pywry"

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/openbb_charting/charting.py

@@ -1,6 +1,6 @@
 """Charting Class implementation."""
 
-# pylint: disable=too-many-arguments,unused-argument
+# pylint: disable=too-many-arguments,unused-argument,too-many-positional-arguments
 
 from typing import (
     TYPE_CHECKING,
@@ -57,6 +57,8 @@ class Charting:
         Create a line chart from external data.
     create_bar_chart
         Create a bar chart, on a single x-axis with one or more values for the y-axis, from external data.
+    create_correlation_matrix
+        Create a correlation matrix from external data.
     toggle_chart_style
         Toggle the chart style, of an existing chart, between light and dark mode.
     """
@@ -367,6 +369,54 @@ class Charting:
 
         return fig
 
+    def create_correlation_matrix(
+        self,
+        data: Union[
+            list[Data],
+            "DataFrame",
+        ],
+        method: Literal["pearson", "kendall", "spearman"] = "pearson",
+        colorscale: str = "RdBu",
+        title: str = "Asset Correlation Matrix",
+        layout_kwargs: Optional[Dict[str, Any]] = None,
+    ):
+        """Create a correlation matrix from external data.
+
+        Parameters
+        ----------
+        data : Union[list[Data], DataFrame]
+            Input dataset.
+        method : Literal["pearson", "kendall", "spearman"]
+            Method to use for correlation calculation. Default is "pearson".
+                pearson : standard correlation coefficient
+                kendall : Kendall Tau correlation coefficient
+                spearman : Spearman rank correlation
+        colorscale : str
+            Plotly colorscale to use for the heatmap. Default is "RdBu".
+        title : str
+            Title of the chart. Default is "Asset Correlation Matrix".
+        layout_kwargs : Dict[str, Any]
+            Additional keyword arguments to apply with figure.update_layout(), by default None.
+
+        Returns
+        -------
+        OpenBBFigure
+            The OpenBBFigure object.
+        """
+        # pylint: disable=import-outside-toplevel
+        from openbb_charting.charts.correlation_matrix import correlation_matrix
+
+        kwargs = {
+            "data": data,
+            "method": method,
+            "colorscale": colorscale,
+            "title": title,
+            "layout_kwargs": layout_kwargs,
+        }
+        fig, _ = correlation_matrix(**kwargs)
+        fig = self._set_chart_style(fig)
+        return fig
+
     # pylint: disable=inconsistent-return-statements
     def show(self, render: bool = True, **kwargs):
         """Display chart and save it to the OBBject."""

openbb_charting-2.2.4/openbb_charting/charts/correlation_matrix.py

@@ -0,0 +1,119 @@
+"""Correlation Matrix Chart."""
+
+from typing import TYPE_CHECKING, Any, Union
+
+if TYPE_CHECKING:
+    from plotly.graph_objs import Figure  # noqa
+    from openbb_charting.core.openbb_figure import OpenBBFigure  # noqa
+
+
+def correlation_matrix(  # noqa: PLR0912
+    **kwargs,
+) -> tuple[Union["OpenBBFigure", "Figure"], dict[str, Any]]:
+    """Correlation Matrix Chart."""
+    # pylint: disable=import-outside-toplevel
+    from numpy import ones_like, triu  # noqa
+    from openbb_core.app.utils import basemodel_to_df  # noqa
+    from openbb_charting.core.openbb_figure import OpenBBFigure
+    from openbb_charting.core.chart_style import ChartStyle
+    from plotly.graph_objs import Figure, Heatmap, Layout
+    from pandas import DataFrame
+
+    if "data" in kwargs and isinstance(kwargs["data"], DataFrame):
+        corr = kwargs["data"]
+    elif "data" in kwargs and isinstance(kwargs["data"], list):
+        corr = basemodel_to_df(kwargs["data"], index=kwargs.get("index", "date"))  # type: ignore
+    else:
+        corr = basemodel_to_df(
+            kwargs["obbject_item"], index=kwargs.get("index", "date")  # type: ignore
+        )
+    if (
+        "symbol" in corr.columns
+        and len(corr.symbol.unique()) > 1
+        and "close" in corr.columns
+    ):
+        corr = corr.pivot(
+            columns="symbol",
+            values="close",
+        )
+
+    method = kwargs.get("method") or "pearson"
+    corr = corr.corr(method=method, numeric_only=True)
+
+    X = corr.columns.to_list()
+    x_replace = X[-1]
+    Y = X.copy()
+    y_replace = Y[0]
+    X = [x if x != x_replace else "" for x in X]
+    Y = [y if y != y_replace else "" for y in Y]
+    mask = triu(ones_like(corr, dtype=bool))
+    df = corr.mask(mask)
+    title = kwargs.get("title") or "Asset Correlation Matrix"
+    text_color = "white" if ChartStyle().plt_style == "dark" else "black"
+    colorscale = kwargs.get("colorscale") or "RdBu"
+
+    heatmap = Heatmap(
+        z=df,
+        x=X,
+        y=Y,
+        xgap=1,
+        ygap=1,
+        colorscale=colorscale,
+        colorbar=dict(
+            orientation="v",
+            x=0.8,
+            y=0.5,
+            xanchor="left",
+            yanchor="middle",
+            xref="container",
+            yref="paper",
+            len=0.66,
+            bgcolor="rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)",
+        ),
+        text=df.fillna(""),
+        texttemplate="%{text:.4f}",
+        hoverongaps=False,
+        hovertemplate="%{x} - %{y} : %{z:.4f}<extra></extra>",
+    )
+    layout = Layout(
+        title=title,
+        title_x=0.5,
+        xaxis=dict(
+            showgrid=False,
+            showline=False,
+            ticklen=0,
+            domain=[0.03, 1],
+            tickangle=90,
+            automargin=False,
+        ),
+        yaxis=dict(
+            showgrid=False,
+            side="left",
+            autorange="reversed",
+            showline=False,
+            ticklen=0,
+            automargin="height+width+left",
+            tickmode="auto",
+        ),
+        margin=dict(l=10, r=0, t=0, b=10),
+        dragmode="pan",
+    )
+    fig = Figure(data=[heatmap], layout=layout)
+    figure = OpenBBFigure(fig=fig)
+    figure.update_layout(
+        font=dict(color=text_color),
+        paper_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        plot_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+    )
+    layout_kwargs = kwargs.get("layout_kwargs", {})
+
+    if layout_kwargs:
+        figure.update_layout(**layout_kwargs)
+
+    content = figure.show(external=True).to_plotly_json()  # type: ignore
+
+    return figure, content

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/openbb_charting/charts/generic_charts.py

@@ -1,6 +1,6 @@
 """Generic Charts Module."""
 
-# pylint: disable=too-many-arguments,unused-argument,too-many-locals, too-many-branches, too-many-lines, too-many-statements, use-dict-literal, broad-exception-caught, too-many-nested-blocks
+# pylint: disable=too-many-arguments,unused-argument,too-many-locals, too-many-branches, too-many-lines, too-many-statements, use-dict-literal, broad-exception-caught, too-many-nested-blocks, too-many-positional-arguments
 
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Union
 
@@ -52,7 +52,7 @@ def line_chart(  # noqa: PLR0912
     """Create a line chart."""
     # pylint: disable=import-outside-toplevel
     from pandas import DataFrame, Series, to_datetime  # noqa
-    from openbb_charting.core.openbb_figure import OpenBBFigure  # noqa
+    from openbb_charting.core.openbb_figure import OpenBBFigure
 
     if data is None:
         raise ValueError("Error: Data is a required field.")
@@ -122,6 +122,8 @@ def line_chart(  # noqa: PLR0912
     except Exception as _:
         fig = OpenBBFigure(create_backend=True)
 
+    fig.update_layout(ChartStyle().plotly_template.get("layout", {}))
+    text_color = "white" if ChartStyle().plt_style == "dark" else "black"
     title = f"{title}" if title else ""
     xtitle = xtitle if xtitle else ""
     y1title = ytitle if ytitle else ""
@@ -242,15 +244,24 @@ def line_chart(  # noqa: PLR0912
 
     fig.update_layout(
         title=dict(text=title if title else None, x=0.5, font=dict(size=16)),
-        paper_bgcolor="rgba(0,0,0,0)",
-        plot_bgcolor="rgba(0,0,0,0)",
+        font=dict(color=text_color),
+        paper_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        plot_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
         legend=dict(
-            orientation="h",
-            yanchor="bottom",
+            orientation="v",
+            yanchor="top",
             xanchor="right",
-            y=1.02,
-            x=0.95,
-            bgcolor="rgba(0,0,0,0)",
+            y=0.95,
+            x=-0.01,
+            xref="paper",
+            font=dict(size=12),
+            bgcolor=(
+                "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+            ),
         ),
         yaxis=(
             dict(
@@ -405,6 +416,7 @@ def bar_chart(  # noqa: PLR0912
     )
 
     figure.update_layout(ChartStyle().plotly_template.get("layout", {}))
+    text_color = "white" if ChartStyle().plt_style == "dark" else "black"
     if colors is not None:
         figure.update_layout(colorway=colors)
     if bar_kwargs is None:
@@ -414,7 +426,8 @@ def bar_chart(  # noqa: PLR0912
 
     bar_df = data.copy().set_index(x)  # type: ignore
     y = y.split(",") if isinstance(y, str) else y
-
+    hovertemplate = bar_kwargs.pop("hovertemplate", None)
+    width = bar_kwargs.pop("width", None)
     for item in y:
         figure.add_bar(
             x=bar_df.index if orientation == "v" else bar_df[item],
@@ -424,25 +437,41 @@ def bar_chart(  # noqa: PLR0912
             legendgroup=bar_df[item].name,
             orientation=orientation,
             hovertemplate=(
-                "%{fullData.name}:%{y}<extra></extra>"
-                if orientation == "v"
-                else "%{fullData.name}:%{x}<extra></extra>"
+                hovertemplate
+                if hovertemplate
+                else (
+                    "%{fullData.name}:%{y}<extra></extra>"
+                    if orientation == "v"
+                    else "%{fullData.name}:%{x}<extra></extra>"
+                )
+            ),
+            width=(
+                width
+                if width
+                else 0.95 / len(y) * 0.75 if barmode == "group" and len(y) > 1 else 0.95
             ),
-            width=0.95 / len(y) * 0.75 if barmode == "group" and len(y) > 1 else 0.95,
             **bar_kwargs,
         )
 
     figure.update_layout(
         title=dict(text=title if title else None, x=0.5, font=dict(size=16)),
-        paper_bgcolor="rgba(0,0,0,0)",
-        plot_bgcolor="rgba(0,0,0,0)",
+        paper_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        plot_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rbga(255,255,255,0)"
+        ),
         legend=dict(
-            orientation="h",
-            yanchor="bottom",
+            orientation="v",
+            yanchor="top",
             xanchor="right",
-            y=1.02,
-            x=0.98,
-            bgcolor="rgba(0,0,0,0)",
+            y=0.95,
+            x=-0.01 if orientation == "v" else 1.01,
+            xref="paper",
+            font=dict(size=12),
+            bgcolor=(
+                "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+            ),
         ),
         xaxis=dict(
             type=xtype,
@@ -469,6 +498,7 @@ def bar_chart(  # noqa: PLR0912
         ),
         margin=dict(pad=5),
         barmode=barmode,
+        font=dict(color=text_color),
     )
     if orientation == "h":
         figure.update_layout(
@@ -483,6 +513,7 @@ def bar_chart(  # noqa: PLR0912
             hoverlabel=dict(
                 font=dict(size=12),
             ),
+            hovermode="y unified",
         )
     if layout_kwargs:
         figure.update_layout(
@@ -532,7 +563,7 @@ def bar_increasing_decreasing(  # pylint: disable=W0102
     """
     # pylint: disable=import-outside-toplevel
     from openbb_charting.core.openbb_figure import OpenBBFigure  # noqa
-    from pandas import Series  # noqa
+    from pandas import Series
 
     try:
         figure = OpenBBFigure()
@@ -548,7 +579,8 @@ def bar_increasing_decreasing(  # pylint: disable=W0102
         row_width=[1],
         specs=[[{"secondary_y": True}]],
     )
-    # figure.update_layout(ChartStyle().plotly_template.get("layout", {}))
+    figure.update_layout(ChartStyle().plotly_template.get("layout", {}))
+    text_color = "white" if ChartStyle().plt_style == "dark" else "black"
 
     try:
         data = Series(data=values, index=keys)
@@ -605,6 +637,13 @@ def bar_increasing_decreasing(  # pylint: disable=W0102
             categoryorder="array" if orientation == "v" else None,
             categoryarray=keys if orientation == "v" else None,
         ),
+        paper_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        plot_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        font=dict(color="white" if text_color == "white" else "black"),
         margin=dict(pad=5),
     )
 

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/openbb_charting/charts/price_historical.py

@@ -120,8 +120,12 @@ def price_historical(  # noqa: PLR0912
         if _volume is True and "atr" in indicators:  # type: ignore
             fig.add_inchart_volume(data)
         fig.update_layout(
-            paper_bgcolor="rgba(0,0,0,0)",
-            plot_bgcolor="rgba(0,0,0,0)",
+            paper_bgcolor=(
+                "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+            ),
+            plot_bgcolor=(
+                "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+            ),
             font=dict(color=text_color),
             showlegend=True,
             legend=dict(
@@ -132,7 +136,9 @@ def price_historical(  # noqa: PLR0912
                 x=-0.01,
                 xref="paper",
                 font=dict(size=12),
-                bgcolor="rgba(0,0,0,0)",
+                bgcolor=(
+                    "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+                ),
             ),
             xaxis=dict(
                 ticklen=0,
@@ -207,6 +213,8 @@ def price_historical(  # noqa: PLR0912
                 y2title = None  # type: ignore
 
         fig = OpenBBFigure()
+        fig.update_layout(ChartStyle().plotly_template.get("layout", {}))
+        text_color = "white" if ChartStyle().plt_style == "dark" else "black"
 
         for i, col in enumerate(data.columns):
 
@@ -248,8 +256,12 @@ def price_historical(  # noqa: PLR0912
         y2title = None  # type: ignore
 
     fig.update_layout(
-        paper_bgcolor="rgba(0,0,0,0)",
-        plot_bgcolor="rgba(0,0,0,0)",
+        paper_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
+        plot_bgcolor=(
+            "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+        ),
         legend=(
             dict(
                 orientation="v",
@@ -257,7 +269,9 @@ def price_historical(  # noqa: PLR0912
                 xanchor="right",
                 y=0.95,
                 x=-0.01,
-                bgcolor="rgba(0,0,0,0)",
+                bgcolor=(
+                    "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+                ),
             )
             if len(data.columns) > 2
             else dict(
@@ -266,7 +280,9 @@ def price_historical(  # noqa: PLR0912
                 xanchor="right",
                 y=1.02,
                 x=0.98,
-                bgcolor="rgba(0,0,0,0)",
+                bgcolor=(
+                    "rgba(0,0,0,0)" if text_color == "white" else "rgba(255,255,255,0)"
+                ),
             )
         ),
         yaxis1=(

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/openbb_charting/core/openbb_figure.py

@@ -1,6 +1,6 @@
 """OpenBB Figure Class."""
 
-# pylint: disable=C0302,R0902,W3301
+# pylint: disable=C0302,R0902,W3301,R0917
 import json
 import textwrap
 from datetime import datetime, timedelta
@@ -925,19 +925,6 @@ class OpenBBFigure(go.Figure):
                     if data.get("layout", {}):
                         pio.show(data, *args, **kwargs)
 
-        self.update_layout(
-            legend=dict(
-                orientation=(
-                    "v"
-                    if not self.layout.legend.orientation
-                    else self.layout.legend.orientation
-                ),
-            ),
-            barmode="overlay",
-            bargap=0,
-            bargroupgap=0,
-        )
-
         return pio.show(self, *args, **kwargs)
 
     def _xaxis_tickformatstops(self) -> None:

{openbb_charting-2.2.2 → openbb_charting-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbb-charting"
-version = "2.2.2"
+version = "2.2.4"
 description = "Charting extension for OpenBB"
 authors = ["OpenBB Team <hello@openbb.co>"]
 license = "AGPL-3.0-only"
@@ -15,7 +15,7 @@ statsmodels = "^0.14.0"
 pywry = { version = "^0.6.1", optional = true }
 nbformat = "^5.9.2"
 pandas-ta = "^0.3.14b"
-openbb-core = "^1.3.2"
+openbb-core = "^1.3.5"
 numpy = "^1"
 
 [tool.poetry.extras]