Update trade_manager.py

trade_manager.py

@@ -1,4 +1,4 @@
-# trade_manager.py (V15.6 - GEM-Architect Fix: Precision Logging)
+# trade_manager.py (V16.2 - GEM-Architect: Full Restoration + Active Mgmt Fixes)
 import asyncio
 import json
 import uuid
@@ -22,7 +22,7 @@ class TradeManager:
         
         self.execution_lock = asyncio.Lock()
         
-        print(f"🛡️ [TradeManager V15.6] Sentry Module Initialized (Precision Logs).")
+        print(f"🛡️ [TradeManager V16.2] Sentry Module Initialized (Full Stack).")
         if self.guard:
             print(f"   -> Guard V2 (Exit Protector) CREATED.")
         else:
@@ -46,7 +46,7 @@ class TradeManager:
             self.open_positions = {} 
 
     # ==============================================================================
-    # 🎯 دالة الفرز والتنفيذ
+    # 🎯 دوال الفرز والتنفيذ (L4 Sniper Logic)
     # ==============================================================================
     async def select_and_execute_best_signal(self, oracle_approved_signals: List[Dict[str, Any]]):
         if len(self.open_positions) > 0:
@@ -126,7 +126,7 @@ class TradeManager:
         await self.select_and_execute_best_signal([signal_data])
 
     # ==============================================================================
-    # 🎯 تنفيذ الدخول (المعدل لدقة الأرقام)
+    # 🎯 تنفيذ الدخول
     # ==============================================================================
     async def _execute_entry_from_signal(self, symbol, signal_data):
         try:
@@ -194,7 +194,6 @@ class TradeManager:
             
             self.sentry_tasks[symbol] = asyncio.create_task(self._guardian_loop(symbol))
             
-            # [GEM-FIX] استخدام تنسيق 8 خانات في السجلات
             print(f"✅ [ENTRY EXECUTED] {symbol} | Price: {current_price:.8f} | TP: {tp_price:.8f} | SL: {sl_price:.8f}")
             print(f"   -> L2 Score: {new_trade['l1_score']:.2f}, L4 Conf: {new_trade['l2_sniper_confidence']:.2f}")
 
@@ -203,9 +202,10 @@ class TradeManager:
             traceback.print_exc()
 
     # ==============================================================================
-    # Watchlist Functions
+    # 👁️ Watchlist Functions (تم استعادتها بالكامل)
     # ==============================================================================
     async def _add_to_watchlist(self, symbol, signal_data):
+        """إضافة عملة لقائمة المراقبة إذا لم يكن الوقت مناسباً بعد"""
         if symbol not in self.open_positions and symbol not in self.watchlist:
             if self.open_positions:
                 print(f"👀 [Watchlist] {symbol} تم تجاهله (توجد صفقة أخرى مفتوحة).")
@@ -215,6 +215,7 @@ class TradeManager:
             print(f"👀 [Watchlist] {symbol} تمت إضافته للمراقبة (L1 Score: {signal_data['enhanced_final_score']:.2f})")
 
     async def _find_signal_in_watchlist(self):
+        """فحص دوري لقائمة المراقبة لمعرفة ما إذا تحقق شرط القناص"""
         if not self.watchlist:
             return
             
@@ -250,10 +251,10 @@ class TradeManager:
             await self.select_and_execute_best_signal(signals_from_watchlist)
 
     # ==============================================================================
-    # دوال حارس الخروج (Sentry)
+    # 🛡️ دوال حارس الخروج (Sentry)
     # ==============================================================================
     async def _guardian_loop(self, symbol: str):
-        print(f"🛡️ [Sentry Activated] بدء الحراسة لـ {symbol}.")
+        print(f"🛡️ [Sentry Activated] بدء الحراسة لـ {symbol} (فحص كل 60 ثانية).")
         
         while self.running and symbol in self.open_positions:
             try:
@@ -268,6 +269,9 @@ class TradeManager:
                     print(f"⚠️ [Sentry {symbol}] فشل جلب السعر، إعادة المحاولة...")
                     continue 
 
+                # [Log Stamp] تأكيد حياة الحارس في السجلات
+                # print(f"   🛡️ [Sentry Check] {symbol} Price: {current_price:.8f} | TP: {trade['tp_price']:.8f} | SL: {trade['sl_price']:.8f}")
+
                 if current_price >= trade['tp_price']:
                     print(f"✅ [Sentry EXIT] {symbol} (TP Hit) at {current_price:.8f}")
                     async with self.execution_lock:
@@ -280,29 +284,31 @@ class TradeManager:
                         await self._execute_exit(symbol, current_price, "SL_HIT")
                     break 
 
-                if self.guard and not self.guard.initialized:
-                    try:
-                        print(f"   -> [Lazy Load] 🛡️ تهيئة GuardEngine V2 لـ {symbol} عند الطلب...")
-                        await self.guard.initialize()
-                    except Exception as e:
-                        print(f"❌ [Lazy Load] فشل فادح في تهيئة GuardEngine: {e}")
-                        self.guard = None
-
-                if self.guard and self.guard.initialized:
-                    ohlcv_5m = await self.data_manager.get_latest_ohlcv(symbol, '5m', 250)
-                    
-                    if len(ohlcv_5m) >= 250: 
-                        exit_check = await self.guard.check_exit_signal_async(ohlcv_5m)
+                # [L2 Guard Integration]
+                if self.guard:
+                    if not self.guard.initialized:
+                        try:
+                            print(f"   -> [Lazy Load] 🛡️ تهيئة GuardEngine V2 لـ {symbol}...")
+                            await self.guard.initialize()
+                        except Exception as e:
+                            print(f"❌ [Lazy Load] فشل تهيئة GuardEngine: {e}")
+                            self.guard = None
+
+                    if self.guard and self.guard.initialized:
+                        ohlcv_5m = await self.data_manager.get_latest_ohlcv(symbol, '5m', 250)
                         
-                        if exit_check['action'] == 'EXIT_NOW':
-                            print(f"🛡️ [Guard V2 EXIT] {symbol} (Conf: {exit_check['confidence']:.2f})")
-                            async with self.execution_lock:
-                                await self._execute_exit(symbol, current_price, "GUARD_V2_SIGNAL")
-                            break 
+                        if len(ohlcv_5m) >= 200: 
+                            # [GEM-Architect Fix] استخدام الدالة Async الجديدة
+                            exit_check = await self.guard.check_exit_signal_async(ohlcv_5m)
+                            
+                            if exit_check['action'] == 'EXIT_NOW':
+                                print(f"🛡️ [Guard V2 SIGNAL] {symbol} أمر بالخروج (Conf: {exit_check['confidence']:.2f})")
+                                async with self.execution_lock:
+                                    await self._execute_exit(symbol, current_price, "GUARD_V2_SIGNAL")
+                                break 
                         else:
+                            # print(f"⚠️ [Guard V2 Skip] {symbol} بيانات 5m غير كافية.")
                             pass
-                    else:
-                        print(f"⚠️ [Guard V2 Skip] {symbol} بيانات 5m غير كافية للحارس.")
 
                 self.open_positions[symbol]['last_update'] = datetime.now().isoformat()
             
@@ -316,7 +322,7 @@ class TradeManager:
 
     async def _execute_exit(self, symbol, price, reason):
         if symbol not in self.open_positions:
-            print(f"⚠️ [Exit ERROR] {symbol} غير موجودة في الصفقات المفتوحة (ربما أغلقت للتو).")
+            print(f"⚠️ [Exit ERROR] {symbol} غير موجودة في الصفقات المفتوحة.")
             return
 
         try:
@@ -341,9 +347,18 @@ class TradeManager:
         except Exception as e:
             print(f"❌ [TradeManager] فشل فادح أثناء تنفيذ الخروج لـ {symbol}: {e}")
             traceback.print_exc()
+            # إعادة الصفقة للقائمة في حال الفشل لضمان عدم ضياعها
             if symbol not in self.open_positions:
                  self.open_positions[symbol] = trade 
 
+    # [GEM-Architect Fix] دالة للخروج القسري من الإدارة (app.py)
+    async def force_exit_by_manager(self, symbol, reason):
+        """يسمح لنظام الإدارة الذكي بإجبار الخروج عند تغير التحليل"""
+        print(f"⚠️ [Manager Force Exit] طلب خروج إداري لـ {symbol} بسبب: {reason}")
+        current_price = await self.data_manager.get_latest_price_async(symbol)
+        async with self.execution_lock:
+            await self._execute_exit(symbol, current_price, reason)
+
     async def update_trade_targets(self, symbol, new_tp=None, new_sl=None, reason="MANUAL"):
         if symbol in self.open_positions:
             trade = self.open_positions[symbol]
@@ -371,6 +386,5 @@ class TradeManager:
         self.running = False
         for sym, task in self.sentry_tasks.items():
             task.cancel()
-        
         await asyncio.sleep(1)
         print("🛑 [TradeManager] All sentries stopped.")