add extra validation to optimizer/backtester and when importing, made progress bar jump to 100 if successful

Author: ZENALC

algobot/__main__.py

@@ -264,34 +264,60 @@ def export_optimizer(self, file_type: str):
         else:
             create_popup(self, 'No table rows found because optimizer has not been run yet.')
 
-    def validate_optimizer(self, combos: dict):
+    def validate_optimizer_or_backtest(self, caller):
         """
-        Validate optimizer to ensure it is correctly setup.
+        Validate optimizer/backtester to ensure it is correctly setup.
         :return: False if not validated and true if validated.
         """
-        if not self.validate_ticker(OPTIMIZER):
+        config = self.configuration
+        noun = 'optimizer' if caller == OPTIMIZER else 'backtester'
+
+        if not self.validate_ticker(caller):
             return False
 
-        if self.configuration.optimizer_backtest_dict[OPTIMIZER]['data'] is None:
-            create_popup(self, "No data setup yet for optimizer. Please configure them in settings first.")
+        if config.optimizer_backtest_dict[caller]['data'] is None:
+            create_popup(self, f"No data setup yet for {noun}. Please download or import data in settings first.")
             return False
 
-        if self.configuration.get_optimizer_settings()['strategies'] == {}:
-            create_popup(self, "No strategies found. Make sure you have some strategies for optimization.")
+        selected_symbol = self.interfaceDictionary[caller]['configuration']['ticker'].text()
+        download_symbol = config.optimizer_backtest_dict[caller]['dataType']
+
+        if selected_symbol != download_symbol and download_symbol.lower() != 'imported':
+            create_popup(self, f"{noun.capitalize()} symbol ({selected_symbol}) does not match downloaded symbol "
+                               f"({download_symbol}). Change your ticker to ({download_symbol}) "
+                               f"or download ({selected_symbol}) data to get rid of this error.")
             return False
 
-        if not self.check_combos(combos['strategies']):
-            create_popup(self, "Please configure your strategies correctly.")
+        selected_interval = self.interfaceDictionary[caller]['configuration']['interval'].currentText().lower()
+        download_interval = config.optimizer_backtest_dict[caller]['dataInterval'].lower()
+
+        if selected_interval != download_interval and download_symbol.lower() != 'imported':
+            create_popup(self, f"{noun.capitalize()} interval ({selected_interval}) does not match downloaded interval "
+                               f"({download_interval}). Change your data interval to ({download_interval}) "
+                               f"or download ({selected_interval}) data to get rid of this error.")
             return False
 
+        if download_symbol.lower() == 'imported':
+            # TODO: Add verification for imports.
+            create_popup(self, "You are using imported data. Please ensure they logically work correctly with your "
+                               "inputs. Algobot currently does not support imported data verification.")
+
         return True
 
     def initiate_optimizer(self):
         """
         Main function to begin optimization.
         """
+        if not self.validate_optimizer_or_backtest(caller=OPTIMIZER):
+            return
+
         combos = self.configuration.get_optimizer_settings()
-        if not self.validate_optimizer(combos=combos):
+        if combos['strategies'] == {}:
+            create_popup(self, "No strategies found. Make sure you have some strategies for optimization.")
+            return
+
+        if not self.check_combos(combos['strategies']):
+            create_popup(self, "Please configure your strategies correctly.")
             return
 
         self.threads[OPTIMIZER] = optimizerThread.OptimizerThread(gui=self, logger=self.logger, combos=combos)
@@ -322,11 +348,7 @@ def initiate_backtest(self):
         """
         Initiates backtest based on settings configured. If there is no data configured, prompts user to configure data.
         """
-        if not self.validate_ticker(BACKTEST):
-            return
-
-        if self.configuration.optimizer_backtest_dict[BACKTEST]['data'] is None:
-            create_popup(self, "No data setup yet for backtesting. Please configure them in settings first.")
+        if not self.validate_optimizer_or_backtest(caller=BACKTEST):
             return
 
         if not self.check_strategies(BACKTEST):
@@ -500,7 +522,8 @@ def validate_ticker(self, caller: int):
             create_popup(self, "Please specify a ticker. No ticker found.")
             return False
         if selected_ticker not in self.tickers:
-            create_popup(self, "Invalid ticker specified. Please check your settings and configure it correctly.")
+            create_popup(self, f'Invalid ticker "{selected_ticker}" provided. If it is valid, '
+                               f'then try updating your tickers in the configuration settings.')
             return False
         return True
 

algobot/algodict.py

@@ -106,11 +106,13 @@ def get_interface_dictionary(parent, caller: int = None):
                 'mainConfigurationTabWidget': parent.configuration.backtestConfigurationTabWidget,
                 'precision': parent.configuration.backtestPrecisionSpinBox,
                 'ticker': parent.configuration.backtestTickerLineEdit,
+                'interval': parent.configuration.backtestIntervalComboBox,
             },
         },
         OPTIMIZER: {
             'configuration': {
                 'ticker': parent.configuration.optimizerTickerLineEdit,
+                'interval': parent.configuration.optimizerIntervalComboBox,
             },
         }
     }

algobot/interface/config_utils/data_utils.py

@@ -15,15 +15,21 @@ def import_data(config_obj, caller: int = BACKTEST):
     :param config_obj: Configuration QDialog object (from configuration.py)
     :param caller: Caller that'll determine who called this function -> OPTIMIZER or BACKTEST
     """
-    config_obj.optimizer_backtest_dict[caller]['infoLabel'].setText("Importing data...")
+    inner_dict = config_obj.optimizer_backtest_dict[caller]
+    action = 'backtest' if caller == BACKTEST else 'optimization'
+
+    inner_dict['infoLabel'].setText("Importing data...")
     filePath, _ = QFileDialog.getOpenFileName(config_obj, 'Open file', helpers.ROOT_DIR, "CSV (*.csv)")
     if filePath == '':
-        config_obj.optimizer_backtest_dict[caller]['infoLabel'].setText("Data not imported.")
+        inner_dict['infoLabel'].setText("Data not imported.")
+        inner_dict['downloadProgress'].setValue(0)
     else:
-        config_obj.optimizer_backtest_dict[caller]['data'] = helpers.load_from_csv(filePath, descending=False)
-        config_obj.optimizer_backtest_dict[caller]['dataType'] = "Imported"
-        config_obj.optimizer_backtest_dict[caller]['infoLabel'].setText("Imported data successfully.")
-        config_obj.optimizer_backtest_dict[caller]['dataLabel'].setText('Using imported data to conduct backtest.')
+        inner_dict['data'] = helpers.load_from_csv(filePath, descending=False)
+        inner_dict['dataType'] = "Imported"
+        inner_dict['dataInterval'] = inner_dict['dataIntervalComboBox'].currentText()
+        inner_dict['infoLabel'].setText("Imported data successfully.")
+        inner_dict['dataLabel'].setText(f'Using imported data to conduct {action}.')
+        inner_dict['downloadProgress'].setValue(100)
         setup_calendar(config_obj=config_obj, caller=caller)
 
 
@@ -59,13 +65,17 @@ def set_downloaded_data(config_obj, data, caller: int = BACKTEST):
     :param caller: Caller that'll determine which caller was used.
     :param data: Data to be used for backtesting.
     """
-    symbol = config_obj.optimizer_backtest_dict[caller]['tickers'].text()
-    interval = config_obj.optimizer_backtest_dict[caller]['intervals'].currentText().lower()
+    inner_dict = config_obj.optimizer_backtest_dict[caller]
+    action = 'backtest' if caller == BACKTEST else 'optimization'
+
+    symbol = inner_dict['tickers'].text()
+    interval = inner_dict['intervals'].currentText().lower()
 
-    config_obj.optimizer_backtest_dict[caller]['data'] = data
-    config_obj.optimizer_backtest_dict[caller]['dataType'] = symbol
-    config_obj.optimizer_backtest_dict[caller]['infoLabel'].setText(f"Downloaded {interval} {symbol} data.")
-    config_obj.optimizer_backtest_dict[caller]['dataLabel'].setText(f'Using {interval} {symbol} data to run backtest.')
+    inner_dict['dataInterval'] = inner_dict['dataIntervalComboBox'].currentText()
+    inner_dict['data'] = data
+    inner_dict['dataType'] = symbol
+    inner_dict['infoLabel'].setText(f"Downloaded {interval} {symbol} data.")
+    inner_dict['dataLabel'].setText(f'Using {interval} {symbol} data to run {action}.')
     setup_calendar(config_obj=config_obj, caller=caller)
 
 

algobot/interface/configuration.py

@@ -39,6 +39,8 @@ def __init__(self, parent: QMainWindow, logger: Logger = None):
                 'tickers': self.backtestTickerLineEdit,
                 'intervals': self.backtestIntervalComboBox,
                 'data': None,
+                'dataIntervalComboBox': self.backtestIntervalComboBox,
+                'dataInterval': None,
                 'dataType': None,
                 'infoLabel': self.backtestInfoLabel,
                 'dataLabel': self.backtestDataLabel,
@@ -55,6 +57,8 @@ def __init__(self, parent: QMainWindow, logger: Logger = None):
                 'tickers': self.optimizerTickerLineEdit,
                 'intervals': self.optimizerIntervalComboBox,
                 'data': None,
+                'dataIntervalComboBox': self.optimizerIntervalComboBox,
+                'dataInterval': None,
                 'dataType': None,
                 'infoLabel': self.optimizerInfoLabel,
                 'dataLabel': self.optimizerDataLabel,