Update app.py

app.py

@@ -531,6 +531,16 @@ def detect_chart_scenario(df, df_1m=None, df_5m=None, df_15m=None, df_1h=None):
         vwap = (typical_price * df['volume']).cumsum() / (df['volume'].cumsum() + 1e-9)
         price_above_vwap = df['close'].iloc[-1] > vwap.iloc[-1]
         price_below_vwap = df['close'].iloc[-1] < vwap.iloc[-1]
+        # ========================
+        # 🔥 VWAP BANDS (Institutional zones)
+        # ========================
+        vwap_std = df['close'].rolling(20).std()
+        vwap_upper = vwap + vwap_std
+        vwap_lower = vwap - vwap_std
+
+        price_extended_high = df['close'].iloc[-1] > vwap_upper.iloc[-1]
+        price_extended_low = df['close'].iloc[-1] < vwap_lower.iloc[-1]
+  
 
         # --- 2. MULTI TIMEFRAME (1m, 5m, 15m, 1h) ---
         mtf_bull = mtf_bear = 0
@@ -547,19 +557,46 @@ def detect_chart_scenario(df, df_1m=None, df_5m=None, df_15m=None, df_1h=None):
         mtf_trend_up = mtf_bull >= 3
         mtf_trend_down = mtf_bear >= 3
 
-        # --- 3. ORDER BLOCKS (Smart Money) ---
-        last_candles = df.tail(20)
-        bullish_ob = bearish_ob = False
+        # ========================
+        # 🔥 ORDER BLOCK STRENGTH
+        # ========================
+        bullish_ob = False
+        bearish_ob = False
+        ob_strength = 0
+
         for i in range(len(last_candles) - 3):
-            c1, c2 = last_candles.iloc[i], last_candles.iloc[i + 1]
-            if c1['close'] < c1['open'] and c2['close'] > c2['open'] * 1.01: bullish_ob = True
-            if c1['close'] > c1['open'] and c2['close'] < c2['open'] * 0.99: bearish_ob = True
+            c1 = last_candles.iloc[i]
+            c2 = last_candles.iloc[i + 1]
+
+            body_size = abs(c2['close'] - c2['open'])
+            candle_range = c2['high'] - c2['low'] + 1e-9
+
+            strength = body_size / candle_range
+
+            if c1['close'] < c1['open'] and c2['close'] > c2['open']:
+                bullish_ob = True
+                ob_strength = max(ob_strength, strength)
+
+            if c1['close'] > c1['open'] and c2['close'] < c2['open']:
+                bearish_ob = True
+                ob_strength = max(ob_strength, strength)
 
         # --- 4. LIQUIDITY SWEEP ---
         recent_high, prev_high = np.max(h[-10:]), np.max(h[-30:-10])
         recent_low, prev_low = np.min(l[-10:]), np.min(l[-30:-10])
         liquidity_sweep_high = recent_high > prev_high and c[-1] < recent_high
         liquidity_sweep_low = recent_low < prev_low and c[-1] > recent_low
+        liquidity_high_zone = np.mean(h[-50:])
+        liquidity_low_zone = np.mean(l[-50:])
+
+        near_liquidity_high = abs(c[-1] - liquidity_high_zone) / c[-1] < 0.002
+        near_liquidity_low = abs(c[-1] - liquidity_low_zone) / c[-1] < 0.002
+
+        # ========================
+        # 🔥 FAKE BREAKOUT FILTER
+        # ========================
+        fake_breakout_up = bos_up and c[-1] < recent_high
+        fake_breakout_down = bos_down and c[-1] > recent_low
 
         # --- 5. STRUCTURE ET RSI ---
         range_start, range_end = np.mean(h[:20] - l[:20]), np.mean(h[-20:] - l[-20:])
@@ -582,18 +619,30 @@ def detect_chart_scenario(df, df_1m=None, df_5m=None, df_15m=None, df_1h=None):
         vol_recent, vol_past = np.mean(v[-15:]), np.mean(v[-40:-15])
         vol_inc = vol_recent > vol_past * 1.2
 
-        # --- 🚀 LOGIQUE DE DÉCISION FINALE ---
-        if squeeze and trend_strength > 0.004 and price_above_vwap and mtf_trend_up: return 4
-        if (liquidity_sweep_high or bearish_ob or bearish_div) and trend_up: return 5
-        if (liquidity_sweep_low or bullish_ob or bullish_div) and trend_down: return 5
-        
-        if trend_strength > 0.006 and vol_inc:
-            if price_above_vwap and mtf_trend_up: return 0
-            if price_below_vwap and mtf_trend_down: return 1
+        # 🔥 CONTINUATION PRO MAX
+        if squeeze and trend_strength > 0.004 and price_above_vwap and mtf_trend_up and not price_extended_high:
+            return 4
+
+        # 🔴 REVERSAL SMART MONEY
+        if (liquidity_sweep_high or bearish_ob or bearish_div or price_extended_high or near_liquidity_high) and trend_up:
+            return 5
+
+        if (liquidity_sweep_low or bullish_ob or bullish_div or price_extended_low or near_liquidity_low) and trend_down:
+            return 5
+
+        # 🟢 TREND INSTITUTIONNEL
+        if trend_strength > 0.006 and vol_inc and ob_strength > 0.5:
+            if price_above_vwap and mtf_trend_up and not fake_breakout_up:
+                return 0
+            if price_below_vwap and mtf_trend_down and not fake_breakout_down:
+                return 1
+
+        # 🟡 BREAKOUT PROPRE
+        if vol_inc and not fake_breakout_up and bos_up and price_above_vwap:
+            return 0
 
-        if vol_inc:
-            if bos_up and price_above_vwap: return 0
-            if bos_down and price_below_vwap: return 1
+        if vol_inc and not fake_breakout_down and bos_down and price_below_vwap:
+            return 1
 
         return 3 # RANGE / CHAOS par défaut
     except Exception as e: