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

fix tests

Browse Source
This commit is contained in:
jmorganca
2025-11-06 13:49:17 -08:00
parent 0a84939c11
commit fed3665c70
4 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
middleware/openai_test.go
View File

@@ -484,13 +484,7 @@ func TestChatMiddleware(t *testing.T) {
Function: api.ToolFunction{ Function: api.ToolFunction{
Name: "get_weather", Name: "get_weather",
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: api.ToolFunctionParameters{
Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"`
Properties map[string]api.ToolProperty `json:"properties"`
}{
Type: "object", Type: "object",
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]api.ToolProperty{ Properties: map[string]api.ToolProperty{

2
server/routes_debug_test.go
View File

@@ -363,7 +363,7 @@ func TestChatDebugRenderOnly(t *testing.T) {
DebugRenderOnly: true, DebugRenderOnly: true,
}, },
expectDebug: true, expectDebug: true,
expectTemplate: "[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get weather information\",\"parameters\":{\"type\":\"\",\"required\":null,\"properties\":null}}}]user: Get the weather\n", expectTemplate: "[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get weather information\",\"parameters\":{\"type\":\"\",\"properties\":null}}}]user: Get the weather\n",
}, },
} }

16
server/routes_generate_test.go
View File

@@ -485,13 +485,7 @@ func TestGenerateChat(t *testing.T) {
Function: api.ToolFunction{ Function: api.ToolFunction{
Name: "get_weather", Name: "get_weather",
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: api.ToolFunctionParameters{
Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"`
Properties map[string]api.ToolProperty `json:"properties"`
}{
Type: "object", Type: "object",
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]api.ToolProperty{ Properties: map[string]api.ToolProperty{
@@ -585,13 +579,7 @@ func TestGenerateChat(t *testing.T) {
Function: api.ToolFunction{ Function: api.ToolFunction{
Name: "get_weather", Name: "get_weather",
Description: "Get the current weather", Description: "Get the current weather",
Parameters: struct { Parameters: api.ToolFunctionParameters{
Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"`
Properties map[string]api.ToolProperty `json:"properties"`
}{
Type: "object", Type: "object",
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]api.ToolProperty{ Properties: map[string]api.ToolProperty{

16
server/routes_harmony_streaming_test.go
View File

@@ -26,13 +26,7 @@ func getTestTools() []api.Tool {
Function: api.ToolFunction{ Function: api.ToolFunction{
Name: "get_weather", Name: "get_weather",
Description: "Get the current weather in a given location", Description: "Get the current weather in a given location",
Parameters: struct { Parameters: api.ToolFunctionParameters{
Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"`
Properties map[string]api.ToolProperty `json:"properties"`
}{
Type: "object", Type: "object",
Required: []string{"location"}, Required: []string{"location"},
Properties: map[string]api.ToolProperty{ Properties: map[string]api.ToolProperty{
@@ -49,13 +43,7 @@ func getTestTools() []api.Tool {
Function: api.ToolFunction{ Function: api.ToolFunction{
Name: "calculate", Name: "calculate",
Description: "Calculate a mathematical expression", Description: "Calculate a mathematical expression",
Parameters: struct { Parameters: api.ToolFunctionParameters{
Type string `json:"type"`
Defs any `json:"$defs,omitempty"`
Items any `json:"items,omitempty"`
Required []string `json:"required"`
Properties map[string]api.ToolProperty `json:"properties"`
}{
Type: "object", Type: "object",
Required: []string{"expression"}, Required: []string{"expression"},
Properties: map[string]api.ToolProperty{ Properties: map[string]api.ToolProperty{