Update app.py

app.py

@@ -47,7 +47,6 @@ def call_o1_ai_api(formatted_chat_history):
             response = requests.post(AI_API_URL, headers=headers, data=json.dumps(payload), timeout=timeout)
             response.raise_for_status()
             assistant_response = response.json().get("assistant_response", "No response received.")
-            # Do NOT append another user/system turn here. Only append assistant turn for trace.
             formatted_chat_history.append({"role": "assistant", "content": assistant_response})
             return assistant_response, formatted_chat_history
         except requests.exceptions.Timeout:
@@ -173,7 +172,7 @@ def build_chat_history(alert_message=None):
 
 ردك سيكون عبارة عن XML لا غير وهي المفاتيح الأساسية لتحريك النظام هنا شرحها
 
-before everything you have <analysis>here take your time to analysis the images for XAUUSD 15min and 1H , 1m , 5m also the DXY be so pro person and use the SCHOOLS for trading to analysis also use the NEWS from up there and your OLD analysis</analysis>
+before everything you have <analysis>here take your time to analysis the images for XAUUSD 15min and 1H also the DXY be so pro person and use the SCHOOLS for trading to analysis</analysis>
 
 اولا الانتظار :
 
@@ -287,10 +286,11 @@ do you understand ??
     try:
         analysis_data = db_analysis.fetch_json_from_github()
         if analysis_data["success"] and analysis_data["data"]:
-            previous_analysis = analysis_data["data"][0]["response"]
+            # Keep raw previous analyses, AI will see them as a block of text
+            previous_block = analysis_data["data"][0]["response"]
             multipart_content.append({
                 "type": "text",
-                "text": f"التحليل السابق:\n{previous_analysis}"
+                "text": f"التحليل السابق:\n{previous_block}"
             })
     except Exception as e:
         logger.error(f"Error fetching previous analysis: {e}")
@@ -344,7 +344,6 @@ do you understand ??
             "content": multipart_content
         })
     else:
-        # Fallback user message if no content
         chat_history.append({
             "role": "user",
             "content": "No charts or additional context available."
@@ -352,16 +351,98 @@ do you understand ??
 
     return chat_history
 
-def parse_ai_response(ai_response):
-    actions_performed = []
+def build_analysis_record(text):
+    """Create a tidy analysis record with Greenwich (UTC) timestamp."""
+    # ISO 8601 UTC format
+    ts = datetime.now(timezone.utc).isoformat()
+    return {
+        "timestamp_utc": ts,
+        "response": text
+    }
 
-    # 1. Save analysis
+def load_existing_analyses_safe():
+    """Fetch current analyses as a Python list of dicts. Return [] on any issue."""
     try:
+        analysis_data = db_analysis.fetch_json_from_github()
+        if analysis_data and analysis_data.get("success") and analysis_data.get("data"):
+            # Expect stored JSON text is already the full array, or in older format
+            raw = analysis_data["data"][0].get("response", "")
+            # Try parse as JSON array
+            parsed = json.loads(raw)
+            if isinstance(parsed, list):
+                # Ensure each item has timestamp_utc and response
+                cleaned = []
+                for item in parsed:
+                    if isinstance(item, dict) and ("response" in item):
+                        # Keep existing timestamp if present
+                        if "timestamp_utc" in item:
+                            cleaned.append(item)
+                        else:
+                            cleaned.append({
+                                "timestamp_utc": datetime.now(timezone.utc).isoformat(),
+                                "response": item.get("response", "")
+                            })
+                    elif isinstance(item, str):
+                        cleaned.append({
+                            "timestamp_utc": datetime.now(timezone.utc).isoformat(),
+                            "response": item
+                        })
+                return cleaned
+            else:
+                # If not a list, wrap it
+                return [{
+                    "timestamp_utc": datetime.now(timezone.utc).isoformat(),
+                    "response": str(parsed)
+                }]
+        return []
+    except Exception as e:
+        logger.warning(f"load_existing_analyses_safe fallback: {e}")
+        return []
+
+def save_latest_analyses(new_text):
+    """Save only the latest 3 analyses (newest first) with UTC timestamps."""
+    try:
+        existing = load_existing_analyses_safe()
+
+        # Prepend new record
+        new_record = build_analysis_record(new_text)
+        combined = [new_record] + existing
+
+        # Sort by timestamp desc (newest first)
+        def ts_key(x):
+            try:
+                return datetime.fromisoformat(x.get("timestamp_utc", "1970-01-01T00:00:00+00:00"))
+            except Exception:
+                return datetime(1970, 1, 1, tzinfo=timezone.utc)
+
+        combined_sorted = sorted(combined, key=ts_key, reverse=True)
+
+        # Keep only latest 3
+        trimmed = combined_sorted[:3]
+
+        # Save back as JSON array
         auth_token, commit_oid = db_analysis.fetch_authenticity_token_and_commit_oid()
         if auth_token and commit_oid:
-            new_analysis = json.dumps([{"response": ai_response}])
-            db_analysis.update_user_json_file(auth_token, commit_oid, new_analysis)
-            actions_performed.append("✅ تم حفظ التحليل")
+            new_payload_text = json.dumps(trimmed, ensure_ascii=False)
+            db_analysis.update_user_json_file(auth_token, commit_oid, new_payload_text)
+            return True
+        else:
+            logger.error("Failed to fetch auth or commit OID for analysis saving.")
+            return False
+    except Exception as e:
+        logger.error(f"Error saving latest analyses: {e}")
+        return False
+
+def parse_ai_response(ai_response):
+    actions_performed = []
+
+    # 1. Save analysis (latest 3 with UTC time, newest first)
+    try:
+        ok = save_latest_analyses(ai_response)
+        if ok:
+            actions_performed.append("✅ تم حفظ آخر 3 تحليلات مع توقيت Greenwich (UTC)")
+        else:
+            actions_performed.append("❌ فشل في حفظ التحليل")
     except Exception as e:
         logger.error(f"Error saving analysis: {e}")
         actions_performed.append("❌ خطأ في حفظ التحليل")
@@ -642,7 +723,7 @@ def health_check():
         "timestamp": datetime.now().isoformat(),
         "system": "XAUUSD Trading AI",
         "execution_order": [
-            "1. Save analysis",
+            "1. Save analysis (latest 3, UTC timestamps, newest first)",
             "2. Close trades (HIGH PRIORITY)",
             "3. Create new signals",
             "4. Send user messages",
@@ -660,7 +741,7 @@ def index():
             "/test_actions": "اختبار معالجة XML tags (POST)",
             "/health": "فحص حالة النظام (GET)"
         },
-        "version": "2.2.0",
+        "version": "2.3.0",
         "execution_priority": "close_trade → signal → send_user → alert"
     })