types: allow allow single or multiple types tool property

Author: ParthSareen

ollama/_client.py

@@ -1,5 +1,6 @@
 import ipaddress
 import json
+from rich import print
 import os
 import platform
 import sys
@@ -330,19 +331,21 @@ def add_two_numbers(a: int, b: int) -> int:
 
     Returns `ChatResponse` if `stream` is `False`, otherwise returns a `ChatResponse` generator.
     """
+    request_data = ChatRequest(
+      model=model,
+      messages=[message for message in _copy_messages(messages)],
+      tools=[tool for tool in _copy_tools(tools)],
+      stream=stream,
+      format=format,
+      options=options,
+      keep_alive=keep_alive,
+    ).model_dump(exclude_none=True)
+    print('Sending chat request to Ollama API:', request_data)
     return self._request(
       ChatResponse,
       'POST',
       '/api/chat',
-      json=ChatRequest(
-        model=model,
-        messages=[message for message in _copy_messages(messages)],
-        tools=[tool for tool in _copy_tools(tools)],
-        stream=stream,
-        format=format,
-        options=options,
-        keep_alive=keep_alive,
-      ).model_dump(exclude_none=True),
+      json=request_data,
       stream=stream,
     )
 

ollama/_types.py

@@ -313,7 +313,7 @@ class Parameters(SubscriptableBaseModel):
       class Property(SubscriptableBaseModel):
         model_config = ConfigDict(arbitrary_types_allowed=True)
 
-        type: Optional[str] = None
+        type: Optional[Union[str, Sequence[str]]] = None
         description: Optional[str] = None
 
       properties: Optional[Mapping[str, Property]] = None

tests/test_client.py

@@ -1139,7 +1139,7 @@ def func2(y: str) -> int:
       'description': 'Test function',
       'parameters': {
         'type': 'object',
-        'properties': {'x': {'type': 'string', 'description': 'A string'}},
+        'properties': {'x': {'type': 'string', 'description': 'A string', 'enum': ['a', 'b', 'c']}, 'y': {'type': ['integer', 'number'], 'description': 'An integer'}},
         'required': ['x'],
       },
     },