Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.4 - Fixed Re-Analysis Timer Bug)
+# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.6 - Added Close Callback)
 import os
 import traceback
 import signal
@@ -79,7 +79,7 @@ async def initialize_services():
     global learning_hub_global, trade_manager_global, sentiment_analyzer_global
     global symbol_whale_monitor_global
     try:
-        print("🚀 بدء تهيئة الخدمات (بنية Sentry الجديدة V5.4)...")
+        print("🚀 بدء تهيئة الخدمات (بنية Sentry الجديدة V5.6)...")
         print("   🔄 تهيئة R2Service..."); r2_service_global = R2Service(); state_manager.set_service_initialized('r2_service'); print("   ✅ R2Service مهيأة")
         print("   🔄 جلب قاعدة بيانات العقود..."); contracts_database = await r2_service_global.load_contracts_db_async(); print(f"   ✅ تم تحميل {len(contracts_database)} عقد")
 
@@ -123,12 +123,18 @@ async def initialize_services():
         print("   ✅ LLMService مربوط بمحور التعلم")
 
         print("   🔄 تهيئة مدير الصفقات (Layer 2 Sentry + Layer 3 Executor)...");
+        
+        # 🔴 --- START OF CHANGE (V6.8) --- 🔴
+        # (تمرير دالة الدورة كـ "رد نداء" ليتم استدعاؤها بعد إغلاق الصفقة)
         trade_manager_global = TradeManager(
             r2_service=r2_service_global,
             learning_hub=learning_hub_global,
             data_manager=data_manager_global,
-            state_manager=state_manager 
+            state_manager=state_manager,
+            callback_on_close=run_bot_cycle_async 
         )
+        # 🔴 --- END OF CHANGE --- 🔴
+        
         await trade_manager_global.initialize_sentry_exchanges()
         state_manager.set_service_initialized('trade_manager');
         print("   ✅ مدير الصفقات (Sentry/Executor) مهيأ")
@@ -228,7 +234,7 @@ async def process_batch_parallel(batch, ml_processor, batch_num, total_batches,
 
 async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
     """
-    (معدل V5.3) - هذا هو "المستكشف" (Layer 1).
+    (معدل V5.5) - هذا هو "المستكشف" (Layer 1).
     """
     layer1_candidates = []
     layer2_candidates = []
@@ -243,7 +249,7 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
         if not await state_manager.wait_for_initialization():
             print("❌ Services not fully initialized (Explorer)"); return []
 
-        print("\n🔍 Layer 1.1: Rapid Screening (data_manager V7.1)...")
+        print("\n🔍 Layer 1.1: Rapid Screening (data_manager V7.3)...")
         layer1_candidates = await data_manager_global.layer1_rapid_screening()
         if not layer1_candidates: print("❌ No candidates found in Layer 1.1"); return []
         print(f"✅ Selected {len(layer1_candidates)} symbols for Layer 1.2")
@@ -280,7 +286,6 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
 
         consumer_task = asyncio.create_task(ml_consumer_task(ohlcv_data_queue, ml_results_list, preloaded_whale_data_dict))
         
-        # (V5.3 - FIX)
         producer_task = asyncio.create_task(data_manager_global.stream_ohlcv_data(layer1_candidates, ohlcv_data_queue))
         
         await producer_task; 
@@ -304,7 +309,9 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
         if not layer2_candidates: print("❌ No candidates found in Layer 1.3"); return []
 
         layer2_candidates.sort(key=lambda x: x.get('enhanced_final_score', 0), reverse=True)
-        target_count = min(10, len(layer2_candidates))
+        
+        target_count = min(5, len(layer2_candidates))
+        
         final_layer2_candidates = layer2_candidates[:target_count]
 
         print(f"\n🐋 Layer 1.3 (Optimized): Fetching whale data for top {len(final_layer2_candidates)} candidates...")
@@ -337,7 +344,7 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
                 print(f"   ❌ [Score Recalc] {candidate.get('symbol')} - Error: {e}")
         
         final_layer2_candidates.sort(key=lambda x: x.get('enhanced_final_score', 0), reverse=True)
-        print("   ✅ Top 10 scores updated and re-sorted.")
+        print("   ✅ Top 5 scores updated and re-sorted.")
 
 
         print(f"\n🔬 Layer 1.4: Running Advanced MC (GARCH+LGBM) on top {len(final_layer2_candidates)} candidates...")
@@ -414,7 +421,7 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
             print("❌ Explorer analysis complete: No suitable candidates for Sentry Watchlist.")
             return []
 
-        top_watchlist = watchlist_candidates[:5]
+        top_watchlist = watchlist_candidates
         print(f"✅ Explorer analysis complete. Sending {len(top_watchlist)} candidates to Sentry.")
         return top_watchlist
 
@@ -424,7 +431,7 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
 
 
 async def re_analyze_open_trade_async(trade_data):
-    """(V5.3) - إصلاح تمرير الوسيط"""
+    """(V5.4) - إصلاح تمرير الوسيط"""
     symbol = trade_data.get('symbol')
     try:
         async with state_manager.trade_analysis_lock:
@@ -433,7 +440,6 @@ async def re_analyze_open_trade_async(trade_data):
             ohlcv_data_list = []
             temp_queue = asyncio.Queue()
             
-            # (V5.3 - FIX: تمرير قائمة Dict)
             await data_manager_global.stream_ohlcv_data(
                 [{'symbol': symbol, 'layer1_score': 0, 'reasons_for_candidacy': ['re-analysis']}], 
                 temp_queue
@@ -505,7 +511,6 @@ async def run_bot_cycle_async():
                 now = datetime.now()
                 trades_to_reanalyze = [t for t in open_trades if now >= datetime.fromisoformat(t.get('expected_target_time', now.isoformat()))]
                 
-                # 🔴 --- START OF CHANGE (V5.4 - TIMER FIX) --- 🔴
                 if trades_to_reanalyze:
                     print(f"🔄 (Explorer) Re-analyzing {len(trades_to_reanalyze)} trades strategically...")
                     reanalysis_results = await asyncio.gather(*[re_analyze_open_trade_async(trade) for trade in trades_to_reanalyze], return_exceptions=True)
@@ -521,16 +526,13 @@ async def run_bot_cycle_async():
                              
                          elif result and result['decision'].get('action') == "HOLD":
                              print(f"   ℹ️ (Explorer) Holding {trade.get('symbol')}. Resetting 15-min timer.")
-                             # (إصلاح الخلل: إعادة ضبط المؤقت حتى لو كان القرار "HOLD" لمنع إعادة التحليل المتكرر)
                              await trade_manager_global.update_trade_strategy(trade, result['decision'])
                              
                          elif result: 
-                             # (مثل: CLOSE_TRADE - لا تفعل شيئاً، دع Sentry/Executor يتعامل معها)
                              print(f"   ℹ️ (Explorer) Re-analysis returned '{result['decision'].get('action')}' for {trade.get('symbol')}. No timer update needed.")
                              
                          else: 
                              print(f"   ⚠️ Re-analysis for {trade.get('symbol')} yielded no decision.")
-                # 🔴 --- END OF CHANGE --- 🔴
 
             current_open_trades_count = len(await trade_manager_global.get_open_trades())
             should_look_for_new_trade = current_open_trades_count == 0
@@ -592,7 +594,7 @@ async def lifespan(application: FastAPI):
         await cleanup_on_shutdown()
 
 
-application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.4)", version="5.4.0")
+application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.6)", version="5.6.0")
 
 @application.get("/")
 async def root(): return {"message": "Welcome to the AI Trading System", "system": "Explorer-Sentry-Executor", "status": "running" if state_manager.initialization_complete else "initializing", "timestamp": datetime.now().isoformat()}
@@ -604,7 +606,7 @@ async def run_cycle_api():
     return {"message": "Explorer (Layer 1) cycle initiated", "system": "Explorer-Sentry-Executor"}
 
 @application.get("/health")
-async def health_check(): return {"status": "healthy" if state_manager.initialization_complete else "initializing", "initialization_complete": state_manager.initialization_complete, "services_initialized": state_manager.services_initialized, "initialization_error": state_manager.initialization_error, "timestamp": datetime.now().isoformat(), "system_architecture": "Explorer-Sentry-Executor (V5.4)"}
+async def health_check(): return {"status": "healthy" if state_manager.initialization_complete else "initializing", "initialization_complete": state_manager.initialization_complete, "services_initialized": state_manager.services_initialized, "initialization_error": state_manager.initialization_error, "timestamp": datetime.now().isoformat(), "system_architecture": "Explorer-Sentry-Executor (V5.6)"}
 
 @application.get("/analyze-market")
 async def analyze_market_api():
@@ -657,5 +659,5 @@ def signal_handler(signum, frame): print(f"🛑 Received signal {signum}. Initia
 signal.signal(signal.SIGINT, signal_handler); signal.signal(signal.SIGTERM, signal_handler)
 
 if __name__ == "__main__":
-    print("🚀 Starting AI Trading Bot (Explorer-Sentry-Executor V5.4)...")
+    print("🚀 Starting AI Trading Bot (Explorer-Sentry-Executor V5.6)...")
     uvicorn.run( application, host="0.0.0.0", port=7860, log_level="info", access_log=True )