mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add trade_duration parameter to custom_roi

Browse Source
This commit is contained in:
mrpabloyeah
2025-05-15 11:53:48 +02:00
parent 12cd654bce
commit 90e2935abf
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/strategy-callbacks.md
+5 -4
View File
@@ -527,7 +527,7 @@ class AwesomeStrategy(IStrategy):
# ... populate_* methods # ... populate_* methods
def custom_roi(self, pair: str, trade: Trade, current_time: datetime, def custom_roi(self, pair: str, trade: Trade, current_time: datetime, trade_duration: int,
entry_tag: str | None, side: str, **kwargs) -> float | None: entry_tag: str | None, side: str, **kwargs) -> float | None:
""" """
Custom ROI logic, returns a new minimum ROI threshold (as a ratio, e.g., 0.05 for +5%). Custom ROI logic, returns a new minimum ROI threshold (as a ratio, e.g., 0.05 for +5%).
@@ -540,6 +540,7 @@ class AwesomeStrategy(IStrategy):
:param pair: Pair that's currently analyzed. :param pair: Pair that's currently analyzed.
:param trade: trade object. :param trade: trade object.
:param current_time: datetime object, containing the current datetime. :param current_time: datetime object, containing the current datetime.
:param trade_duration: Current trade duration in minutes.
:param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal. :param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal.
:param side: 'long' or 'short' - indicating the direction of the current trade. :param side: 'long' or 'short' - indicating the direction of the current trade.
:param **kwargs: Ensure to keep this here so updates to this won't break your strategy. :param **kwargs: Ensure to keep this here so updates to this won't break your strategy.
@@ -561,7 +562,7 @@ class AwesomeStrategy(IStrategy):
# ... populate_* methods # ... populate_* methods
def custom_roi(self, pair: str, trade: Trade, current_time: datetime, def custom_roi(self, pair: str, trade: Trade, current_time: datetime, trade_duration: int,
entry_tag: str | None, side: str, **kwargs) -> float | None: entry_tag: str | None, side: str, **kwargs) -> float | None:
stake = trade.stake_currency stake = trade.stake_currency
@@ -587,7 +588,7 @@ class AwesomeStrategy(IStrategy):
# ... populate_* methods # ... populate_* methods
def custom_roi(self, pair: str, trade: Trade, current_time: datetime, def custom_roi(self, pair: str, trade: Trade, current_time: datetime, trade_duration: int,
entry_tag: str | None, side: str, **kwargs) -> float | None: entry_tag: str | None, side: str, **kwargs) -> float | None:
roi_by_tag = { roi_by_tag = {
@@ -616,7 +617,7 @@ class AwesomeStrategy(IStrategy):
# <...> # <...>
dataframe["atr"] = ta.ATR(dataframe, timeperiod=10) dataframe["atr"] = ta.ATR(dataframe, timeperiod=10)
def custom_roi(self, pair: str, trade: Trade, current_time: datetime, def custom_roi(self, pair: str, trade: Trade, current_time: datetime, trade_duration: int,
entry_tag: str | None, side: str, **kwargs) -> float | None: entry_tag: str | None, side: str, **kwargs) -> float | None:
dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe) dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe)
freqtrade/strategy/interface.py
+3
View File
@@ -472,6 +472,7 @@ class IStrategy(ABC, HyperStrategyMixin):
pair: str, pair: str,
trade: Trade, trade: Trade,
current_time: datetime, current_time: datetime,
trade_duration: int,
entry_tag: str | None, entry_tag: str | None,
side: str, side: str,
**kwargs, **kwargs,
@@ -487,6 +488,7 @@ class IStrategy(ABC, HyperStrategyMixin):
:param pair: Pair that's currently analyzed. :param pair: Pair that's currently analyzed.
:param trade: trade object. :param trade: trade object.
:param current_time: datetime object, containing the current datetime. :param current_time: datetime object, containing the current datetime.
:param trade_duration: Current trade duration in minutes.
:param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal. :param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal.
:param side: 'long' or 'short' - indicating the direction of the current trade. :param side: 'long' or 'short' - indicating the direction of the current trade.
:param **kwargs: Ensure to keep this here so updates to this won't break your strategy. :param **kwargs: Ensure to keep this here so updates to this won't break your strategy.
@@ -1686,6 +1688,7 @@ class IStrategy(ABC, HyperStrategyMixin):
pair=trade.pair, pair=trade.pair,
trade=trade, trade=trade,
current_time=current_time, current_time=current_time,
trade_duration=trade_dur,
entry_tag=trade.enter_tag, entry_tag=trade.enter_tag,
side=trade.trade_direction, side=trade.trade_direction,
) )