Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (V17.6 - Full Logic Restored + Interface Fixes)
+# app.py (V17.9 - The Ultimate: Non-Blocking UI + FULL 100% Logic Restored)
 import os
 import sys
 import traceback
@@ -12,15 +12,15 @@ from io import StringIO
 from fastapi import FastAPI, HTTPException, BackgroundTasks
 from typing import List, Dict, Any
 
-# [ استيراد مكتبات الواجهة ]
+# [ واجهة Gradio ومكتبات الرسم ]
 import gradio as gr
 import pandas as pd
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
-plt.switch_backend('Agg') # مهم جداً لبيئة السيرفر
+plt.switch_backend('Agg') 
 
 # ==============================================================================
-# 📥 استيراد الوحدات الأساسية (Core Modules Imports)
+# 📥 استيراد الوحدات الأساسية
 # ==============================================================================
 try:
     from r2 import R2Service
@@ -34,22 +34,22 @@ try:
     from ml_engine.guard_engine import GuardEngine
     from ml_engine.sniper_engine import SniperEngine
 except ImportError as e:
-    sys.exit(f"❌ [FATAL ERROR] Failed to import core modules: {e}")
+    print(f"❌ Critical Import Error: {e}")
 
 # ==============================================================================
-# 🌐 المتغيرات العامة وحالة النظام (Global State)
+# 🌐 المتغيرات العامة
 # ==============================================================================
-r2: R2Service = None
-data_manager: DataManager = None
-ml_processor: MLProcessor = None
-trade_manager: TradeManager = None
-whale_monitor: EnhancedWhaleMonitor = None
-news_fetcher: NewsFetcher = None
-senti_analyzer: SentimentIntensityAnalyzer = None
-sys_state: 'SystemState' = None
-guard_engine: GuardEngine = None
-sniper_engine: SniperEngine = None
-oracle_engine: OracleEngine = None
+r2 = None
+data_manager = None
+ml_processor = None
+trade_manager = None
+whale_monitor = None
+news_fetcher = None
+senti_analyzer = None
+sys_state = None
+guard_engine = None
+sniper_engine = None
+oracle_engine = None
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 SHARED_GUARD_MODELS_DIR = os.path.join(BASE_DIR, "ml_models", "guard_v2")
@@ -62,81 +62,83 @@ class SystemState:
     def __init__(self):
         self.ready = False
         self.cycle_running = False
-        self.last_cycle_time: datetime = None
-        self.last_cycle_error = None
-        self.app_start_time = datetime.now()
-        # مخزن مؤقت لآخر سجلات الدورة
-        self.last_cycle_logs = "النظام قيد التهيئة... يرجى الانتظار."
+        self.startup_error = None
+        self.logs = "⏳ بدء تشغيل النظام... (الواجهة تعمل، التحميل في الخلفية)\n"
 
-    def set_ready(self): 
+    def log(self, msg):
+        print(msg)
+        timestamp = datetime.now().strftime('%H:%M:%S')
+        self.logs += f"[{timestamp}] {msg}\n"
+
+    def set_ready(self):
         self.ready = True
-        self.last_cycle_logs = "✅ النظام جاهز. اضغط 'بدء' للعمل."
-    
-    def set_cycle_start(self): 
-        self.cycle_running = True
-        self.last_cycle_logs = "🌀 [Cycle START] جاري العمل..."
+        self.log("✅ النظام جاهز تماماً للعمل.")
 
-    def set_cycle_end(self, error=None, logs=None):
-        self.cycle_running = False
-        self.last_cycle_time = datetime.now()
-        self.last_cycle_error = str(error) if error else None
-        if logs:
-            self.last_cycle_logs = logs
-        elif error:
-            self.last_cycle_logs = f"❌ [Cycle ERROR] {error}"
-        else:
-            self.last_cycle_logs = f"✅ [Cycle END] {datetime.now().strftime('%H:%M:%S')}. الدورة انتهت."
+    def set_error(self, err):
+        self.ready = False
+        self.startup_error = str(err)
+        self.log(f"❌ فشل التشغيل: {err}")
 
 sys_state = SystemState()
 
 # ==============================================================================
-# 🚀 تهيئة التطبيق ودورة الحياة (Lifespan)
+# 🏗️ عملية التحميل في الخلفية (Non-Blocking Startup)
 # ==============================================================================
-@asynccontextmanager
-async def lifespan(app: FastAPI):
+async def background_initialization():
+    """
+    تحميل النظام بالكامل في الخلفية لضمان ظهور الواجهة فوراً.
+    """
     global r2, data_manager, ml_processor, trade_manager, oracle_engine
     global whale_monitor, news_fetcher, senti_analyzer, guard_engine, sniper_engine, sys_state
-    
-    print("🚀 [System] Starting Up (V17.6 Full)...")
-    print("------------------------------------------------------")
-    
+
     try:
-        print("   [1/8] تهيئة R2Service...")
+        await asyncio.sleep(1) # مهلة قصيرة جداً
+        sys_state.log("🚀 بدء تحميل الوحدات (Background Task)...")
+
+        # 1. R2
+        sys_state.log("   [1/8] الاتصال بـ Cloudflare R2...")
         r2 = R2Service()
         
-        print("   [2/8] تهيئة DataManager...")
+        # 2. Data Manager
+        sys_state.log("   [2/8] تهيئة DataManager...")
         data_manager = DataManager(contracts_db={}, whale_monitor=None, r2_service=r2)
-        await data_manager.initialize() 
-        await data_manager.load_contracts_from_r2()
+        await data_manager.initialize()
+        try:
+            await data_manager.load_contracts_from_r2()
+            sys_state.log("       -> تم تحميل قاعدة عقود العملات.")
+        except Exception as e:
+            sys_state.log(f"       ⚠️ تحذير: فشل تحميل العقود ({e})")
 
-        print("   [3/8] تهيئة L2 Services (Whales, News, Sentiment)...")
+        # 3. Services
+        sys_state.log("   [3/8] تهيئة خدمات الحيتان والأخبار...")
         whale_monitor = EnhancedWhaleMonitor(contracts_db=data_manager.get_contracts_db(), r2_service=r2)
         news_fetcher = NewsFetcher()
         senti_analyzer = SentimentIntensityAnalyzer()
         data_manager.whale_monitor = whale_monitor
 
-        print(f"   [4/8] تهيئة OracleEngine (L3 Brain) من {UNIFIED_MODELS_DIR}...")
+        # 4. Oracle
+        sys_state.log(f"   [4/8] تحميل نماذج Oracle L3 من {UNIFIED_MODELS_DIR}...")
         oracle_engine = OracleEngine(model_dir=UNIFIED_MODELS_DIR)
         await oracle_engine.initialize()
 
-        print("   [5/8] (تم تخطي LearningHub - مدمج في Oracle)")
-
-        print("   [6/8] تهيئة MLProcessor (L1 Engine)...")
+        # 5. ML Processor
+        sys_state.log("   [5/8] تهيئة Titan Engine L1...")
         ml_processor = MLProcessor(market_context=None, data_manager=data_manager, learning_hub=None) 
         await ml_processor.initialize()
         
-        print(f"   -> [Guard Path] استخدام المسار المشترك للحارس: {SHARED_GUARD_MODELS_DIR}")
-        
-        print("   [7/8] تهيئة GuardEngine (L2 Exit Protector)...")
+        # 6. Guard
+        sys_state.log("   [6/8] تهيئة Guard Engine L2...")
         guard_engine = GuardEngine(models_dir=SHARED_GUARD_MODELS_DIR) 
         await guard_engine.initialize()
 
-        print("   [8/8] تهيئة SniperEngine (L2 Entry Sniper)...")
+        # 7. Sniper
+        sys_state.log("   [7/8] تهيئة Sniper Engine L2...")
         sniper_engine = SniperEngine(models_dir=SHARED_GUARD_MODELS_DIR) 
         await sniper_engine.initialize()
-        sniper_engine.set_entry_threshold(0.35) # العتبة المحدثة
+        sniper_engine.set_entry_threshold(0.35)
         
-        print("   [FINAL] تهيئة TradeManager...")
+        # 8. Trade Manager
+        sys_state.log("   [8/8] تهيئة Trade Manager واستعادة الصفقات...")
         trade_manager = TradeManager(
             r2_service=r2, 
             data_manager=data_manager, 
@@ -145,30 +147,31 @@ async def lifespan(app: FastAPI):
             guard_engine=guard_engine,
             sniper_engine=sniper_engine
         )
-        # تحميل الحالة فوراً من R2
         await trade_manager.initialize_sentry_exchanges()
         await trade_manager.start_sentry_loops()
         
         sys_state.set_ready()
-        print("------------------------------------------------------")
-        print("✅ [System READY] جميع الوحدات تم تهيئتها بنجاح.")
-        print("------------------------------------------------------")
-        
-        yield
-    
+
     except Exception as e:
-        print(f"❌ [FATAL STARTUP ERROR] فشل فادح أثناء بدء التشغيل: {e}")
+        sys_state.set_error(e)
         traceback.print_exc()
 
-    finally:
-        print("\n🛑 [System] بدء إيقاف التشغيل...")
-        sys_state.ready = False
-        if trade_manager: await trade_manager.stop_sentry_loops()
-        if data_manager: await data_manager.close()
-        print("✅ [System SHUTDOWN] تم إغلاق جميع الاتصالات.")
+# ==============================================================================
+# 🚀 دورة الحياة (FastAPI Lifespan)
+# ==============================================================================
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    asyncio.create_task(background_initialization())
+    print("✅ [FastAPI] Server Started (Initialization running in background).")
+    yield
+    print("\n🛑 [FastAPI] Shutting down...")
+    sys_state.ready = False
+    if trade_manager: await trade_manager.stop_sentry_loops()
+    if data_manager: await data_manager.close()
+    print("✅ [FastAPI] Shutdown complete.")
 
 # ==============================================================================
-# 🧠 دوال التحليل المساعدة
+# 🧠 وظائف التحليل
 # ==============================================================================
 async def _analyze_symbol_task(symbol: str) -> Dict[str, Any]:
     global data_manager, ml_processor
@@ -176,153 +179,134 @@ async def _analyze_symbol_task(symbol: str) -> Dict[str, Any]:
         required_tfs = ["5m", "15m", "1h", "4h", "1d"]
         data_tasks = [data_manager.get_latest_ohlcv(symbol, tf, limit=250) for tf in required_tfs]
         all_data = await asyncio.gather(*data_tasks)
-        
         ohlcv_data = {}
         for tf, data in zip(required_tfs, all_data):
             if data and len(data) > 0: ohlcv_data[tf] = data
-
-        if '5m' not in ohlcv_data or '15m' not in ohlcv_data or '1h' not in ohlcv_data or '4h' not in ohlcv_data:
-            return None
-            
+        
+        if '5m' not in ohlcv_data or '1h' not in ohlcv_data: return None
+        
         current_price = await data_manager.get_latest_price_async(symbol)
         raw_data = {'symbol': symbol, 'ohlcv': ohlcv_data, 'current_price': current_price}
         return await ml_processor.process_and_score_symbol_enhanced(raw_data)
-    except Exception as e:
-        return None
+    except: return None
+
+def fmt_price(price):
+    if price is None or price == 0: return "0.00"
+    if price < 1.0: return f"{price:.8f}"
+    if price < 100: return f"{price:.4f}"
+    return f"{price:.2f}"
 
 # ==============================================================================
-# [ 🚀 🚀 🚀 ] الدورة الموحدة (Logic Restored + R2 Priority)
+# 🧬 الدورة الموحدة (Full Logic Restored)
 # ==============================================================================
 async def run_unified_cycle():
-    """
-    دورة التحليل الكاملة: L1 -> L2 -> L3 -> L4.
-    - تتحقق أولاً من وجود صفقات مفتوحة.
-    - إذا وجدت، تقوم بفحص صحي (Health Check) وتتوقف.
-    - إذا لم تجد، تبدأ البحث الكامل (Full Scan).
-    """
-    
-    # (إعداد التقاط السجلات)
     log_buffer = StringIO()
-    
     def log_and_print(message):
-        """دالة مساعدة للطباعة في السجل الفعلي وفي الواجهة"""
         print(message)
         log_buffer.write(message + '\n')
 
-    if sys_state.cycle_running:
-        log_and_print("⚠️ [Cycle] الدورة الحالية لا تزال قيد التشغيل. تم تجاهل الطلب.")
-        return
-    
     if not sys_state.ready:
-        log_and_print("⚠️ [Cycle] تم تجاهل الدورة، النظام لم يكتمل تهيئته.")
+        log_and_print(f"⚠️ النظام غير جاهز بعد. انتظر انتهاء التحميل.")
         return
 
-    sys_state.set_cycle_start()
+    if sys_state.cycle_running:
+        log_and_print("⚠️ الدورة تعمل حالياً."); return
+
+    sys_state.cycle_running = True
     log_and_print(f"\n🌀 [Cycle START] {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
     
     try:
-        # -----------------------------------------------------------
-        # 1. [ 🛑 الفحص الحاسم ] هل لدينا صفقة مفتوحة؟
-        # -----------------------------------------------------------
+        # ---------------------------------------------------------
+        # 1. فحص الصفقات المفتوحة (R2 Priority)
+        # ---------------------------------------------------------
         if trade_manager.open_positions:
             symbol = list(trade_manager.open_positions.keys())[0]
-            log_and_print(f"⚠️ [System Limit] توجد صفقة مفتوحة بالفعل على {symbol}.")
-            log_and_print(f"   -> 🛑 تم إلغاء البحث عن فرص جديدة (قاعدة الصفقة الواحدة).")
-            log_and_print(f"   -> 🩺 جاري تشغيل 'إعادة التحليل' (Health Check) للصفقة الحالية...")
+            log_and_print(f"⚠️ [Limit] توجد صفقة نشطة: {symbol}. تم إلغاء البحث.")
+            log_and_print(f"   -> 🩺 تشغيل الفحص الصحي (Re-Analysis)...")
             
-            # --- إعادة تحليل الصفقة المفتوحة ---
             analysis = await _analyze_symbol_task(symbol)
             if analysis:
                 score = analysis.get('enhanced_final_score', 0.0)
                 comps = analysis.get('components', {})
+                log_and_print(f"\n📊 [Report] {symbol} | L1 Score: {score:.2f}")
+                log_and_print(f"   - Titan: {comps.get('titan_score', 0):.2f} | Patterns: {comps.get('patterns_score', 0):.2f}")
                 
-                log_and_print(f"\n📊 [Health Report] {symbol}")
-                log_and_print(f"   - Current L1 Score: {score:.2f}")
-                log_and_print(f"   - Titan: {comps.get('titan_score', 0):.2f} | Patterns: {comps.get('patterns_score', 0):.2f} | MC: {comps.get('mc_score', 0):.2f}")
-                
-                # فحص العقل
-                log_and_print("   -> 🧠 استشارة Oracle للصفقة المفتوحة...")
                 oracle_res = await oracle_engine.predict(analysis)
-                action = oracle_res.get('action', 'WAIT')
-                conf = oracle_res.get('confidence', 0.0)
-                reason = oracle_res.get('analysis_summary') or oracle_res.get('reason')
-                log_and_print(f"   -> Oracle Says: {action} (Conf: {conf:.2f})")
-                log_and_print(f"      Reason: {reason}")
+                act = oracle_res.get('action'); conf = oracle_res.get('confidence', 0)
+                log_and_print(f"   -> Oracle: {act} (Conf: {conf:.2f})")
                 
-                # فحص الحارس
-                log_and_print("   -> 🛡️ استشارة Guard V2 للخروج...")
                 if '5m' in analysis['ohlcv']:
                     guard_res = await guard_engine.check_exit_signal_async(analysis['ohlcv']['5m'])
-                    log_and_print(f"   -> Guard Says: {guard_res['action']} (Conf: {guard_res['confidence']:.2f})")
-                
+                    log_and_print(f"   -> Guard V2: {guard_res['action']} (Conf: {guard_res['confidence']:.2f})")
             else:
-                log_and_print(f"⚠️ فشل تحليل البيانات لـ {symbol}.")
-
-            log_and_print(f"\n✅ انتهت دورة المتابعة. النظام يراقب {symbol}.")
-            sys_state.set_cycle_end(logs=log_buffer.getvalue())
+                log_and_print(f"⚠️ فشل تحليل {symbol} (بيانات ناقصة).")
+                
+            sys_state.cycle_running = False
+            sys_state.logs = log_buffer.getvalue()
             return
 
-        # -----------------------------------------------------------
-        # 2. (اذا لم توجد صفقات) -> ابدأ البحث الكامل (Restored Logic)
-        # -----------------------------------------------------------
+        # ---------------------------------------------------------
+        # 2. البحث الجديد (Full Logic Restored)
+        # ---------------------------------------------------------
+        log_and_print("✅ البحث عن فرص جديدة...")
         
-        # --- 1. الغربلة الأولية (L1) ---
-        log_and_print("   [Cycle 1/5] 🔍 بدء الغربلة السريعة (L1 Screening)...")
-        candidates_to_analyze = await data_manager.layer1_rapid_screening()
-        
-        if not candidates_to_analyze:
-            log_and_print("⚠️ [Cycle] لا توجد مرشحات من L1. إنهاء.")
-            sys_state.set_cycle_end(logs=log_buffer.getvalue()); return
-            
-        log_and_print(f"   -> 🧠 بدء تحليل L1 المعمق لـ {len(candidates_to_analyze)} عملة...")
+        # --- L1 Screening ---
+        log_and_print("   [1/5] L1 Rapid Screening...")
+        candidates = await data_manager.layer1_rapid_screening()
+        if not candidates:
+            log_and_print("⚠️ لا توجد عملات."); sys_state.cycle_running = False; sys_state.logs = log_buffer.getvalue(); return
+
+        # --- L1 Deep Analysis ---
+        log_and_print(f"   -> تحليل معمق لـ {len(candidates)} عملة...")
         analysis_start_time = time.time()
         
-        tasks = [_analyze_symbol_task(cand['symbol']) for cand in candidates_to_analyze if cand.get('symbol')]
+        tasks = [_analyze_symbol_task(c['symbol']) for c in candidates if c.get('symbol')]
         results = await asyncio.gather(*tasks)
+        valid_l1_results = [r for r in results if r]
         
-        valid_l1_results = [res for res in results if res is not None]
+        # ترتيب حسب L1
         top_10_l1 = sorted(valid_l1_results, key=lambda x: x.get('enhanced_final_score', 0.0), reverse=True)[:10]
         
         log_and_print(f"   -> 🧠 انتهى تحليل L1 في {time.time() - analysis_start_time:.2f} ثانية.")
         log_and_print(f"       - ✅ نجح: {len(valid_l1_results)} إشارة مرشحة.")
         
-        if top_10_l1:
-            log_and_print(f"\n       -> 🥇 أعلى 10 درجات في الطبقة الأولى (L1):")
-            for i, res in enumerate(top_10_l1):
-                components = res.get('components', {})
-                titan_s = components.get('titan_score', 0.0)
-                pattern_s = components.get('patterns_score', 0.0)
-                mc_s = components.get('mc_score', 0.0)
-                log_and_print(f"           {i+1}. {res.get('symbol'):<10}: {res.get('enhanced_final_score', 0.0):.4f} [T: {titan_s:.2f} | P: {pattern_s:.2f} | M: {mc_s:.2f}]")
-        else:
-            log_and_print("       -> ⚠️ لم يتم العثور على أي عملات صالحة.")
-            sys_state.set_cycle_end(logs=log_buffer.getvalue()); return
+        if not top_10_l1:
+            log_and_print("⚠️ لا توجد نتائج L1 صالحة."); sys_state.cycle_running = False; sys_state.logs = log_buffer.getvalue(); return
 
-        # --- 2. التعزيز وحساب نقاط الطبقة الثانية (L2 Boosting) ---
-        # [ تم استعادة الكو�� الكامل هنا ]
+        # --- L2 Boosting (Full Detailed Logic) ---
         log_and_print(f"\n   [Cycle 2/5] 🚀 بدء تعزيز النقاط (L2 Boosting) لأفضل 10 عملات...")
         l2_enriched_candidates = []
         
         for candidate in top_10_l1:
             symbol = candidate['symbol']
             l1_score = candidate['enhanced_final_score']
+            
             whale_score = 0.0; whale_raw_str = "No Data"
             news_score = 0.0; news_raw_str = "No Data"
             adv_mc_score = 0.0; mc_raw_str = "No Data"
-            
+
             # (أ. بيانات الحيتان)
+            whale_data = {}
             try:
                 whale_data = await whale_monitor.get_symbol_whale_activity(symbol)
                 net_flow = whale_data.get('accumulation_analysis_24h', {}).get('net_flow_usd', 0.0)
                 whale_raw_str = f"${net_flow:,.0f}"
                 if net_flow <= -500000: whale_score = 0.10
                 elif net_flow < 0: whale_score = 0.05
-            except Exception as e: log_and_print(f"       ⚠️ [Whale Error] {symbol}: {e}")
-            candidate['whale_data'] = {} 
+            except Exception as e:
+                pass # (تخفيف الضوضاء، الأخطاء مسجلة في مكان آخر)
+            candidate['whale_data'] = whale_data
 
             # (ب. الأخبار)
+            news_text = "No news available"
             try:
-                news_item = await news_fetcher.get_news(symbol)
+                if hasattr(news_fetcher, 'get_news'):
+                    news_item = await news_fetcher.get_news(symbol)
+                elif hasattr(news_fetcher, 'fetch_news'):
+                    news_item = await news_fetcher.fetch_news(symbol)
+                else:
+                    news_item = {'summary': 'News fetcher method not found'}
+                
                 if news_item:
                     news_text = news_item.get('summary', 'No news')
                     sentiment = senti_analyzer.polarity_scores(news_text)
@@ -330,28 +314,39 @@ async def run_unified_cycle():
                     news_raw_str = f"{compound:.2f}"
                     if compound >= 0.5: news_score = 0.05
                     elif compound >= 0.1: news_score = 0.02
-            except Exception as e: log_and_print(f"       ⚠️ [News Error] {symbol}: {e}")
-            candidate['news_text'] = "..." 
+            except Exception as e:
+                pass
+            candidate['news_text'] = news_text
 
             # (ج. مونت كارلو المتقدمة)
             try:
                 full_ohlcv_1h = await data_manager.get_latest_ohlcv(symbol, '1h', limit=100)
-                if full_ohlcv_1h and len(full_ohlcv_1h) >= 30:
+                if not full_ohlcv_1h or len(full_ohlcv_1h) < 30:
+                    pass 
+                else:
                     mc_data = {'1h': full_ohlcv_1h}
                     mc_res = await ml_processor.mc_analyzer.generate_1h_distribution_advanced(mc_data)
                     if mc_res and not mc_res.get('error', False):
                         prob_gain = mc_res.get('probability_of_gain', 0.5)
                         mc_raw_str = f"{prob_gain:.2f}"
-                        if prob_gain > 0.5: adv_mc_score = min(0.10, (prob_gain - 0.5) * 0.20)
-            except Exception as e: log_and_print(f"       ⚠️ [MC Exception] {symbol}: {e}")
+                        if prob_gain > 0.5:
+                            adv_mc_score = min(0.10, (prob_gain - 0.5) * 0.20)
+                        else:
+                            adv_mc_score = 0.0
+                    else:
+                        reason = mc_res.get('reason', 'Unknown') if mc_res else "Null Result"
+                        mc_raw_str = f"Err: {reason}"
+            except Exception as e:
+                pass
                 
+            # (د. حساب الدرجة النهائية)
             final_score = l1_score + whale_score + news_score + adv_mc_score
             candidate['final_total_score'] = final_score
             candidate['l2_scores'] = {'whale': whale_score, 'news': news_score, 'adv_mc': adv_mc_score}
             candidate['l2_raw_values'] = {'whale': whale_raw_str, 'news': news_raw_str, 'adv_mc': mc_raw_str}
             l2_enriched_candidates.append(candidate)
 
-        # --- 3. إعادة الترتيب وطباعة الجدول ---
+        # --- 3. إعادة الترتيب وطباعة الجدول (Full Detail) ---
         log_and_print(f"   [Cycle 3/5] 📊 إعادة ترتيب المرشحين حسب الدرجة النهائية (L1 + L2)...")
         sorted_finalists = sorted(l2_enriched_candidates, key=lambda x: x['final_total_score'], reverse=True)
         
@@ -359,12 +354,18 @@ async def run_unified_cycle():
         header = f"{'SYMBOL':<10} | {'L1 SCORE':<8} | {'WHALE (Flow)':<22} | {'NEWS (Sent)':<18} | {'ADV MC (Prob)':<18} | {'FINAL':<8}"
         log_and_print(header)
         log_and_print("-" * 135)
+        
         for cand in sorted_finalists:
-            sym = cand['symbol']; l1 = cand['enhanced_final_score']; l2 = cand['l2_scores']; l2_raw = cand['l2_raw_values']; final = cand['final_total_score']
+            sym = cand['symbol']
+            l1 = cand['enhanced_final_score']
+            l2 = cand['l2_scores']
+            l2_raw = cand['l2_raw_values']
+            final = cand['final_total_score']
             whale_cell = f"{l2['whale']:.2f} ({l2_raw['whale']})"
             news_cell = f"{l2['news']:.2f} ({l2_raw['news']})"
             mc_cell = f"{l2['adv_mc']:.2f} ({l2_raw['adv_mc']})"
             log_and_print(f"{sym:<10} | {l1:.4f}   | {whale_cell:<22} | {news_cell:<18} | {mc_cell:<18} | {final:.4f}")
+            
         log_and_print("="*135 + "\n")
 
         # --- 4. اختيار أفضل 5 للنموذج الضخم (Oracle) ---
@@ -379,13 +380,16 @@ async def run_unified_cycle():
             if signal['final_total_score'] < 0.60: 
                 log_and_print(f"   -> 🛑 {symbol} تم استبعاده (الدرجة النهائية {signal['final_total_score']:.2f} < 0.60)")
                 continue
+            
             log_and_print(f"   -> 🧠 [Oracle Scan] جاري فحص {symbol}...")
+            
             try:
                 oracle_decision = await oracle_engine.predict(signal)
-                action = oracle_decision.get('action'); confidence = oracle_decision.get('confidence', 0.0)
+                action = oracle_decision.get('action')
+                confidence = oracle_decision.get('confidence', 0.0)
                 reason = oracle_decision.get('analysis_summary') or oracle_decision.get('reason', 'No summary provided')
-                
-                # [فلترة إشارات الشورت]
+
+                # فلتر الشورت الصارم
                 if "SHORT" in str(reason).upper() or "SHORT" in str(oracle_decision.get('strategy')).upper():
                     log_and_print(f"       🛑 [Oracle SKIP] {symbol} تم تجاهلها (إشارة بيع SHORT).")
                     continue
@@ -398,7 +402,8 @@ async def run_unified_cycle():
                     oracle_approved_signals.append(signal)
                 else:
                     log_and_print(f"       🛑 [Oracle REJECTED] {symbol} (Conf: {confidence:.2f})")
-                    log_and_print(f"           📝 Reason: {reason[:200]}...")
+                    log_and_print(f"           📝 Reason: {reason[:200]}...") 
+            
             except Exception as e:
                 log_and_print(f"       ⚠️ [Oracle Error] فشل تحليل Oracle لـ {symbol}: {e}")
                 traceback.print_exc(file=log_buffer)
@@ -406,184 +411,152 @@ async def run_unified_cycle():
         
         log_and_print(f"   -> 🧠 انتهى فحص Oracle في {time.time() - oracle_start_time:.2f} ثانية. (تمت الموافقة على {len(oracle_approved_signals)} إشارة)")
 
-        # (إرسال المجموعة إلى TradeManager للفرز النهائي والتنفيذ)
+        # --- L4 Sniper Batch ---
         if oracle_approved_signals:
             log_and_print(f"   -> 🎯 [L4 Sniper Batch] إرسال {len(oracle_approved_signals)} إشارة للقناص للفرز النهائي واختيار الأفضل...")
             
-            # التقاط سجلات TradeManager
             tm_log_buffer = StringIO()
             with redirect_stdout(tm_log_buffer), redirect_stderr(tm_log_buffer):
                 await trade_manager.select_and_execute_best_signal(oracle_approved_signals)
             
             tm_logs = tm_log_buffer.getvalue()
-            print(tm_logs) # طباعة في السجل الرئيسي
-            log_buffer.write(tm_logs + '\n') # إضافة إلى سجل الواجهة
+            print(tm_logs) 
+            log_buffer.write(tm_logs + '\n') 
         else:
             log_and_print("   -> 🎯 [L4 Sniper Batch] لا توجد إشارات معتمدة من العقل لإرسالها للقناص.")
-            
-        # --- 5. الصيانة والتعلم ---
-        log_and_print(f"   [Cycle 5/5] 🧹 تنظيف الذاكرة...")
-        gc.collect()
-        log_and_print(f"🌀 [Cycle END] {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
-        sys_state.set_cycle_end(logs=log_buffer.getvalue())
 
-    except Exception as e:
-        error_logs = f"❌ [Cycle ERROR] فشلت الدورة الموحدة: {e}\n{traceback.format_exc()}"
-        log_and_print(error_logs)
-        sys_state.set_cycle_end(error=e, logs=log_buffer.getvalue())
+        log_and_print("✅ الدورة اكتملت.")
+        sys_state.cycle_running = False
+        sys_state.logs = log_buffer.getvalue()
 
-# ==============================================================================
-# 🔧 دوال مساعدة للواجهة (تنسيق الأرقام) - [جديد]
-# ==============================================================================
-def fmt_price(price):
-    """تنسيق ذكي للأسعار: 8 خانات للعملات الصغيرة، 2 للكبيرة"""
-    if price is None or price == 0: return "0.00"
-    if price < 1.0: return f"{price:.8f}" # للعملات مثل SHIB
-    if price < 100: return f"{price:.4f}"
-    return f"{price:.2f}"
+    except Exception as e:
+        log_and_print(f"❌ Error: {e}")
+        traceback.print_exc()
+        sys_state.cycle_running = False
+        sys_state.logs = log_buffer.getvalue()
 
 # ==============================================================================
-# 📊 واجهة Gradio وتحديث البيانات
+# 📊 واجهة Gradio (UI)
 # ==============================================================================
-async def check_live_pnl_and_status():
+async def update_ui():
+    log_text = sys_state.logs
+    
     if not sys_state.ready:
-        return "جاري التهيئة...", "...", "...", "...", "...", None, pd.DataFrame()
+        return log_text, "**System:** 🟠 Loading...", "Wait...", "---", "---", None, pd.DataFrame()
+
+    status_text = f"**System:** 🟢 Ready | **Cycle:** {'Running' if sys_state.cycle_running else 'Idle'}"
+    
+    if not trade_manager:
+        return log_text, status_text, "...", "---", "---", None, pd.DataFrame()
 
-    # 1. الحالة العامة
-    log_text = sys_state.last_cycle_logs
     n_trades = len(trade_manager.open_positions)
-    status_md = f"""
-    **الحالة:** {'<span style="color:green;">جاهز</span>' if not sys_state.cycle_running else '<span style="color:orange;">يحلل...</span>'} | 
-    **الصفقات:** {n_trades} | 
-    **المراقبة:** {len(trade_manager.watchlist)}
-    """
     df_watch = pd.DataFrame(list(trade_manager.watchlist.keys()), columns=["Watchlist"])
 
-    # 2. لا توجد صفقات
     if n_trades == 0:
-        return log_text, status_md, "### لا توجد صفقة نشطة", "---", "---", None, df_watch
+        return log_text, status_text, "### No Active Trades", "---", "---", None, df_watch
 
-    # 3. عرض تفاصيل الصفقة (مع إصلاح الأصفار والمخطط)
+    # عرض الصفقة
     try:
         symbol = list(trade_manager.open_positions.keys())[0]
         trade = trade_manager.open_positions[symbol]
-        
-        curr_price = await data_manager.get_latest_price_async(symbol)
+        curr = await data_manager.get_latest_price_async(symbol)
         entry = trade['entry_price']
         
-        if curr_price > 0 and entry > 0:
-            pnl = ((curr_price - entry) / entry) * 100
-        else:
-            pnl = 0.0
-
-        color = "green" if pnl >= 0 else "red"
-        pnl_html = f"<h2 style='color:{color}; text-align:center;'>{pnl:.2f}%</h2>"
+        pnl = ((curr - entry)/entry)*100 if entry else 0
+        col = "green" if pnl >= 0 else "red"
+        pnl_html = f"<h2 style='color:{col}; text-align:center;'>{pnl:.2f}%</h2>"
         
-        # [ إصلاح التنسيق ] استخدام fmt_price
         details = f"""
         **Entry:** {fmt_price(entry)}
-        **Current:** {fmt_price(curr_price)}
+        **Current:** {fmt_price(curr)}
         **TP:** {fmt_price(trade['tp_price'])}
         **SL:** {fmt_price(trade['sl_price'])}
         """
-        
-        symbol_md = f"### {symbol}"
 
-        # [ إصلاح المخطط ]
-        fig = plt.figure(figsize=(10, 5))
+        # الرسم البياني
+        fig = plt.figure(figsize=(10, 4), dpi=100)
         try:
             ohlcv = await data_manager.get_latest_ohlcv(symbol, '5m', 100)
             if ohlcv:
                 df = pd.DataFrame(ohlcv, columns=['ts', 'o', 'h', 'l', 'c', 'v'])
                 df['dt'] = pd.to_datetime(df['ts'], unit='ms')
-                
-                plt.style.use('dark_background')
-                plt.plot(df['dt'], df['c'], label='Price', color='cyan')
-                plt.axhline(entry, color='gray', linestyle='--', label='Entry')
-                plt.axhline(trade['tp_price'], color='green', linestyle=':', label='TP')
-                plt.axhline(trade['sl_price'], color='red', linestyle=':', label='SL')
-                plt.title(f"{symbol} Live Chart")
-                plt.legend()
-                plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
+                ax = plt.gca()
+                ax.plot(df['dt'], df['c'], color='#00ffcc', label='Price')
+                ax.axhline(entry, color='gray', linestyle='--', label='Entry')
+                ax.axhline(trade['tp_price'], color='green', linestyle=':', label='TP')
+                ax.axhline(trade['sl_price'], color='red', linestyle=':', label='SL')
+                ax.set_facecolor('#0b0f19')
+                fig.patch.set_facecolor('#0b0f19')
+                ax.tick_params(colors='white')
+                ax.xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
+                plt.title(f"{symbol}", color='white')
+                plt.legend(facecolor='#1f2937', labelcolor='white')
                 plt.tight_layout()
             else:
-                plt.text(0.5, 0.5, "No Data", ha='center', color='white')
+                plt.text(0.5, 0.5, "No Data", color='white', ha='center')
+                plt.axis('off')
         except:
             plt.close()
             fig = None
 
-        return log_text, status_md, symbol_md, pnl_html, details, fig, df_watch
-
+        return log_text, status_text, f"### {symbol}", pnl_html, details, fig, df_watch
     except Exception as e:
-        return log_text, status_md, f"Error: {e}", "...", "...", None, df_watch
+        return log_text, status_text, f"Error: {e}", "...", "...", None, df_watch
 
-# ==============================================================================
-# 📟 بناء الواجهة (UI Construction)
-# ==============================================================================
-def create_ui():
-    with gr.Blocks(title="Titan Dashboard", theme=gr.themes.Monochrome()) as demo:
-        gr.Markdown("# 📊 Titan Automated Trading System")
+def create_dashboard():
+    css = """
+    body { background-color: #0b0f19; color: white; }
+    .gradio-container { background-color: #0b0f19; }
+    """
+    with gr.Blocks(title="Titan Trader", theme=gr.themes.Monochrome(), css=css) as demo:
+        gr.Markdown("# 🏛️ Titan Automated Trading System")
         
         with gr.Row():
             with gr.Column(scale=3):
-                chart = gr.Plot(label="Chart")
+                chart = gr.Plot(label="Live Chart", show_label=False)
             with gr.Column(scale=1):
-                sym_lbl = gr.Markdown("### ...")
-                pnl_lbl = gr.HTML("---") # HTML للألوان
-                det_lbl = gr.Markdown("Waiting...")
+                sym = gr.Markdown("### Loading...")
+                pnl = gr.HTML("---")
+                det = gr.Markdown("...")
         
         with gr.Row():
-            btn = gr.Button("🚀 بدء دورة التحليل / فحص الحالة")
-            stat = gr.Markdown("**Status:** Initializing...")
+            btn = gr.Button("🚀 Start Analysis Cycle", variant="primary")
+            stat = gr.Markdown("**System:** Starting...")
         
         with gr.Row():
-            logs = gr.Textbox(label="Logs", lines=15, max_lines=30, autoscroll=True)
+            logs = gr.Textbox(label="System Logs", lines=12, max_lines=20, autoscroll=True)
             watch = gr.DataFrame(label="Watchlist")
 
         # Events
-        async def manual_run():
-            if sys_state.cycle_running: return "Busy..."
+        async def on_click():
+            if sys_state.cycle_running: return sys_state.logs
             await run_unified_cycle()
-            return sys_state.last_cycle_logs
+            return sys_state.logs
 
-        btn.click(manual_run, outputs=logs)
+        btn.click(on_click, outputs=logs)
         
-        # Timer (للتحديث التلقائي)
-        timer = gr.Timer(10)
-        timer.tick(
-            check_live_pnl_and_status, 
-            outputs=[logs, stat, sym_lbl, pnl_lbl, det_lbl, chart, watch]
-        )
+        # Auto-refresh every 5s
+        timer = gr.Timer(5)
+        timer.tick(update_ui, outputs=[logs, stat, sym, pnl, det, chart, watch])
         
-        # Load on start (للتحميل الأولي)
-        demo.load(
-            check_live_pnl_and_status, 
-            outputs=[logs, stat, sym_lbl, pnl_lbl, det_lbl, chart, watch]
-        )
+        # Initial load
+        demo.load(update_ui, outputs=[logs, stat, sym, pnl, det, chart, watch])
 
     return demo
 
 # ==============================================================================
-# 🔥 التشغيل (Application Entry Point)
+# 🔥 Main Entry
 # ==============================================================================
 app = FastAPI()
+dash = create_dashboard()
+app = gr.mount_gradio_app(app, dash, path="/")
 
-# نقاط النهاية للخادم الخارجي (Cron Jobs)
 @app.get("/run-cycle")
-async def api_run(bg: BackgroundTasks):
-    if sys_state.cycle_running: return {"status": "Busy"}
+async def cron_job(bg: BackgroundTasks):
+    if not sys_state.ready or sys_state.cycle_running: return {"status": "Busy/NotReady"}
     bg.add_task(run_unified_cycle)
-    return {"status": "Started"}
-
-@app.get("/status")
-async def api_status():
-    return {"trades": len(trade_manager.open_positions) if trade_manager else 0}
-
-# دمج واجهة Gradio
-ui = create_ui()
-app = gr.mount_gradio_app(app, ui, path="/")
+    return {"status": "Triggered"}
 
 if __name__ == "__main__":
     import uvicorn
-    # --no-access-log لإخفاء إزعاج الطلبات
     uvicorn.run(app, host="0.0.0.0", port=7860, access_log=False)