Update services/pipeline_executor.py

services/pipeline_executor.py

@@ -195,40 +195,13 @@ Execute each component by calling the corresponding tool."""
             # Add to conversation (Bedrock converse API format)
             conversation_history.append({"role": "assistant", "content": [{"text": assistant_message}]})
             
-            # Check for Final Answer
-            if "Final Answer:" in assistant_message or "final answer" in assistant_message.lower():
-                # Done!
-                if tool_results:
-                    structured_result = {
-                        "status": "completed",
-                        "components_executed": tool_results,
-                        "summary": {
-                            "total_tools_called": len(tool_results),
-                            "tools": list(tool_results.keys())
-                        },
-                        "final_output": assistant_message
-                    }
-                    
-                    yield {
-                        "type": "final",
-                        "data": structured_result,
-                        "executor": "bedrock"
-                    }
-                else:
-                    yield {
-                        "type": "error",
-                        "error": "Bedrock completed but no tools were called",
-                        "executor": "bedrock"
-                    }
-                return
-            
-            # Parse for Action and Action Input
+            # Parse for Action and Action Input FIRST (before checking Final Answer)
             action_match = re.search(r'Action:\s*(\w+)', assistant_message)
-            action_input_match = re.search(r'Action Input:\s*(\{.*?\})', assistant_message, re.DOTALL)
+            action_input_match = re.search(r'Action Input:\s*(\{.+?\})', assistant_message, re.DOTALL)
             
             if action_match and action_input_match:
                 tool_name = action_match.group(1)
-                action_input_str = action_input_match.group(1)
+                action_input_str = action_input_match.group(1).strip()
                 
                 try:
                     # Parse JSON input
@@ -265,28 +238,60 @@ Execute each component by calling the corresponding tool."""
                         observation_message = f"Observation: {observation}"
                         conversation_history.append({"role": "user", "content": [{"text": observation_message}]})
                         
+                        # Continue to next iteration to get Mistral's next action
+                        continue
+                        
                     else:
                         # Unknown tool
                         error_msg = f"Unknown tool: {tool_name}"
                         conversation_history.append({"role": "user", "content": [{"text": f"Error: {error_msg}"}]})
+                        continue
                         
                 except json.JSONDecodeError as e:
                     # Invalid JSON
                     error_msg = f"Invalid JSON in Action Input: {e}"
                     conversation_history.append({"role": "user", "content": [{"text": f"Error: {error_msg}"}]})
-            else:
-                # No action found - agent might be confused or done
-                if iteration > 0 and not has_called_tools:
-                    # Agent isn't calling tools properly
+                    continue
+            
+            # Check for Final Answer (only if no action was found)
+            if "Final Answer:" in assistant_message or "final answer" in assistant_message.lower():
+                # Done!
+                if tool_results:
+                    structured_result = {
+                        "status": "completed",
+                        "components_executed": tool_results,
+                        "summary": {
+                            "total_tools_called": len(tool_results),
+                            "tools": list(tool_results.keys())
+                        },
+                        "final_output": assistant_message
+                    }
+                    
+                    yield {
+                        "type": "final",
+                        "data": structured_result,
+                        "executor": "bedrock"
+                    }
+                else:
                     yield {
                         "type": "error",
-                        "error": "Bedrock didn't call tools in correct format. Falling back to CrewAI.",
-                        "executor": "bedrock",
-                        "debug_output": assistant_message[:500]
+                        "error": "Bedrock completed but no tools were called",
+                        "executor": "bedrock"
                     }
-                    return
-                elif iteration > 0:
-                    # Has called some tools but stopped - might be done
+                return
+            
+            # No action found - agent might be confused or done
+            if iteration > 0 and not has_called_tools:
+                # Agent isn't calling tools properly
+                yield {
+                    "type": "error",
+                    "error": "Bedrock didn't call tools in correct format. Falling back to CrewAI.",
+                    "executor": "bedrock",
+                    "debug_output": assistant_message[:500]
+                }
+                return
+            elif iteration > 0:
+                # Has called some tools but stopped - might be done
                     structured_result = {
                         "status": "completed",
                         "components_executed": tool_results,