From 82218d01f48051e2a43ad097a7453f3a1da533ac Mon Sep 17 00:00:00 2001 From: hippocritical Date: Fri, 30 Dec 2022 21:48:06 +0100 Subject: [PATCH] sped up the function generic_visit that now skips unnecessary fields added mentioning of skipped class names since they could not be found --- freqtrade/commands/strategy_utils_commands.py | 5 +++-- freqtrade/strategy/strategyupdater.py | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/freqtrade/commands/strategy_utils_commands.py b/freqtrade/commands/strategy_utils_commands.py index 13405089f..cf7ba5e13 100644 --- a/freqtrade/commands/strategy_utils_commands.py +++ b/freqtrade/commands/strategy_utils_commands.py @@ -25,11 +25,12 @@ def start_strategy_update(args: Dict[str, Any]) -> None: config, enum_failed=True, recursive=config.get('recursive_strategy_search', False)) filtered_strategy_objs = [] - for args_strategy in args['strategy_list']: - for strategy_obj in strategy_objs: + for strategy_obj in strategy_objs: + for args_strategy in args['strategy_list']: if strategy_obj['name'] == args_strategy and strategy_obj not in filtered_strategy_objs: filtered_strategy_objs.append(strategy_obj) break + print(f"strategy {strategy_obj['name']} could not be loaded or found and is skipped.") for filtered_strategy_obj in filtered_strategy_objs: # Initialize backtesting object diff --git a/freqtrade/strategy/strategyupdater.py b/freqtrade/strategy/strategyupdater.py index b62bc7822..74bb4454c 100644 --- a/freqtrade/strategy/strategyupdater.py +++ b/freqtrade/strategy/strategyupdater.py @@ -52,6 +52,7 @@ class StrategyUpdater: """ source_file = strategy_obj['location'] + print(f"started conversion of {source_file}") strategies_backup_folder = Path.joinpath(config['user_data_dir'], "strategies_orig_updater") target_file = Path.joinpath(strategies_backup_folder, strategy_obj['location_rel']) @@ -106,6 +107,8 @@ class NameUpdater(ast.NodeTransformer): # traverse the AST recursively by calling the visitor method for each child node if hasattr(node, "_fields"): for field_name, field_value in ast.iter_fields(node): + if not isinstance(field_value, ast.AST): + continue # to avoid unnecessary loops self.visit(field_value) self.generic_visit(field_value) self.check_fields(field_value) @@ -204,8 +207,9 @@ class NameUpdater(ast.NodeTransformer): node.slice.value = StrategyUpdater.rename_dict[node.slice.value] if hasattr(node.slice, "elts"): self.visit_slice_elts(node.slice.elts) - if hasattr(node.slice.value, "elts"): - self.visit_slice_elts(node.slice.value.elts) + if hasattr(node.slice, "value"): + if hasattr(node.slice.value, "elts"): + self.visit_slice_elts(node.slice.value.elts) return node # elts can have elts (technically recursively)