client/types: update web search and fetch API#584
Merged
ParthSareen merged 12 commits intomainfrom Sep 23, 2025
Merged
Conversation
npardal
requested review from
ParthSareen
and removed request for
ParthSareen
npardal
changed the title
ParthSareen
reviewed
Sep 23, 2025
examples/web-search-crawl.py
Outdated
Comment on lines
+23
to
+24
| 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}') | ||
| if isinstance(results.results, dict): |
Member
There was a problem hiding this comment.
Why are we matching this on results.results?
| *, | ||
| query: Optional[str] = None, | ||
| url: Optional[str] = None, | ||
| ): |
Member
There was a problem hiding this comment.
Instead of two optionals, just have query and make it mandatory to call the function
Member
There was a problem hiding this comment.
let's actually just remove these - the model should have context from the attached message - we can just focus on the result
examples/web-search-crawl.py
Outdated
Comment on lines
+25
to
+44
| for q, search_results in results.results.items(): | ||
| output.append(f'Search results for "{q}":') | ||
| for i, result in enumerate(search_results, 1): | ||
| title = getattr(result, 'title', None) | ||
| url_value = getattr(result, 'url', None) | ||
| output.append(f'{i}. {title}' if title else f'{i}. {getattr(result, "content", "")}') | ||
| if url_value: | ||
| output.append(f' URL: {url_value}') | ||
| output.append(f' Content: {getattr(result, "content", "")}') | ||
| output.append('') | ||
| else: | ||
| if query: | ||
| output.append(f'Search results for "{query}":') | ||
| for i, result in enumerate(results.results, 1): | ||
| title = getattr(result, 'title', None) | ||
| url_value = getattr(result, 'url', None) | ||
| output.append(f'{i}. {title}' if title else f'{i}. {getattr(result, "content", "")}') | ||
| if url_value: | ||
| output.append(f' URL: {url_value}') | ||
| output.append(f' Content: {getattr(result, "content", "")}') |
Member
There was a problem hiding this comment.
I don't think this is necessary, you can directly assign from the type like earlier as long as you are matching on the right type
examples/web-search-crawl.py
Outdated
Comment on lines
+89
to
+100
| 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: ', args) | ||
|
|
||
| if tool_call.function.name == 'web_search': | ||
| formatted = format_tool_results(result, query=args.get('query')) | ||
| elif tool_call.function.name == 'web_fetch': | ||
| formatted = format_tool_results(result, url=args.get('url')) | ||
| else: | ||
| formatted = format_tool_results(result) | ||
|
|
||
| print('Result: ', formatted[:200]) |
Member
There was a problem hiding this comment.
Can we keep this change minimal like before?
examples/web-search-crawl.py
Outdated
|
|
||
| # 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[: 2000 * 4], 'tool_name': tool_call.function.name}) |
Member
There was a problem hiding this comment.
naming to formatted_tool_results or something alike
ollama/_client.py
Outdated
| return cls(**(await self._request_raw(*args, **kwargs)).json()) | ||
|
|
||
| async def websearch(self, queries: Sequence[str], max_results: int = 3) -> WebSearchResponse: | ||
| async def websearch(self, query: str, max_results: int = 3) -> WebSearchResponse: |
Member
There was a problem hiding this comment.
didn't realize i didn't update the naming for these. should be web_search
ollama/_client.py
Outdated
| ) | ||
|
|
||
| async def webcrawl(self, urls: Sequence[str]) -> WebCrawlResponse: | ||
| async def webfetch(self, url: str) -> WebFetchResponse: |
Member
There was a problem hiding this comment.
Suggested change
| async def webfetch(self, url: str) -> WebFetchResponse: | |
| async def web_fetch(self, url: str) -> WebFetchResponse: |
npardal
force-pushed
the
nicole/shape-update
branch
from
18b415d to
81c71ba
Compare
ParthSareen
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
updated shapes of web_search and web_fetch to reflect go version