Update agent.py

agent.py

@@ -1,4 +1,4 @@
-# agent_v40.py — czysty agent, zero sugerowanych odpowiedzi, precyzyjne pozyskiwanie
+# agent_v41.py — Agent analizujący każde pytanie krok po kroku i szukający odpowiedzi zewnętrznie
 import os
 import re
 import io
@@ -24,22 +24,46 @@ class GaiaAgent:
         except:
             return None, None
 
-    def search_context(self, question):
+    def get_step_by_step_plan(self, question):
+        steps_prompt = f"""
+You are an expert planner. Break down the question into a clear plan with 2–5 steps.
+
+Question: {question}
+
+Steps:
+"""
         try:
-            return self.search_tool.run(question)[:2000]
+            response = self.client.chat.completions.create(
+                model="gpt-4-turbo",
+                messages=[{"role": "user", "content": steps_prompt}],
+                temperature=0,
+                timeout=15
+            )
+            return response.choices[0].message.content.strip()
         except:
-            return ""
+            return "Step 1: Try to understand the question."
+
+    def search_with_steps(self, question, steps):
+        combined_prompt = f"""
+You are a knowledgeable assistant. Given the following plan:
+
+{steps}
 
-    def ask(self, context, question):
+Answer the original question using verified and precise information.
+Return only the final answer, nothing else.
+
+Question: {question}
+"""
         try:
+            web_context = self.search_tool.run(question)[:2000]
             response = self.client.chat.completions.create(
                 model="gpt-4-turbo",
                 messages=[
-                    {"role": "system", "content": "Answer precisely and factually based only on the provided context. Return only the final answer, in the correct format."},
-                    {"role": "user", "content": f"Context:\n{context}\n\nQuestion:\n{question}\n\nAnswer:"}
+                    {"role": "system", "content": f"Use only this web data:\n{web_context}"},
+                    {"role": "user", "content": combined_prompt}
                 ],
                 temperature=0,
-                timeout=25
+                timeout=30
             )
             return response.choices[0].message.content.strip()
         except:
@@ -51,7 +75,7 @@ class GaiaAgent:
         if "image" in ctype:
             b64 = base64.b64encode(content).decode("utf-8")
             messages = [
-                {"role": "system", "content": "You're a chess analyst. Return only the best move for Black that guarantees a win. Use algebraic notation, like Qd1 or Rxf2."},
+                {"role": "system", "content": "You're a chess analyst. Return only the best move for Black that guarantees a win. Use algebraic notation."},
                 {"role": "user", "content": [
                     {"type": "text", "text": question},
                     {"type": "image_url", "image_url": {"url": f"data:image/png;base64,{b64}"}}
@@ -76,55 +100,20 @@ class GaiaAgent:
                 return "$0.00"
         return content.decode("utf-8", errors="ignore")[:3000]
 
-    def extract_commutativity_set(self, question):
-        try:
-            lines = question.splitlines()
-            S, table = [], {}
-            for line in lines:
-                if line.startswith("|*"):
-                    S = line.strip().split("|")[2:]
-                elif line.startswith("|") and len(line.strip().split("|")) > 2:
-                    parts = line.strip().split("|")[1:-1]
-                    row_key, values = parts[0], parts[1:]
-                    table[row_key] = values
-            non_comm = set()
-            for x in S:
-                for y in S:
-                    if table[x][S.index(y)] != table[y][S.index(x)]:
-                        non_comm.update([x, y])
-            return ", ".join(sorted(non_comm))
-        except:
-            return ""
-
-    def validate_format(self, answer, question):
-        q = question.lower()
-        a = answer.strip()
-        if "algebraic notation" in q:
-            return bool(re.fullmatch(r"[KQBNR]?[a-h]?[1-8]?x?[a-h][1-8][+#]?", a))
-        if "usd with two decimal places" in q:
-            return bool(re.fullmatch(r"\$\d+\.\d{2}", a))
-        if "ioc country code" in q:
-            return bool(re.fullmatch(r"[A-Z]{3}", a.strip()))
-        if "award number" in q:
-            return bool(re.fullmatch(r"80NSSC[0-9A-Z]{6,7}", a))
-        return True
-
     def format_answer(self, raw, question):
         raw = raw.strip().strip("\"'")
         q = question.lower()
-        if "commutative" in q:
-            return self.extract_commutativity_set(question)
         if "algebraic notation" in q:
             match = re.search(r"[KQBNR]?[a-h]?[1-8]?x?[a-h][1-8][+#]?", raw)
             return match.group(0) if match else raw
         if "award number" in q:
             match = re.search(r"80NSSC[0-9A-Z]+", raw)
             return match.group(0) if match else raw
-        if "first name" in q:
-            return raw.split()[0]
         if "usd" in q:
             m = re.search(r"\d+(\.\d{2})", raw)
             return f"${m.group()}" if m else "$0.00"
+        if "first name" in q:
+            return raw.split()[0]
         try:
             return str(w2n.word_to_num(raw))
         except:
@@ -133,6 +122,11 @@ class GaiaAgent:
 
     def __call__(self, question, task_id=None):
         file, ctype = self.fetch_file(task_id) if task_id else (None, None)
-        context = self.handle_file(file, ctype, question) if file else self.search_context(question)
-        raw = self.ask(context, question)
+
+        if file:
+            context = self.handle_file(file, ctype, question)
+            return self.format_answer(context, question)
+
+        steps = self.get_step_by_step_plan(question)
+        raw = self.search_with_steps(question, steps)
         return self.format_answer(raw, question)