Update app/agent/agent.py

app/agent/agent.py

@@ -7,95 +7,88 @@ from executor import Executor
 from tools_runtime import execute_tool_call
 
 
-class Agent:
+# =====================================================
+# 🔥 UNIVERSAL LLM ROUTER (INSIDE agent.py)
+# =====================================================
+class LLMRouter:
 
     def __init__(self):
-        self.history = []
-        self.executor = Executor(llm=self.call_llm)
+        self.providers = [
+            {
+                "url": Config.LLM_API_URL,
+                "key": Config.LLM_API_KEY,
+                "model": Config.MODEL
+            }
+        ]
 
-    # =====================================================
-    # SAFE LLM CALL LAYER (HARDENED)
-    # =====================================================
-    def call_llm(self, messages):
+    def call(self, messages):
 
-        try:
-            if not Config.LLM_API_URL:
-                return self._fallback("missing_llm_url")
-
-            res = requests.post(
-                Config.LLM_API_URL,
-                headers={
-                    "Authorization": f"Bearer {Config.LLM_API_KEY}",
-                    "Content-Type": "application/json"
-                },
-                json={
-                    "model": Config.MODEL,
-                    "messages": messages,
-                    "temperature": 0.2
-                },
-                timeout=30
-            )
+        last_error = None
 
-            # HTTP check
-            if res.status_code != 200:
-                return self._fallback(f"http_{res.status_code}")
+        for p in self.providers:
 
-            # JSON parse safe
             try:
+                res = requests.post(
+                    p["url"],
+                    headers={
+                        "Authorization": f"Bearer {p['key']}",
+                        "Content-Type": "application/json"
+                    },
+                    json={
+                        "model": p["model"],
+                        "messages": messages,
+                        "temperature": 0.2
+                    },
+                    timeout=30
+                )
+
                 data = res.json()
-            except Exception:
-                return self._fallback("invalid_json")
 
-            # structure validation
-            if not isinstance(data, dict):
-                return self._fallback("invalid_structure")
+                # =========================
+                # NORMALIZER (IMPORTANT FIX)
+                # =========================
+                if isinstance(data, list):
+                    data = data[0] if data else {}
 
-            if "choices" not in data:
-                return self._fallback("missing_choices")
+                if isinstance(data, dict) and "result" in data:
+                    data = data["result"]
 
-            return data
+                # =========================
+                # VALIDATION
+                # =========================
+                if isinstance(data, dict) and "choices" in data:
+                    return data
 
-        except Exception as e:
-            return self._fallback(str(e))
+            except Exception as e:
+                last_error = str(e)
+                continue
 
-    # =====================================================
-    # FALLBACK (ALWAYS SAFE OUTPUT)
-    # =====================================================
-    def _fallback(self, error):
         return {
-            "error": error,
-            "choices": [
-                {
-                    "message": {
-                        "content": "LLM_ERROR"
-                    }
+            "choices": [{
+                "message": {
+                    "content": "LLM_ERROR"
                 }
-            ]
+            }],
+            "error": last_error
         }
 
-    # =====================================================
-    # SAFE CONTENT EXTRACTION
-    # =====================================================
-    def _extract_content(self, response):
 
-        try:
-            if not isinstance(response, dict):
-                return ""
+# =====================================================
+# AGENT
+# =====================================================
+class Agent:
 
-            return (
-                response.get("choices", [{}])[0]
-                        .get("message", {})
-                        .get("content", "")
-            )
-        except Exception:
-            return ""
+    def __init__(self):
+
+        self.llm = LLMRouter().call
+        self.executor = Executor(llm=self.llm)
+        self.history = []
 
     # =====================================================
-    # GOAL MODE (SAFE PIPELINE)
+    # GOAL MODE
     # =====================================================
     def run_goal(self, goal: str):
 
-        # PLAN PHASE
         try:
             plan = create_plan(goal)
 
@@ -108,11 +101,10 @@ class Agent:
                 "error": f"plan_failed: {str(e)}"
             }
 
-        # EXECUTION PHASE
         try:
             results = self.executor.run_plan(plan)
         except Exception as e:
-            results = {"error": f"executor_failed: {str(e)}"}
+            results = {"error": str(e)}
 
         return {
             "mode": "goal_execution",
@@ -129,25 +121,7 @@ class Agent:
         messages = [
             {
                 "role": "system",
-                "content": Config.SYSTEM_PROMPT + """
-
-You are a strict autonomous coding agent.
-
-RULES:
-- TOOL MODE → ONLY valid JSON
-- NORMAL MODE → plain text only
-
-TOOLS:
-run_shell(cmd)
-write_file(path, content)
-read_file(path)
-list_files(path)
-delete_file(path)
-browser_open(url)
-browser_click(selector)
-browser_type(selector, text)
-browser_screenshot(path)
-"""
+                "content": Config.SYSTEM_PROMPT
             },
             {
                 "role": "user",
@@ -155,8 +129,19 @@ browser_screenshot(path)
             }
         ]
 
-        response = self.call_llm(messages)
-        content = self._extract_content(response)
+        response = self.llm(messages)
+
+        # =========================
+        # SAFE EXTRACTION
+        # =========================
+        try:
+            content = (
+                response.get("choices", [{}])[0]
+                .get("message", {})
+                .get("content", "")
+            )
+        except Exception:
+            content = ""
 
         if not content:
             return {
@@ -164,29 +149,19 @@ browser_screenshot(path)
                 "response": "empty_llm_response"
             }
 
-        # =================================================
-        # TOOL EXECUTION PATH (SAFE JSON PARSE)
-        # =================================================
+        # =========================
+        # TOOL MODE
+        # =========================
         try:
-            tool_call = json.loads(content)
+            tool = json.loads(content)
 
-            if isinstance(tool_call, dict) and "tool" in tool_call:
+            if isinstance(tool, dict) and "tool" in tool:
 
-                result = execute_tool_call(tool_call)
-
-                # SAFE HEALER (NO CRASH)
-                try:
-                    fix = self.executor.healer.heal(user_input, result)
-
-                    if isinstance(fix, dict) and "tool" in fix:
-                        result = execute_tool_call(fix)
-
-                except Exception:
-                    pass
+                result = execute_tool_call(tool)
 
                 self.history.append({
                     "input": user_input,
-                    "tool_call": tool_call,
+                    "tool_call": tool,
                     "result": result
                 })
 
@@ -198,9 +173,9 @@ browser_screenshot(path)
         except Exception:
             pass
 
-        # =================================================
-        # NORMAL RESPONSE
-        # =================================================
+        # =========================
+        # NORMAL MODE
+        # =========================
         return {
             "mode": "normal_response",
             "response": content
@@ -211,6 +186,7 @@ browser_screenshot(path)
 # DEBUG
 # =====================================================
 if __name__ == "__main__":
+
     agent = Agent()
 
     print(agent.run("List files in current directory"))