From 9936d8238c307cfd6c185d2c264a4593d9a17130 Mon Sep 17 00:00:00 2001 From: DJ Date: Wed, 12 May 2021 06:26:49 -0600 Subject: [PATCH 1/2] Error message --- gamestonk_terminal/forex/fx_controller.py | 25 +++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gamestonk_terminal/forex/fx_controller.py b/gamestonk_terminal/forex/fx_controller.py index fffd5b7e402..9e87e9fefc8 100644 --- a/gamestonk_terminal/forex/fx_controller.py +++ b/gamestonk_terminal/forex/fx_controller.py @@ -1,4 +1,5 @@ import argparse +from oandapyV20.exceptions import V20Error from typing import List from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal.helper_funcs import get_flair @@ -181,18 +182,24 @@ class ForexController: reddit_view.due_diligence(other_args, instrument) def call_eda(self, other_args): - df = fx_view.get_candles_dataframe(account, self.instrument, None) - df = df.rename(columns={"Close": "5. adjusted close"}) - instrument = self.instrument - s_start = pd.to_datetime(df.index.values[0]) - s_interval = "1440min" - eda_controller.menu(df, instrument, s_start, s_interval) + try: + df = fx_view.get_candles_dataframe(account, self.instrument, None) + df = df.rename(columns={"Close": "5. adjusted close"}) + instrument = self.instrument + s_start = pd.to_datetime(df.index.values[0]) + s_interval = "1440min" + eda_controller.menu(df, instrument, s_start, s_interval) + except: + print("No data found, do you have your oanda API keys set?") def call_ba(self, other_args: List[str]): instrument = fx_view.format_instrument(self.instrument, " ") - df = fx_view.get_candles_dataframe(account, self.instrument, None) - s_start = pd.to_datetime(df.index.values[0]) - ba_controller.menu(instrument, s_start) + try: + df = fx_view.get_candles_dataframe(account, self.instrument, None) + s_start = pd.to_datetime(df.index.values[0]) + ba_controller.menu(instrument, s_start) + except: + print("No data found, do you have your oanda API keys set?") def menu(): From d2876728bc32a8f6062f9d88012e5028de8d5239 Mon Sep 17 00:00:00 2001 From: DJ Date: Wed, 12 May 2021 06:55:41 -0600 Subject: [PATCH 2/2] Fix Linter --- gamestonk_terminal/forex/fx_controller.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gamestonk_terminal/forex/fx_controller.py b/gamestonk_terminal/forex/fx_controller.py index 9e87e9fefc8..bea602f8ef4 100644 --- a/gamestonk_terminal/forex/fx_controller.py +++ b/gamestonk_terminal/forex/fx_controller.py @@ -1,5 +1,4 @@ import argparse -from oandapyV20.exceptions import V20Error from typing import List from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal.helper_funcs import get_flair @@ -189,7 +188,7 @@ class ForexController: s_start = pd.to_datetime(df.index.values[0]) s_interval = "1440min" eda_controller.menu(df, instrument, s_start, s_interval) - except: + except AttributeError: print("No data found, do you have your oanda API keys set?") def call_ba(self, other_args: List[str]): @@ -198,7 +197,7 @@ class ForexController: df = fx_view.get_candles_dataframe(account, self.instrument, None) s_start = pd.to_datetime(df.index.values[0]) ba_controller.menu(instrument, s_start) - except: + except AttributeError: print("No data found, do you have your oanda API keys set?")