Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back #2485

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Back #2485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46d256
[Backtesting] add extra_backtesting_time_frames
GuillaumeDSM Dec 11, 2023
6d79bc4
[Requirements] bump
GuillaumeDSM Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions octobot/backtesting/independent_backtesting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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):
Expand Down
7 changes: 7 additions & 0 deletions octobot/config/profile_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
},
"read_only": {
"type": "boolean"
},
"extra_backtesting_time_frames": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading