Update trade_manager.py

trade_manager.py

@@ -1,4 +1,4 @@
-# trade_manager.py (V23.0 - GEM-Architect: Processor Integration)
+# trade_manager.py (V23.2 - GEM-Architect: Sniper with Order Book)
 
 import asyncio
 import uuid
@@ -10,7 +10,7 @@ from typing import List, Dict, Any
 class TradeManager:
     def __init__(self, r2_service, data_manager, processor): 
         """
-        مدير الصفقات: يعتمد كلياً على 'processor' في القرارات الذكية.
+        مدير الصفقات: ينفذ الأوامر بناءً على إشارات المعالج المركزي.
         """
         self.r2 = r2_service
         self.data_manager = data_manager
@@ -32,7 +32,7 @@ class TradeManager:
         
         self.execution_lock = asyncio.Lock()
         
-        print(f"🛡️ [TradeManager V23] Initialized with Central Processor.")
+        print(f"🛡️ [TradeManager V23.2] Initialized (L4 OB Enabled).")
 
     async def initialize_sentry_exchanges(self):
         print("🛡️ [TradeManager] Syncing state with R2...")
@@ -48,14 +48,13 @@ class TradeManager:
             self.open_positions = {} 
 
     # ==============================================================================
-    # 🎯 L4 Sniper Logic (Via Processor)
+    # 🎯 L4 Sniper Logic (Fusion: ML + Order Book)
     # ==============================================================================
     async def select_and_execute_best_signal(self, oracle_approved_signals: List[Dict[str, Any]]):
         if len(self.open_positions) > 0:
              print(f"⛔ [TradeManager] Scan aborted. Max positions reached.")
              return
 
-        # نطلب من المعالج التأكد من أن القناص جاهز
         if not self.processor.initialized:
             await self.processor.initialize()
 
@@ -67,32 +66,48 @@ class TradeManager:
             if symbol in self.open_positions or symbol in self.watchlist:
                 continue
 
-            # جلب البيانات
-            ohlcv_1m = await self.data_manager.get_latest_ohlcv(symbol, '1m', 600)
+            # ⚡ [Parallel Fetch] جلب الشموع + دفتر الطلبات معاً ⚡
+            ohlcv_task = self.data_manager.get_latest_ohlcv(symbol, '1m', 600)
+            ob_task = self.data_manager.get_order_book_snapshot(symbol)
             
-            # استشارة القناص عبر المعالج
-            sniper_result = await self.processor.check_sniper_entry(ohlcv_1m)
+            # تنفيذ الطلبين في وقت واحد للسرعة
+            ohlcv_1m, order_book = await asyncio.gather(ohlcv_task, ob_task)
+            
+            # التحقق من البيانات
+            if not ohlcv_1m or len(ohlcv_1m) < 500:
+                print(f"   -> [L4 Skip] {symbol} (Not enough candle data).")
+                continue
+            
+            if not order_book or 'bids' not in order_book or not order_book['bids']:
+                print(f"   -> [L4 Skip] {symbol} (Empty Order Book).")
+                continue
+
+            # ⚡ استشارة القناص بالبيانات المدمجة ⚡
+            sniper_result = await self.processor.check_sniper_entry(ohlcv_1m, order_book)
             
             if sniper_result['signal'] == 'BUY':
                 confidence = sniper_result['confidence_prob']
-                threshold = sniper_result.get('threshold', 0.60)
-                print(f"   -> [L4 PASS] {symbol} (Conf: {confidence:.2f}). Added to batch.")
+                # تحليل دفتر الطلبات المرفق
+                ob_info = sniper_result.get('ob_data', {})
+                ob_reason = ob_info.get('reason', 'N/A')
+                
+                print(f"   -> [L4 PASS] {symbol} (Conf: {confidence:.2f} | OB: {ob_reason})")
                 
                 signal['l2_sniper_result'] = sniper_result
                 signal['sniper_confidence'] = confidence
                 sniper_candidates.append(signal)
             else:
-                print(f"   -> [L4 REJECT] {symbol} (Conf: {sniper_result.get('confidence_prob',0):.2f})")
+                print(f"   -> [L4 REJECT] {symbol} ({sniper_result.get('reason')})")
 
         if not sniper_candidates:
-            print("   -> [L4 Result] No candidates passed the Sniper check.")
+            print("   -> [L4 Result] No candidates passed the Sniper & OrderBook check.")
             return
 
-        # ترتيب النتائج
+        # ترتيب النتائج حسب الثقة
         sniper_candidates.sort(key=lambda x: (x['sniper_confidence'], x['final_total_score']), reverse=True)
         best_signal = sniper_candidates[0]
         
-        print(f"   🔥 [L4 WINNER] {best_signal['symbol']} (Sniper: {best_signal['sniper_confidence']:.2f})")
+        print(f"   🔥 [L4 WINNER] {best_signal['symbol']} selected for execution.")
         
         # التنفيذ
         async with self.execution_lock:
@@ -111,12 +126,12 @@ class TradeManager:
 
             l2_result = signal_data.get('l2_sniper_result', {})
             
-            # الأهدا�� (من Oracle أو حساب تلقائي)
+            # الأهداف (من Oracle)
             tp_price = float(signal_data.get('tp_price') or 0.0)
             sl_price = float(signal_data.get('sl_price') or 0.0)
 
+            # حماية ضد القيم الصفرية
             if tp_price <= 0 or sl_price <= 0:
-                # Fallback simple calculation
                 atr_mock = current_price * 0.02 
                 tp_price = current_price + (atr_mock * 2.0)
                 sl_price = current_price - (atr_mock * 1.0)
@@ -166,7 +181,7 @@ class TradeManager:
         
         while self.running and symbol in self.open_positions:
             try:
-                await asyncio.sleep(2) # Fast tick
+                await asyncio.sleep(2) # فحص سريع للأسعار
                 
                 trade = self.open_positions.get(symbol)
                 if not trade: break 
@@ -174,7 +189,7 @@ class TradeManager:
                 current_price = await self.data_manager.get_latest_price_async(symbol)
                 if current_price == 0.0: continue 
 
-                # 1. Hard Limits
+                # 1. Hard Limits Check
                 if current_price >= trade['tp_price']:
                     async with self.execution_lock:
                         await self._execute_exit(symbol, current_price, "TP_HIT_HARD")
@@ -184,7 +199,7 @@ class TradeManager:
                         await self._execute_exit(symbol, current_price, "SL_HIT_HARD")
                     break 
 
-                # 2. AI Check (Processor Consultation) every 60s
+                # 2. AI Check (Every 60s)
                 if time.time() - last_ai_check_time > 60:
                     t1 = self.data_manager.get_latest_ohlcv(symbol, '1m', 300)
                     t5 = self.data_manager.get_latest_ohlcv(symbol, '5m', 200)
@@ -193,7 +208,7 @@ class TradeManager:
                     d1, d5, d15 = await asyncio.gather(t1, t5, t15)
                     
                     if d1 and d5 and d15 and len(d1) >= 200:
-                        # ⚡ استشارة المعالج هنا ⚡
+                        # ⚡ استشارة المعالج ⚡
                         decision = self.processor.consult_guardian(d1, d5, d15, trade['entry_price'])
                         
                         action = decision.get('action', 'HOLD')
@@ -299,7 +314,7 @@ class TradeManager:
 
         except Exception as e:
             print(f"❌ [Exit Error] {e}")
-            self.open_positions[symbol] = trade # استعادة في حال الخطأ
+            self.open_positions[symbol] = trade # استعادة الصفقة في الذاكرة عند الخطأ
 
     async def force_exit_by_manager(self, symbol, reason):
         p = await self.data_manager.get_latest_price_async(symbol)