openbb-charting 2.1.1__tar.gz → 2.1.2__tar.gz

{openbb_charting-2.1.1 → openbb_charting-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openbb-charting
-Version: 2.1.1
+Version: 2.1.2
 Summary: Charting extension for OpenBB
 License: AGPL-3.0-only
 Author: OpenBB Team
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: nbformat (>=5.9.2,<6.0.0)
-Requires-Dist: openbb-core (>=1.2.3,<2.0.0)
+Requires-Dist: openbb-core (>=1.2.4,<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)

{openbb_charting-2.1.1 → openbb_charting-2.1.2}/openbb_charting/__init__.py

@@ -459,8 +459,9 @@ class Charting:
             )
         kwargs["provider"] = self._obbject.provider  # pylint: disable=protected-access
         kwargs["extra"] = self._obbject.extra  # pylint: disable=protected-access
-        kwargs["extra_params"] = kwargs["extra"]["metadata"].arguments.get(
-            "extra_params"
+        metadata = kwargs["extra"].get("metadata")
+        kwargs["extra_params"] = (
+            metadata.arguments.get("extra_params") if metadata else None
         )
         if "kwargs" in kwargs:
             _kwargs = kwargs.pop("kwargs")
@@ -554,3 +555,16 @@ class Charting:
                 ipython_display.display(ipython_display.HTML(data_as_df.to_html()))
             else:
                 warn("IPython.display is not available.")
+
+    def url(
+        self,
+        url: str,
+        title: str = "",
+        width: Optional[int] = None,
+        height: Optional[int] = None,
+    ):
+        """Return the URL of the chart."""
+        try:
+            self._backend.send_url(url=url, title=title, width=width, height=height)
+        except Exception as e:  # pylint: disable=W0718
+            warn(f"Failed to show figure with backend. {e}")

{openbb_charting-2.1.1 → openbb_charting-2.1.2}/openbb_charting/core/backend.py

@@ -201,21 +201,18 @@ class Backend(PyWry):
             if self.charting_settings.chart_style == "dark"
             else "rgba(255,255,255,0)"
         )
-
         title = "Interactive Chart"
-
         fig.layout.title.text = re.sub(
             r"<[^>]*>", "", fig.layout.title.text if fig.layout.title.text else title
         )
-
         fig.layout.height += 69
 
-        if export_image and isinstance(export_image, str):
-            export_image = Path(export_image).resolve()
+        export_image = Path(export_image).resolve() if export_image else None
 
         json_data = json.loads(fig.to_json())
         json_data.update(self.get_json_update(command_location))
         json_data["layout"]["paper_bgcolor"] = paper_bg
+
         outgoing = dict(
             html=self.get_plotly_html(),
             json_data=json_data,
@@ -224,7 +221,7 @@ class Backend(PyWry):
         )
         self.send_outgoing(outgoing)
 
-        if export_image and isinstance(export_image, Path):
+        if export_image:
             if self.loop.is_closed():  # type: ignore[has-type]
                 # Create a new event loop
                 self.loop = asyncio.new_event_loop()
@@ -404,75 +401,6 @@ class Backend(PyWry):
 
         super().close()
 
-    async def get_results(self, description: str) -> dict:
-        """Wait for completion of interactive task and return the data.
-
-        Parameters
-        ----------
-        description : str
-            Description of the task to console print while waiting.
-
-        Returns
-        -------
-        dict
-            The data returned from pywry backend.
-        """
-        warnings.warn(
-            f"[green]{description}[/]\n\n"
-            "[yellow]If the window is closed you can continue by pressing Ctrl+C.[/]"
-        )
-        while True:
-            try:
-                data: dict = self.recv.get(block=False) or {}
-                if data.get("result", False):
-                    return json.loads(data["result"])
-            except Exception:  # pylint: disable=W0703
-                await asyncio.sleep(0.1)
-
-            await asyncio.sleep(1)
-
-    def call_hub(self, login: bool = True) -> Optional[dict]:
-        """Call the hub to login or logout.
-
-        Parameters
-        ----------
-        login : bool, optional
-            Whether to login or logout, by default True
-
-        Returns
-        -------
-        Optional[dict]
-            The user data if login was successful, None otherwise.
-        """
-        self.check_backend()
-        endpoint = {True: "login", False: "logout"}[login]
-
-        outgoing = dict(
-            json_data=dict(url=f"https://my.openbb.co/{endpoint}?pywry=true"),
-            **self.get_kwargs(endpoint.title()),
-            width=900,
-            height=800,
-        )
-        self.send_outgoing(outgoing)
-
-        messages_dict = dict(
-            login=dict(
-                message="Welcome to OpenBB Terminal! Please login to continue.",
-                interrupt="Window closed without authentication. Please proceed below.",
-            ),
-            logout=dict(
-                message="Sending logout request", interrupt="Please login to continue."
-            ),
-        )
-
-        try:
-            return self.loop.run_until_complete(
-                self.get_results(messages_dict[endpoint]["message"])
-            )
-        except KeyboardInterrupt:
-            warnings.warn(f"\n[red]{messages_dict[endpoint]['interrupt']}[/red]")
-            return None
-
 
 async def download_plotly_js():
     """Download or updates plotly.js to the assets folder."""

{openbb_charting-2.1.1 → openbb_charting-2.1.2}/openbb_charting/core/openbb_figure.py

@@ -91,7 +91,7 @@ class OpenBBFigure(go.Figure):
         if fig:
             self.__dict__ = fig.__dict__
 
-        self._charting_settings: Optional["ChartingSettings"] = kwargs.pop(
+        self._charting_settings: Optional[ChartingSettings] = kwargs.pop(
             "charting_settings", None
         )
         self._has_secondary_y = kwargs.pop("has_secondary_y", False)
@@ -464,24 +464,6 @@ class OpenBBFigure(go.Figure):
 
         self.update_layout(barmode="overlay", bargap=0.01, bargroupgap=0)
 
-    def is_image_export(self, export: Optional[str] = "") -> bool:
-        """Check if the export format is an image format.
-
-        Parameters
-        ----------
-        export : `str`
-            Export format
-
-        Returns
-        -------
-        `bool`
-            True if the export format is an image format, False otherwise
-        """
-        if not export:
-            return False
-
-        return any(ext in export for ext in ["jpg", "png", "svg"])
-
     def set_title(
         self, title: str, wrap: bool = False, wrap_width: int = 80, **kwargs
     ) -> "OpenBBFigure":
@@ -917,7 +899,7 @@ class OpenBBFigure(go.Figure):
                     self._exported = True
 
                 # We send the figure to the backend to be displayed
-                return self._backend.send_figure(self, export_image)
+                return self._backend.send_figure(fig=self, export_image=export_image)
             except Exception as e:
                 # If the backend fails, we just show the figure normally
                 # This is a very rare case, but it's better to have a fallback

{openbb_charting-2.1.1 → openbb_charting-2.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbb-charting"
-version = "2.1.1"
+version = "2.1.2"
 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 = "^0.6.1"
 nbformat = "^5.9.2"
 pandas-ta = "^0.3.14b"
-openbb-core = "^1.2.3"
+openbb-core = "^1.2.4"
 
 [build-system]
 requires = ["poetry-core"]