Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (V12.3 - Titan Orchestrator + Detailed Diagnostics)
+# app.py (V12.3 - Hybrid Orchestrator with Correct Naming)
 import os
 import traceback
 import signal
@@ -13,18 +13,16 @@ from fastapi import FastAPI, HTTPException, BackgroundTasks
 from datetime import datetime
 from typing import List, Dict, Any
 
-# --- استيراد الخدمات ---
 try:
     from r2 import R2Service
     from LLM import LLMService
-    from data_manager import DataManager
+    from ml_engine.data_manager import DataManager
     from ml_engine.processor import MLProcessor
     from learning_hub.hub_manager import LearningHubManager
     from trade_manager import TradeManager
 except ImportError as e:
     sys.exit(f"❌ Fatal Error: {e}")
 
-# --- المتغيرات العالمية ---
 r2_service_global = None
 data_manager_global = None
 llm_service_global = None
@@ -32,7 +30,6 @@ learning_hub_global = None
 trade_manager_global = None
 ml_processor_global = None
 
-# --- مدير الحالة ---
 class StateManager:
     def __init__(self):
         self.initialization_complete = False
@@ -46,13 +43,12 @@ class StateManager:
 
 state_manager = StateManager()
 
-# --- التهيئة المركزية ---
 async def initialize_services():
     global r2_service_global, data_manager_global, llm_service_global
     global learning_hub_global, trade_manager_global, ml_processor_global
     
     try:
-        print("🚀 [System V12.3] Starting Titan-Powered Initialization...")
+        print("🚀 [System V12.3] Starting Hybrid Initialization...")
         r2_service_global = R2Service()
         state_manager.set_service_initialized('r2')
         
@@ -74,7 +70,9 @@ async def initialize_services():
         trade_manager_global = TradeManager(
             r2_service_global, 
             data_manager_global, 
-            titan_engine=ml_processor_global.titan
+            titan_engine=ml_processor_global.titan,
+            # تمرير المعالج بالكامل للوصول إلى التقييم الهجين لاحقاً إذا احتجنا
+            processor=ml_processor_global 
         )
         await trade_manager_global.initialize_sentry_exchanges()
         state_manager.set_service_initialized('trade')
@@ -85,7 +83,6 @@ async def initialize_services():
         traceback.print_exc()
         return False
 
-# --- دورة المستكشف (Titan Explorer Cycle) ---
 async def run_explorer_cycle():
     if not state_manager.initialization_complete: 
         print("⏳ [Cycle Skipped] System still initializing...")
@@ -94,13 +91,11 @@ async def run_explorer_cycle():
     print(f"\n🔭 [Explorer V12.3] Cycle started at {datetime.now().strftime('%H:%M:%S')}")
     
     try:
-        # 1. غربلة سريعة (Layer 1)
         candidates = await data_manager_global.layer1_rapid_screening()
         if not candidates: 
             print("😴 [Explorer] No candidates found in Layer 1.")
             return
 
-        # 2. تحليل عميق (Layer 2 - Titan Hybrid)
         print(f"🔬 [Titan Hybrid] analyzing {len(candidates)} candidates...")
         titan_candidates = []
         all_scored_debug = []
@@ -120,24 +115,23 @@ async def run_explorer_cycle():
                      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}")
+                     # استخدام العتبة الهجينة الجديدة
+                     if score >= data_manager_global.HYBRID_ENTRY_THRESHOLD:
+                          print(f"   🌟 [Hybrid Approved] {res['symbol']} Score: {score:.4f}")
                           titan_candidates.append(res)
             
             data_queue.task_done()
         await producer
 
-        # 3. التحديث النهائي للحارس
         if titan_candidates:
             titan_candidates.sort(key=lambda x: x['enhanced_final_score'], reverse=True)
             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.")
-            # 🔥 طباعة تشخيصية مفصلة لأفضل المرفوضين 🔥
+            print("📉 [Explorer] No candidates met the Hybrid Threshold this cycle.")
             if all_scored_debug:
-                print(f"\n🔍 [Debug] أفضل 10 مرفوضين (العتبة: {data_manager_global.TITAN_ENTRY_THRESHOLD}):")
+                print(f"\n🔍 [Debug] أفضل 10 مرفوضين (العتبة الهجينة: {data_manager_global.HYBRID_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]):
                      final = cand.get('enhanced_final_score', 0.0)
@@ -145,7 +139,6 @@ async def run_explorer_cycle():
                      t_s = comps.get('titan_score', 0.0)
                      p_s = comps.get('patterns_score', 0.0)
                      m_s = comps.get('mc_score', 0.0)
-                     # طباعة مفصلة: النتيجة النهائية [تيتان | أنماط | مونت كارلو]
                      print(f"   #{i+1} {cand['symbol']:<10}: {final:.4f} [🐺Titan:{t_s:.2f} | 📊Pat:{p_s:.2f} | 🎲MC:{m_s:.2f}]")
             print("-" * 60)
 
@@ -155,7 +148,6 @@ async def run_explorer_cycle():
     finally:
         gc.collect()
 
-# --- FastAPI Setup ---
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     asyncio.create_task(initialize_services())
@@ -164,18 +156,28 @@ async def lifespan(app: FastAPI):
     if data_manager_global: await data_manager_global.close()
     print("👋 [System] Shutdown complete.")
 
-app = FastAPI(lifespan=lifespan, title="Titan Trading Bot V12.3")
+app = FastAPI(lifespan=lifespan, title="Titan Hybrid Trading Bot V12.3")
 
 @app.get("/")
 async def root():
-    return {"status": "Titan Online", "initialized": state_manager.initialization_complete}
+    return {"status": "Hybrid System Online", "initialized": state_manager.initialization_complete}
 
 @app.get("/run-cycle")
 async def trigger_cycle(background_tasks: BackgroundTasks):
     if not state_manager.initialization_complete:
         raise HTTPException(status_code=503, detail="System initializing...")
     background_tasks.add_task(run_explorer_cycle)
-    return {"message": "Cycle triggered"}
+    return {"message": "Hybrid cycle triggered"}
+
+@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()),
+        # استخدام الاسم الجديد في الحالة
+        "hybrid_threshold": data_manager_global.HYBRID_ENTRY_THRESHOLD if data_manager_global else None
+    }
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)