Update app.py

app.py

@@ -302,34 +302,83 @@ class GaiaRunner:
         self.agent = agent_executor
         self.username = username
 
-    def run_on_question(self, question_text: str, file: Optional[str] = None) -> str:
-     import time
-     start = time.time()
-    
-     prompt = SYSTEM_INSTRUCTIONS + "\n\n" + question_text
+    def run_on_question(self, question_text: str, file_path: Optional[str] = None) -> str:
+     """
+    تشغيل الوكيل الرئيسي (ReAct agent) على سؤال واحد مع إمكانية وجود مرفق.
+    يجمع كل خطوات التفكير (Thought → Action → Observation) ويرسلها كوحدة واحدة إلى وكيل الإجابة النهائية.
+     """
      try:
-        # حماية استدعاء الـ agent (langchain / llama-cpp) من الوصول المتوازي
-        with llama_lock:
-            
-            result = self.agent.invoke({"input": prompt})
-        if isinstance(result, dict):
-            output = result.get("output") or result.get("text") or str(result)
-        else:
-            output = getattr(result, "output", str(result))
-     except Exception as e:
-        logger.exception("Agent execution failed")
-        output = f"AGENT_ERROR: {e}"
+        # ==========================
+        # 1️⃣ إعداد الدخل للنموذج
+        # ==========================
+        SYSTEM_INSTRUCTIONS = (
+            "You are a reasoning agent that follows the ReAct pattern (Thought, Action, Observation). "
+            "Use available tools if necessary, and finish with 'Final Answer: ... <<END>>'"
+        )
+
+        prompt = SYSTEM_INSTRUCTIONS + "\n\nQuestion:\n" + question_text
+        if file_path:
+            prompt += f"\n[Attached file path: {file_path}]"
+
+        print(f"\n🚀 Running ReAct agent on question:\n{question_text}")
+        if file_path:
+            print(f"📎 With attachment: {file_path}")
+
+        # ==========================
+        # 2️⃣ تنفيذ الوكيل الرئيسي
+        # ==========================
+        result = self.agent.invoke({"input": prompt})
+
+        # ==========================
+        # 3️⃣ بناء سجل التفكير الكامل
+        # ==========================
+        full_log = []
+        full_log.append(f"Question: {question_text}\n")
+
+        # إذا كان هناك مرفق
+        if file_path:
+            full_log.append(f"Attachment: {file_path}\n")
+
+        # إضافة جميع خطوات ReAct الداخلية
+        if "intermediate_steps" in result:
+            for step in result["intermediate_steps"]:
+                try:
+                    action, observation = step
+                    full_log.append(
+                        f"Action: {action.tool}\n"
+                        f"Action Input: {action.tool_input}\n"
+                        f"Observation: {observation}\n"
+                    )
+                except Exception as e:
+                    print(f"[⚠️] Failed to parse intermediate step: {e}")
+
+         # إضافة الإجابة النهائية
+         output = result.get("output", "")
+         full_log.append(f"Final Answer: {output}\n")
+
+         # دمج كل السجل في نص واحد
+         conversation_log = "\n".join(full_log)
+
+         print("\n🧠 === FULL REACT LOG ===")
+         print(conversation_log)
+         print("==========================")
+
+         # ==========================
+         # 4️⃣ إرسال السجل الكامل إلى وكيل الإجابة النهائية
+         # ==========================
+         final_out = None
+         try:
+            final_out = final_client.predict_text(conversation_log)
+            print(f"✅ Final Answer Agent Output: {final_out}")
+         except Exception as e:
+            print(f"[⚠️] Failed to contact Final Answer Agent: {e}")
+            final_out = output  # fallback إلى الناتج المحلي إن فشل
+
+         return final_out or output
 
-     try:
-        final_out = final_client.predict_text(output)
      except Exception as e:
-        logger.exception("Final client failed")
-        final_out = f"FINAL_AGENT_ERROR: {e}"
-
-     end = time.time()
-     logger.info(f"⏱️ Time for question: {end - start:.2f} sec")
-
-     return final_out
+        print(f"[❌] Error while running on question: {e}")
+        return "Error: unable to process this question."
 
     def run_all_and_submit(self) -> Dict[str, Any]:
         questions_url =f"{GAIA_API_BASE}/questions"