Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (V12.1 - Titan Orchestrator + External Trigger Fixed)
+# app.py (V12.2 - Titan Orchestrator + Diagnostics)
 import os
 import traceback
 import signal
@@ -40,8 +40,7 @@ class StateManager:
 
     def set_service_initialized(self, service_name):
         self.services_initialized[service_name] = True
-        # نحتاج 5 خدمات أساسية لتعمل قبل بدء أي دورة
-        if len(self.services_initialized) >= 5: # r2, data, hub, processor, trade
+        if len(self.services_initialized) >= 5:
             self.initialization_complete = True
             print("🎯 [System] All services initialized. Ready for external triggers.")
 
@@ -53,9 +52,7 @@ async def initialize_services():
     global learning_hub_global, trade_manager_global, ml_processor_global
     
     try:
-        print("🚀 [System V12.1] Starting Titan-Powered Initialization...")
-        
-        # 1. الأساسيات
+        print("🚀 [System V12.2] Starting Titan-Powered Initialization...")
         r2_service_global = R2Service()
         state_manager.set_service_initialized('r2')
         
@@ -64,19 +61,16 @@ async def initialize_services():
         await data_manager_global.initialize()
         state_manager.set_service_initialized('data')
 
-        # 2. الذكاء
         llm_service_global = LLMService()
         llm_service_global.r2_service = r2_service_global
         learning_hub_global = LearningHubManager(r2_service_global, llm_service_global, data_manager_global)
         await learning_hub_global.initialize()
         state_manager.set_service_initialized('hub')
 
-        # 3. المعالج (Titan Core)
         ml_processor_global = MLProcessor(None, data_manager_global, learning_hub_global)
         await ml_processor_global.initialize()
         state_manager.set_service_initialized('processor')
 
-        # 4. مدير التداول
         trade_manager_global = TradeManager(
             r2_service_global, 
             data_manager_global, 
@@ -93,12 +87,11 @@ async def initialize_services():
 
 # --- دورة المستكشف (Titan Explorer Cycle) ---
 async def run_explorer_cycle():
-    # حماية: لا تعمل إذا لم يكتمل التحميل
     if not state_manager.initialization_complete: 
         print("⏳ [Cycle Skipped] System still initializing...")
         return
 
-    print(f"\n🔭 [Explorer V12.1] Cycle started at {datetime.now().strftime('%H:%M:%S')}")
+    print(f"\n🔭 [Explorer V12.2] Cycle started at {datetime.now().strftime('%H:%M:%S')}")
     
     try:
         # 1. غربلة سريعة (Layer 1)
@@ -110,6 +103,7 @@ async def run_explorer_cycle():
         # 2. تحليل عميق (Layer 2 - Titan)
         print(f"🔬 [Titan] analyzing {len(candidates)} candidates...")
         titan_candidates = []
+        all_scored_debug = [] # 🔥 قائمة جديدة للتشخيص
         
         data_queue = asyncio.Queue(maxsize=10)
         producer = asyncio.create_task(data_manager_global.stream_ohlcv_data(candidates, data_queue))
@@ -122,76 +116,61 @@ async def run_explorer_cycle():
             
             for raw_data in batch:
                 res = await ml_processor_global.process_and_score_symbol_enhanced(raw_data)
-                # استخدام عتبة الدخول الصارمة لـ Titan
-                if res and res['enhanced_final_score'] >= data_manager_global.TITAN_ENTRY_THRESHOLD:
-                     print(f"   🌟 [Titan Approved] {res['symbol']} Score: {res['enhanced_final_score']:.4f}")
-                     titan_candidates.append(res)
+                if res:
+                     score = res.get('enhanced_final_score', 0.0)
+                     # تخزين للتشخيص
+                     all_scored_debug.append(res)
+                     
+                     if score >= data_manager_global.TITAN_ENTRY_THRESHOLD:
+                          print(f"   🌟 [Titan Approved] {res['symbol']} Score: {score:.4f}")
+                          titan_candidates.append(res)
             
             data_queue.task_done()
         await producer
 
-        # 3. التحديث النهائي للحارس
+        # 3. التحديث النهائي للحارس (مع التشخيص)
         if titan_candidates:
             titan_candidates.sort(key=lambda x: x['enhanced_final_score'], reverse=True)
-            # نرسل أفضل 5 فقط للحارس ليركز عليهم
             top_picks = titan_candidates[:5]
             print(f"✅ [Explorer] Sending {len(top_picks)} to Sentry.")
             await trade_manager_global.update_sentry_watchlist(top_picks)
         else:
             print("📉 [Explorer] Titan rejected all candidates this cycle.")
+            # 🔥 طباعة تشخيصية لأفضل المرفوضين
+            if all_scored_debug:
+                print(f"\n🔍 [Debug] أفضل 10 مرفوضين (العتبة المطلوبة: {data_manager_global.TITAN_ENTRY_THRESHOLD}):")
+                all_scored_debug.sort(key=lambda x: x.get('enhanced_final_score', 0.0), reverse=True)
+                for i, cand in enumerate(all_scored_debug[:10]):
+                     print(f"   #{i+1} {cand['symbol']}: {cand.get('enhanced_final_score', 0.0):.4f}")
+            print("-" * 40)
 
     except Exception as e:
         print(f"❌ [Cycle Error] {e}")
         traceback.print_exc()
     finally:
-        # تنظيف الذاكرة بعد كل دورة مهم جداً عند التشغيل المستمر
         gc.collect()
 
 # --- FastAPI Setup ---
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    # بدء التهيئة عند تشغيل البوت
     asyncio.create_task(initialize_services())
     yield
-    # تنظيف عند الإيقاف
     if trade_manager_global: await trade_manager_global.stop_sentry_loops()
     if data_manager_global: await data_manager_global.close()
     print("👋 [System] Shutdown complete.")
 
-app = FastAPI(lifespan=lifespan, title="Titan Trading Bot V12.1")
+app = FastAPI(lifespan=lifespan, title="Titan Trading Bot V12.2")
 
 @app.get("/")
 async def root():
-    return {
-        "status": "Titan Online", 
-        "initialized": state_manager.initialization_complete,
-        "waiting_for_trigger": True
-    }
-
-# ==================================================================
-# 🔌 نقطة النهاية للمجدول الخارجي (External Trigger Endpoint)
-# ==================================================================
+    return {"status": "Titan Online", "initialized": state_manager.initialization_complete}
+
 @app.get("/run-cycle")
 async def trigger_cycle(background_tasks: BackgroundTasks):
-    """
-    يتم استدعاء هذا الرابط كل 15 دقيقة من قبل المجدول الخارجي.
-    يقوم بتشغيل دورة بحث كاملة في الخلفية.
-    """
     if not state_manager.initialization_complete:
-        raise HTTPException(status_code=503, detail="System still initializing, please wait.")
-    
+        raise HTTPException(status_code=503, detail="System initializing...")
     background_tasks.add_task(run_explorer_cycle)
-    return {"message": "Titan cycle triggered successfully", "timestamp": datetime.now().isoformat()}
-
-# نقطة نهاية إضافية لفحص الحالة بسرعة
-@app.get("/status")
-async def get_status():
-    sentry_status = trade_manager_global.watchlist if trade_manager_global else {}
-    return {
-        "initialized": state_manager.initialization_complete,
-        "sentry_targets": list(sentry_status.keys()),
-        "titan_threshold": data_manager_global.TITAN_ENTRY_THRESHOLD if data_manager_global else None
-    }
+    return {"message": "Cycle triggered"}
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)