Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion ollama/_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ class ShowRequest(BaseRequest):


class ShowResponse(SubscriptableBaseModel):
model_config = ConfigDict(populate_by_name=True)

modified_at: Optional[datetime] = None

template: Optional[str] = None
Expand All @@ -572,7 +574,7 @@ class ShowResponse(SubscriptableBaseModel):

details: Optional[ModelDetails] = None

modelinfo: Optional[Mapping[str, Any]] = Field(alias='model_info')
modelinfo: Optional[Mapping[str, Any]] = Field(default=None, alias='model_info')

parameters: Optional[str] = None

Expand Down
32 changes: 32 additions & 0 deletions tests/test_type_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,35 @@ def test_create_request_serialization_license_list():
request = CreateRequest(model='test-model', license=['MIT', 'Apache-2.0'])
serialized = request.model_dump()
assert serialized['license'] == ['MIT', 'Apache-2.0']


def test_show_response_without_model_info():
"""ShowResponse should accept responses that omit model_info (e.g. cloud models).

Regression test for https://github.com/ollama/ollama-python/issues/607
"""
from ollama._types import ShowResponse

# model_info completely absent from response
resp = ShowResponse()
assert resp.modelinfo is None

resp = ShowResponse(template='{{ .Prompt }}')
assert resp.modelinfo is None
assert resp.template == '{{ .Prompt }}'


def test_show_response_with_model_info_alias():
"""ShowResponse should accept model_info via its alias."""
from ollama._types import ShowResponse

resp = ShowResponse(model_info={'general.architecture': 'llama'})
assert resp.modelinfo == {'general.architecture': 'llama'}


def test_show_response_with_modelinfo_field_name():
"""ShowResponse should accept modelinfo via its Python field name."""
from ollama._types import ShowResponse

resp = ShowResponse(modelinfo={'general.architecture': 'llama'})
assert resp.modelinfo == {'general.architecture': 'llama'}