highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-11 18:27:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

types: include the 'items' and '$defs' fields to properly handle "array" types (#10091)

Browse Source 
---------

Co-authored-by: Parth Sareen <parth.sareen@ollama.com>
This commit is contained in:
Tom Sheffler
2025-04-09 17:45:49 -07:00
committed by GitHub
parent 42ecb9f138
commit ef65174df2
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/types.go
View File

@@ -163,6 +163,7 @@ func (t *ToolCallFunctionArguments) String() string {
type Tool struct { type Tool struct {
Type string `json:"type"` Type string `json:"type"`
Items any `json:"items,omitempty"`
Function ToolFunction `json:"function"` Function ToolFunction `json:"function"`
} }
@@ -213,9 +214,12 @@ type ToolFunction struct {
Description string `json:"description"` Description string `json:"description"`
Parameters struct { Parameters struct {
Type string `json:"type"` Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"` Required []string `json:"required"`
Properties map[string]struct { Properties map[string]struct {
Type PropertyType `json:"type"` Type PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
} `json:"properties"` } `json:"properties"`

4
openai/openai_test.go
View File

@@ -281,9 +281,12 @@ func TestChatMiddleware(t *testing.T) {
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: struct {
Type string `json:"type"` Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"` Required []string `json:"required"`
Properties map[string]struct { Properties map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
} `json:"properties"` } `json:"properties"`
@@ -292,6 +295,7 @@ func TestChatMiddleware(t *testing.T) {
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]struct { Properties: map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
}{ }{

8
server/routes_generate_test.go
View File

@@ -370,9 +370,12 @@ func TestGenerateChat(t *testing.T) {
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: struct {
Type string `json:"type"` Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"` Required []string `json:"required"`
Properties map[string]struct { Properties map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
} `json:"properties"` } `json:"properties"`
@@ -381,6 +384,7 @@ func TestGenerateChat(t *testing.T) {
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]struct { Properties: map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
}{ }{
@@ -467,9 +471,12 @@ func TestGenerateChat(t *testing.T) {
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: struct {
Type string `json:"type"` Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"` Required []string `json:"required"`
Properties map[string]struct { Properties map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
} `json:"properties"` } `json:"properties"`
@@ -478,6 +485,7 @@ func TestGenerateChat(t *testing.T) {
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]struct { Properties: map[string]struct {
Type api.PropertyType `json:"type"` Type api.PropertyType `json:"type"`
Items any `json:"items,omitempty"`
Description string `json:"description"` Description string `json:"description"`
Enum []any `json:"enum,omitempty"` Enum []any `json:"enum,omitempty"`
}{ }{