github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-23 22:21:55 -05:00
Code Issues 16.9k Packages Projects Releases 122 Wiki Activity

[PR #11705] [MERGED] tools: support anyOf types #44856

New Issue
Closed
opened 2026-04-25 00:32:01 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-25 00:32:01 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/11705
Author: @drifkin
Created: 8/5/2025
Status: ✅ Merged
Merged: 8/6/2025
Merged by: @drifkin

Base: main ← Head: drifkin/fn-schema

📝 Commits (1)

  • 30f8a68 tools: support anyOf types

📊 Changes

7 files changed (+264 additions, -154 deletions)

View changed files

📝 api/types.go (+58 -10)
➕ api/types_typescript_test.go (+142 -0)
📝 openai/openai_test.go (+6 -16)
📝 server/routes_generate_test.go (+12 -32)
📝 server/routes_harmony_streaming_test.go (+12 -32)
📝 template/template.go (+10 -0)
📝 tools/tools_test.go (+24 -64)

📄 Description

afaik gpt-oss is the first model that meaningfully transforms tool function definitions in its template. We found that relatively common definitions that include anyOf were not working because the template was assuming that types were always defined via a type field.

anyOf allows for fully recursive types, so I exposed a toTypeScriptType() function to handle this recursive logic in go and keep the templates cleaner. The gpt-oss templates will need to be updated to use this.

We should keep building out our function definition support to more fully support the parts of json schema that make sense for this use case, but in the meantime this will unblock some users (e.g., zed's ollama integration w/ gpt-oss). Probably the most urgent is proper array support

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/11705 **Author:** [@drifkin](https://github.com/drifkin) **Created:** 8/5/2025 **Status:** ✅ Merged **Merged:** 8/6/2025 **Merged by:** [@drifkin](https://github.com/drifkin) **Base:** `main` ← **Head:** `drifkin/fn-schema` --- ### 📝 Commits (1) - [`30f8a68`](https://github.com/ollama/ollama/commit/30f8a68c4cc55e0f3a717b891931847c97190843) tools: support anyOf types ### 📊 Changes **7 files changed** (+264 additions, -154 deletions) <details> <summary>View changed files</summary> 📝 `api/types.go` (+58 -10) ➕ `api/types_typescript_test.go` (+142 -0) 📝 `openai/openai_test.go` (+6 -16) 📝 `server/routes_generate_test.go` (+12 -32) 📝 `server/routes_harmony_streaming_test.go` (+12 -32) 📝 `template/template.go` (+10 -0) 📝 `tools/tools_test.go` (+24 -64) </details> ### 📄 Description afaik gpt-oss is the first model that meaningfully transforms tool function definitions in its template. We found that relatively common definitions that include `anyOf` were not working because the template was assuming that types were always defined via a `type` field. anyOf allows for fully recursive types, so I exposed a `toTypeScriptType()` function to handle this recursive logic in go and keep the templates cleaner. The gpt-oss templates will need to be updated to use this. We should keep building out our function definition support to more fully support the parts of json schema that make sense for this use case, but in the meantime this will unblock some users (e.g., zed's ollama integration w/ gpt-oss). Probably the most urgent is proper array support --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-25 00:32:01 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#44856
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?