Interactive tables using react (#4386)

* feat: experimenting tables with react * feat: adding new interactive tables * feat: adding more table features * small changes * update * Update backend.py * Update backend.py * fix: dark mode? * feat: lot of table improvements * fix: my b * fix: load only when prod * feat: naive detect links and dates * handle index and column names * increased min width * codespell * mypy, pylint * fix: added new chart, export, etc * testing * updates * fix : add PLOT_OPEN_EXPORT, USE_INTERACTIVE_DF to user dataclass * bump pywry version, readd removed `plots_backend().start()` * req files * Update unit-test.yml * Update unit-test.yml * Update unit-test.yml * updates * fixing some date things * update table * fix formatting with timezones * fixing some long prints and tables * Mickey Mouse Co-authored-by: teh_coderer <[email protected]> Co-authored-by: jose-donato <[email protected]> * fix: ?!?!? * adding limit arg to all print_rich_table * tests * lint * simple by Default on interactive charts * playing with some css (thks jose) * Fix #4426 * Edit some structure * fix sdk generation * Update backend.py * fa menu tested and working * fix #4460 * fix #4460 drop indices * update tests * update tests * Update helper_funcs.py * tests * Update unit-test.yml * Update etf.ipynb --------- Co-authored-by: teh_coderer <[email protected]> Co-authored-by: andrewkenreich <[email protected]> Co-authored-by: teh_coderer <[email protected]> Co-authored-by: jose-donato <[email protected]> Co-authored-by: James Maslek <[email protected]>
OpenBB-finance · Apr 12, 2023 · 1298161 · 1298161
1 parent c3eed53
commit 1298161
Show file tree

Hide file tree

Showing 16 changed files with 921 additions and 26 deletions.
diff --git a/frontend-components/tables/src/components/Table.tsx b/frontend-components/tables/src/components/Table.tsx
diff --git a/openbb_terminal/alternative/oss/runa_view.py b/openbb_terminal/alternative/oss/runa_view.py
@@ -55,8 +55,6 @@ def display_rossindex(
     if df.empty:
         console.print("\nError in runa request\n")
     else:
-        plots_backend().send_table(df, title="Runa ROSS Index")
-
         if sortby in runa_model.SORT_COLUMNS:
             df = df.sort_values(by=sortby, ascending=ascend)
         df = df.head(limit)

diff --git a/openbb_terminal/core/plots/backend.py b/openbb_terminal/core/plots/backend.py
@@ -230,10 +230,23 @@ def send_table(self, df_table: pd.DataFrame, title: str = "", source: str = ""):
             Source of the data, by default ""
         """
         self.loop.run_until_complete(self.check_backend())
+
+        if title:
+            # We remove any html tags and markdown from the title
+            title = re.sub(r"<[^>]*>", "", title)
+            title = re.sub(r"\[\/?[a-z]+\]", "", title)
+
+        # we get the length of each column using the max length of the column
+        # name and the max length of the column values as the column width
         columnwidth = [
-            max(len(str(df_table[col].name)), df_table[col].astype(str).str.len().max())
+            max(
+                len(str(df_table[col].name)),
+                df_table[col].astype(str).str.len().max(),
+            )
             for col in df_table.columns
+            if hasattr(df_table[col], "name") and hasattr(df_table[col], "dtype")
         ]
+
         # we add a percentage of max to the min column width
         columnwidth = [
             int(x + (max(columnwidth) - min(columnwidth)) * 0.2) for x in columnwidth

diff --git a/openbb_terminal/cryptocurrency/defi/defi_controller.py b/openbb_terminal/cryptocurrency/defi/defi_controller.py
@@ -465,7 +465,6 @@ def call_ldapps(self, other_args: List[str]):
         )
         if ns_parser:
             llama_view.display_defi_protocols(
-                interactive=ns_parser.interactive,
                 limit=ns_parser.limit,
                 sortby=ns_parser.sortby,
                 ascend=ns_parser.reverse,

diff --git a/openbb_terminal/cryptocurrency/defi/llama_view.py b/openbb_terminal/cryptocurrency/defi/llama_view.py
@@ -77,7 +77,6 @@ def display_grouped_defi_protocols(
 @log_start_end(log=logger)
 def display_defi_protocols(
     sortby: str,
-    interactive: bool = False,
     limit: int = 20,
     ascend: bool = False,
     description: bool = False,

diff --git a/openbb_terminal/cryptocurrency/discovery/discovery_controller.py b/openbb_terminal/cryptocurrency/discovery/discovery_controller.py
@@ -162,7 +162,6 @@ def call_top(self, other_args):
         if ns_parser:
             if ns_parser.source == "CoinGecko":
                 pycoingecko_view.display_coins(
-                    interactive=ns_parser.interactive,
                     sortby=" ".join(ns_parser.sortby),
                     category=ns_parser.category,
                     limit=ns_parser.limit,

diff --git a/openbb_terminal/cryptocurrency/discovery/pycoingecko_view.py b/openbb_terminal/cryptocurrency/discovery/pycoingecko_view.py
@@ -32,7 +32,6 @@
 @log_start_end(log=logger)
 def display_coins(
     category: str,
-    interactive: bool = False,
     limit: int = 250,
     sortby: str = "Symbol",
     export: str = "",

diff --git a/openbb_terminal/economy/fred_view.py b/openbb_terminal/economy/fred_view.py
@@ -369,12 +369,15 @@ def plot_cpi(
         fig.add_scatter(x=df.index, y=df[column].values, name=label)
 
     if raw:
+        # was a -iloc so we need to flip the index as we use head
+        df = df.sort_index(ascending=False)
         print_rich_table(
-            df.iloc[-10:],
+            df,
             title=title,
             show_index=True,
             floatfmt=".3f",
             export=bool(export),
+            limit=limit,
         )
 
     export_data(

diff --git a/openbb_terminal/helper_funcs.py b/openbb_terminal/helper_funcs.py
@@ -372,6 +372,54 @@ def _get_headers(_headers: Union[List[str], pd.Index]) -> List[str]:
         if columns_to_auto_color is None and rows_to_auto_color is None:
             df = df.applymap(lambda x: return_colored_value(str(x)))
 
+    def _get_headers(_headers: Union[List[str], pd.Index]) -> List[str]:
+        """Check if headers are valid and return them."""
+        output = _headers
+        if isinstance(_headers, pd.Index):
+            output = list(_headers)
+        if len(output) != len(df.columns):
+            log_and_raise(
+                ValueError("Length of headers does not match length of DataFrame")
+            )
+        return output
+
+    if current_user.preferences.USE_INTERACTIVE_DF and plots_backend().isatty:
+        df_outgoing = df.copy()
+        # If headers are provided, use them
+        if headers is not None:
+            # We check if headers are valid
+            df_outgoing.columns = _get_headers(headers)
+
+        if show_index and index_name not in df_outgoing.columns:
+            # If index name is provided, we use it
+            df_outgoing.index.name = index_name or "Index"
+            df_outgoing = df_outgoing.reset_index()
+
+        for col in df_outgoing.columns:
+            if col == "":
+                df_outgoing = df_outgoing.rename(columns={col: "  "})
+
+        plots_backend().send_table(df_table=df_outgoing, title=title)
+        return
+
+    df = df.copy() if not limit else df.copy().iloc[:limit]
+    if current_user.preferences.USE_COLOR and automatic_coloring:
+        if columns_to_auto_color:
+            for col in columns_to_auto_color:
+                # checks whether column exists
+                if col in df.columns:
+                    df[col] = df[col].apply(lambda x: return_colored_value(str(x)))
+        if rows_to_auto_color:
+            for row in rows_to_auto_color:
+                # checks whether row exists
+                if row in df.index:
+                    df.loc[row] = df.loc[row].apply(
+                        lambda x: return_colored_value(str(x))
+                    )
+
+        if columns_to_auto_color is None and rows_to_auto_color is None:
+            df = df.applymap(lambda x: return_colored_value(str(x)))
+
     if current_user.preferences.USE_TABULATE_DF:
         table = Table(title=title, show_lines=True, show_header=show_header)
 

diff --git a/openbb_terminal/reports/templates/etf.ipynb b/openbb_terminal/reports/templates/etf.ipynb
@@ -19,8 +19,8 @@
     "import numpy as np\n",
     "import datetime\n",
     "\n",
-    "from IPython.display import HTML\n",
-    "\n",
+    "from IPython.display import HTML \n",
+    " \n",
     "import openbb_terminal.config_terminal as cfg\n",
     "from openbb_terminal.reports import widget_helpers as widgets\n",
     "from openbb_terminal.sdk import openbb\n",

diff --git a/openbb_terminal/stocks/stocks_controller.py b/openbb_terminal/stocks/stocks_controller.py
@@ -380,7 +380,7 @@ def call_candle(self, other_args: List[str]):
             dest="ticker",
             help="Ticker to analyze",
             type=str,
-            default=self.ticker,
+            default=None,
             required=not any(x in other_args for x in ["-h", "--help"])
             and not self.ticker,
         )

diff --git a/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[2.0.0-2.0.0rc1].txt b/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[2.0.0-2.0.0rc1].txt
@@ -1,3 +1,3 @@
-[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
-
-
+[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
+
+
diff --git a/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v0.0.1-v0.0.1].txt b/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v0.0.1-v0.0.1].txt
@@ -1,3 +1,3 @@
-[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
-
-
+[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
+
+
diff --git a/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v0.0.2-v0.0.1].txt b/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v0.0.2-v0.0.1].txt
@@ -1,3 +1,3 @@
-[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
-
-
+[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
+
+
diff --git a/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v1.10.0-v1.9.0].txt b/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v1.10.0-v1.9.0].txt
@@ -1,3 +1,3 @@
-[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
-
-
+[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
+
+
diff --git a/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v1.9.0-v1.10.0].txt b/tests/openbb_terminal/txt/test_terminal_helper/test_check_for_updates[v1.9.0-v1.10.0].txt
@@ -1,3 +1,3 @@
-[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
-
-
+[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]
+
+
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@
		[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]


		[yellow]Unable to check for updates... Check your internet connection and try again...[/yellow]