adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename sell_profit_only to exit_profit_only

Browse Source
This commit is contained in:
Matthias
2022-04-05 20:00:35 +02:00
parent 5c01969969
commit bba9629a2a
17 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/configuration/config_validation.py
View File

@@ -219,6 +219,7 @@ def validate_migrated_strategy_settings(conf: Dict[str, Any]) -> None:
_validate_order_types(conf)
_validate_unfilledtimeout(conf)
_validate_pricing_rules(conf)
_strategy_settings(conf)
def _validate_time_in_force(conf: Dict[str, Any]) -> None:
@@ -312,3 +313,8 @@ def _validate_pricing_rules(conf: Dict[str, Any]) -> None:
else:
process_deprecated_setting(conf, 'ask_strategy', obj, 'exit_pricing', obj)
del conf['ask_strategy']
def _strategy_settings(conf: Dict[str, Any]) -> None:
process_deprecated_setting(conf, None, 'sell_profit_only', None, 'exit_profit_only')

18
freqtrade/configuration/deprecated_settings.py
View File

@@ -72,12 +72,7 @@ def process_temporary_deprecated_settings(config: Dict[str, Any]) -> None:
# Kept for future deprecated / moved settings
# check_conflicting_settings(config, 'ask_strategy', 'use_sell_signal',
# 'experimental', 'use_sell_signal')
process_deprecated_setting(config, 'ask_strategy', 'use_sell_signal',
None, 'use_sell_signal')
process_deprecated_setting(config, 'ask_strategy', 'sell_profit_only',
None, 'sell_profit_only')
process_deprecated_setting(config, 'ask_strategy', 'sell_profit_offset',
None, 'sell_profit_offset')
process_deprecated_setting(config, 'ask_strategy', 'ignore_roi_if_buy_signal',
None, 'ignore_roi_if_buy_signal')
process_deprecated_setting(config, 'ask_strategy', 'ignore_buying_expired_candle_after',
@@ -109,12 +104,15 @@ def process_temporary_deprecated_settings(config: Dict[str, Any]) -> None:
'webhook', 'webhookexitfill')
# Legacy way - having them in experimental ...
process_removed_setting(config, 'experimental', 'use_sell_signal',
None, 'use_sell_signal')
process_removed_setting(config, 'experimental', 'sell_profit_only',
None, 'sell_profit_only')
process_removed_setting(config, 'experimental', 'use_sell_signal', None, 'use_sell_signal')
process_removed_setting(config, 'experimental', 'sell_profit_only', None, 'sell_profit_only')
process_removed_setting(config, 'experimental', 'ignore_roi_if_buy_signal',
None, 'ignore_roi_if_buy_signal')
process_removed_setting(config, 'ask_strategy', 'use_sell_signal', None, 'use_sell_signal')
process_removed_setting(config, 'ask_strategy', 'sell_profit_only', None, 'sell_profit_only')
process_removed_setting(config, 'ask_strategy', 'sell_profit_offset',
None, 'sell_profit_offset')
if (config.get('edge', {}).get('enabled', False)
and 'capital_available_percentage' in config.get('edge', {})):

2
freqtrade/constants.py
View File

@@ -150,7 +150,7 @@ CONF_SCHEMA = {
'trailing_stop_positive_offset': {'type': 'number', 'minimum': 0, 'maximum': 1},
'trailing_only_offset_is_reached': {'type': 'boolean'},
'use_sell_signal': {'type': 'boolean'},
'sell_profit_only': {'type': 'boolean'},
'exit_profit_only': {'type': 'boolean'},
'sell_profit_offset': {'type': 'number'},
'ignore_roi_if_buy_signal': {'type': 'boolean'},
'ignore_buying_expired_candle_after': {'type': 'number'},

2
freqtrade/optimize/optimize_reports.py
View File

@@ -461,7 +461,7 @@ def generate_strategy_stats(pairlist: List[str],
'use_custom_stoploss': config.get('use_custom_stoploss', False),
'minimal_roi': config['minimal_roi'],
'use_sell_signal': config['use_sell_signal'],
'sell_profit_only': config['sell_profit_only'],
'exit_profit_only': config['exit_profit_only'],
'sell_profit_offset': config['sell_profit_offset'],
'ignore_roi_if_buy_signal': config['ignore_roi_if_buy_signal'],
**daily_stats,

15
freqtrade/resolvers/strategy_resolver.py
View File

@@ -86,7 +86,7 @@ class StrategyResolver(IResolver):
("startup_candle_count", None),
("unfilledtimeout", None),
("use_sell_signal", True),
("sell_profit_only", False),
("exit_profit_only", False),
("ignore_roi_if_buy_signal", False),
("sell_profit_offset", 0.0),
("disable_dataframe_checks", False),
@@ -187,9 +187,13 @@ class StrategyResolver(IResolver):
if check_override(strategy, IStrategy, 'custom_sell'):
raise OperationalException(
"Please migrate your implementation of `custom_sell` to `custom_exit`.")
warn_deprecated_setting(strategy, 'sell_profit_only', 'exit_profit_only', True)
else:
# TODO: Implementing one of the following methods should show a deprecation warning
# buy_trend and sell_trend, custom_sell
warn_deprecated_setting(strategy, 'sell_profit_only', 'exit_profit_only')
if (
not check_override(strategy, IStrategy, 'populate_buy_trend')
and not check_override(strategy, IStrategy, 'populate_entry_trend')
@@ -262,6 +266,15 @@ class StrategyResolver(IResolver):
)
def warn_deprecated_setting(strategy: IStrategy, old: str, new: str, error: False):
if hasattr(strategy, old):
errormsg = f"DEPRECATED: Using '{old}' moved to '{new}'."
if error:
raise OperationalException(errormsg)
logger.warning(errormsg)
setattr(strategy, new, getattr(strategy, f'{old}'))
def check_override(object, parentclass, attribute):
"""
Checks if a object overrides the parent class attribute.

6
freqtrade/strategy/interface.py
View File

@@ -91,7 +91,7 @@ class IStrategy(ABC, HyperStrategyMixin):
process_only_new_candles: bool = False
use_sell_signal: bool
sell_profit_only: bool
exit_profit_only: bool
sell_profit_offset: float
ignore_roi_if_buy_signal: bool
@@ -881,8 +881,8 @@ class IStrategy(ABC, HyperStrategyMixin):
current_rate = rate
current_profit = trade.calc_profit_ratio(current_rate)
if (self.sell_profit_only and current_profit <= self.sell_profit_offset):
# sell_profit_only and profit doesn't reach the offset - ignore sell signal
if (self.exit_profit_only and current_profit <= self.sell_profit_offset):
# exit_profit_only and profit doesn't reach the offset - ignore sell signal
pass
elif self.use_sell_signal and not enter:
if exit_:

2
freqtrade/templates/base_strategy.py.j2
View File

@@ -66,7 +66,7 @@ class {{ strategy }}(IStrategy):
# These values can be overridden in the config.
use_sell_signal = True
sell_profit_only = False
exit_profit_only = False
ignore_roi_if_buy_signal = False
# Number of candles the strategy requires before producing valid signals

2
freqtrade/templates/sample_strategy.py
View File

@@ -66,7 +66,7 @@ class SampleStrategy(IStrategy):
# These values can be overridden in the config.
use_sell_signal = True
sell_profit_only = False
exit_profit_only = False
ignore_roi_if_buy_signal = False
# Hyperoptable parameters