types: allow items and defs for tools

[ParthSareen]

ff for: ollama/ollama#10091

[sheffler]

Glad to see you working on the python client. FYI In my testing, to get it to emit the field named "$defs" (it has an alias) in file _client.py I needed to change the model_dump() to include by_alias=True

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, by_alias=True),
      stream=stream,
    )

[ParthSareen]

Glad to see you working on the python client. FYI In my testing, to get it to emit the field named "$defs" (it has an alias) in file _client.py I needed to change the model_dump() to include by_alias=True

I'll give that a look - didn't test thoroughly yet but initial test looked fine. Thanks for the heads up!

[sheffler]

Hi Parth -
I've been watching this and trying out your change. It didn't pass through "$defs" for me. However, I followed your lead and found a way to keep the changes local instead of requiring a change to the top level.

However, it requires Pydantic >=2.11.0, and that may not be acceptable to the project.

Here is the code that worked for me.

class Tool(SubscriptableBaseModel):
  type: Optional[Literal['function']] = 'function'

  class Function(SubscriptableBaseModel):
    name: Optional[str] = None
    description: Optional[str] = None

    class Parameters(SubscriptableBaseModel):
      model_config = ConfigDict(serialize_by_alias=True)

      type: Optional[Literal['object']] = 'object'
      required: Optional[Sequence[str]] = None
      defs: Optional[Any] = Field(None, alias="$defs")

      class Property(SubscriptableBaseModel):
        model_config = ConfigDict(arbitrary_types_allowed=True)

        type: Optional[str] = None
        description: Optional[str] = None
        items: Optional[Dict[str, Any]] = None

      properties: Optional[Mapping[str, Property]] = None

    parameters: Optional[Parameters] = None

  function: Optional[Function] = None

With this change, "oterm" was able to pass through the complex json schema with the $defs clause.

[ParthSareen]

@sheffler trying something similar to what we do already want to give this branch another shot?

[sheffler]

will try it out tomorrow.

[sheffler]

Done! I performed a test using oterm with an MCP Tool that has a $defs clause in the JSON Schema. It worked and the $defs clause was passed through correctly.

😃

[ParthSareen]

Awesome! thanks for the double check @sheffler!

[ParthSareen]

this is the same pattern as the create request