From 78ebeef12565a0f65b6e0545272522c01689548b Mon Sep 17 00:00:00 2001 From: Phoebe Hu <68739569+Light-JH@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:15:19 -0700 Subject: [PATCH 1/2] print message if yahoo finance load fails (#5450) --- openbb_terminal/stocks/stocks_helper.py | 1 + openbb_terminal/stocks/stocks_model.py | 1 + 2 files changed, 2 insertions(+) diff --git a/openbb_terminal/stocks/stocks_helper.py b/openbb_terminal/stocks/stocks_helper.py index 4d9d76540bc..83d9c2f6996 100644 --- a/openbb_terminal/stocks/stocks_helper.py +++ b/openbb_terminal/stocks/stocks_helper.py @@ -411,6 +411,7 @@ def load( # Check that loading a stock was not successful if df_stock_candidate.empty: + console.print("[red]No results found in yahoo finance reply.[/red]") return pd.DataFrame() df_stock_candidate.index = pd.to_datetime( diff --git a/openbb_terminal/stocks/stocks_model.py b/openbb_terminal/stocks/stocks_model.py index 56bdde3f812..f84a84034e7 100644 --- a/openbb_terminal/stocks/stocks_model.py +++ b/openbb_terminal/stocks/stocks_model.py @@ -182,6 +182,7 @@ def load_stock_yf( # Check that loading a stock was not successful if df_stock_candidate.empty: + console.print("[red]No results found in yahoo finance reply.[/red]") return pd.DataFrame() df_stock_candidate_cols = [ "Open", From bf082d1aeda02ac2d2e77c5c142dde5a0a6b9605 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Wed, 20 Sep 2023 17:09:35 -0400 Subject: [PATCH 2/2] Hotfix stock screener (#5440) * correct screener * fix another .strip --- .../stocks/screener/screener_controller.py | 28 +++++++++---------- .../stocks/screener/screener_view.py | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openbb_terminal/stocks/screener/screener_controller.py b/openbb_terminal/stocks/screener/screener_controller.py index 36e32e42e02..ec40c1d2c07 100644 --- a/openbb_terminal/stocks/screener/screener_controller.py +++ b/openbb_terminal/stocks/screener/screener_controller.py @@ -57,7 +57,7 @@ class ScreenerController(BaseController): if PRESETS_PATH.exists(): preset_choices.update( { - filepath.name.strip(".ini"): filepath + filepath.name.replace(".ini", ""): filepath for filepath in PRESETS_PATH.iterdir() if filepath.suffix == ".ini" } @@ -66,7 +66,7 @@ class ScreenerController(BaseController): if PRESETS_PATH_DEFAULT.exists(): preset_choices.update( { - filepath.name.strip(".ini"): filepath + filepath.name.replace(".ini", ""): filepath for filepath in PRESETS_PATH_DEFAULT.iterdir() if filepath.suffix == ".ini" } @@ -243,8 +243,8 @@ class ScreenerController(BaseController): if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) @@ -321,8 +321,8 @@ class ScreenerController(BaseController): if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) sort_map = screener_helper.finviz_map("valuation") @@ -398,8 +398,8 @@ class ScreenerController(BaseController): if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) sort_map = screener_helper.finviz_map("financial") @@ -475,8 +475,8 @@ class ScreenerController(BaseController): if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) sort_map = screener_helper.finviz_map("ownership") @@ -553,8 +553,8 @@ class ScreenerController(BaseController): sort_map = screener_helper.finviz_map("performance") if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) self.screen_tickers = finviz_view.screener( @@ -628,8 +628,8 @@ class ScreenerController(BaseController): if ns_parser: preset = ( - self.preset.strip(".ini") - if self.preset.strip(".ini") in finviz_model.d_signals + self.preset.replace(".ini", "") + if self.preset.replace(".ini", "") in finviz_model.d_signals else self.preset ) sort_map = screener_helper.finviz_map("technical") diff --git a/openbb_terminal/stocks/screener/screener_view.py b/openbb_terminal/stocks/screener/screener_view.py index 08287fe5b78..1ae79ef0a39 100644 --- a/openbb_terminal/stocks/screener/screener_view.py +++ b/openbb_terminal/stocks/screener/screener_view.py @@ -19,7 +19,7 @@ preset_choices = {} if PRESETS_PATH.exists(): preset_choices.update( { - filepath.name.strip(".ini"): filepath + filepath.name.replace(".ini", ""): filepath for filepath in PRESETS_PATH.iterdir() if filepath.suffix == ".ini" } @@ -28,7 +28,7 @@ if PRESETS_PATH.exists(): if PRESETS_PATH_DEFAULT.exists(): preset_choices.update( { - filepath.name.strip(".ini"): filepath + filepath.name.replace(".ini", ""): filepath for filepath in PRESETS_PATH_DEFAULT.iterdir() if filepath.suffix == ".ini" }