From eb82d9505491c0abe81643ab2953f92bf412fd07 Mon Sep 17 00:00:00 2001 From: Colin Delahunty <72827203+colin99d@users.noreply.github.com> Date: Fri, 30 Sep 2022 12:34:56 +0200 Subject: [PATCH] Fixed ccxt (#2666) * Fixed ccxt * Tells you when a bad source is sent Co-authored-by: hjoaquim --- openbb_terminal/cryptocurrency/cryptocurrency_helpers.py | 8 +++++--- openbb_terminal/stocks/stocks_helper.py | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py b/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py index 8aa8d3b9ec6..6f0088ab9c8 100644 --- a/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py +++ b/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py @@ -310,8 +310,8 @@ def load( exchange: str = "binance", vs_currency: str = "usdt", end_date: datetime = datetime.now(), - source: str = "ccxt", -): + source: str = "CCXT", +) -> pd.DataFrame: """Load crypto currency to perform analysis on CoinGecko is used as source for price and YahooFinance for volume. @@ -330,7 +330,7 @@ def load( Dataframe consisting of price and volume data """ df = pd.DataFrame() - if source == "ccxt": + if source == "CCXT": pair = f"{symbol.upper()}/{vs_currency.upper()}" try: df = fetch_ccxt_ohlc( @@ -410,6 +410,8 @@ def load( console.print(f"\nPair {pair} not found in Yahoo Finance\n") return pd.DataFrame() df.index.name = "date" + else: + console.print("[red]Invalid source sent[/red]\n") return df diff --git a/openbb_terminal/stocks/stocks_helper.py b/openbb_terminal/stocks/stocks_helper.py index ef8bdae5ff0..f6fc44a32ef 100644 --- a/openbb_terminal/stocks/stocks_helper.py +++ b/openbb_terminal/stocks/stocks_helper.py @@ -262,6 +262,9 @@ def load( df_stock_candidate = load_stock_polygon( symbol, start_date, end_date, weekly, monthly ) + else: + console.print("[red]Invalid source for stock[/red]\n") + return if df_stock_candidate.empty: return df_stock_candidate