Skip to content

Apply the Bearer token guard to AsyncClient.web_search and web_fetch #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ckarnell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply the Bearer token guard to AsyncClient.web_search and web_fetch #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ollama/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,12 @@ async def web_search(self, query: str, max_results: int = 3) -> WebSearchRespons

Returns:
WebSearchResponse with the search results
Raises:
ValueError: If OLLAMA_API_KEY environment variable is not set
"""
if not self._client.headers.get('authorization', '').startswith('Bearer '):
raise ValueError('Authorization header with Bearer token is required for web search')

return await self._request(
WebSearchResponse,
'POST',
Expand All @@ -821,7 +826,12 @@ async def web_fetch(self, url: str) -> WebFetchResponse:

Returns:
WebFetchResponse with the fetched result
Raises:
ValueError: If OLLAMA_API_KEY environment variable is not set
"""
if not self._client.headers.get('authorization', '').startswith('Bearer '):
raise ValueError('Authorization header with Bearer token is required for web fetch')

return await self._request(
WebFetchResponse,
'POST',
Expand Down
18 changes: 18 additions & 0 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,24 @@ def test_client_web_fetch_requires_bearer_auth_header(monkeypatch: pytest.Monkey
client.web_fetch('https://example.com')


async def test_async_client_web_search_requires_bearer_auth_header(monkeypatch: pytest.MonkeyPatch):
monkeypatch.delenv('OLLAMA_API_KEY', raising=False)

client = AsyncClient()

with pytest.raises(ValueError, match='Authorization header with Bearer token is required for web search'):
await client.web_search('test query')


async def test_async_client_web_fetch_requires_bearer_auth_header(monkeypatch: pytest.MonkeyPatch):
monkeypatch.delenv('OLLAMA_API_KEY', raising=False)

client = AsyncClient()

with pytest.raises(ValueError, match='Authorization header with Bearer token is required for web fetch'):
await client.web_fetch('https://example.com')


def _mock_request_web_search(self, cls, method, url, json=None, **kwargs):
assert method == 'POST'
assert url == 'https://ollama.com/api/web_search'
Expand Down