Allowed for newly exported files to be loaded (#2894)

openbb_terminal/forecast/forecast_controller.py

@@ -16,7 +16,8 @@ try:
     if darts.__version__ != darts_latest:
         print(f"You are currently using Darts version {darts.__version__}")
         print(
-            f"Follow instructions on creating a new conda environment with the latest Darts version ({darts_latest}):"
+            "Follow instructions on creating a new conda environment with the latest "
+            f"Darts version ({darts_latest}):"
         )
         print(
             "https://github.com/OpenBB-finance/OpenBBTerminal/blob/main/openbb_terminal/README.md"
@@ -156,8 +157,7 @@ class ForecastController(BaseController):
         self.datasets: Dict[str, pd.DataFrame] = dict()
 
         if ticker and not data.empty:
-            # data["date"] = data.index
-            data = data.reset_index()  # convert date from index to column
+            data = data.reset_index()
             data.columns = data.columns.map(lambda x: x.lower().replace(" ", "_"))
 
             self.files.append(ticker)
@@ -183,7 +183,7 @@ class ForecastController(BaseController):
             "pow": "**",
         }
         self.file_types = forecast_model.base_file_types
-        self.DATA_FILES = forecast_model.default_files
+        self.DATA_FILES = forecast_model.get_default_files()
 
         # setting device on GPU if available, else CPU
         self.device = "cuda" if torch.cuda.is_available() else "cpu"
@@ -213,6 +213,8 @@ class ForecastController(BaseController):
             self.update_runtime_choices()
 
     def update_runtime_choices(self):
+        # Load in any newly exported files
+        self.DATA_FILES = forecast_model.get_default_files()
         if session and obbff.USE_PROMPT_TOOLKIT:
             dataset_columns = {
                 f"{dataset}.{column}": {column: None, dataset: None}
@@ -240,8 +242,6 @@ class ForecastController(BaseController):
                 "delta",
                 "atr",
                 "signal",
-                # "index",
-                # "remove",
                 "combine",
                 "rename",
                 "expo",
@@ -331,7 +331,6 @@ class ForecastController(BaseController):
         mt.add_cmd("tcn", self.files)
         mt.add_cmd("trans", self.files)
         mt.add_cmd("tft", self.files)
-        # mt.add_info("_comingsoon_")
 
         console.print(text=mt.menu_text, menu="Forecast")
 
@@ -724,6 +723,8 @@ class ForecastController(BaseController):
             help="Alias name to give to the dataset",
             type=str,
         )
+        # Load in any newly exported files
+        self.DATA_FILES = forecast_model.get_default_files()
 
         if other_args and "-" not in other_args[0][0]:
             other_args.insert(0, "-f")

openbb_terminal/forecast/forecast_model.py

@@ -23,15 +23,26 @@ logger = logging.getLogger(__name__)
 
 
 base_file_types = ["csv", "xlsx"]
-default_files = {
-    filepath.name: filepath
-    for file_type in base_file_types
-    for filepath in chain(
-        USER_EXPORTS_DIRECTORY.rglob(f"*.{file_type}"),
-        USER_CUSTOM_IMPORTS_DIRECTORY.rglob(f"*.{file_type}"),
-    )
-    if filepath.is_file()
-}
+
+
+def get_default_files() -> Dict[str, Path]:
+    """Get the default files to load.
+
+    Returns
+    -------
+    default_files : Dict[str, Path]
+        A dictionary to map the default file names to their paths.
+    """
+    default_files = {
+        filepath.name: filepath
+        for file_type in base_file_types
+        for filepath in chain(
+            USER_EXPORTS_DIRECTORY.rglob(f"*.{file_type}"),
+            USER_CUSTOM_IMPORTS_DIRECTORY.rglob(f"*.{file_type}"),
+        )
+        if filepath.is_file()
+    }
+    return default_files
 
 
 @log_start_end(log=logger)
@@ -62,7 +73,7 @@ def load(
     if file_types is None:
         file_types = ["csv", "xlsx"]
     if data_files is None:
-        data_files = default_files
+        data_files = get_default_files()
 
     if file in data_files:
         full_file = data_files[file]