Update r2.py

r2.py

@@ -1,22 +1,44 @@
-# r2.py (محدث V10.3 - Typing Fix)
-import os, traceback, json, time
+# r2.py (V11.0 - GEM-Architect: Full Stack Restoration & Accounting Fix)
+import os
+import traceback
+import json
+import time
 from datetime import datetime, timedelta
 import asyncio
 import boto3
 from botocore.exceptions import NoCredentialsError, ClientError
-from typing import List, Dict, Any, Optional # <-- 🔴 السطر المضاف لإصلاح الخطأ
+from typing import List, Dict, Any, Optional
 
+# ==============================================================================
+# ⚙️ التكوين والإعدادات
+# ==============================================================================
 R2_ACCOUNT_ID = os.getenv("R2_ACCOUNT_ID")
 R2_ACCESS_KEY_ID = os.getenv("R2_ACCESS_KEY_ID")
 R2_SECRET_ACCESS_KEY = os.getenv("R2_SECRET_ACCESS_KEY")
 BUCKET_NAME = "trading"
-INITIAL_CAPITAL = 10.0
 
-# 🔴 --- (جديد V10.2) أسماء ملفات التعلم --- 🔴
+# الرصيد الافتراضي عند إنشاء محفظة جديدة (تم تحديثه ليكون منطقياً للمحاكاة)
+INITIAL_CAPITAL = 100.0 
+
+# 📁 مفاتيح الملفات في R2 (File Keys)
+# 1. التعلم العميق للحيتان
 WHALE_LEARNING_PENDING_KEY = "learning_whale_pending_records.json"
 WHALE_LEARNING_COMPLETED_KEY = "learning_whale_completed_records.json"
 WHALE_LEARNING_CONFIG_KEY = "learning_whale_optimal_config.json"
 
+# 2. المحاسبة والتاريخ
+PORTFOLIO_STATE_KEY = "portfolio_state.json"
+OPEN_TRADES_KEY = "open_trades.json"
+CLOSED_TRADES_KEY = "closed_trades_history.json"
+
+# 3. النظام والمرشحين
+CANDIDATES_KEY = "Candidates.json"
+CONTRACTS_DB_KEY = "contracts.json"
+SYSTEM_LOGS_KEY = "system_logs.json"
+LLM_PROMPTS_KEY = "llm_prompts.json"
+LEARNING_DATA_KEY = "learning_data.json"
+ANALYSIS_AUDIT_KEY = "analysis_audit_log.json"
+
 
 class R2Service:
     def __init__(self):
@@ -31,6 +53,7 @@ class R2Service:
             self.lock_acquired = False
             self.BUCKET_NAME = BUCKET_NAME
             
+            # منع تكرار طباعة التحذيرات
             self._open_trades_warning_printed = False
             self._portfolio_warning_printed = False
             self._contracts_warning_printed = False
@@ -38,6 +61,9 @@ class R2Service:
         except Exception as e:
             raise RuntimeError(f"Failed to initialize S3 client: {e}")
 
+    # ==============================================================================
+    # 🔒 إدارة القفل (Lock Mechanism)
+    # ==============================================================================
     def acquire_lock(self, max_retries=3):
         lock_path = "lock.txt"
         for attempt in range(max_retries):
@@ -70,10 +96,12 @@ class R2Service:
             except Exception as e:
                 print(f"❌ Failed to release lock: {e}")
 
+    # ==============================================================================
+    # 📊 إدارة المرشحين (Candidates)
+    # ==============================================================================
     async def save_candidates_async(self, candidates):
         """حفظ بيانات المرشحين العشرة في ملف منفصل في R2"""
         try:
-            key = "Candidates.json"
             data = {
                 "timestamp": datetime.now().isoformat(),
                 "total_candidates": len(candidates),
@@ -81,7 +109,7 @@ class R2Service:
             }
             data_json = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=CANDIDATES_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"✅ تم حفظ {len(candidates)} مرشح في ملف Candidates في R2")
             
@@ -99,8 +127,7 @@ class R2Service:
     async def load_candidates_async(self):
         """تحميل بيانات المرشحين من R2"""
         try:
-            key = "Candidates.json"
-            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=CANDIDATES_KEY)
             data = json.loads(response['Body'].read())
             candidates = data.get('candidates', [])
             print(f"✅ تم تحميل {len(candidates)} مرشح من R2")
@@ -112,12 +139,14 @@ class R2Service:
             else:
                 raise
 
+    # ==============================================================================
+    # 📝 السجلات والتعلم (Logs & Debugging)
+    # ==============================================================================
     async def save_llm_prompts_async(self, symbol, prompt_type, prompt_content, analysis_data=None):
         """حفظ الـ Prompts المرسلة إلى النموذج الضخم"""
         try:
-            key = "llm_prompts.json"
             try:
-                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=LLM_PROMPTS_KEY)
                 existing_data = json.loads(response['Body'].read())
             except ClientError as e:
                 if e.response['Error']['Code'] == 'NoSuchKey':
@@ -128,18 +157,19 @@ class R2Service:
             new_prompt = {
                 "timestamp": datetime.now().isoformat(),
                 "symbol": symbol,
-                "prompt_type": prompt_type,  # 'trading_decision' or 'trade_reanalysis'
+                "prompt_type": prompt_type,
                 "prompt_content": prompt_content,
                 "analysis_data": analysis_data
             }
             
             existing_data["prompts"].append(new_prompt)
+            # الاحتفاظ بآخر 2000 سجل فقط
             if len(existing_data["prompts"]) > 2000:
                 existing_data["prompts"] = existing_data["prompts"][-2000:]
             
             data_json = json.dumps(existing_data, indent=2, ensure_ascii=False).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=LLM_PROMPTS_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"✅ تم حفظ prompt لـ {symbol} ({prompt_type}) في R2")
         except Exception as e:
@@ -147,9 +177,8 @@ class R2Service:
 
     async def save_system_logs_async(self, log_data):
         try:
-            key = "system_logs.json"
             try:
-                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=SYSTEM_LOGS_KEY)
                 existing_logs = json.loads(response['Body'].read())
             except ClientError as e:
                 if e.response['Error']['Code'] == 'NoSuchKey':
@@ -168,22 +197,24 @@ class R2Service:
             
             data_json = json.dumps(existing_logs, indent=2, ensure_ascii=False).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=SYSTEM_LOGS_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"✅ System log saved: {log_data.get('cycle_started', log_data.get('cycle_completed', 'event'))}")
         except Exception as e:
             print(f"❌ Failed to save system logs: {e}")
 
+    # ==============================================================================
+    # 🧠 بيانات التعلم العام (General Learning Data)
+    # ==============================================================================
     async def save_learning_data_async(self, learning_data):
         try:
-            key = "learning_data.json"
             data = {
                 "timestamp": datetime.now().isoformat(),
                 "learning_data": learning_data
             }
             data_json = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=LEARNING_DATA_KEY, Body=data_json, ContentType="application/json"
             )
             print("✅ Learning data saved to R2")
         except Exception as e:
@@ -191,8 +222,7 @@ class R2Service:
 
     async def load_learning_data_async(self):
         try:
-            key = "learning_data.json"
-            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=LEARNING_DATA_KEY)
             data = json.loads(response['Body'].read())
             print("✅ Learning data loaded from R2")
             return data
@@ -203,10 +233,12 @@ class R2Service:
             else:
                 raise
 
+    # ==============================================================================
+    # 💰 إدارة المحفظة (Accounting & Portfolio) - [معدل للمحاسبة]
+    # ==============================================================================
     async def get_portfolio_state_async(self):
-        key = "portfolio_state.json"
         try:
-            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=PORTFOLIO_STATE_KEY)
             state = json.loads(response['Body'].read())
             if hasattr(self, '_portfolio_warning_printed'):
                 delattr(self, '_portfolio_warning_printed')
@@ -217,14 +249,19 @@ class R2Service:
                 if not hasattr(self, '_portfolio_warning_printed'):
                     print(f"⚠️ No portfolio state file found. Initializing with ${INITIAL_CAPITAL:.2f}")
                     self._portfolio_warning_printed = True
+                
+                # تهيئة محفظة جديدة نظيفة
                 initial_state = {
                     "current_capital_usd": INITIAL_CAPITAL,
                     "invested_capital_usd": 0.0,
                     "initial_capital_usd": INITIAL_CAPITAL,
                     "total_trades": 0,
                     "winning_trades": 0,
+                    "losing_trades": 0,
                     "total_profit_usd": 0.0,
-                    "total_loss_usd": 0.0
+                    "total_loss_usd": 0.0,
+                    "win_rate": 0.0,
+                    "last_update": datetime.now().isoformat()
                 }
                 await self.save_portfolio_state_async(initial_state)
                 return initial_state
@@ -232,20 +269,23 @@ class R2Service:
                 raise
 
     async def save_portfolio_state_async(self, state):
-        key = "portfolio_state.json"
         try:
+            state['last_update'] = datetime.now().isoformat()
             data_json = json.dumps(state, indent=2).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=PORTFOLIO_STATE_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"💾 Portfolio state saved: Current Capital ${state.get('current_capital_usd', 0):.2f}")
         except Exception as e:
             print(f"❌ Failed to save portfolio state: {e}")
             raise
 
+    # ==============================================================================
+    # 📈 إدارة الصفقات (Open Trades & History)
+    # ==============================================================================
     async def get_open_trades_async(self):
         try:
-            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key="open_trades.json")
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=OPEN_TRADES_KEY)
             trades = json.loads(response['Body'].read())
             if hasattr(self, '_open_trades_warning_printed'):
                 delattr(self, '_open_trades_warning_printed')
@@ -254,7 +294,6 @@ class R2Service:
             if e.response['Error']['Code'] == 'NoSuchKey':
                 if not hasattr(self, '_open_trades_warning_printed'):
                     print("⚠️ No open trades file found. Starting with an empty list.")
-                    print("💡 This is normal for first-time runs or when all trades are closed.")
                     self._open_trades_warning_printed = True
                 return []
             else:
@@ -264,17 +303,57 @@ class R2Service:
         try:
             data_json = json.dumps(trades, indent=2).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key="open_trades.json", Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=OPEN_TRADES_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"✅ Open trades saved to R2. Total open trades: {len(trades)}")
         except Exception as e:
             print(f"❌ Failed to save open trades: {e}")
             raise
 
+    # 🔴 [جديد] أرشفة الصفقات المغلقة 🔴
+    async def append_to_closed_trades_history(self, trade_data: Dict[str, Any]):
+        """إضافة صفقة مغلقة إلى السجل التاريخي الدائم"""
+        try:
+            # 1. تحميل السجل القديم
+            try:
+                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=CLOSED_TRADES_KEY)
+                history = json.loads(response['Body'].read())
+            except ClientError as e:
+                if e.response['Error']['Code'] == 'NoSuchKey':
+                    history = []
+                else:
+                    raise
+
+            # 2. إضافة الصفقة الجديدة
+            history.append(trade_data)
+            
+            # 3. حفظ السجل (نحتفظ بآخر 1000 صفقة فقط)
+            if len(history) > 1000:
+                history = history[-1000:]
+                
+            data_json = json.dumps(history, indent=2).encode('utf-8')
+            self.s3_client.put_object(
+                Bucket=BUCKET_NAME, Key=CLOSED_TRADES_KEY, Body=data_json, ContentType="application/json"
+            )
+            print(f"📜 [R2 History] تم أرشفة الصفقة {trade_data.get('symbol')} في السجل التاريخي.")
+            
+        except Exception as e:
+            print(f"❌ [R2 Error] فشل حفظ الصفقة في السجل التاريخي: {e}")
+
+    async def get_closed_trades_history(self):
+        """جلب سجل الصفقات التاريخية"""
+        try:
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=CLOSED_TRADES_KEY)
+            return json.loads(response['Body'].read())
+        except ClientError:
+            return []
+
+    # ==============================================================================
+    # 📜 قاعدة بيانات العقود (Contracts DB)
+    # ==============================================================================
     async def load_contracts_db_async(self):
-        key = "contracts.json"
         try:
-            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+            response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=CONTRACTS_DB_KEY)
             contracts_db = json.loads(response['Body'].read())
             if hasattr(self, '_contracts_warning_printed'):
                 delattr(self, '_contracts_warning_printed')
@@ -290,17 +369,19 @@ class R2Service:
                 raise
     
     async def save_contracts_db_async(self, data):
-        key = "contracts.json"
         try:
             data_json = json.dumps(data, indent=2).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=CONTRACTS_DB_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"✅ Contracts database saved to R2 successfully. Total entries: {len(data)}")
         except Exception as e:
             print(f"❌ Failed to save contracts database to R2: {e}")
             raise
 
+    # ==============================================================================
+    # 🛠️ أدوات مساعدة (Utilities)
+    # ==============================================================================
     async def get_trade_by_symbol_async(self, symbol):
         try:
             open_trades = await self.get_open_trades_async()
@@ -341,25 +422,20 @@ class R2Service:
             print(f"❌ Failed to get monitored trades: {e}")
             return []
     
-    # 
-    # 🔴 دالة جديدة: لحفظ سجل تدقيق التحليل
-    #
     async def save_analysis_audit_log_async(self, audit_data):
         """حفظ سجل تدقيق دورة التحليل (يحتفظ بآخر 50 دورة)"""
         try:
-            key = "analysis_audit_log.json"
-            
             # 1. جلب السجل الحالي (إن وجد)
             try:
-                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
+                response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=ANALYSIS_AUDIT_KEY)
                 existing_log_data = json.loads(response['Body'].read())
                 if isinstance(existing_log_data, list):
                     history = existing_log_data
                 else:
-                    history = [] # بدء سجل جديد إذا كان التنسيق غير صالح
+                    history = [] 
             except ClientError as e:
                 if e.response['Error']['Code'] == 'NoSuchKey':
-                    history = [] # ملف جديد
+                    history = []
                 else:
                     raise
             
@@ -373,14 +449,16 @@ class R2Service:
             # 4. حفظ الملف المحدث
             data_json = json.dumps(history, indent=2, ensure_ascii=False).encode('utf-8')
             self.s3_client.put_object(
-                Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
+                Bucket=BUCKET_NAME, Key=ANALYSIS_AUDIT_KEY, Body=data_json, ContentType="application/json"
             )
             print(f"📊 تم حفظ سجل تدقيق التحليل بنجاح في R2 (إجمالي {len(history)} سجلات)")
             
         except Exception as e:
             print(f"❌ فشل حفظ سجل تدقيق التحليل في R2: {e}")
 
-    # 🔴 --- START OF CHANGE (V10.2 - Whale Learning Storage) --- 🔴
+    # ==============================================================================
+    # 🐋 تعلم الحيتان (Whale Learning) - V10.2
+    # ==============================================================================
     
     async def _load_json_file_from_r2(self, key: str, default: Any = []) -> Any:
         """دالة مساعدة لتحميل ملف JSON بأمان."""
@@ -410,10 +488,7 @@ class R2Service:
             traceback.print_exc()
 
     async def save_whale_learning_record_async(self, record: Dict[str, Any]):
-        """
-        (جديد V10.2)
-        يحفظ سجلاً "معلقاً" جديداً في ملف PENDING.
-        """
+        """يحفظ سجلاً 'معلقاً' جديداً في ملف PENDING."""
         try:
             pending_records = await self._load_json_file_from_r2(WHALE_LEARNING_PENDING_KEY, default=[])
             pending_records.append(record)
@@ -423,10 +498,7 @@ class R2Service:
             print(f"❌ [R2Service] فشل في save_whale_learning_record_async: {e}")
 
     async def get_pending_whale_learning_records_async(self) -> List[Dict[str, Any]]:
-        """
-        (جديد V10.2)
-        يجلب جميع السجلات "المعلقة" من ملف PENDING.
-        """
+        """يجلب جميع السجلات 'المعل��ة' من ملف PENDING."""
         try:
             return await self._load_json_file_from_r2(WHALE_LEARNING_PENDING_KEY, default=[])
         except Exception as e:
@@ -434,11 +506,7 @@ class R2Service:
             return []
 
     async def update_completed_whale_learning_record_async(self, completed_record: Dict[str, Any]):
-        """
-        (جديد V10.2)
-        1. يحفظ السجل "المكتمل" في ملف COMPLETED.
-        2. يزيل السجل من ملف PENDING.
-        """
+        """يحفظ السجل 'المكتمل' في ملف COMPLETED ويزيله من PENDING."""
         try:
             record_id = completed_record.get("record_id")
             if not record_id:
@@ -465,10 +533,7 @@ class R2Service:
             print(f"❌ [R2Service] فشل في update_completed_whale_learning_record_async: {e}")
             
     async def get_all_completed_whale_records_async(self) -> List[Dict[str, Any]]:
-        """
-        (جديد V10.2)
-        يجلب *جميع* السجلات المكتملة (لتحليل الارتباط).
-        """
+        """يجلب جميع السجلات المكتملة."""
         try:
             return await self._load_json_file_from_r2(WHALE_LEARNING_COMPLETED_KEY, default=[])
         except Exception as e:
@@ -476,21 +541,12 @@ class R2Service:
             return []
             
     async def save_whale_learning_config_async(self, config: Dict[str, Any]):
-        """
-        (جديد V10.2)
-        يحفظ ملف الإعدادات (الأوزان) الذي نتج عن التعلم.
-        """
+        """يحفظ ملف الإعدادات (الأوزان) الذي نتج عن التعلم."""
         await self._save_json_file_to_r2(WHALE_LEARNING_CONFIG_KEY, config)
         print(f"✅ [R2Service] تم حفظ إعدادات تعلم الحيتان المثلى.")
         
     async def load_whale_learning_config_async(self) -> Dict[str, Any]:
-        """
-        (جديد V10.2)
-        يجلب ملف الإعدادات (الأوزان) الذي نتج عن التعلم.
-        """
+        """يجلب ملف الإعدادات (الأوزان)."""
         return await self._load_json_file_from_r2(WHALE_LEARNING_CONFIG_KEY, default={})
 
-    # 🔴 --- END OF CHANGE --- 🔴
-
-
-print("✅ Enhanced R2 Service Loaded - Comprehensive Logging System with Candidates Support")
+print("✅ Full R2 Service Loaded - Accounting & History Modules Ready")