Update app.py

app.py

@@ -1,183 +1,48 @@
-# app.py (V12.3 - Hybrid Orchestrator with Correct Naming)
-import os
-import traceback
-import signal
-import sys
+# app.py (Simulation Version - Auto-Runner)
 import uvicorn
 import asyncio
-import json
-import gc
-import time
+from fastapi import FastAPI, BackgroundTasks
 from contextlib import asynccontextmanager
-from fastapi import FastAPI, HTTPException, BackgroundTasks
-from datetime import datetime
-from typing import List, Dict, Any
+import os
 
+# استيراد مشغل المحاكاة والحالة
 try:
-    from r2 import R2Service
-    from LLM import LLMService
-    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
-learning_hub_global = None
-trade_manager_global = None
-ml_processor_global = None
-
-class StateManager:
-    def __init__(self):
-        self.initialization_complete = False
-        self.services_initialized = {}
-
-    def set_service_initialized(self, service_name):
-        self.services_initialized[service_name] = True
-        if len(self.services_initialized) >= 5:
-            self.initialization_complete = True
-            print("🎯 [System] All services initialized. Ready for external triggers.")
-
-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 Hybrid Initialization...")
-        r2_service_global = R2Service()
-        state_manager.set_service_initialized('r2')
-        
-        contracts_db = await r2_service_global.load_contracts_db_async() or {}
-        data_manager_global = DataManager(contracts_db, None, r2_service_global)
-        await data_manager_global.initialize()
-        state_manager.set_service_initialized('data')
-
-        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')
-
-        ml_processor_global = MLProcessor(None, data_manager_global, learning_hub_global)
-        await ml_processor_global.initialize()
-        state_manager.set_service_initialized('processor')
-
-        trade_manager_global = TradeManager(
-            r2_service_global, 
-            data_manager_global, 
-            titan_engine=ml_processor_global.titan,
-            # تمرير المعالج بالكامل للوصول إلى التقييم الهجين لاحقاً إذا احتجنا
-            processor=ml_processor_global 
-        )
-        await trade_manager_global.initialize_sentry_exchanges()
-        state_manager.set_service_initialized('trade')
-
-        return True
-    except Exception as e:
-        print(f"❌ [Init Error] {e}")
-        traceback.print_exc()
-        return False
-
-async def run_explorer_cycle():
-    if not state_manager.initialization_complete: 
-        print("⏳ [Cycle Skipped] System still initializing...")
-        return
-
-    print(f"\n🔭 [Explorer V12.3] Cycle started at {datetime.now().strftime('%H:%M:%S')}")
-    
-    try:
-        candidates = await data_manager_global.layer1_rapid_screening()
-        if not candidates: 
-            print("😴 [Explorer] No candidates found in Layer 1.")
-            return
-
-        print(f"🔬 [Titan Hybrid] 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))
-        
-        while True:
-            batch = await data_queue.get()
-            if batch is None:
-                data_queue.task_done()
-                break
-            
-            for raw_data in batch:
-                res = await ml_processor_global.process_and_score_symbol_enhanced(raw_data)
-                if res:
-                     score = res.get('enhanced_final_score', 0.0)
-                     all_scored_debug.append(res)
-                     
-                     # استخدام العتبة الهجينة الجديدة
-                     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
-
-        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] No candidates met the Hybrid Threshold this cycle.")
-            if all_scored_debug:
-                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)
-                     comps = cand.get('components', {})
-                     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)
-
-    except Exception as e:
-        print(f"❌ [Cycle Error] {e}")
-        traceback.print_exc()
-    finally:
-        gc.collect()
-
+    from simulation_engine.sim_runner import run_realistic_simulation, SIM_STATUS, SIM_CONFIG
+except ImportError:
+    print("❌ Error: تأكد من أنك داخل مجلد المحاكاة وأن simulation_engine موجود.")
+    exit(1)
+
+# مهمة الخلفية التي لا تتوقف
+async def continuous_simulation_task():
+    print("⏳ انتظار قصير قبل بدء المحاكاة (10 ثواني)...")
+    await asyncio.sleep(10)
+    # تشغيل المحاكاة مرة واحدة (يمكن وضعها في while True لو أردت تكرارها بتواريخ مختلفة)
+    await run_realistic_simulation()
+    print("✅ تمت مهمة المحاكاة التلقائية.")
+
+# إعداد التطبيق
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    asyncio.create_task(initialize_services())
+    # عند البدء: تشغيل المحاكاة في الخلفية فوراً
+    task = asyncio.create_task(continuous_simulation_task())
     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.")
+    # عند الإيقاف: لا شيء مميز
+    pass
 
-app = FastAPI(lifespan=lifespan, title="Titan Hybrid Trading Bot V12.3")
+app = FastAPI(lifespan=lifespan, title="Titan Simulation Runner")
 
 @app.get("/")
 async def root():
-    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": "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
+        "status": "RUNNING" if SIM_STATUS["running"] else "IDLE (Finished or Not Started)",
+        "progress": f"{SIM_STATUS['progress']:.1f}%",
+        "current_sim_balance": f"${SIM_STATUS['current_balance']:.2f}",
+        "trades_executed": SIM_STATUS["trades_count"],
+        "config": SIM_CONFIG
     }
 
 if __name__ == "__main__":
+    # تشغيل السيرفر الذي سيبدأ المحاكاة تلقائياً
+    print("🔥 تشغيل خادم المحاكاة... ستبدأ المحاكاة تلقائياً.")
     uvicorn.run(app, host="0.0.0.0", port=7860)