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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openbb-charting
-Version: 2.2.2
+Version: 2.2.3
 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.3,<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.3}/openbb_charting/charts/generic_charts.py

@@ -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.3}/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.3}/openbb_charting/core/openbb_figure.py

@@ -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.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbb-charting"
-version = "2.2.2"
+version = "2.2.3"
 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.3"
 numpy = "^1"
 
 [tool.poetry.extras]