Merge branch 'develop' of https://github.com/OpenBB-finance/OpenBBTerminal into develop

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")

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"
         }

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(

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",