Update r2.py

r2.py

@@ -1,4 +1,11 @@
-# r2.py (V14.0 - GEM-Architect: Full Support for Training & Models)
+# ==============================================================================
+# ☁️ r2.py (V14.1 - GEM-Architect: Portfolio-Ready Storage)
+# ==============================================================================
+# التحديثات:
+# 1. دعم الحقول الجديدة (allocated_capital, daily_net_pnl) في الهيكل الافتراضي.
+# 2. تصفير شامل يشمل ملف حالة المحفظة الذكية (smart_portfolio_state.json).
+# ==============================================================================
+
 import os
 import traceback
 import json
@@ -27,6 +34,9 @@ WHALE_LEARNING_COMPLETED_KEY = "learning_whale_completed_records.json"
 WHALE_LEARNING_CONFIG_KEY = "learning_whale_optimal_config.json"
 
 PORTFOLIO_STATE_KEY = "portfolio_state.json"
+# ✅ المفتاح الجديد لحالة المحفظة الذكية
+SMART_PORTFOLIO_STATE_KEY = "smart_portfolio_state.json"
+
 OPEN_TRADES_KEY = "open_trades.json"
 CLOSED_TRADES_KEY = "closed_trades_history.json"
 
@@ -58,16 +68,18 @@ class R2Service:
             raise RuntimeError(f"Failed to initialize S3 client: {e}")
 
     # ==============================================================================
-    # 🔴 [هام جداً] دالة التصفير الشامل
+    # 🔴 [هام جداً] دالة التصفير الشامل (Updated for Smart Portfolio)
     # ==============================================================================
     async def reset_all_stats_async(self):
         """تصفير المحفظة والسجلات التاريخية والعودة لنقطة الصفر"""
         try:
             print("🔄 [R2 Reset] بدء عملية التصفير...")
             
+            # 1. إعداد الحالة الأولية المتوافقة مع SmartPortfolio V1.2
             initial_state = {
                 "current_capital_usd": INITIAL_CAPITAL,
-                "invested_capital_usd": 0.0,
+                "invested_capital_usd": 0.0,    # حقل قديم (للتوافق)
+                "allocated_capital_usd": 0.0,   # ✅ حقل جديد (للمحفظة الذكية)
                 "initial_capital_usd": INITIAL_CAPITAL,
                 "total_trades": 0,
                 "winning_trades": 0,
@@ -75,10 +87,27 @@ class R2Service:
                 "total_profit_usd": 0.0,
                 "total_loss_usd": 0.0,
                 "win_rate": 0.0,
+                "daily_net_pnl": 0.0,           # ✅ حقل جديد
+                "is_trading_halted": False,     # ✅ حقل جديد
                 "last_update": datetime.now().isoformat()
             }
+            
+            # حفظ الحالة في الملف الرئيسي
             await self.save_portfolio_state_async(initial_state)
             
+            # ✅ تصفير ملف المحفظة الذكية الخاص أيضاً
+            smart_state = {
+                "current_capital": INITIAL_CAPITAL,
+                "allocated_capital_usd": 0.0,
+                "session_start_balance": INITIAL_CAPITAL,
+                "daily_net_pnl": 0.0,
+                "is_trading_halted": False,
+                "halt_reason": None,
+                "last_session_reset": datetime.now().isoformat()
+            }
+            await self.upload_json_async(smart_state, SMART_PORTFOLIO_STATE_KEY)
+            
+            # تصفير السجلات الأخرى
             empty_list_json = json.dumps([], indent=2).encode('utf-8')
             self.s3_client.put_object(
                 Bucket=BUCKET_NAME, Key=CLOSED_TRADES_KEY, Body=empty_list_json, ContentType="application/json"
@@ -89,7 +118,7 @@ class R2Service:
                 Bucket=BUCKET_NAME, Key=SYSTEM_LOGS_KEY, Body=empty_logs_json, ContentType="application/json"
             )
             
-            print("✅ [R2 Reset] تم تصفير جميع البيانات والمحفظة بنجاح.")
+            print("✅ [R2 Reset] تم تصفير جميع البيانات والمحفظة (بما في ذلك SmartPortfolio) بنجاح.")
             return True
             
         except Exception as e:
@@ -98,13 +127,12 @@ class R2Service:
             return False
 
     # ==============================================================================
-    # 🆕 دوال دعم التدريب (Training Support) - [NEW for V13 Learning Hub]
+    # 🆕 دوال دعم التدريب (Training Support)
     # ==============================================================================
     async def upload_json_async(self, data: Any, key: str):
         """رفع أي بيانات JSON إلى مسار محدد"""
         try:
             json_bytes = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
-            # تشغيل الرفع في Thread منفصل لمنع تجميد الحلقة
             await asyncio.to_thread(
                 self.s3_client.put_object,
                 Bucket=self.BUCKET_NAME, 
@@ -126,7 +154,6 @@ class R2Service:
             )
             return response['Body'].read()
         except ClientError as e:
-            # إذا الملف غير موجود، نرجع None بدلاً من رفع استثناء
             if e.response['Error']['Code'] == 'NoSuchKey':
                 return None
             raise
@@ -191,11 +218,9 @@ class R2Service:
     # 📝 السجلات والتعلم
     # ==============================================================================
     async def save_system_logs_async(self, log_data):
-        # (يمكن تحسينها باستخدام append بدلاً من قراءة الكل، لكن سنبقيها بسيطة الآن)
-        pass # تم تعطيلها لتخفيف الحمل، الاعتماد على Console Logs + Audit
+        pass 
 
     async def append_deep_steward_audit(self, audit_record: Dict[str, Any]):
-        """حفظ تحليل ما بعد الخروج"""
         try:
             file_key = "DeepSteward_Audit_Log.json"
             data_bytes = await self.get_file_async(file_key)
@@ -210,25 +235,30 @@ class R2Service:
             print(f"❌ [R2 Error] فشل حفظ التدقيق: {e}")
 
     # ==============================================================================
-    # 💰 إدارة المحفظة (Accounting)
+    # 💰 إدارة المحفظة (Accounting - Updated)
     # ==============================================================================
     async def get_portfolio_state_async(self):
         try:
             data_bytes = await self.get_file_async(PORTFOLIO_STATE_KEY)
             if data_bytes:
                 state = json.loads(data_bytes)
-                # تصحيح البيانات القديمة
+                # ✅ تصحيح وتحديث البيانات القديمة لتشمل حقول SmartPortfolio
                 if 'losing_trades' not in state: state['losing_trades'] = 0
                 if 'initial_capital_usd' not in state: state['initial_capital_usd'] = INITIAL_CAPITAL
+                if 'allocated_capital_usd' not in state: state['allocated_capital_usd'] = 0.0
+                if 'daily_net_pnl' not in state: state['daily_net_pnl'] = 0.0
                 return state
             
-            # تهيئة افتراضية
+            # تهيئة افتراضية متكاملة
             initial_state = {
                 "current_capital_usd": INITIAL_CAPITAL,
-                "invested_capital_usd": 0.0,
+                "allocated_capital_usd": 0.0, # ✅ جديد
+                "invested_capital_usd": 0.0,  # Legacy support
                 "initial_capital_usd": INITIAL_CAPITAL,
                 "total_trades": 0, "winning_trades": 0, "losing_trades": 0,
                 "total_profit_usd": 0.0, "total_loss_usd": 0.0, "win_rate": 0.0,
+                "daily_net_pnl": 0.0,         # ✅ جديد
+                "is_trading_halted": False,
                 "last_update": datetime.now().isoformat()
             }
             await self.save_portfolio_state_async(initial_state)
@@ -292,7 +322,6 @@ class R2Service:
             rec_id = completed_record.get("record_id")
             if not rec_id: return
 
-            # نقل من Pending -> Completed
             comp_data = await self.get_file_async(WHALE_LEARNING_COMPLETED_KEY)
             completed = json.loads(comp_data) if comp_data else []
             completed.append(completed_record)
@@ -316,4 +345,4 @@ class R2Service:
         data = await self.get_file_async(WHALE_LEARNING_CONFIG_KEY)
         return json.loads(data) if data else {}
 
-print("✅ [R2 V14.0] Full Service Loaded (Training & Models Support).")
+print("✅ [R2 V14.1] Service Loaded (Smart Portfolio Compatible).")