revert to HEAD^

This commit is contained in:
zhangkun9038@dingtalk.com 2025-08-12 23:38:12 +08:00
parent 34f12f4200
commit 35da096005

View File

@ -814,20 +814,15 @@ class FreqaiPrimer(IStrategy):
def custom_entry_price(self, pair: str, trade: Trade | None, current_time: datetime, proposed_rate: float,
entry_tag: str | None, side: str, **kwargs) -> float:
adjusted_rate = proposed_rate * (1 - 0.0075)
adjusted_rate = proposed_rate * (1 - 0.005)
logger.info(f"[{pair}] 自定义买入价:{adjusted_rate:.6f}(原价:{proposed_rate:.6f}")
return adjusted_rate
def custom_exit_price(self, pair: str, trade: Trade,
current_time: datetime, proposed_rate: float,
current_profit: float, exit_tag: str | None, **kwargs) -> float:
# 获取趋势得分
trend_score = self.get_market_trend(metadata={'pair': pair})
# 计算额外的百分比提升
extra_percentage_increase = max(0, trend_score - 90) / 100
# 调整卖出价格
adjusted_rate = proposed_rate * (1 + extra_percentage_increase)
logger.info(f"[{pair}] 自定义卖出价:{adjusted_rate:.6f}(原价:{proposed_rate:.6f}),趋势得分:{trend_score},额外提升:{extra_percentage_increase * 100:.2f}%")
adjusted_rate = proposed_rate * (1 + 0.0025)
logger.info(f"[{pair}] 自定义卖出价:{adjusted_rate:.6f}(原价:{proposed_rate:.6f}")
return adjusted_rate
def get_market_trend(self, dataframe: DataFrame = None, metadata: dict = None) -> int: