updates

app.py

@@ -5,7 +5,7 @@ import gradio as gr
 import pandas as pd
 import requests
 # Additional libraries
-from langchain_core.messages import HumanMessage
+from langchain_core.messages import AIMessage, HumanMessage
 
 from agent import build_graph
 
@@ -54,7 +54,35 @@ class BasicAgent:
         # The answer is expected to be in the 'content' of the last message.
         answer = response_messages['messages'][-1].content
         print(f"Agent full response: {answer}")
-        return answer
+
+        final_answer = ""
+        if not messages:
+            print(f"No messages found in the result state for task {task_id}.")
+            return "AGENT ERROR: No messages returned by the agent."
+
+        for msg in reversed(messages):
+            if hasattr(msg, "content") and msg.content:
+                content = msg.content
+                if isinstance(content, str):
+                    if "FINAL ANSWER:" in content:
+                        final_answer = content.split("FINAL ANSWER:", 1)[1].strip()
+                        break 
+                    elif isinstance(msg, AIMessage):
+                        # If it's an AIMessage and no "FINAL ANSWER:" has been found yet,
+                        # tentatively set it. This will be overridden if a "FINAL ANSWER:" is found later.
+                        if not final_answer: 
+                            final_answer = content
+        
+        # If after checking all messages, final_answer is still from a non-"FINAL ANSWER:" AIMessage, that's our best guess.
+        # If final_answer is empty, it means no AIMessage with content or "FINAL ANSWER:" was found.
+        if not final_answer: # This means no "FINAL ANSWER:" and no AIMessage content was suitable
+            final_answer = "AGENT ERROR: Could not extract a final answer from the agent's messages."
+            print(f"Could not extract final answer for task {task_id}. Messages: {messages}")
+
+        print(f"FinalAgent returning answer for task_id '{task_id}': {final_answer[:100]}...")
+        return final_answer
+
+#        return answer
         
 
 

tools.py

@@ -10,12 +10,12 @@ import pandas
 import pytz
 import torch
 from bs4 import BeautifulSoup
-from langchain.schema import HumanMessage
 from langchain_community.document_loaders import (
     ArxivLoader, AssemblyAIAudioTranscriptLoader, WikipediaLoader)
 from langchain_community.document_loaders.generic import GenericLoader
 from langchain_community.document_loaders.parsers import LanguageParser
-from langchain_community.tools import DuckDuckGoSearchRun
+from langchain_core.messages import HumanMessage
+# from langchain_community.tools import DuckDuckGoSearchRun
 from langchain_core.tools import tool
 from langchain_google_genai import ChatGoogleGenerativeAI
 from langchain_tavily import TavilySearch