Update ml_engine/data_manager.py

ml_engine/data_manager.py

@@ -1,6 +1,6 @@
 # ============================================================
 # 📂 ml_engine/data_manager.py 
-# (V67.2 - GEM-Architect: Full Code - Visible Market Validator)
+# (V67.3 - GEM-Architect: Full Code - Relaxed Funnel)
 # ============================================================
 
 import asyncio
@@ -44,7 +44,7 @@ class DataManager:
             'UP', 'DOWN', 'BEAR', 'BULL', '3S', '3L'
         ]
         
-        print(f"📦 [DataManager V67.2] Initialized (Validator Visible).")
+        print(f"📦 [DataManager V67.3] Initialized (Relaxed Funnel).")
 
     async def initialize(self):
         print("   > [DataManager] Starting initialization...")
@@ -121,7 +121,7 @@ class DataManager:
     # ==================================================================
     async def layer1_rapid_screening(self, adaptive_hub_ref=None) -> List[Dict[str, Any]]:
         self.adaptive_hub_ref = adaptive_hub_ref
-        print(f"🔍 [Layer 1] Screening for High Vol Assets (Bottom/Acc/Mom)...")
+        print(f"🔍 [Layer 1] Screening for High Vol Assets (Relaxed Funnel)...")
         
         # 0. فحص صحة السوق أولاً
         market_health = await self.check_global_market_health()
@@ -238,7 +238,7 @@ class DataManager:
             return 0.5
 
     # ==================================================================
-    # ⚖️ The Dual-Classifier Logic
+    # ⚖️ The Dual-Classifier Logic (RELAXED FUNNEL)
     # ==================================================================
     def _classify_opportunity_type(self, data: Dict[str, Any]) -> Dict[str, Any]:
         try:
@@ -258,31 +258,40 @@ class DataManager:
         upper_bb = curr['upper_bb'] if 'upper_bb' in curr else (curr['ema20'] + (2*curr['atr']))
         bb_width = (upper_bb - lower_bb) / curr['ema20'] if curr['ema20'] > 0 else 1.0
 
-        # 🔥 1. Dead Coin Filter (فلتر النبض)
+        # 🔥 1. Dead Coin Filter (Relaxed to 0.3%)
+        # تم تخفيض العتبة من 0.4 إلى 0.3 للسماح للعملات الهادئة بالدخول إذا تحركت قليلاً
         volatility_pct = (atr / close) * 100 if close > 0 else 0
-        if volatility_pct < 0.4: return {'type': 'NONE', 'score': 0}
+        if volatility_pct < 0.3: return {'type': 'NONE', 'score': 0}
 
-        # 🛡️ TYPE 1: SAFE_BOTTOM
-        if rsi < 45:
+        # 🛡️ TYPE 1: SAFE_BOTTOM (Widened)
+        # RSI < 55 (كانت 45)، والسعر عند أو تحت الحد السفلي + 8% (كانت 5%)
+        if rsi < 55:
             dist_from_ema = (ema50 - close) / ema50
-            if close <= lower_bb * 1.05 and dist_from_ema > 0.015:
-                score = (55 - rsi) / 20.0 
+            if close <= lower_bb * 1.08:
+                score = (60 - rsi) / 20.0 
                 return {'type': 'SAFE_BOTTOM', 'score': min(score, 1.0)}
 
-        # 🔋 TYPE 2: ACCUMULATION_SQUEEZE
-        elif 45 <= rsi <= 60:
-            if bb_width < 0.12:
-                if close > ema20 * 0.995:
-                    score = 1.0 - (bb_width * 4.0) 
-                    return {'type': 'ACCUMULATION_SQUEEZE', 'score': max(score, 0.5), 'is_squeeze': True}
-
-        # 🚀 TYPE 3: MOMENTUM_LAUNCH
-        elif 60 < rsi < 80:
-            if close > ema50 and close > ema200:
+        # 🔋 TYPE 2: ACCUMULATION_SQUEEZE (Widened)
+        # RSI 40-65 (كانت 45-60)، BB Width < 0.18 (كانت 0.12)
+        elif 40 <= rsi <= 65:
+            if bb_width < 0.18:
+                # إزالة الشرط الصارم لـ EMA20 للسماح للنماذج بالاختيار
+                score = 1.0 - (bb_width * 3.0) 
+                return {'type': 'ACCUMULATION_SQUEEZE', 'score': max(score, 0.5), 'is_squeeze': True}
+
+        # 🚀 TYPE 3: MOMENTUM_LAUNCH (Earlier Entry)
+        # RSI > 50 (كانت 60)
+        elif 50 < rsi < 85:
+            if close > ema50:
                 dist_to_upper = (upper_bb - close) / close
-                if dist_to_upper < 0.08: 
+                if dist_to_upper < 0.12: # السماح بمسافة أكبر قليلاً
                     score = rsi / 100.0
                     return {'type': 'MOMENTUM_LAUNCH', 'score': score}
+        
+        # 🃏 Special Case: High Volatility Wildcard
+        # إذا كانت السيولة والتقلب مرتفعين جداً (> 1.5%)، مررها للنماذج
+        if volatility_pct > 1.5:
+             return {'type': 'SAFE_BOTTOM', 'score': 0.4}
 
         return {'type': 'NONE', 'score': 0}