Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.3 - Fixed Producer Task)
+# app.py (Fully updated to Explorer-Sentry-Executor architecture V5.4 - Fixed Re-Analysis Timer Bug)
 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.3)...")
+        print("🚀 بدء تهيئة الخدمات (بنية Sentry الجديدة V5.4)...")
         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)} عقد")
 
@@ -244,14 +244,10 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
             print("❌ Services not fully initialized (Explorer)"); return []
 
         print("\n🔍 Layer 1.1: Rapid Screening (data_manager V7.1)...")
-        # (هذه الآن ترجع قائمة المرشحين الناجحين من الغربلة الذكية)
         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")
         
-        # (لم نعد بحاجة إلى layer1_symbols)
-        # layer1_symbols = [c['symbol'] for c in layer1_candidates]
-
         print(f"\n📊 Layer 1.2: Fetching OHLCV data for {len(layer1_candidates)} symbols (Streaming)...")
         DATA_QUEUE_MAX_SIZE = 2
         ohlcv_data_queue = asyncio.Queue(maxsize=DATA_QUEUE_MAX_SIZE)
@@ -284,10 +280,8 @@ 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))
         
-        # 🔴 --- START OF CHANGE (V5.3 - FIX) --- 🔴
-        # (تمرير layer1_candidates (List[Dict]) بدلاً من layer1_symbols (List[str]))
+        # (V5.3 - FIX)
         producer_task = asyncio.create_task(data_manager_global.stream_ohlcv_data(layer1_candidates, ohlcv_data_queue))
-        # 🔴 --- END OF CHANGE --- 🔴
         
         await producer_task; 
         await ohlcv_data_queue.join()
@@ -297,8 +291,6 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
         for batch_result in ml_results_list:
             for success_item in batch_result['success']:
                 symbol = success_item['symbol']
-                
-                # (البيانات الأولية موجودة الآن في success_item)
                 l1_data = success_item
                 
                 if l1_data:
@@ -319,7 +311,6 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
         
         whale_tasks = []
         async def get_whale_data_for_candidate(candidate):
-            """دالة مساعدة لجلب وتحديث بيانات الحيتان للمرشح"""
             symbol = candidate.get('symbol', 'UNKNOWN')
             try:
                 data = await data_manager_global.get_whale_data_for_symbol(symbol)
@@ -433,7 +424,7 @@ async def run_3_layer_analysis_explorer() -> List[Dict[str, Any]]:
 
 
 async def re_analyze_open_trade_async(trade_data):
-    """(لا تغيير) - هذا لا يزال تحليلاً استراتيجياً (Explorer)"""
+    """(V5.3) - إصلاح تمرير الوسيط"""
     symbol = trade_data.get('symbol')
     try:
         async with state_manager.trade_analysis_lock:
@@ -442,9 +433,9 @@ async def re_analyze_open_trade_async(trade_data):
             ohlcv_data_list = []
             temp_queue = asyncio.Queue()
             
-            # (إصلاح هنا أيضاً: تمرير قائمة Dict)
+            # (V5.3 - FIX: تمرير قائمة Dict)
             await data_manager_global.stream_ohlcv_data(
-                [{'symbol': symbol, 'layer1_score': 0, 'reasons': ['re-analysis']}], 
+                [{'symbol': symbol, 'layer1_score': 0, 'reasons_for_candidacy': ['re-analysis']}], 
                 temp_queue
             )
             
@@ -461,10 +452,6 @@ async def re_analyze_open_trade_async(trade_data):
             if not ohlcv_data_list: print(f"⚠️ Failed to get re-analysis data for {symbol}"); return None
             ohlcv_data = ohlcv_data_list[0]
 
-            # (لم نعد بحاجة لهذا، البيانات مدمجة)
-            # l1_data = await data_manager_global._get_detailed_symbol_data(symbol)
-            # if l1_data: ohlcv_data.update(l1_data); ohlcv_data['reasons_for_candidacy'] = ['re-analysis']
-
             re_analysis_whale_data = await data_manager_global.get_whale_data_for_symbol(symbol)
 
             ml_processor = MLProcessor(market_context, data_manager_global, learning_hub_global)
@@ -497,7 +484,7 @@ async def re_analyze_open_trade_async(trade_data):
 
 async def run_bot_cycle_async():
     """
-    (لا تغيير) - دورة البوت الرئيسية (المستكشف)
+    (محدث V5.4) - دورة البوت الرئيسية (المستكشف)
     """
     try:
         if not await state_manager.wait_for_initialization():
@@ -517,17 +504,33 @@ async def run_bot_cycle_async():
             if open_trades:
                 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)
+                    
                     for i, result in enumerate(reanalysis_results):
                          trade = trades_to_reanalyze[i]
-                         if isinstance(result, Exception): print(f"   ❌ Re-analysis failed for {trade.get('symbol')}: {result}")
+                         if isinstance(result, Exception): 
+                             print(f"   ❌ Re-analysis failed for {trade.get('symbol')}: {result}")
+                             
                          elif result and result['decision'].get('action') == "UPDATE_TRADE":
                              print(f"   ✅ (Explorer) Updating strategy for {trade.get('symbol')}.");
                              await trade_manager_global.update_trade_strategy(trade, result['decision'])
-                         elif result: print(f"   ℹ️ (Explorer) Holding {trade.get('symbol')} based on re-analysis.")
-                         else: print(f"   ⚠️ Re-analysis for {trade.get('symbol')} yielded no decision.")
+                             
+                         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
@@ -589,7 +592,7 @@ async def lifespan(application: FastAPI):
         await cleanup_on_shutdown()
 
 
-application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.3)", version="5.3.0")
+application = FastAPI(lifespan=lifespan, title="AI Trading Bot", description="Explorer-Sentry-Executor Architecture (V5.4)", version="5.4.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()}
@@ -601,7 +604,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.3)"}
+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)"}
 
 @application.get("/analyze-market")
 async def analyze_market_api():
@@ -654,5 +657,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.3)...")
+    print("🚀 Starting AI Trading Bot (Explorer-Sentry-Executor V5.4)...")
     uvicorn.run( application, host="0.0.0.0", port=7860, log_level="info", access_log=True )