Update app.py

app.py

@@ -752,14 +752,13 @@ def should_send_signal(symbol, timeframe, proba):
             
     last_signals_sent[key] = (proba, now)
     return True
-# --- ⚖️ JUDGE API V31 (AUTO-CONFIRMATION & TRAILING STOP) ---
+# --- ⚖️ JUDGE API V31 (VERSION NETTOYÉE POUR SL PHYSIQUE) ---
 def run_judge_api(live_prices_json="{}"):
     try:
         import json
         try: 
             raw_prices = json.loads(live_prices_json) if isinstance(live_prices_json, str) else {}
             live_prices = {k.lower(): v for k, v in raw_prices.items()}
-            if live_prices: print(f"📡 [PRIX REÇUS DU BRAS] : {live_prices}")
         except: 
             live_prices = {}
 
@@ -767,12 +766,11 @@ def run_judge_api(live_prices_json="{}"):
             conn.row_factory = sqlite3.Row
             cursor = conn.cursor()
             
-            # 🔥 ON PREND TOUS LES TRADES (Confirmés ou non)
             cursor.execute("SELECT * FROM signals WHERE status = 'EN_COURS'")
             trades = cursor.fetchall()
             
             closed_trades = []
-            watching_info = []
+            watching_info = [] # 🎯 Contiendra uniquement des dicts pour le Bras
             current_time = datetime.now(timezone.utc)
             max_age_minutes = {"1m": 5, "5m": 10, "15m": 30, "1h": 60}
             
@@ -782,15 +780,12 @@ def run_judge_api(live_prices_json="{}"):
                     epic = sym_db.replace("/", "").replace("USDT", "USD").lower()
                     if not epic.endswith("m"): epic += "m"
 
-                    # 1. EST-CE QUE LE MT5 A CE TRADE OUVERT ?
                     is_live = epic in live_prices
 
-                    # 🎯 LA MAGIE : Si MT5 a le trade, on l'Auto-Confirme !
                     if is_live and t['confirmed'] == 0:
                         cursor.execute("UPDATE signals SET confirmed = 1 WHERE id = ?", (t['id'],))
-                        print(f"✅ [AUTO-CONFIRM] Le Bras trade {epic} (ID: {t['id']}).")
+                        print(f"✅ [AUTO-CONFIRM] ID: {t['id']}")
                     
-                    # 🗑️ Si MT5 NE L'A PAS
                     if not is_live:
                         date_str = t['date'].replace('Z', '+00:00')
                         signal_time = datetime.fromisoformat(date_str)
@@ -798,38 +793,29 @@ def run_judge_api(live_prices_json="{}"):
                         max_age = max_age_minutes.get(t['timeframe'], 60)
                         
                         if t['confirmed'] == 1:
-                            # Il était confirmé mais a disparu de MT5 (TP/SL touché en local)
                             cursor.execute("UPDATE signals SET status = 'FERMÉ PAR MT5 🛑' WHERE id = ?", (t['id'],))
-                            print(f"🏁 [JUGE] Trade ID {t['id']} fermé nativement par le MT5.")
-                            closed_trades.append({"symbol": t['symbol'], "id": t['id']})
+                            closed_trades.append({"symbol": t['symbol'], "id": t['id'], "direction": t['direction']})
                         elif age_minutes > max_age:
-                            # Il n'a jamais été pris et il est vieux
                             cursor.execute("UPDATE signals SET status = 'EXPIRÉ ⏰' WHERE id = ?", (t['id'],))
-                            print(f"🧹 [PURGE] Signal ID {t['id']} expiré.")
-                        continue # On stoppe ici pour ce trade, on passe au suivant
+                        continue
 
-                    # ==========================================
-                    # ⚖️ 2. LE TRAILING STOP (Puisque is_live est True)
-                    # ==========================================
+                    # --- CALCUL DU TRAILING ---
                     current_price = float(live_prices[epic])
-                    
                     sl_dyn, peak = t['sl'], t['peak_price']
                     new_peak = max(peak, current_price) if t['direction'] == 'HAUSSIER' else min(peak, current_price)
-                    
                     dist_totale = abs(t['tp'] - t['price'])
                     
                     if t['direction'] == 'HAUSSIER':
                         mouvement = current_price - t['price']
-                    else: # BAISSIER
+                    else:
                         mouvement = t['price'] - current_price
                         
                     progression = mouvement / dist_totale if (dist_totale > 0 and mouvement > 0) else 0
-                    watching_info.append(f"{sym_db} ({current_price}$) -> Prog: {round(progression*100, 1)}%")
                     
                     nouveau_sl = sl_dyn
                     dist_sl_initial = abs(t['price'] - sl_dyn)
 
-                    # LOGIQUE AGRESSIVE DE SÉCURISATION
+                    # LOGIQUE AGRESSIVE
                     if t['direction'] == 'HAUSSIER':
                         if progression >= 0.60: nouveau_sl = max(sl_dyn, t['price'] + (dist_totale * 0.50))
                         elif progression >= 0.40: nouveau_sl = max(sl_dyn, t['price'] + (dist_totale * 0.20))
@@ -842,13 +828,8 @@ def run_judge_api(live_prices_json="{}"):
                         elif progression >= 0.10: nouveau_sl = min(sl_dyn, t['price'] + (dist_sl_initial * 0.50))
 
                     cursor.execute("UPDATE signals SET peak_price = ?, sl = ? WHERE id = ?", (new_peak, nouveau_sl, t['id']))
-                    # 🔥 AJOUTE CETTE LIGNE pour envoyer les coordonnées au Bras
-                    watching_info.append({"id": t['id'], "symbol": t['symbol'], "sl": nouveau_sl, "prog": progression})
-                    
-                    # 🚨 ALERTE SI LE SL A BOUGÉ
-                    if nouveau_sl != sl_dyn:
-                        print(f"🛡️ [CLOUD-SL] {t['symbol']} ID {t['id']} | Le SL avance à {round(nouveau_sl, 5)} (Prog: {round(progression*100,1)}%)")
                     
+                    # --- DÉCISION DE CLÔTURE ---
                     outcome, reward = None, 0 
                     if t['direction'] == 'HAUSSIER':
                         if current_price >= t['tp']: outcome, reward = "GAGNÉ ✅", 3
@@ -858,19 +839,30 @@ def run_judge_api(live_prices_json="{}"):
                         elif current_price >= nouveau_sl: outcome, reward = ("GAGNÉ (PARTIEL) 💸", 1) if nouveau_sl < t['price'] else ("PERDU ❌", -5)
 
                     if outcome:
-                        # Si le Juge clôture la position par lui-même
                         mutate_agent(t['symbol'], t['timeframe'], t['regime'], success=(reward>0))
                         cursor.execute("UPDATE signals SET status=? WHERE id=?", (outcome, t['id']))
-                        print(f"🏁 [JUGE] Trade ID {t['id']} ({t['symbol']}) clôturé : {outcome}")
-                        closed_trades.append({"symbol": t['symbol'], "id": t['id']})
-                        
+                        closed_trades.append({"symbol": t['symbol'], "id": t['id'], "direction": t['direction']})
+                    else:
+                        # 🎯 ON N'AJOUTE DANS WATCHING QUE SI LE TRADE EST ENCORE OUVERT
+                        watching_info.append({
+                            "id": t['id'], 
+                            "symbol": t['symbol'], 
+                            "sl": round(nouveau_sl, 6), 
+                            "prog": round(progression, 4)
+                        })
+
                 except Exception as e: 
                     print(f"⚠️ Erreur Trade ID {t['id']}: {e}")
-        
+            
             conn.commit()
-        return {"status": "updates", "data": closed_trades, "watching": watching_info} if closed_trades else {"status": "waiting", "watching": watching_info}
-    except Exception as e: return {"status": "error", "message": str(e)}
 
+        # Retour propre : data contient les fermetures, watching contient les mises à jour SL
+        return {
+            "status": "updates" if closed_trades else "waiting", 
+            "data": closed_trades, 
+            "watching": watching_info
+        }
+    except Exception as e: return {"status": "error", "message": str(e)}
 # --- 📡 LECTURE RADAR OPTIMISÉE ---
 def get_active_signals():
     try: