diff --git a/docs/strategy_analysis_example.md b/docs/strategy_analysis_example.md index f2ee9c4e4..5c01ab2cb 100644 --- a/docs/strategy_analysis_example.md +++ b/docs/strategy_analysis_example.md @@ -129,7 +129,7 @@ print(stats['strategy_comparison']) trades = load_backtest_data(backtest_dir) # Show value-counts per pair -trades.groupby("pair")["sell_reason"].value_counts() +trades.groupby("pair")["exit_reason"].value_counts() ``` ## Plotting daily profit / equity line diff --git a/freqtrade/plugins/protections/stoploss_guard.py b/freqtrade/plugins/protections/stoploss_guard.py index efca49054..8d7fb2a0e 100644 --- a/freqtrade/plugins/protections/stoploss_guard.py +++ b/freqtrade/plugins/protections/stoploss_guard.py @@ -41,16 +41,6 @@ class StoplossGuard(IProtection): Evaluate recent trades """ look_back_until = date_now - timedelta(minutes=self._lookback_period) - # filters = [ - # Trade.is_open.is_(False), - # Trade.close_date > look_back_until, - # or_(Trade.sell_reason == ExitType.STOP_LOSS.value, - # and_(Trade.sell_reason == ExitType.TRAILING_STOP_LOSS.value, - # Trade.close_profit < 0)) - # ] - # if pair: - # filters.append(Trade.pair == pair) - # trades = Trade.get_trades(filters).all() trades1 = Trade.get_trades_proxy(pair=pair, is_open=False, close_date=look_back_until) trades = [trade for trade in trades1 if (str(trade.exit_reason) in ( diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index bd719dc24..928c761c6 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -235,7 +235,7 @@ class TradeSchema(BaseModel): profit_pct: Optional[float] profit_abs: Optional[float] profit_fiat: Optional[float] - sell_reason: Optional[str] + sell_reason: Optional[str] # Deprecated exit_reason: Optional[str] sell_order_status: Optional[str] stop_loss_abs: Optional[float] diff --git a/freqtrade/templates/strategy_analysis_example.ipynb b/freqtrade/templates/strategy_analysis_example.ipynb index dc20d71b8..082961ba2 100644 --- a/freqtrade/templates/strategy_analysis_example.ipynb +++ b/freqtrade/templates/strategy_analysis_example.ipynb @@ -187,7 +187,7 @@ "trades = load_backtest_data(backtest_dir)\n", "\n", "# Show value-counts per pair\n", - "trades.groupby(\"pair\")[\"sell_reason\"].value_counts()" + "trades.groupby(\"pair\")[\"exit_reason\"].value_counts()" ] }, {