From 59d177a1dbf0344c9c9b345aa3b5edde301fae73 Mon Sep 17 00:00:00 2001
From: m5l14i11 <siarhei.melnik@proton.me>
Date: Mon, 16 Sep 2024 12:56:43 +0300
Subject: [PATCH] upd

---
 core/models/position_risk.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/models/position_risk.py b/core/models/position_risk.py
index 9d846e4a..e6b60bbc 100644
--- a/core/models/position_risk.py
+++ b/core/models/position_risk.py
@@ -395,6 +395,12 @@ def sl_ats(self, side: PositionSide, ta: TechAnalysis, sl: float) -> "float":
         if min_length < 3:
             return sl
 
+        anomaly = lambda series: (series - np.mean(series)) / np.std(series)
+        close_anomaly = anomaly(close[-min_length:])
+
+        if abs(close_anomaly[-1]) > 2:
+            return sl
+
         close_smooth, volatility_smooth, high_smooth, low_smooth = smooth_savgol(
             close, volatility, high, low
         )
@@ -404,10 +410,8 @@ def sl_ats(self, side: PositionSide, ta: TechAnalysis, sl: float) -> "float":
 
         ats = self._ats(close_smooth, volatility_smooth)
 
-        rising_low = low_smooth[-1] > low_smooth[-2] and low_smooth[-2] > low_smooth[-3]
-        failing_high = (
-            high_smooth[-1] < high_smooth[-2] and high_smooth[-2] < high_smooth[-3]
-        )
+        rising_low = low[-1] > low[-2] and low[-2] > low[-3]
+        failing_high = high[-1] < high[-2] and high[-2] < high[-3]
 
         bullish = rising_low and (ta.trend.dmi[-1] > 0.0 or ta.momentum.cci[-1] > 100.0)
         bearish = failing_high and (
@@ -415,20 +419,22 @@ def sl_ats(self, side: PositionSide, ta: TechAnalysis, sl: float) -> "float":
         )
 
         if side == PositionSide.LONG:
-            l_constr = min(low_smooth[-1], low_smooth[-2])
+            l_constr = min(low[-1], low[-2])
             adjusted_sl = (
                 min(l_constr, np.max(ats)) if bullish else min(l_constr, ats[-1])
             )
+            atr_stop = l_constr - volatility_smooth[-1]
 
-            return max(sl, adjusted_sl)
+            return max(sl, max(atr_stop, adjusted_sl))
 
         if side == PositionSide.SHORT:
-            h_constr = max(high_smooth[-1], high_smooth[-2])
+            h_constr = max(high[-1], high[-2])
             adjusted_sl = (
                 max(h_constr, np.min(ats)) if bearish else max(h_constr, ats[-1])
             )
+            atr_stop = h_constr + volatility_smooth[-1]
 
-            return min(sl, adjusted_sl)
+            return min(sl, min(atr_stop, adjusted_sl))
 
         return sl