Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.8 - Fixed CLOSE_TRADE Bug)
+# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.9 - Callback Logic)
 import os
 import traceback
 import signal
@@ -79,7 +79,9 @@ async def initialize_services():
     global learning_hub_global, trade_manager_global, sentiment_analyzer_global
     global symbol_whale_monitor_global
     try:
-        print("🚀 بدء تهيئة الخدمات (بنية Sentry الجديدة V5.8)...")
+        # 🔴 --- START OF CHANGE (V7.0) --- 🔴
+        print("🚀 بدء تهيئة الخدمات (بنية Sentry الجديدة V5.9)...")
+        # 🔴 --- END OF CHANGE --- 🔴
         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)} عقد")
 
@@ -124,6 +126,7 @@ async def initialize_services():
 
         print("   🔄 تهيئة مدير الصفقات (Layer 2 Sentry + Layer 3 Executor)...");
         
+        # (تمرير دالة الدورة كـ "رد نداء" ليتم استدعاؤها بعد إغلاق الصفقة)
         trade_manager_global = TradeManager(
             r2_service=r2_service_global,
             learning_hub=learning_hub_global,
@@ -487,14 +490,16 @@ async def re_analyze_open_trade_async(trade_data):
 
 async def run_bot_cycle_async():
     """
-    (محدث V5.8) - دورة البوت الرئيسية (المستكشف)
+    (محدث V5.9) - دورة البوت الرئيسية (المستكشف)
     """
     try:
         if not await state_manager.wait_for_initialization():
             print("❌ Services not fully initialized - skipping cycle"); return
 
+        # 🔴 --- START OF CHANGE (V6.9) --- 🔴
         # (إضافة: تأخير بسيط لضمان تحرير القفل من الدورة السابقة)
         await asyncio.sleep(1.0) 
+        # 🔴 --- END OF CHANGE --- 🔴
         
         print("🔄 Starting Explorer cycle (Layer 1)...");
         await r2_service_global.save_system_logs_async({"explorer_cycle_started": True})
@@ -528,16 +533,13 @@ async def run_bot_cycle_async():
                              print(f"   ℹ️ (Explorer) Holding {trade.get('symbol')}. Resetting 15-min timer.")
                              await trade_manager_global.update_trade_strategy(trade, result['decision'])
                          
-                         # 🔴 --- START OF CHANGE (V5.8 - FIX) --- 🔴
                          elif result and result['decision'].get('action') == "CLOSE_TRADE":
                              print(f"   🛑 (Explorer) LLM Re-analysis ordered CLOSE_TRADE for {trade.get('symbol')}. Executing...")
-                             # (استدعاء المنفذ لإغلاق الصفقة)
                              await trade_manager_global.immediate_close_trade(
                                  trade.get('symbol'),
-                                 result['current_price'], # (السعر الحالي من نتيجة إعادة التحليل)
+                                 result['current_price'], 
                                  f"Strategic Exit: LLM Re-analysis ({result['decision'].get('reasoning', 'N/A')[:50]}...)"
                              )
-                         # 🔴 --- END OF CHANGE --- 🔴
                              
                          elif result: 
                              print(f"   ℹ️ (Explorer) Re-analysis returned unhandled action '{result['decision'].get('action')}' for {trade.get('symbol')}.")
@@ -605,7 +607,7 @@ async def lifespan(application: FastAPI):
         await cleanup_on_shutdown()
 
 
-application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.8)", version="5.8.0")
+application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.9)", version="5.9.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()}
@@ -617,7 +619,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.8)"}
+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.9)"}
 
 @application.get("/analyze-market")
 async def analyze_market_api():
@@ -670,5 +672,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.8)...")
+    print("🚀 Starting AI Trading Bot (Explorer-Sentry-Executor V5.9)...")
     uvicorn.run( application, host="0.0.0.0", port=7860, log_level="info", access_log=True )