fix: improved browser tool search output, if python tool had result then skip stdout in msg

Author: ErikBjare

gptme/tools/_browser_playwright.py

@@ -121,11 +121,20 @@ def _list_clickable_elements(page, selector=None) -> list[Element]:
     return elements
 
 
-def titleurl_to_list(results: list[tuple[str, str]]) -> str:
-    s = "```results"
-    for i, (title, url) in enumerate(results):
-        s += f"\n{i+1}. {title} ({url})"
-    return s + "\n```"
+@dataclass
+class SearchResult:
+    title: str
+    url: str
+    description: str | None = None
+
+
+def titleurl_to_list(results: list[SearchResult]) -> str:
+    s = ""
+    for i, r in enumerate(results):
+        s += f"\n{i + 1}. {r.title} ({r.url})"
+        if r.description:
+            s += f"\n   {r.description}"
+    return s.strip()
 
 
 def _list_results_google(page) -> str:
@@ -141,8 +150,11 @@ def _list_results_google(page) -> str:
         h3 = result.query_selector("h3")
         if h3:
             title = h3.inner_text()
-            result.query_selector("span").inner_text()
-            hits.append((title, url))
+            # desc has data-sncf attribute
+            desc = (
+                result.query_selector("[data-sncf]").inner_text().strip().split("\n")[0]
+            )
+            hits.append(SearchResult(title, url, desc))
     return titleurl_to_list(hits)
 
 
@@ -163,6 +175,6 @@ def _list_results_duckduckgo(page) -> str:
         h2 = result.query_selector("h2")
         if h2:
             title = h2.inner_text()
-            result.query_selector("span").inner_text()
-            hits.append((title, url))
+            desc = result.query_selector("span").inner_text().strip().split("\n")[0]
+            hits.append(SearchResult(title, url, desc))
     return titleurl_to_list(hits)

gptme/tools/python.py

@@ -114,25 +114,20 @@ def execute_python(code: str, ask: bool, args=None) -> Generator[Message, None,
         result = _ipython.run_cell(code, silent=False, store_history=False)
 
     output = ""
-    if captured.stdout:
-        # remove one occurrence of the result if present, to avoid repeating the result in the output
-        stdout = (
-            captured.stdout.replace(str(result.result), "", 1)
-            if result.result
-            else captured.stdout
-        )
-        if stdout:
-            output += f"\n```stdout\n{stdout.rstrip()}\n```\n\n"
+    if result.result is not None:
+        output += f"Result:\n```\n{result.result}\n```\n\n"
+    # only show stdout if there is no result
+    elif captured.stdout:
+        output += f"```stdout\n{captured.stdout.rstrip()}\n```\n\n"
+
     if captured.stderr:
-        output += f"stderr:\n```\n{captured.stderr.rstrip()}\n```\n\n"
+        output += f"```stderr\n{captured.stderr.rstrip()}\n```\n\n"
     if result.error_in_exec:
         tb = result.error_in_exec.__traceback__
         while tb.tb_next:  # type: ignore
             tb = tb.tb_next  # type: ignore
         # type: ignore
         output += f"Exception during execution on line {tb.tb_lineno}:\n  {result.error_in_exec.__class__.__name__}: {result.error_in_exec}"
-    if result.result is not None:
-        output += f"Result:\n```\n{result.result}\n```\n\n"
 
     # strip ANSI escape sequences
     # TODO: better to signal to the terminal that we don't want colors?