Merge branch 'feature/cryptostats_fees' of https://github.com/OpenBB-…

…finance/OpenBBTerminal into feature/cryptostats_fees

openbb_terminal/cryptocurrency/defi/terramoney_fcd_view.py

@@ -3,21 +3,17 @@
 
 import logging
 import os
+import textwrap
 from typing import Optional, Union
 
-from openbb_terminal import (
-    OpenBBFigure,
-)
+from openbb_terminal import OpenBBFigure
 from openbb_terminal.cryptocurrency.dataframe_helpers import (
     lambda_very_long_number_formatter,
     prettify_column_names,
 )
 from openbb_terminal.cryptocurrency.defi import terramoney_fcd_model
 from openbb_terminal.decorators import log_start_end
-from openbb_terminal.helper_funcs import (
-    export_data,
-    print_rich_table,
-)
+from openbb_terminal.helper_funcs import export_data, print_rich_table
 from openbb_terminal.rich_config import console
 
 logger = logging.getLogger(__name__)
@@ -97,6 +93,10 @@ def display_validators(
         for x in prettify_column_names(df.columns)
     ]
 
+    df["Account address"] = df["Account address"].apply(
+        lambda x: "\n".join(textwrap.wrap(x, width=20))
+    )
+
     print_rich_table(
         df,
         headers=list(df.columns),

openbb_terminal/terminal_controller.py

@@ -24,10 +24,7 @@
 from prompt_toolkit.styles import Style
 
 import openbb_terminal.config_terminal as cfg
-from openbb_terminal.account.show_prompt import (
-    get_show_prompt,
-    set_show_prompt,
-)
+from openbb_terminal.account.show_prompt import get_show_prompt, set_show_prompt
 from openbb_terminal.common import biztoc_model, biztoc_view, feedparser_view
 from openbb_terminal.core.config.paths import (
     HOME_DIRECTORY,
@@ -38,10 +35,7 @@
 from openbb_terminal.core.log.generation.custom_logger import log_terminal
 from openbb_terminal.core.session import session_controller
 from openbb_terminal.core.session.current_system import set_system_variable
-from openbb_terminal.core.session.current_user import (
-    get_current_user,
-    set_preference,
-)
+from openbb_terminal.core.session.current_user import get_current_user, set_preference
 from openbb_terminal.helper_funcs import (
     EXPORT_ONLY_RAW_DATA_ALLOWED,
     check_positive,
@@ -352,6 +346,7 @@ def call_askobb(self, other_args: List[str]) -> None:
         self.save_class()
         parser = argparse.ArgumentParser(
             add_help=False,
+            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
             prog="askobb",
             description="Accept input as a string and return the most appropriate Terminal command",
         )
@@ -379,7 +374,7 @@ def call_askobb(self, other_args: List[str]) -> None:
             help="GPT Model to use for Askobb LLM (default: gpt-3.5-turbo) or gpt-4 (beta)",
         )
 
-        if other_args and "-q" not in other_args:
+        if other_args and "-" not in other_args[0][0]:
             other_args.insert(0, "-q")
 
         ns_parser = self.parse_known_args_and_warn(

tests/openbb_terminal/cryptocurrency/defi/test_terramoney_fcd_view.py

@@ -19,9 +19,9 @@
             ),
         ),
         ("display_validators", dict()),
-        ("display_gov_proposals", dict()),
+        # ("display_gov_proposals", dict()), Can't reach node
         ("display_account_growth", dict()),
-        ("display_staking_ratio_history", dict()),
+        # ("display_staking_ratio_history", dict()), Can't reach node
         ("display_staking_returns_history", dict()),
     ],
 )

tests/openbb_terminal/cryptocurrency/defi/txt/test_terramoney_fcd_view/test_call_func[display_account_staking_info-kwargs0].txt

@@ -1,3 +1,3 @@
   Validator name Validator status  Amount delegated  Total reward
-0    Terra Bites           active               0.0           0.0
-1         Bitrue         inactive               0.0           0.0
+0    Terra Bites           jailed               0.0        0.0001
+1         Bitrue         inactive               0.0        0.0000

tests/openbb_terminal/cryptocurrency/defi/txt/test_terramoney_fcd_view/test_call_func[display_gov_proposals-kwargs2].txt

@@ -1,11 +0,0 @@
-    Id       Submit time  Deposit end time    Status                  Type                                                       Title  Yes  No  Abstain  No with veto
-99   2  2020-01-07 17:50  2020-01-21 17:50  Rejected         Text Proposal  Unlocking the pre-seed, seed round's\nLuna Tokens at once.   11  17        0             0
-98   3  2020-01-11 05:08  2020-01-25 05:08  Rejected         Text Proposal      Explicit disclosure of the circulating\nsupply of LUNA   13   8        5             2
-97   4  2020-01-22 08:15  2020-02-05 08:15    Passed      Parameter-change          Proposal to Implement a Temporary Tax\nRate Freeze   27   0        0             1
-96   5  2020-02-12 19:49  2020-02-26 19:49  Rejected         Text Proposal      Sort validators by self-delegation (skin\nin the game)   20   6        4             0
-95   6  2020-03-18 07:09  2020-04-01 07:09    Passed  Community-pool Spend                              Seigniorage Allocation to Chai   25   5        0             0
-94   7  2020-03-31 09:30  2020-04-14 09:30  Rejected      Parameter-change            Increase Minimum Deposit for Goverance\nProposal   28   1        1             0
-93   8  2020-03-31 09:34  2020-04-14 09:34  Rejected      Parameter-change                           Decrease Goverance Minimum Quorum   19   8        0             2
-92   9  2020-05-20 12:36  2020-06-03 12:36  Rejected         Text Proposal       Proposal to Exclude Luna delegated by\nthe Foundation   17   3        4             2
-91  10  2020-06-07 16:35  2020-06-21 16:35    Passed      Parameter-change         Temporary Increasing Tobin Tax From\n0.25% to 0.35%   29   1        0             0
-90  11  2020-09-02 08:50  2020-09-16 08:50    Passed      Parameter-change      Proposal to decrease minspread of Terra\nto Luna swaps   28   0        0             0