Update app.py

app.py

@@ -712,78 +712,78 @@ Your goal: Provide the EXACT answer in the EXACT format requested.
                     # This ensures the *next* run of this node is *still* Turn 1.
                     return {"messages": [ai_message, correction_message], "turn": 1}
                 # --- END OF RULE ENFORCEMENT BLOCK ---
-# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-            # --- FIX #2: REPLACE THE FALLBACK PARSING BLOCK ---
-            #
-            # --- Fallback Parsing ---
-            # Check if LLM failed to format tool call and put it in 'content'
-            if not ai_message.tool_calls and isinstance(ai_message.content, str) and ai_message.content.strip():
-                content = ai_message.content
-                tool_name = None
-                tool_input = None
-                
-                # 1. Try to parse the new <function(tool_name)>{json}</function> format
-                # Note: We look for </function> optionally, as it might be truncated
-                func_match = re.search(
-                    r"<function\(([^)]+)\)>(\{.*?\})(?:</function>)?",
-                    content,
-                    re.DOTALL | re.IGNORECASE
-                )
-                
-                if func_match:
-                    try:
-                        tool_name = func_match.group(1).strip()
-                        json_str = func_match.group(2)
-                        tool_input = json.loads(json_str)
-                        print(f"🔧 Fallback (Format 1): Parsed tool call for '{tool_name}'")
-                    except json.JSONDecodeError as e:
-                        print(f"⚠️ Fallback (Format 1): Failed to parse JSON: {e}")
-                        tool_name = None # Reset
-                
-                # 2. If Format 1 failed, try to parse bare JSON (old fallback)
-                if not tool_name:
-                    json_match = re.search(
-                        r"```(?:json)?\s*(\{.*?\})\s*```|(\{.*?\})", 
-                        content, 
+    # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                # --- FIX #2: REPLACE THE FALLBACK PARSING BLOCK ---
+                #
+                # --- Fallback Parsing ---
+                # Check if LLM failed to format tool call and put it in 'content'
+                if not ai_message.tool_calls and isinstance(ai_message.content, str) and ai_message.content.strip():
+                    content = ai_message.content
+                    tool_name = None
+                    tool_input = None
+                    
+                    # 1. Try to parse the new <function(tool_name)>{json}</function> format
+                    # Note: We look for </function> optionally, as it might be truncated
+                    func_match = re.search(
+                        r"<function\(([^)]+)\)>(\{.*?\})(?:</function>)?",
+                        content,
                         re.DOTALL | re.IGNORECASE
                     )
-                    if json_match:
-                        json_str = json_match.group(1) or json_match.group(2)
+                    
+                    if func_match:
                         try:
-                            parsed_json = json.loads(json_str)
-                            # This format is less structured; we guess tool from keys
-                            if isinstance(parsed_json, dict):
-                                if "tool" in parsed_json and "tool_input" in parsed_json:
-                                    tool_name = parsed_json.get("tool")
-                                    tool_input = parsed_json.get("tool_input", {})
-                                elif "code" in parsed_json: # Guess code_interpreter
-                                    tool_name = "code_interpreter"
-                                    tool_input = parsed_json
-                                elif "answer" in parsed_json: # Guess final_answer
-                                    tool_name = "final_answer_tool"
-                                    tool_input = parsed_json
-                                
-                                if tool_name:
-                                    print(f"🔧 Fallback (Format 2): Parsed tool call for '{tool_name}'")
-
+                            tool_name = func_match.group(1).strip()
+                            json_str = func_match.group(2)
+                            tool_input = json.loads(json_str)
+                            print(f"🔧 Fallback (Format 1): Parsed tool call for '{tool_name}'")
                         except json.JSONDecodeError as e:
-                             print(f"⚠️ Fallback (Format 2): Failed to parse JSON: {e}")
-
-                # --- If any fallback parser succeeded, build the tool call ---
-                if tool_name and tool_input is not None and any(t.name == tool_name for t in self.tools):
-                    print(f"🔧 Fallback SUCCESS: Rebuilding tool call for '{tool_name}'")
-                    tool_call = ToolCall(
-                        name=tool_name, 
-                        args=tool_input, 
-                        id=str(uuid.uuid4())
-                    )
-                    ai_message.tool_calls = [tool_call]
-                    ai_message.content = "" # Clear content field
-                
-                elif not tool_name:
-                    print(f"⚠️ Fallback FAILED: Could not parse any tool call from content:\n{content[:200]}...")
-            # --- END OF REPLACEMENT BLOCK ---
-            # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                            print(f"⚠️ Fallback (Format 1): Failed to parse JSON: {e}")
+                            tool_name = None # Reset
+                    
+                    # 2. If Format 1 failed, try to parse bare JSON (old fallback)
+                    if not tool_name:
+                        json_match = re.search(
+                            r"```(?:json)?\s*(\{.*?\})\s*```|(\{.*?\})", 
+                            content, 
+                            re.DOTALL | re.IGNORECASE
+                        )
+                        if json_match:
+                            json_str = json_match.group(1) or json_match.group(2)
+                            try:
+                                parsed_json = json.loads(json_str)
+                                # This format is less structured; we guess tool from keys
+                                if isinstance(parsed_json, dict):
+                                    if "tool" in parsed_json and "tool_input" in parsed_json:
+                                        tool_name = parsed_json.get("tool")
+                                        tool_input = parsed_json.get("tool_input", {})
+                                    elif "code" in parsed_json: # Guess code_interpreter
+                                        tool_name = "code_interpreter"
+                                        tool_input = parsed_json
+                                    elif "answer" in parsed_json: # Guess final_answer
+                                        tool_name = "final_answer_tool"
+                                        tool_input = parsed_json
+                                    
+                                    if tool_name:
+                                        print(f"🔧 Fallback (Format 2): Parsed tool call for '{tool_name}'")
+
+                            except json.JSONDecodeError as e:
+                                print(f"⚠️ Fallback (Format 2): Failed to parse JSON: {e}")
+
+                    # --- If any fallback parser succeeded, build the tool call ---
+                    if tool_name and tool_input is not None and any(t.name == tool_name for t in self.tools):
+                        print(f"🔧 Fallback SUCCESS: Rebuilding tool call for '{tool_name}'")
+                        tool_call = ToolCall(
+                            name=tool_name, 
+                            args=tool_input, 
+                            id=str(uuid.uuid4())
+                        )
+                        ai_message.tool_calls = [tool_call]
+                        ai_message.content = "" # Clear content field
+                    
+                    elif not tool_name:
+                        print(f"⚠️ Fallback FAILED: Could not parse any tool call from content:\n{content[:200]}...")
+                # --- END OF REPLACEMENT BLOCK ---
+                # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
             # --- Logging ---