Skip to content

Fix get() fallback for unset model fields #704

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
PEliet wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Fix get() fallback for unset model fields #704

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
2 changes: 1 addition & 1 deletion ollama/_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def get(self, key: str, default: Any = None) -> Any:
>>> msg.get('tool_calls')[0]['function']['name']
'foo'
"""
return getattr(self, key) if hasattr(self, key) else default
return getattr(self, key) if key in self else default


class Options(SubscriptableBaseModel):
Expand Down
14 changes: 13 additions & 1 deletion tests/test_type_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@

import pytest

from ollama._types import CreateRequest, Image
from ollama._types import CreateRequest, Image, Message


def test_subscriptable_model_get_returns_default_for_unset_field():
message = Message(role='user')

assert 'content' not in message
assert message.get('content', 'fallback') == 'fallback'

message.content = None

assert 'content' in message
assert message.get('content', 'fallback') is None


def test_image_serialization_bytes():
Expand Down