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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openbb-charting
-Version: 2.2.0
+Version: 2.2.2
 Summary: Charting extension for OpenBB
 License: AGPL-3.0-only
 Author: OpenBB Team
@@ -12,12 +12,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 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.0,<2.0.0)
+Requires-Dist: openbb-core (>=1.3.2,<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)
+Requires-Dist: pywry (>=0.6.1,<0.7.0) ; extra == "pywry"
 Requires-Dist: scipy (>=1.10.0,<2.0.0)
 Requires-Dist: statsmodels (>=0.14.0,<0.15.0)
 Description-Content-Type: text/markdown

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

@@ -546,6 +546,32 @@ class Charting:
             external=True
         ).to_plotly_json()
 
+    @staticmethod
+    def _convert_to_string(x):
+        """Sanitize the data for the table."""
+        # pylint: disable=import-outside-toplevel
+        from numpy import isnan
+
+        if isinstance(x, (float, int)) and not isnan(x):
+            return x
+        if isinstance(x, dict):
+            return ", ".join([str(v) for v in x.values()])
+        if isinstance(x, list):
+            if all(isinstance(i, dict) for i in x):
+                return ", ".join(
+                    str(", ".join([str(v) for v in i.values()])) for i in x
+                )
+            return ", ".join([str(i) for i in x])
+
+        return (
+            str(x)
+            .replace("[", "")
+            .replace("]", "")
+            .replace("'{", "")
+            .replace("}'", "")
+            .replace("nan", "")
+        )
+
     def table(
         self,
         data: Optional[Union["DataFrame", "Series"]] = None,
@@ -569,6 +595,8 @@ class Charting:
             data_as_df.reset_index(inplace=True, drop=True)
         else:
             data_as_df.reset_index(inplace=True)
+        for col in data_as_df.columns:
+            data_as_df[col] = data_as_df[col].apply(self._convert_to_string)
         if self._backend.isatty:
             try:
                 self._backend.send_table(

{openbb_charting-2.2.0 → openbb_charting-2.2.2}/openbb_charting/core/backend.py

@@ -3,8 +3,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
-from openbb_core.env import Env
-
 if TYPE_CHECKING:
     from openbb_core.app.model.charts.charting_settings import ChartingSettings
     from pandas import DataFrame
@@ -16,9 +14,7 @@ BACKEND = None
 
 try:
     from pywry import PyWry  # pylint: disable=import-outside-toplevel
-except ImportError as e:
-    if Env().DEBUG_MODE:
-        print(f"\033[91m{e}\033[0m")  # noqa: T201
+except ImportError:
     from .dummy_backend import DummyBackend  # pylint: disable=import-outside-toplevel
 
     class PyWry(DummyBackend):  # type: ignore
@@ -89,8 +85,8 @@ class Backend(PyWry):
 
     def set_window_dimensions(self):
         """Set the window dimensions."""
-        width = self.charting_settings.plot_pywry_width or 1400
-        height = self.charting_settings.plot_pywry_height or 762
+        width = 1400
+        height = 762
 
         self.WIDTH, self.HEIGHT = int(width), int(height)
 
@@ -233,7 +229,6 @@ class Backend(PyWry):
         """Check if the image has been exported to the path."""
         # pylint: disable=import-outside-toplevel
         import asyncio
-        import os
         import subprocess
         import sys
 
@@ -247,14 +242,8 @@ class Backend(PyWry):
                 break
 
         if img_path.exists():  # noqa: SIM102
-            if self.charting_settings.plot_open_export:
-                if sys.platform == "win32":
-                    os.startfile(export_image)  # nosec: B606 # noqa: S606
-                else:
-                    opener = "open" if sys.platform == "darwin" else "xdg-open"
-                    subprocess.check_call(
-                        [opener, export_image]  # nosec: B603 # noqa: S603
-                    )
+            opener = "open" if sys.platform == "darwin" else "xdg-open"
+            subprocess.check_call([opener, export_image])  # nosec: B603 # noqa: S603
 
     def send_table(
         self,
@@ -427,7 +416,7 @@ async def download_plotly_js():
         # we use aiohttp to download plotly.js
         # this is so we don't have to block the main thread
         async with aiohttp.ClientSession(
-            connector=aiohttp.TCPConnector(verify_ssl=False)
+            connector=aiohttp.TCPConnector(verify_ssl=False), trust_env=True
         ) as session, session.get(f"https://cdn.plot.ly/{js_filename}") as resp:
             with open(str(PLOTLYJS_PATH), "wb") as f:
                 while True:

{openbb_charting-2.2.0 → openbb_charting-2.2.2}/openbb_charting/core/dummy_backend.py

@@ -1,37 +1,14 @@
 """Dummy backend for charting to avoid import errors."""
 
 import asyncio
-import warnings
 from queue import Queue
 from typing import List
 
 import dotenv
 from openbb_core.app.constants import OPENBB_DIRECTORY
-from openbb_core.env import Env
 
 SETTINGS_ENV_FILE = OPENBB_DIRECTORY / ".env"
 
-pywry_missing = """
-[red]PyWry is not installed or missing required linux dependencies.[/]
-
-[yellow]Install PyWry[/]
-[green]pip install pywry --upgrade[/]
-
-[yellow]Platform-specific notes[/]
-Here is the underlying web engine each platform uses you might need to install.
-
-[green]Linux[/]
-Pywry uses gtk-rs and its related libraries for window creation and Wry also needs WebKitGTK for WebView.
-To activate interactive plots/tables in pywry window, please make sure the following packages are installed:
-
-[yellow]Arch Linux / Manjaro:[/]
-[green]sudo pacman -S webkit2gtk[/]\n
-[yellow]Debian / Ubuntu:[/]
-[green]sudo apt install libwebkit2gtk-4.0-dev[/]\n
-[yellow]Fedora / CentOS / AlmaLinux:[/]
-[green]sudo dnf install gtk3-devel webkit2gtk3-devel[/]\r
-"""
-
 
 class DummyBackend:
     """Dummy class to avoid import errors."""
@@ -63,8 +40,6 @@ class DummyBackend:
             self.loop = asyncio.new_event_loop()
             asyncio.set_event_loop(self.loop)
 
-        if Env().DEBUG_MODE:
-            warnings.warn(pywry_missing)
         dotenv.set_key(SETTINGS_ENV_FILE, "PLOT_ENABLE_PYWRY", "0")
 
     def close(self, reset: bool = False):  # pylint: disable=W0613

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbb-charting"
-version = "2.2.0"
+version = "2.2.2"
 description = "Charting extension for OpenBB"
 authors = ["OpenBB Team <hello@openbb.co>"]
 license = "AGPL-3.0-only"
@@ -12,12 +12,15 @@ python = ">=3.9,<3.13"  # scipy forces python <4.0 explicitly
 scipy = "^1.10.0"
 plotly = "^5.17.0"
 statsmodels = "^0.14.0"
-pywry = "^0.6.1"
+pywry = { version = "^0.6.1", optional = true }
 nbformat = "^5.9.2"
 pandas-ta = "^0.3.14b"
-openbb-core = "^1.3.0"
+openbb-core = "^1.3.2"
 numpy = "^1"
 
+[tool.poetry.extras]
+pywry = ["pywry"]
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"