eliott/ollama-python
1
0
Fork 0
mirror of https://github.com/kharonsec/ollama-python synced 2026-04-25 15:14:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

types: allow items and defs for tools (#501)

Browse Source
This commit is contained in:
Parth Sareen
2025-04-16 13:33:51 -07:00
committed by GitHub
parent e33ceb7188
commit 65f94b4fba
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ollama/_types.py
View File

@@ -307,15 +307,19 @@ class Tool(SubscriptableBaseModel):
description: Optional[str] = None
class Parameters(SubscriptableBaseModel):
model_config = ConfigDict(populate_by_name=True)
type: Optional[Literal['object']] = 'object'
defs: Optional[Any] = Field(None, alias='$defs')
items: Optional[Any] = None
required: Optional[Sequence[str]] = None
class Property(SubscriptableBaseModel):
model_config = ConfigDict(arbitrary_types_allowed=True)
type: Optional[Union[str, Sequence[str]]] = None
items: Optional[Any] = None
description: Optional[str] = None
enum: Optional[Sequence] = None
enum: Optional[Sequence[Any]] = None
properties: Optional[Mapping[str, Property]] = None
@@ -325,6 +329,15 @@ class Tool(SubscriptableBaseModel):
class ChatRequest(BaseGenerateRequest):
@model_serializer(mode='wrap')
def serialize_model(self, nxt):
output = nxt(self)
if 'tools' in output and output['tools']:
for tool in output['tools']:
if 'function' in tool and 'parameters' in tool['function'] and 'defs' in tool['function']['parameters']:
tool['function']['parameters']['$defs'] = tool['function']['parameters'].pop('defs')
return output
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None
'Messages to chat with.'