Update smart_portfolio.py

smart_portfolio.py

@@ -1,5 +1,5 @@
 # ==============================================================================
-# 💼 smart_portfolio.py (V37.0 - GEM-Architect: Grade-Based Sizing)
+# 💼 smart_portfolio.py (V37.2 - GEM-Architect: Regime-Aware Targeting)
 # ==============================================================================
 
 import asyncio
@@ -46,7 +46,7 @@ class SmartPortfolio:
             "halt_reason": None
         }
         
-        print("💼 [SmartPortfolio V37.0] Grade-Based Sizing System Initialized.")
+        print("💼 [SmartPortfolio V37.2] Regime-Aware Sizing & Targeting Initialized.")
 
     async def initialize(self):
         await self._sync_state_from_r2()
@@ -76,11 +76,12 @@ class SmartPortfolio:
                     await asyncio.sleep(60)
 
     # ==============================================================================
-    # 🧠 Core Logic: Entry Approval (Grade-Based)
+    # 🧠 Core Logic: Entry Approval (Grade-Based + Regime-Aware TP)
     # ==============================================================================
     async def request_entry_approval(self, signal_data: Dict[str, Any], open_positions_count: int) -> Tuple[bool, Dict[str, Any]]:
         """
         تطلب الموافقة وتحدد الحجم بناءً على جودة الحوكمة (Grade).
+        وتحدد الهدف (TP) بناءً على الريجيم الحالي (Context).
         """
         async with self.capital_lock:
             # 1. Circuit Breaker
@@ -106,12 +107,13 @@ class SmartPortfolio:
                 return False, {"reason": f"Governance Rejected (Score: {gov_score})"}
 
             # 4. Regime-Based Slots
-            regime = getattr(SystemLimits, 'CURRENT_REGIME', 'RANGE')
+            # محاولة استخراج الريجيم من الإشارة نفسها (الأدق) أو العودة للنظام العام
+            regime = signal_data.get('asset_regime', getattr(SystemLimits, 'CURRENT_REGIME', 'RANGE'))
             
             if regime == "BULL": max_slots = 6 
             elif regime == "BEAR": max_slots = 3 
             elif regime == "DEAD": max_slots = 2 
-            else: max_slots = 4 
+            else: max_slots = 4  # RANGE
             
             if current_cap < self.MIN_CAPITAL_FOR_SPLIT: max_slots = min(max_slots, 2)
 
@@ -126,9 +128,6 @@ class SmartPortfolio:
                 return False, {"reason": f"Insufficient Free Capital (${free_capital:.2f})"}
 
             # ✅ 6. Position Sizing (Grade Logic)
-            # القاعدة: الحصة الكاملة = الكابيتال / عدد الخانات.
-            # الجودة تحدد كم نأخذ من هذه الحصة.
-            
             target_slot_size = 0.0
             if current_cap >= self.MIN_CAPITAL_FOR_SPLIT:
                 target_slot_size = current_cap / max_slots
@@ -151,17 +150,21 @@ class SmartPortfolio:
                 if free_capital >= 5.0: final_size_usd = 5.0
                 else: return False, {"reason": "Calculated size too small"}
 
-            # 7. Dynamic TP Selection
+            # ✅ 7. Dynamic TP Selection (The Fix)
+            # إصلاح المنطق: في أسواق Range/Dead/Bear، نلتزم بـ TP1 لضمان الخروج بربح.
             entry_price = float(signal_data.get('sniper_entry_price') or signal_data.get('current_price'))
             tp_map = signal_data.get('tp_map', {})
             
             if regime == "BULL" and gov_grade in ["STRONG", "ULTRA"]:
+                # فقط في البول رن القوي نستهدف الأهداف البعيدة
                 selected_tp = tp_map.get('TP3') or tp_map.get('TP4')
                 target_label = "TP3/4 (Bull Run)"
-            elif regime == "BEAR":
+            elif regime in ["RANGE", "DEAD", "BEAR"]:
+                # في الأسواق العرضية والميتة والهابطة، نأخذ أول هدف ونخرج
                 selected_tp = tp_map.get('TP1')
-                target_label = "TP1 (Scalp)"
+                target_label = f"TP1 ({regime} Scalp)"
             else:
+                # الحالة الطبيعية
                 selected_tp = tp_map.get('TP2')
                 target_label = "TP2"