client/types: update web search and fetch API (#584)

---------

Co-authored-by: ParthSareen <[email protected]>

examples/web-search-crawl.py

@@ -9,56 +9,47 @@ from typing import Union
 
 from rich import print
 
-from ollama import WebCrawlResponse, WebSearchResponse, chat, web_crawl, web_search
+from ollama import WebFetchResponse, WebSearchResponse, chat, web_fetch, web_search
 
 
-def format_tool_results(results: Union[WebSearchResponse, WebCrawlResponse]):
+def format_tool_results(
+  results: Union[WebSearchResponse, WebFetchResponse],
+  user_search: str,
+):
+  output = []
   if isinstance(results, WebSearchResponse):
-    if not results.success:
-      error_msg = ', '.join(results.errors) if results.errors else 'Unknown error'
-      return f'Web search failed: {error_msg}'
-
-    output = []
-    for query, search_results in results.results.items():
-      output.append(f'Search results for "{query}":')
-      for i, result in enumerate(search_results, 1):
-        output.append(f'{i}. {result.title}')
-        output.append(f'   URL: {result.url}')
-        output.append(f'   Content: {result.content}')
-        output.append('')
-
+    output.append(f'Search results for "{user_search}":')
+    for result in results.results:
+      output.append(f'{result.title}' if result.title else f'{result.content}')
+      output.append(f'   URL: {result.url}')
+      output.append(f'   Content: {result.content}')
+      output.append('')
     return '\n'.join(output).rstrip()
 
-  elif isinstance(results, WebCrawlResponse):
-    if not results.success:
-      error_msg = ', '.join(results.errors) if results.errors else 'Unknown error'
-      return f'Web crawl failed: {error_msg}'
-
-    output = []
-    for url, crawl_results in results.results.items():
-      output.append(f'Crawl results for "{url}":')
-      for i, result in enumerate(crawl_results, 1):
-        output.append(f'{i}. {result.title}')
-        output.append(f'   URL: {result.url}')
-        output.append(f'   Content: {result.content}')
-        if result.links:
-          output.append(f'   Links: {", ".join(result.links)}')
-        output.append('')
-
+  elif isinstance(results, WebFetchResponse):
+    output.append(f'Fetch results for "{user_search}":')
+    output.extend(
+      [
+        f'Title: {results.title}',
+        f'URL: {user_search}' if user_search else '',
+        f'Content: {results.content}',
+      ]
+    )
+    if results.links:
+      output.append(f'Links: {", ".join(results.links)}')
+    output.append('')
     return '\n'.join(output).rstrip()
 
 
-# Set OLLAMA_API_KEY in the environment variable or use the headers parameter to set the authorization header
-# client = Client(headers={'Authorization': 'Bearer <OLLAMA_API_KEY>'})
+# client = Client(headers={'Authorization': f"Bearer {os.getenv('OLLAMA_API_KEY')}"} if api_key else None)
+available_tools = {'web_search': web_search, 'web_fetch': web_fetch}
 
-available_tools = {'web_search': web_search, 'web_crawl': web_crawl}
-
-query = "ollama's new engine"
+query = "what is ollama's new engine"
 print('Query: ', query)
 
 messages = [{'role': 'user', 'content': query}]
 while True:
-  response = chat(model='qwen3', messages=messages, tools=[web_search, web_crawl], think=True)
+  response = chat(model='qwen3', messages=messages, tools=[web_search, web_fetch], think=True)
   if response.message.thinking:
     print('Thinking: ')
     print(response.message.thinking + '\n\n')
@@ -72,12 +63,20 @@ while True:
     for tool_call in response.message.tool_calls:
       function_to_call = available_tools.get(tool_call.function.name)
       if function_to_call:
-        result: WebSearchResponse | WebCrawlResponse = function_to_call(**tool_call.function.arguments)
-        print('Result from tool call name: ', tool_call.function.name, 'with arguments: ', tool_call.function.arguments)
-        print('Result: ', format_tool_results(result)[:200])
+        args = tool_call.function.arguments
+        result: Union[WebSearchResponse, WebFetchResponse] = function_to_call(**args)
+        print('Result from tool call name:', tool_call.function.name, 'with arguments:')
+        print(args)
+        print()
+
+        user_search = args.get('query', '') or args.get('url', '')
+        formatted_tool_results = format_tool_results(result, user_search=user_search)
+
+        print(formatted_tool_results[:300])
+        print()
 
         # caps the result at ~2000 tokens
-        messages.append({'role': 'tool', 'content': format_tool_results(result)[: 2000 * 4], 'tool_name': tool_call.function.name})
+        messages.append({'role': 'tool', 'content': formatted_tool_results[: 2000 * 4], 'tool_name': tool_call.function.name})
       else:
         print(f'Tool {tool_call.function.name} not found')
         messages.append({'role': 'tool', 'content': f'Tool {tool_call.function.name} not found', 'tool_name': tool_call.function.name})