Update app.py

app.py

@@ -1196,68 +1196,64 @@ tavily_tool = TavilySearchResults(
     search_depth="advanced",
     days=1,
     include_answer=True,
+    include_images=True,
     include_raw_content=True,
     exclude_domains=['example.com'],
 )
 
-def validate_tavily_results(query):
-    """
-    Fetch and validate results from TavilySearchResults.
-    Ensures that results do not lead to 'Page Not Found' pages.
-    """
-    # Use the Tavily tool to fetch results
-    results = tavily_tool.run(query)  # Pass the query as tool_input to the Tavily tool
-
-    # Check if results are in expected format (list of dicts). Adjust if necessary.
-    if isinstance(results, str):
-        # If results are returned as a string, parse them into a structured format
-        # For example, if results are JSON-formatted strings
-        import json
-        try:
-            results = json.loads(results)
-        except json.JSONDecodeError:
-            # If parsing fails, split by newlines assuming URLs are separated by lines
-            results = [{"title": f"Result {i+1}", "url": url.strip()} for i, url in enumerate(results.splitlines())]
+# def validate_tavily_results(query):
+#     """
+#     Fetch and validate results from TavilySearchResults.
+#     Ensures that results do not lead to 'Page Not Found' pages.
+#     """
+#     # Use the Tavily tool to fetch results
+#     results = tavily_tool.run(query)  # Pass the query as tool_input to the Tavily tool
 
-    valid_results = []
+#     # Check if results are in expected format (list of dicts). Adjust if necessary.
+#     if isinstance(results, str):
+#         # If results are returned as a string, parse them into a structured format
+#         # For example, if results are JSON-formatted strings
+#         import json
+#         try:
+#             results = json.loads(results)
+#         except json.JSONDecodeError:
+#             # If parsing fails, split by newlines assuming URLs are separated by lines
+#             results = [{"title": f"Result {i+1}", "url": url.strip()} for i, url in enumerate(results.splitlines())]
 
-    for result in results:
-        url = result.get("url")
-        if not url:
-            continue
+#     valid_results = []
 
-        try:
-            # Fetch page content
-            response = requests.get(url, timeout=10)
-            if response.status_code != 200:
-                continue
+#     for result in results:
+#         url = result.get("url")
+#         if not url:
+#             continue
 
-            # Parse page content to check for "Page Not Found"
-            soup = BeautifulSoup(response.content, "html.parser")
-            page_text = soup.get_text(separator=' ', strip=True)
+#         try:
+#             # Fetch page content
+#             response = requests.get(url, timeout=10)
+#             if response.status_code != 200:
+#                 continue
 
-            # Common markers of "Page Not Found"
-            if any(marker.lower() in page_text.lower() for marker in ["Page Not Found", "404", "Error", "Not Available"]):
-                continue
+#             # Parse page content to check for "Page Not Found"
+#             soup = BeautifulSoup(response.content, "html.parser")
+#             page_text = soup.get_text(separator=' ', strip=True)
 
-            # Add valid result
-            valid_results.append(result)
+#             # Common markers of "Page Not Found"
+#             if any(marker.lower() in page_text.lower() for marker in ["Page Not Found", "404", "Error", "Not Available"]):
+#                 continue
 
-        except requests.RequestException:
-            continue
+#             # Add valid result
+#             valid_results.append(result)
 
-    return valid_results
+#         except requests.RequestException:
+#             continue
 
-# Define a custom tool for Tavily
-def tavily_tool_with_validation(query):
-    valid_results = validate_tavily_results(query)
-    return "\n".join([f"{res.get('title')}: {res.get('url')}" for res in valid_results])
+#     return valid_results
 
 
 #Compile all tool functions into a list
 tools = [
     knowledge_base_tool,  # Tool for querying the knowledge base and retrieving responses
-    google_search_tool,
+    tavily_tool,
     #google_search_tool,  # Tool for performing a Google search and retrieving search result snippets
 ]