From d234780adcde67ff7c8cc57f7a8c82a8233ab8b4 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 7 Nov 2022 16:03:32 -0500 Subject: [PATCH 1/2] fixing cgstables bug --- .../overview/overview_controller.py | 24 ++++++++++++++----- .../overview/pycoingecko_view.py | 16 ++++++++++--- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/openbb_terminal/cryptocurrency/overview/overview_controller.py b/openbb_terminal/cryptocurrency/overview/overview_controller.py index aa09cffc0ce4..e96033164491 100644 --- a/openbb_terminal/cryptocurrency/overview/overview_controller.py +++ b/openbb_terminal/cryptocurrency/overview/overview_controller.py @@ -141,8 +141,21 @@ def __init__(self, queue: List[str] = None): "-l": "--limit", "--pie": {}, } + choices["stables"] = { - "--sortby": {c: {} for c in pycoingecko_model.COINS_COLUMNS}, + "--sortby": { + c: {} + for c in [ + "Symbol", + "Name", + "Price_[$]", + "Market_Cap_[$]", + "Market_Cap_Rank", + "Change_7d_[%]", + "Change_24h_[%]", + "Volume_[$]", + ] + }, "-s": "--sortby", "--limit": {str(c): {} for c in range(1, 100)}, "-l": "--limit", @@ -765,8 +778,8 @@ def call_categories(self, other_args): dest="sortby", type=str, help="Sort by given column. Default: market_cap_desc", - default=pycoingecko_model.SORT_VALUES[0], - choices=pycoingecko_model.SORT_VALUES, + # default=pycoingecko_model.SORT_VALUES[0], + # choices=pycoingecko_model.SORT_VALUES, ) parser.add_argument( @@ -818,13 +831,12 @@ def call_stables(self, other_args): dest="sortby", type=str, help="Sort by given column. Default: market_cap", - default="market_cap", - choices=pycoingecko_model.COINS_COLUMNS, + default="Market_Cap_[$]", ) parser.add_argument( "--descend", - action="store_false", + action="store_true", help="Flag to sort in descending order (lowest first)", dest="descend", default=False, diff --git a/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py b/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py index 3c301944b0b0..55106435be66 100644 --- a/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py +++ b/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py @@ -356,7 +356,17 @@ def display_stablecoins( pie : bool Whether to show a pie chart """ - + sort_mapping = { + "Symbol": "symbol", + "Name": "name", + "Price_[$]": "current_price", + "Market_Cap_[$]": "market_cap", + "Market_Cap_Rank": "market_cap_rank", + "Change_7d_[%]": "price_change_percentage_7d_in_currency", + "Change_24h_[%]": "price_change_percentage_24h_in_currency", + "Volume_[$]": "total_volume", + } + sortby = sort_mapping[sortby] df = gecko.get_stable_coins(limit, sortby=sortby, ascend=ascend) if not df.empty: @@ -372,13 +382,13 @@ def display_stablecoins( "Price [$]", "Market Cap [$]", "Market Cap Rank", - "Change 24h [%]", "Change 7d [%]", + "Change 24h [%]", "Volume [$]", f"Percentage [%] of top {limit}", ], axis=1, - inplace=False, + copy=False, ) df = df.applymap(lambda x: lambda_long_number_format_with_type_check(x)) if pie: From 188d649a297d885e84e2e322f587af90fb6dc6c8 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 10 Nov 2022 10:58:19 -0500 Subject: [PATCH 2/2] edit --- .../overview/overview_controller.py | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/openbb_terminal/cryptocurrency/overview/overview_controller.py b/openbb_terminal/cryptocurrency/overview/overview_controller.py index e96033164491..aa13abc74539 100644 --- a/openbb_terminal/cryptocurrency/overview/overview_controller.py +++ b/openbb_terminal/cryptocurrency/overview/overview_controller.py @@ -91,6 +91,17 @@ class OverviewController(BaseController): ORDERED_LIST_SOURCES_EXCHANGES = get_ordered_list_sources(f"{PATH}exchanges") + STABLES_CHOICES = [ + "Symbol", + "Name", + "Price_[$]", + "Market_Cap_[$]", + "Market_Cap_Rank", + "Change_7d_[%]", + "Change_24h_[%]", + "Volume_[$]", + ] + def __init__(self, queue: List[str] = None): """Constructor""" super().__init__(queue) @@ -143,19 +154,7 @@ def __init__(self, queue: List[str] = None): } choices["stables"] = { - "--sortby": { - c: {} - for c in [ - "Symbol", - "Name", - "Price_[$]", - "Market_Cap_[$]", - "Market_Cap_Rank", - "Change_7d_[%]", - "Change_24h_[%]", - "Volume_[$]", - ] - }, + "--sortby": {c: {} for c in self.STABLES_CHOICES}, "-s": "--sortby", "--limit": {str(c): {} for c in range(1, 100)}, "-l": "--limit",