Update app.py

app.py

@@ -1,5 +1,5 @@
 # ==============================================================================
-# 🚀 app.py (V35.6 - GEM-Architect: Active Trade PnL Display)
+# 🚀 app.py (V36.0 - GEM-Architect: The Cybernetic Host)
 # ==============================================================================
 
 import os
@@ -34,7 +34,7 @@ logger = logging.getLogger("TitanCore")
 # Imports
 # ------------------------------------------------------------------------------
 try:
-    from r2 import R2Service, INITIAL_CAPITAL # ✅ استيراد رأس المال الافتراضي
+    from r2 import R2Service, INITIAL_CAPITAL 
     from ml_engine.data_manager import DataManager
     from ml_engine.processor import MLProcessor, SystemLimits 
     from whale_monitor.core import EnhancedWhaleMonitor
@@ -43,6 +43,14 @@ try:
     from vaderSentiment.vaderSentiment import SentimentIntensityAnalyzer
     from learning_hub.adaptive_hub import AdaptiveHub
     from trade_manager import TradeManager
+    
+    # محاولة استيراد محرك الباكتست (اختياري للتشغيل عبر الواجهة)
+    try:
+        from backtest_engine import run_strategic_optimization_task
+        BACKTEST_AVAILABLE = True
+    except ImportError:
+        BACKTEST_AVAILABLE = False
+        
 except ImportError as e:
     logger.critical(f"❌ [FATAL ERROR] Failed to import core modules: {e}")
     traceback.print_exc()
@@ -82,7 +90,7 @@ class SystemState:
 
     def set_ready(self): 
         self.ready = True
-        self.last_cycle_logs = "✅ System Ready. Auto-Pilot ON."
+        self.last_cycle_logs = "✅ System Ready. Cybernetic Loop ON."
         logger.info("✅ System State set to READY.")
     
     def set_cycle_start(self): 
@@ -146,15 +154,20 @@ async def auto_pilot_loop():
             await asyncio.sleep(5) 
             if not sys_state.ready: continue
             
+            # تحديث حالة الـ Adaptive Hub في الواجهة كل دقيقة
             if adaptive_hub and int(time.time()) % 60 == 0:
                 sys_state.training_status_msg = adaptive_hub.get_status()
 
+            # فحص الحراس (Watchdogs) للصفقات المفتوحة
             if trade_manager and len(trade_manager.open_positions) > 0:
                 wd_status = await trade_manager.ensure_active_guardians()
                 if "No active" not in wd_status:
-                    sys_state.last_cycle_logs = trade_manager.latest_guardian_log
+                    # تحديث السجلات بحالة الحارس فقط إذا لم تكن هناك دورة مسح نشطة
+                    if not sys_state.cycle_running:
+                        sys_state.last_cycle_logs = trade_manager.latest_guardian_log
                 continue 
 
+            # تشغيل دورة المسح (Cycle) إذا كان الطيار الآلي مفعلاً
             if sys_state.auto_pilot and not sys_state.cycle_running and not sys_state.training_running:
                 if sys_state.last_cycle_time:
                     elapsed = (datetime.now() - sys_state.last_cycle_time).total_seconds()
@@ -176,13 +189,15 @@ async def auto_pilot_loop():
 async def lifespan(app: FastAPI):
     global r2, data_manager, ml_processor, adaptive_hub, trade_manager, whale_monitor, news_fetcher, senti_analyzer, sys_state
     
-    logger.info("\n🚀 [System] Startup Sequence (Titan V35.6)...")
+    logger.info("\n🚀 [System] Startup Sequence (Titan V36.0 - Cybernetic)...")
     try:
+        # 1. الخدمات الأساسية
         r2 = R2Service()
         data_manager = DataManager(contracts_db={}, whale_monitor=None, r2_service=r2)
         await data_manager.initialize() 
         await data_manager.load_contracts_from_r2()
         
+        # 2. المراقبة والتحليل
         whale_monitor = EnhancedWhaleMonitor(contracts_db=data_manager.get_contracts_db(), r2_service=r2)
         rpc_mgr = AdaptiveRpcManager(data_manager.http_client)
         whale_monitor.set_rpc_manager(rpc_mgr)
@@ -191,21 +206,30 @@ async def lifespan(app: FastAPI):
         senti_analyzer = SentimentIntensityAnalyzer()
         data_manager.whale_monitor = whale_monitor
         
+        # 3. العقل الاستراتيجي (Adaptive Hub)
+        # يتم تهيئته أولاً ليحقن الـ DNA في SystemLimits
         adaptive_hub = AdaptiveHub(r2_service=r2)
         await adaptive_hub.initialize()
 
+        # 4. المعالج العصبي (Processor)
+        # سيقرأ SystemLimits المحدثة من AdaptiveHub
         ml_processor = MLProcessor(data_manager=data_manager)
         await ml_processor.initialize()
         
+        # 5. مدير التنفيذ (Trade Manager)
         trade_manager = TradeManager(r2_service=r2, data_manager=data_manager, processor=ml_processor)
+        
+        # 🔥 الربط العصبي: حقن LearningHub داخل TradeManager
+        # هذا يغلق حلقة التعلم (Feedback Loop)
         trade_manager.learning_hub = adaptive_hub 
-        await trade_manager.initialize_sentry_exchanges()
         
+        await trade_manager.initialize_sentry_exchanges()
         await trade_manager.start_sentry_loops()
         
+        # 6. الجاهزية
         sys_state.set_ready()
         asyncio.create_task(auto_pilot_loop())
-        logger.info("✅ [System READY] All modules operational.")
+        logger.info("✅ [System READY] All modules operational. Cybernetic Link Established.")
         yield
         
     except Exception as e:
@@ -237,22 +261,10 @@ async def _analyze_symbol_task(symbol: str) -> Dict[str, Any]:
         current_price = await data_manager.get_latest_price_async(symbol)
         raw_data = {'symbol': symbol, 'ohlcv': ohlcv_data, 'current_price': current_price, 'timestamp': time.time()}
         
+        # المعالجة (تستخدم الأوزان الديناميكية الحالية)
         res = await ml_processor.process_compound_signal(raw_data)
         if not res: return None
 
-        titan_s = res.get('titan_score', 0.5)
-        pattern_s = res.get('patterns_score', 0.5)
-        mc_light_s = res.get('mc_score', 0.5)
-
-        l2_base_score = (
-            (titan_s * SystemLimits.L2_WEIGHT_TITAN) + 
-            (pattern_s * SystemLimits.L2_WEIGHT_PATTERNS) + 
-            (mc_light_s * SystemLimits.L2_WEIGHT_MC)
-        )
-        
-        res['enhanced_final_score'] = l2_base_score 
-        res['l2_base_score'] = l2_base_score
-        
         return res
     except Exception: return None
 
@@ -271,9 +283,10 @@ async def run_unified_cycle():
     sys_state.set_cycle_start()
     
     try:
-        # LAYER 0: Guardian
+        # LAYER 0: Guardian & Portfolio Check
         await trade_manager.sync_internal_state_with_r2()
         
+        # عرض سريع للصفقات
         if len(trade_manager.open_positions) > 0:
             log_and_print(f"ℹ️ [Cycle] Active Positions: {len(trade_manager.open_positions)}")
             for sym, tr in trade_manager.open_positions.items():
@@ -282,11 +295,14 @@ async def run_unified_cycle():
                 pnl = ((curr_p - entry_p)/entry_p)*100 if entry_p > 0 else 0
                 log_and_print(f"   🔒 {sym}: {pnl:+.2f}%")
 
-        # LAYER 1: Screening
-        log_and_print("   [1/5] 🔍 L1 Screening (Liquidity & Volume)...")
+        # LAYER 1: Adaptive Screening
+        # يستخدم الآن النظام المتكيف (Bull/Bear/Range)
+        current_regime = getattr(SystemLimits, 'CURRENT_REGIME', 'UNKNOWN')
+        log_and_print(f"   [1/5] 🔍 L1 Screening (Regime: {current_regime})...")
+        
         candidates = await data_manager.layer1_rapid_screening()
         if not candidates:
-            log_and_print("⚠️ No L1 candidates found.")
+            log_and_print("⚠️ No L1 candidates found for current regime.")
             sys_state.set_cycle_end(logs=log_buffer.getvalue())
             return
             
@@ -296,22 +312,24 @@ async def run_unified_cycle():
         results = await asyncio.gather(*tasks)
         valid_l2 = [res for res in results if res is not None]
         
-        semi_finalists = sorted(valid_l2, key=lambda x: x.get('l2_base_score', 0.0), reverse=True)[:10]
+        # ترتيب حسب النقاط النهائية (التي تم حسابها بالأوزان الديناميكية)
+        semi_finalists = sorted(valid_l2, key=lambda x: x.get('enhanced_final_score', 0.0), reverse=True)[:10]
         
         if not semi_finalists:
             log_and_print("⚠️ No valid L2 candidates.")
             sys_state.set_cycle_end(logs=log_buffer.getvalue())
             return
 
-        # LAYER 3: Deep Dive
-        log_and_print(f"   [3/5] 📡 L3 Deep Dive (Dynamic Scoring) for TOP {len(semi_finalists)}...")
+        # LAYER 3: Deep Dive (Contextual)
+        log_and_print(f"   [3/5] 📡 L3 Deep Dive (Whales & News) for TOP {len(semi_finalists)}...")
         
         final_candidates = []
 
         for sig in semi_finalists:
             symbol = sig['symbol']
-            l2_score = sig.get('l2_base_score', 0.0)
+            l2_score = sig.get('enhanced_final_score', 0.0)
             
+            # Whale Check
             whale_points = 0.0
             try:
                 if whale_monitor:
@@ -325,6 +343,7 @@ async def run_unified_cycle():
                         elif action == 'SELL': whale_points = -dynamic_impact
             except Exception: pass
 
+            # News Check
             news_points = 0.0
             try:
                 if news_fetcher and senti_analyzer:
@@ -336,6 +355,7 @@ async def run_unified_cycle():
                         news_points = compound_score * SystemLimits.L3_NEWS_IMPACT_MAX
             except Exception: pass
 
+            # MC Advanced
             mc_a_points = 0.0
             try:
                 raw_mc_a = await ml_processor.run_advanced_monte_carlo(symbol, '1h')
@@ -356,8 +376,8 @@ async def run_unified_cycle():
 
         approved_signals = []
         
-        header = (f"{'SYM':<9} | {'TITAN':<5} | {'MC(L)':<5} | {'PATT':<5} | "
-                  f"{'WHALE':<6} | {'NEWS':<6} | {'MC(A)':<6} | {'FINAL':<6} | {'ORACLE':<6} | {'STATUS'}")
+        header = (f"{'SYM':<9} | {'L2(HYB)':<6} | {'TITAN':<5} | {'PATT':<5} | "
+                  f"{'WHALE':<6} | {'MC(A)':<6} | {'FINAL':<6} | {'ORACLE':<6} | {'STATUS'}")
         log_and_print("-" * 110)
         log_and_print(header)
         log_and_print("-" * 110)
@@ -365,6 +385,7 @@ async def run_unified_cycle():
         for sig in final_candidates:
             symbol = sig['symbol']
             
+            # Oracle Check (يستخدم العتبة الديناميكية)
             decision = await ml_processor.consult_oracle(sig)
             
             action = decision.get('action', 'WAIT')
@@ -377,21 +398,19 @@ async def run_unified_cycle():
                 sig.update(decision)
                 approved_signals.append(sig)
 
+            l2_hybrid = sig.get('enhanced_final_score', 0.0)
             titan_d = sig.get('titan_score', 0.0)
-            mcl_d = sig.get('mc_score', 0.0)
             patt_d = sig.get('patterns_score', 0.0)
             whale_d = sig.get('whale_score', 0.0)
-            news_d = sig.get('news_score', 0.0)
             mca_d = sig.get('mc_advanced_score', 0.0)
             final_d = sig.get('final_total_score', 0.0)
 
             log_and_print(
                 f"{symbol:<9} | "
+                f"{l2_hybrid:.2f}   | "
                 f"{titan_d:.2f}  | "
-                f"{mcl_d:.2f}  | "
                 f"{patt_d:.2f}  | "
                 f"{whale_d:+.2f}  | " 
-                f"{news_d:+.2f}  | " 
                 f"{mca_d:+.2f}  | " 
                 f"{final_d:.2f}   | " 
                 f"{oracle_conf:.2f}   | "
@@ -425,32 +444,56 @@ async def run_unified_cycle():
 # Handlers (Reset Logic & Training)
 # ------------------------------------------------------------------------------
 async def trigger_training_cycle():
+    """عرض الحالة الحالية للأوزان والاستراتيجية"""
     if adaptive_hub:
         status = adaptive_hub.get_status()
-        return f"🤖 Adaptive System Active. Status: {status}"
+        return f"🤖 Adaptive System: {status}"
     return "⚠️ System not ready."
 
+async def trigger_strategic_backtest():
+    """تشغيل الباكتست الاستراتيجي في الخلفية لتحديث الـ DNA"""
+    if not BACKTEST_AVAILABLE:
+        return "⚠️ Backtest Engine not found."
+    
+    if sys_state.training_running:
+        return "⚠️ Training already in progress."
+        
+    async def _run_bg_task():
+        sys_state.training_running = True
+        sys_state.training_status_msg = "🧪 Strategic Backtest Running..."
+        try:
+            logger.info("🧪 [Manual Trigger] Starting Strategic Backtest...")
+            await run_strategic_optimization_task()
+            # إعادة حقن الإعدادات الجديدة
+            if adaptive_hub: 
+                await adaptive_hub.initialize()
+            logger.info("✅ [Manual Trigger] Backtest Complete. DNA Updated.")
+        except Exception as e:
+            logger.error(f"❌ Backtest Failed: {e}")
+        finally:
+            sys_state.training_running = False
+            sys_state.training_status_msg = adaptive_hub.get_status() if adaptive_hub else "Ready"
+
+    asyncio.create_task(_run_bg_task())
+    return "🧪 Strategic Backtest Started (Check Console)."
+
 async def manual_close_current_trade():
     if not trade_manager.open_positions: return "⚠️ No trade."
     symbol = list(trade_manager.open_positions.keys())[0]
     await trade_manager.force_exit_by_manager(symbol, reason="MANUAL_UI")
     return f"✅ Closed {symbol}."
 
-# ✅ الدالة 1: تصفير السجل التاريخي فقط (مع الحفاظ على المال)
 async def reset_history_handler():
     if trade_manager.open_positions: return "⚠️ Close active trades first."
     
-    # نقرأ الحالة الحالية أولاً لنحافظ على المال
     current_state = await r2.get_portfolio_state_async()
     preserved_capital = current_state.get('current_capital_usd', INITIAL_CAPITAL)
     
-    # تصفير شامل (الذي يصفر كل شيء في r2)
     await r2.reset_all_stats_async()
     
-    # استعادة رأس المال المحفوظ
     if trade_manager and trade_manager.smart_portfolio:
          sp = trade_manager.smart_portfolio
-         sp.state["current_capital"] = preserved_capital # استعادة المال
+         sp.state["current_capital"] = preserved_capital 
          sp.state["session_start_balance"] = preserved_capital
          sp.state["allocated_capital_usd"] = 0.0
          sp.state["daily_net_pnl"] = 0.0
@@ -459,13 +502,12 @@ async def reset_history_handler():
          
     return f"✅ History Cleared. Capital Preserved at ${preserved_capital:.2f}"
 
-# ✅ الدالة 2: تصفير رأس المال فقط (مع الحفاظ على السجل)
 async def reset_capital_handler():
     if trade_manager.open_positions: return "⚠️ Close active trades first."
     
     if trade_manager and trade_manager.smart_portfolio:
          sp = trade_manager.smart_portfolio
-         sp.state["current_capital"] = INITIAL_CAPITAL # العودة لـ 10$
+         sp.state["current_capital"] = INITIAL_CAPITAL 
          sp.state["session_start_balance"] = INITIAL_CAPITAL
          sp.state["allocated_capital_usd"] = 0.0
          sp.state["daily_net_pnl"] = 0.0
@@ -484,7 +526,7 @@ async def run_cycle_from_gradio():
     return "🚀 Launched."
 
 # ------------------------------------------------------------------------------
-# UI Updates (Updated for Active Trade PnL)
+# UI Updates
 # ------------------------------------------------------------------------------
 async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
     empty_chart = go.Figure()
@@ -496,7 +538,7 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
 
     try:
         sp = trade_manager.smart_portfolio
-        equity = sp.state.get('current_capital', 10.0) # الرصيد المحقق (بدون العائم)
+        equity = sp.state.get('current_capital', 10.0) 
         allocated = sp.state.get('allocated_capital_usd', 0.0)
         free_cap = max(0.0, equity - allocated)
         daily_pnl = sp.state.get('daily_net_pnl', 0.0)
@@ -504,7 +546,7 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
         market_mood = sp.market_trend
         fg_index = sp.fear_greed_index
         
-        # --- حسابات الصفقات المفتوحة ---
+        # معلومات الصفقة النشطة
         symbol = None; entry_p = 0.0; tp_p = 0.0; sl_p = 0.0; curr_p = 0.0; pnl_pct = 0.0; pnl_val_unrealized = 0.0
         active_trade_info = ""
         trade_dur_str = "--:--:--"
@@ -522,7 +564,6 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
             if curr_p > 0 and entry_p > 0:
                 pnl_pct = ((curr_p - entry_p) / entry_p) * 100
                 size = float(trade.get('entry_capital', 0.0))
-                # حساب القيمة العائمة (ربح/خسارة غير محققة)
                 pnl_val_unrealized = size * (pnl_pct / 100)
                 
             active_trade_info = f"""
@@ -534,16 +575,11 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
              </div>
             """
 
-        # Virtual Equity = الرصيد المحقق + الربح/الخسارة العائمة
         virtual_equity = equity + pnl_val_unrealized
-        
-        # ✅ FIX: User requested ACTIVE TRADE PnL ONLY under the main Equity
-        # (Instead of Total Account PnL)
-        # If no trade active, this is 0.00
         active_trade_pnl_val = pnl_val_unrealized
         active_pnl_color = "#00ff00" if active_trade_pnl_val >= 0 else "#ff0000"
 
-        # --- باقي الكود للعرض كما هو ---
+        # معلومات المحفظة
         portfolio = await r2.get_portfolio_state_async()
         total_t = portfolio.get('total_trades', 0)
         wins = portfolio.get('winning_trades', 0)
@@ -556,6 +592,9 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
 
         color = "#00ff00" if daily_pnl >= 0 else "#ff0000"
         halt_status = "<span style='color:red; font-weight:bold;'>HALTED</span>" if is_halted else "<span style='color:#00ff00;'>ACTIVE</span>"
+        
+        # عرض الحالة الاستراتيجية الحالية
+        current_regime = getattr(SystemLimits, 'CURRENT_REGIME', 'N/A')
 
         wallet_md = f"""
         <div style='background-color: #1a1a1a; padding: 15px; border-radius: 8px; border: 1px solid #333; text-align:center;'>
@@ -574,6 +613,9 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
             <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc;'>
                 <span>🦅 Market:</span> <span style='color: white;'>{market_mood} ({fg_index})</span>
             </div>
+            <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc; margin-top:3px;'>
+                <span>🧬 Regime:</span> <span style='color: #00e5ff; font-weight:bold;'>{current_regime}</span>
+            </div>
             <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc; margin-top:5px;'>
                 <span>🛡️ Status:</span> {halt_status}
             </div>
@@ -650,7 +692,7 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
                 )
 
         train_status = sys_state.training_status_msg
-        if sys_state.training_running: train_status = "🏋️‍♂️ Training..."
+        if sys_state.training_running: train_status = "🧪 Backtest Running..."
 
         return (status_txt, status_line, fig, f"{curr_p:.6f}", f"{entry_p:.6f}", f"{tp_p:.6f}", f"{sl_p:.6f}",
                 f"{pnl_pct:+.2f}%", wl_df, wallet_md, history_md, train_status)
@@ -665,10 +707,10 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
 def create_gradio_ui():
     custom_css = ".gradio-container {background:#0b0f19} .dataframe {background:#1a1a1a!important} .html-box {min-height:180px}"
     
-    with gr.Blocks(title="Titan V35.6 (Active PnL Only)") as demo:
+    with gr.Blocks(title="Titan V36.0 (Cybernetic)", css=custom_css) as demo:
         gr.HTML(f"<style>{custom_css}</style>")
         
-        gr.Markdown("# 🚀 Titan V35.6 (Portfolio-Aware & Dual-Core)")
+        gr.Markdown("# 🚀 Titan V36.0 (Cybernetic: Regime-Adaptive)")
         
         with gr.Row():
             with gr.Column(scale=3):
@@ -701,20 +743,21 @@ def create_gradio_ui():
                     btn_run = gr.Button("🚀 Scan", variant="primary")
                     btn_close = gr.Button("🚨 Close", variant="stop")
                 with gr.Row():
-                    btn_train = gr.Button("🤖 Check Adaptive Status", variant="secondary")
-                    # ✅ تقسيم الأزرار
+                    btn_train = gr.Button("🤖 Status", variant="secondary")
+                    btn_backtest = gr.Button("🧪 Run Strategic Backtest", variant="secondary")
+                with gr.Row():
                     btn_history_reset = gr.Button("🗑️ Clear History", variant="secondary")
                     btn_cap_reset = gr.Button("💰 Reset Capital", variant="secondary")
                     
                 status = gr.Markdown("Init...")
-                train_status = gr.Textbox(label="Adaptive Mode", interactive=False, value="Active")
+                train_status = gr.Textbox(label="Adaptive DNA Status", interactive=False, value="Active")
                 alert = gr.Textbox(label="Alerts", interactive=False)
             
             with gr.Column(scale=3):
                 logs = gr.Textbox(label="Logs", lines=14, autoscroll=True, elem_classes="log-box", type="text")
                 gr.HTML("<style>.log-box textarea { font-family: 'Consolas', 'Monaco', monospace !important; font-size: 12px !important; white-space: pre !important; }</style>")
 
-        # ربط الأزرار بالدوال الجديدة
+        # Event Handlers
         btn_run.click(fn=run_cycle_from_gradio, outputs=alert)
         btn_close.click(fn=manual_close_current_trade, outputs=alert)
         
@@ -722,6 +765,8 @@ def create_gradio_ui():
         btn_cap_reset.click(fn=reset_capital_handler, outputs=alert)
         
         btn_train.click(fn=trigger_training_cycle, outputs=alert)
+        btn_backtest.click(fn=trigger_strategic_backtest, outputs=alert) # زر الباكتست الجديد
+        
         auto_pilot.change(fn=toggle_auto_pilot, inputs=auto_pilot, outputs=alert)
         
         gr.Timer(3).tick(fn=check_live_pnl_and_status, inputs=stats_dd,