lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 10:21:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding tests

Browse Source 
added more code inside NameUpdater to grab more variables.
This commit is contained in:
hippocritical 2023-01-01 18:57:38 +01:00
parent a51e44eea3
commit 762dd4f024
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
freqtrade/strategy/strategyupdater.py
View File

@ -128,6 +128,15 @@ class NameUpdater(ast.NodeTransformer):
for key in field_value.keys: for key in field_value.keys:
self.visit(key) self.visit(key)
def check_args(self, node):
if isinstance(node.args, ast.arguments):
self.check_args(node.args)
if hasattr(node, "args"):
if isinstance(node.args, list):
for arg in node.args:
arg.arg = StrategyUpdater.name_mapping[arg.arg]
return node
def visit_Name(self, node): def visit_Name(self, node):
# if the name is in the mapping, update it # if the name is in the mapping, update it
if node.id in StrategyUpdater.name_mapping: if node.id in StrategyUpdater.name_mapping:
@ -152,6 +161,8 @@ class NameUpdater(ast.NodeTransformer):
# if the function name is in the mapping, update it # if the function name is in the mapping, update it
if node.name in StrategyUpdater.function_mapping: if node.name in StrategyUpdater.function_mapping:
node.name = StrategyUpdater.function_mapping[node.name] node.name = StrategyUpdater.function_mapping[node.name]
if hasattr(node, "args"):
self.check_args(node)
return self.generic_visit(node) return self.generic_visit(node)
def visit_Attribute(self, node): def visit_Attribute(self, node):
@ -193,10 +204,10 @@ class NameUpdater(ast.NodeTransformer):
# Replace the slice attributes with the values from rename_dict # Replace the slice attributes with the values from rename_dict
node.slice.value = StrategyUpdater.rename_dict[node.slice.value] node.slice.value = StrategyUpdater.rename_dict[node.slice.value]
if hasattr(node.slice, "elts"): if hasattr(node.slice, "elts"):
self.visit_slice_elts(node.slice.elts) self.visit_elts(node.slice.elts)
if hasattr(node.slice, "value"): if hasattr(node.slice, "value"):
if hasattr(node.slice.value, "elts"): if hasattr(node.slice.value, "elts"):
self.visit_slice_elts(node.slice.value.elts) self.visit_elts(node.slice.value.elts)
# Check if the target is a Subscript object with a "value" attribute # Check if the target is a Subscript object with a "value" attribute
# if isinstance(target, ast.Subscript) and hasattr(target.value, "attr"): # if isinstance(target, ast.Subscript) and hasattr(target.value, "attr"):
# if target.value.attr == "loc": # if target.value.attr == "loc":
@ -204,12 +215,25 @@ class NameUpdater(ast.NodeTransformer):
return node return node
# elts can have elts (technically recursively) # elts can have elts (technically recursively)
def visit_slice_elts(self, elts): def visit_elts(self, elts):
for elt in elts: if isinstance(elts, list):
if isinstance(elt, ast.Constant) and elt.value in StrategyUpdater.rename_dict: for elt in elts:
elt.value = StrategyUpdater.rename_dict[elt.value] self.visit_elt(elt)
elif hasattr(elt, "elts"): else:
self.visit_slice_elts(elt.elts) self.visit_elt(elts)
# sub function again needed since the structure itself is highly flexible ...
def visit_elt(self, elt):
if isinstance(elt, ast.Constant) and elt.value in StrategyUpdater.rename_dict:
elt.value = StrategyUpdater.rename_dict[elt.value]
if hasattr(elt, "elts"):
self.visit_elts(elt.elts)
if hasattr(elt, "args"):
if isinstance(elt.args, ast.arguments):
self.visit_elts(elt.args)
else:
for arg in elt.args:
self.visit_elts(arg)
def visit_Constant(self, node): def visit_Constant(self, node):
# do not update the names in import statements # do not update the names in import statements

11
tests/test_strategy_updater.py
View File

@ -4,6 +4,11 @@ from freqtrade.strategy.strategyupdater import StrategyUpdater
def test_strategy_updater(default_conf, caplog) -> None: def test_strategy_updater(default_conf, caplog) -> None:
modified_code5 = StrategyUpdater.update_code(StrategyUpdater, """
def confirm_trade_exit(sell_reason: str):
pass
""")
modified_code1 = StrategyUpdater.update_code(StrategyUpdater, """ modified_code1 = StrategyUpdater.update_code(StrategyUpdater, """
class testClass(IStrategy): class testClass(IStrategy):
def populate_buy_trend(): def populate_buy_trend():
@ -31,9 +36,10 @@ ignore_roi_if_buy_signal = True
forcebuy_enable = True forcebuy_enable = True
""") """)
modified_code4 = StrategyUpdater.update_code(StrategyUpdater, """ modified_code4 = StrategyUpdater.update_code(StrategyUpdater, """
dataframe.loc[reduce(lambda x, y: x & y, conditions), 'buy'] = 1 dataframe.loc[reduce(lambda x, y: x & y, conditions), ["buy", "buy_tag"]] = (1, "buy_signal_1")
dataframe.loc[reduce(lambda x, y: x & y, conditions), 'sell'] = 1 dataframe.loc[reduce(lambda x, y: x & y, conditions), 'sell'] = 1
""") """)
assert "populate_entry_trend" in modified_code1 assert "populate_entry_trend" in modified_code1
assert "populate_exit_trend" in modified_code1 assert "populate_exit_trend" in modified_code1
assert "check_entry_timeout" in modified_code1 assert "check_entry_timeout" in modified_code1
@ -54,3 +60,6 @@ dataframe.loc[reduce(lambda x, y: x & y, conditions), 'sell'] = 1
assert "enter_long" in modified_code4 assert "enter_long" in modified_code4
assert "exit_long" in modified_code4 assert "exit_long" in modified_code4
assert "enter_tag" in modified_code4
assert "exit_reason" in modified_code5