Update app.py

app.py

@@ -178,8 +178,6 @@ def init_db():
                 # On initialise les réglages sur le régime 3 (RANGE/CHAOS) par défaut
                 defaults = [
                     # Symbol, TF, Regime, TP, SL, Score, PNL, Prob, Dist, Gen, B_TP, B_SL
-                    ('ALL', '1m', 3, 1.0, 0.8, 0, 0, 0.65, 0.001, 1, 0, 0), 
-                    ('ALL', '5m', 3, 1.2, 0.9, 0, 0, 0.62, 0.002, 1, 0, 0), 
                     ('ALL', '15m', 3, 1.5, 1.0, 0, 0, 0.60, 0.003, 1, 0, 0), 
                     ('ALL', '1h', 3, 2.0, 1.5, 0, 0, 0.55, 0.005, 1, 0, 0),
                     ('ALL', '4h', 3, 3.0, 2.0, 0, 0, 0.50, 0.008, 1, 0, 0)
@@ -363,7 +361,7 @@ def prepare_features_sync(symbol, timeframe='1h', limit_bars=600):
 
 import numpy as np
 
-def detect_chart_scenario(df, df_1m=None, df_5m=None, df_15m=None, df_1h=None):
+def detect_chart_scenario(df, df_15m=None, df_1h=None, df_4h=None):
     try:
         # 🛠️ Fix colonnes KuCoin
         if 'vol' in df.columns and 'volume' not in df.columns:
@@ -392,21 +390,18 @@ def detect_chart_scenario(df, df_1m=None, df_5m=None, df_15m=None, df_1h=None):
         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) ---
+        # --- 2. MULTI TIMEFRAME MACRO (15m, 1h, 4h) ---
         mtf_bull = mtf_bear = 0
         def analyze_tf(tf_df):
             if tf_df is None or len(tf_df) < 50 or 'EMA200' not in tf_df.columns: return 0
             slope = (tf_df['EMA200'].iloc[-1] / tf_df['EMA200'].iloc[-20]) - 1
             return 1 if slope > 0.0001 else (-1 if slope < -0.0001 else 0)
 
-        for tf_data in [df_1m, df_5m, df_15m, df_1h]:
+        for tf_data in [df_15m, df_1h, df_4h]:
             res = analyze_tf(tf_data)
             if res == 1: mtf_bull += 1
             elif res == -1: mtf_bear += 1
 
-        mtf_trend_up = mtf_bull >= 3
-        mtf_trend_down = mtf_bear >= 3
-
         # ========================
         # 🔥 ORDER BLOCK STRENGTH
         # ========================
@@ -518,18 +513,17 @@ async def predict_signal(symbol, timeframe="1h"):
         oi, cvd = futures_data["oi"], futures_data["cvd"]
         p_sent = await get_crypto_sentiment(symbol)
 
-        # 🏗️ 1.5 CHARGEMENT MULTI-TIMEFRAME (NOUVEAU)
-        df_1m = prepare_features_sync(symbol, "1m", limit_bars=150)
-        df_5m = prepare_features_sync(symbol, "5m", limit_bars=150)
+        # 🏗️ 1.5 CHARGEMENT MULTI-TIMEFRAME MACRO
         df_15m = prepare_features_sync(symbol, "15m", limit_bars=150)
         df_1h = prepare_features_sync(symbol, "1h", limit_bars=150)
+        df_4h = prepare_features_sync(symbol, "4h", limit_bars=150)
 
         # 🧠 2. DÉTECTION DU SCÉNARIO (L'œil + L'IA)
         regime_scaled = regime_scaler.transform(last_row[["ATR_pct", "EMA200_slope", "Drawdown", "RSI_Macro"]])
         regime_ml = int(regime_model.predict(regime_scaled)[0])
         
-        # On passe les dataframes MTF à ta fonction
-        pattern_id = detect_chart_scenario(df, df_1m, df_5m, df_15m, df_1h)
+        # On passe les dataframes MTF à la fonction
+        pattern_id = detect_chart_scenario(df, df_15m, df_1h, df_4h)
         final_scenario = pattern_id if pattern_id in [4, 5] else regime_ml
 
         # 🧠 3. CALCUL DES PROBABILITÉS IA
@@ -789,7 +783,7 @@ def run_judge_api(live_prices_json="{}"):
             closed_trades = []
             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}
+            max_age_minutes = {"15m": 30, "1h": 60, "4h": 240} # Le 4h expire après 4 heures
             
             for t in trades:
                 try:
@@ -971,7 +965,7 @@ def trigger_training(symbol="BTC/USD"):
 
 # --- 🚀 MOTEURS AUTO-PILOTE ---
 AUTO_SYMBOLS = ["BTC/USD", "ETH/USD", "SOL/USD"]
-AUTO_TIMEFRAMES = ["1m", "5m", "15m", "1h"]
+AUTO_TIMEFRAMES = ["15m", "1h", "4h"]
 
 def set_bot_mode(mode):
     global DREAM_MODE_ACTIVE
@@ -1071,7 +1065,7 @@ with gr.Blocks(theme=gr.themes.Monochrome()) as iface:
         reset_btn.click(fn=reset_trade_history, inputs=[], outputs=reset_out, api_name="reset_trades")
         
     with gr.Tab("🎯 Prédictions"): 
-        gr.Button("Predict", variant="primary").click(fn=predict_signal, inputs=[gr.Textbox(label="Symbole", value="BTC/USD"), gr.Dropdown(choices=["1m", "5m", "15m", "1h"], value="1h")], outputs=gr.JSON())
+        gr.Button("Predict", variant="primary").click(fn=predict_signal, inputs=[gr.Textbox(label="Symbole", value="BTC/USD"), gr.Dropdown(choices=["15m", "1h", "4h"], value="1h")], outputs=gr.JSON())
         
     with gr.Tab("⚖️ Système"):
         gr.Button("Judge").click(fn=run_judge_api, inputs=gr.Textbox(value="{}", visible=False), outputs=gr.JSON(), api_name="run_judge_api")