Skip to content

Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.

fix(llm): stop putting format/stream inside Ollama options

Burak Keskin1b2f2bb4f5a4
diff --git a/browser_use/llm/ollama/chat.py b/browser_use/llm/ollama/chat.py
index 0d592d448..bbec7030a 100644
--- a/browser_use/llm/ollama/chat.py
+++ b/browser_use/llm/ollama/chat.py
@@ -1,3 +1,4 @@
+import logging
from collections.abc import Mapping
from dataclasses import dataclass
from typing import Any, TypeVar, overload
@@ -5,7 +6,7 @@ from typing import Any, TypeVar, overload
import httpx
from ollama import AsyncClient as OllamaAsyncClient
from ollama import Options
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
from browser_use.llm.base import BaseChatModel
from browser_use.llm.exceptions import ModelProviderError
@@ -14,6 +15,20 @@ from browser_use.llm.ollama.serializer import OllamaMessageSerializer
from browser_use.llm.views import ChatInvokeCompletion
T = TypeVar('T', bound=BaseModel)
+logger = logging.getLogger(__name__)
+
+# These belong on AsyncClient.chat(), not in the model `options` dict.
+_TOP_LEVEL_CHAT_KEYS = frozenset({'format', 'stream'})
+
+
+def _unwrap_json_content(content: str) -> str:
+ """Strip markdown code fences that Ollama vision models often wrap around JSON."""
+ text = content.strip()
+ if text.startswith('```json') and text.endswith('```'):
+ return text[7:-3].strip()
+ if text.startswith('```') and text.endswith('```'):
+ return text[3:-3].strip()
+ return text
@dataclass
@@ -57,6 +72,27 @@ class ChatOllama(BaseChatModel):
def name(self) -> str:
return self.model
+ def _chat_options(self) -> Mapping[str, Any] | Options | None:
+ """Return ollama_options with top-level chat keys removed.
+
+ `format` and `stream` are parameters of `AsyncClient.chat()`, not model
+ runtime options. Putting them in `ollama_options` is ignored or fights
+ the structured-output schema we already pass as `format=`.
+ """
+ options = self.ollama_options
+ if not options or not isinstance(options, Mapping):
+ return options
+
+ dropped = sorted(key for key in options if key in _TOP_LEVEL_CHAT_KEYS)
+ if not dropped:
+ return options
+
+ logger.warning(
+ 'Ignoring %s in ollama_options; those are top-level chat() parameters, not model options',
+ ', '.join(dropped),
+ )
+ return {key: value for key, value in options.items() if key not in _TOP_LEVEL_CHAT_KEYS}
+
@overload
async def ainvoke(
self, messages: list[BaseMessage], output_format: None = None, **kwargs: Any
@@ -71,29 +107,36 @@ class ChatOllama(BaseChatModel):
ollama_messages = OllamaMessageSerializer.serialize_messages(messages)
try:
+ options = self._chat_options()
if output_format is None:
response = await self.get_client().chat(
model=self.model,
messages=ollama_messages,
- options=self.ollama_options,
+ options=options,
)
return ChatInvokeCompletion(completion=response.message.content or '', usage=None)
- else:
- schema = output_format.model_json_schema()
-
- response = await self.get_client().chat(
- model=self.model,
- messages=ollama_messages,
- format=schema,
- options=self.ollama_options,
- )
-
- completion = response.message.content or ''
- if output_format is not None:
- completion = output_format.model_validate_json(completion)
-
- return ChatInvokeCompletion(completion=completion, usage=None)
+ schema = output_format.model_json_schema()
+ response = await self.get_client().chat(
+ model=self.model,
+ messages=ollama_messages,
+ format=schema,
+ options=options,
+ )
+
+ completion = _unwrap_json_content(response.message.content or '')
+ try:
+ parsed = output_format.model_validate_json(completion)
+ except ValidationError as e:
+ raise ModelProviderError(
+ message=f'Ollama returned invalid JSON for structured output: {e}',
+ model=self.name,
+ ) from e
+
+ return ChatInvokeCompletion(completion=parsed, usage=None)
+
+ except ModelProviderError:
+ raise
except Exception as e:
raise ModelProviderError(message=str(e), model=self.name) from e
diff --git a/tests/ci/models/test_llm_ollama.py b/tests/ci/models/test_llm_ollama.py
new file mode 100644
index 000000000..d82c3e045
--- /dev/null
+++ b/tests/ci/models/test_llm_ollama.py
@@ -0,0 +1,57 @@
+"""Tests for ChatOllama option handling and structured-output parsing."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from pydantic import BaseModel
+
+from browser_use.llm.exceptions import ModelProviderError
+from browser_use.llm.messages import UserMessage
+from browser_use.llm.ollama.chat import ChatOllama
+
+
+class Answer(BaseModel):
+ answer: str
+
+
+def _client_returning(content: str) -> MagicMock:
+ client = MagicMock()
+ client.chat = AsyncMock(return_value=MagicMock(message=MagicMock(content=content)))
+ return client
+
+
+async def test_drops_format_and_stream_from_ollama_options():
+ """format/stream belong on chat(), not inside options (#5017)."""
+ client = _client_returning('{"answer": "ok"}')
+ llm = ChatOllama(
+ model='test-model',
+ ollama_options={'think': False, 'format': 'json', 'stream': False, 'num_ctx': 2048},
+ )
+
+ with patch.object(ChatOllama, 'get_client', return_value=client):
+ result = await llm.ainvoke([UserMessage(content='hi')], output_format=Answer)
+
+ assert result.completion.answer == 'ok'
+ kwargs = client.chat.await_args.kwargs
+ assert kwargs['options'] == {'think': False, 'num_ctx': 2048}
+ assert kwargs['format'] == Answer.model_json_schema()
+
+
+async def test_parses_json_wrapped_in_markdown_fences():
+ client = _client_returning('```json\n{"answer": "ok"}\n```')
+ llm = ChatOllama(model='test-model')
+
+ with patch.object(ChatOllama, 'get_client', return_value=client):
+ result = await llm.ainvoke([UserMessage(content='hi')], output_format=Answer)
+
+ assert result.completion.answer == 'ok'
+
+
+async def test_truncated_json_raises_model_provider_error():
+ client = _client_returning('{\n')
+ llm = ChatOllama(model='test-model')
+
+ with patch.object(ChatOllama, 'get_client', return_value=client), pytest.raises(ModelProviderError) as exc_info:
+ await llm.ainvoke([UserMessage(content='hi')], output_format=Answer)
+
+ assert 'Invalid JSON' in exc_info.value.message or 'invalid JSON' in exc_info.value.message.lower()