Update data_manager.py

data_manager.py

@@ -1,4 +1,4 @@
-# data_manager.py (Updated to V7.3 - Increased L1 Threshold to 0.50)
+# data_manager.py (Updated to V7.3 - V8 Pattern Engine Init)
 import os
 import asyncio
 import httpx
@@ -19,15 +19,18 @@ except ImportError:
 
 from ml_engine.indicators import AdvancedTechnicalAnalyzer
 from ml_engine.monte_carlo import MonteCarloAnalyzer
+# (V8-MODIFICATION) استيراد المحرك الصحيح (V8)
 from ml_engine.patterns import ChartPatternAnalyzer
 
 logging.getLogger("httpx").setLevel(logging.WARNING)
 logging.getLogger("httpcore").setLevel(logging.WARNING)
 
 class DataManager:
-    def __init__(self, contracts_db, whale_monitor):
+    # (V8-MODIFICATION) قبول r2_service
+    def __init__(self, contracts_db, whale_monitor, r2_service=None):
         self.contracts_db = contracts_db or {}
         self.whale_monitor = whale_monitor
+        self.r2_service = r2_service # (V8-MODIFICATION) الإضافة الجديدة
         
         try:
             self.exchange = ccxt.kucoin({
@@ -47,11 +50,23 @@ class DataManager:
 
         self.technical_analyzer = AdvancedTechnicalAnalyzer()
         self.monte_carlo_analyzer = MonteCarloAnalyzer()
-        self.pattern_analyzer = ChartPatternAnalyzer()
+        self.pattern_analyzer = None # (V8-MODIFICATION) سيتم تهيئته في initialize
         
     async def initialize(self):
         self.http_client = httpx.AsyncClient(timeout=30.0)
         await self._load_markets()
+        
+        # (V8-MODIFICATION) تهيئة محرك الأنماط V8 (ML-Based)
+        print("   > [DataManager] تهيئة محرك الأنماط V8 (ML-Based)...")
+        try:
+            self.pattern_analyzer = ChartPatternAnalyzer(r2_service=self.r2_service)
+            await self.pattern_analyzer.initialize() # (تحميل النموذج والمقياس من R2)
+        except Exception as e:
+            print(f"❌ [DataManager] فشل تهيئة محرك الأنماط V8: {e}")
+            # (العودة للوضع الآمن إذا فشل التحميل)
+            self.pattern_analyzer = ChartPatternAnalyzer(r2_service=None)
+        # --- (نهاية الإضافة) ---
+
         print("✅ DataManager initialized - V7.3 (L1 Threshold @ 0.50)")
 
     async def _load_markets(self):
@@ -384,6 +399,7 @@ class DataManager:
 
         task_indicators = self.technical_analyzer.calculate_all_indicators(df, '1h')
         task_mc = self.monte_carlo_analyzer.generate_1h_price_distribution(ohlcv_1h)
+        # (V8-MODIFICATION) استخدام الدالة الجديدة
         task_pattern = self.pattern_analyzer.detect_chart_patterns(ohlcv_1h)
 
         results = await asyncio.gather(task_mc, task_pattern, return_exceptions=True)
@@ -566,11 +582,13 @@ class DataManager:
             for i, (timeframe, limit) in enumerate(timeframes):
                 result = timeframe_results[i]
                 if isinstance(result, Exception): continue
-                if result and len(result) >= 10:
+                # (V8-MODIFICATION) زيادة الحد الأدنى من الشموع لاستيعاب المؤشرات
+                if result and len(result) >= 200: # (كان 10)
                     ohlcv_data[timeframe] = result
                     successful_timeframes += 1
             
-            if successful_timeframes >= min_required_timeframes and ohlcv_data:
+            # (V8-MODIFICATION) زيادة الحد الأدنى للأطر الزمنية
+            if successful_timeframes >= 3 and ohlcv_data: # (كان 2)
                 try:
                     current_price = await self.get_latest_price_async(symbol)
                     if current_price is None: