Merge pull request #2486 from Drakkar-Software/dev

Dev merge
Drakkar-Software · Dec 12, 2023 · bb4a544 · bb4a544
2 parents 9f328da + 316c6c6
commit bb4a544
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/octobot/backtesting/independent_backtesting.py b/octobot/backtesting/independent_backtesting.py
@@ -87,6 +87,7 @@ def __init__(
         self.previous_handlers_log_level = commons_logging.get_logger_level_per_handler()
         self.enforce_total_databases_max_size_after_run = enforce_total_databases_max_size_after_run
         self.backtesting_data = backtesting_data
+        self.required_extra_timeframes = config.get(common_constants.CONFIG_REQUIRED_EXTRA_TIMEFRAMES, [])
         self.octobot_backtesting = backtesting.OctoBotBacktesting(
             self.backtesting_config,
             self.tentacles_setup_config,
@@ -378,6 +379,7 @@ def _adapt_config(self):
         self.backtesting_config[common_constants.CONFIG_BACKTESTING_ID] = self.backtesting_id
         if self.forced_time_frames:
             self.backtesting_config[evaluator_constants.CONFIG_FORCED_TIME_FRAME] = self.forced_time_frames
+        self.backtesting_config[common_constants.CONFIG_REQUIRED_EXTRA_TIMEFRAMES] = self.required_extra_timeframes
         self._add_config_default_backtesting_values()
 
     def _init_exchange_type(self):

diff --git a/octobot/community/authentication.py b/octobot/community/authentication.py
@@ -255,8 +255,9 @@ async def send(self, message, channel_type, identifier=None):
         """
         Sends a message
         """
-        await self._ensure_init_community_feed()
-        await self._community_feed.send(message, channel_type, identifier)
+        self.logger.debug("Sending trading signals is disabled for now")
+        # await self._ensure_init_community_feed()
+        # await self._community_feed.send(message, channel_type, identifier)
 
     async def wait_for_login_if_processing(self):
         if self._login_completed is not None and not self._login_completed.is_set():

diff --git a/octobot/community/models/strategy_data.py b/octobot/community/models/strategy_data.py
@@ -41,10 +41,7 @@ class ResultsData(commons_dataclasses.FlexibleDataclass):
     reference_market_profitability: dict = dataclasses.field(default_factory=dict)
 
     def get_max(self, key):
-        return max(
-            self.profitability.get(key, 0),
-            self.reference_market_profitability.get(key, 0)
-        )
+        return self.reference_market_profitability.get(key, 0)
 
 
 @dataclasses.dataclass

diff --git a/octobot/config/profile_schema.json b/octobot/config/profile_schema.json
@@ -30,6 +30,13 @@
         },
         "read_only": {
           "type": "boolean"
+        },
+        "extra_backtesting_time_frames": {
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
         }
       }
     },

diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
 # Drakkar-Software requirements
-OctoBot-Commons==1.9.33
+OctoBot-Commons==1.9.34
 OctoBot-Trading==2.4.46
 OctoBot-Evaluators==1.9.3
 OctoBot-Tentacles-Manager==2.9.6
 OctoBot-Services==1.6.5
-OctoBot-Backtesting==1.9.6
+OctoBot-Backtesting==1.9.7
 Async-Channel==2.2.1
 trading-backend==1.2.11