-
Notifications
You must be signed in to change notification settings - Fork 1k
VertexAI转换为openai协议支持FunctionCall #3456
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
wydream
wants to merge
2
commits into
alibaba:main
Choose a base branch
from
wydream:feat/vertex_tool_call
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
265 changes: 265 additions & 0 deletions
265
plugins/wasm-go/extensions/ai-proxy/provider/model_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,265 @@ | ||
| package provider | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestCleanFunctionParameters(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input map[string]interface{} | ||
| expected map[string]interface{} | ||
| }{ | ||
| { | ||
| name: "nil input", | ||
| input: nil, | ||
| expected: nil, | ||
| }, | ||
| { | ||
| name: "empty map", | ||
| input: map[string]interface{}{}, | ||
| expected: map[string]interface{}{}, | ||
| }, | ||
| { | ||
| name: "remove $schema at root level", | ||
| input: map[string]interface{}{ | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "location": map[string]interface{}{ | ||
| "type": "string", | ||
| "description": "The city and state", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "location": map[string]interface{}{ | ||
| "type": "string", | ||
| "description": "The city and state", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "remove multiple unsupported fields", | ||
| input: map[string]interface{}{ | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "$id": "https://example.com/schema", | ||
| "$comment": "This is a comment", | ||
| "definitions": map[string]interface{}{}, | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "name": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "name": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "nested $schema in properties", | ||
| input: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "nested": map[string]interface{}{ | ||
| "$schema": "should be removed", | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "field": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "nested": map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "field": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "array with map elements", | ||
| input: map[string]interface{}{ | ||
| "type": "array", | ||
| "items": []interface{}{ | ||
| map[string]interface{}{ | ||
| "$schema": "should be removed", | ||
| "type": "string", | ||
| }, | ||
| map[string]interface{}{ | ||
| "type": "number", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "array", | ||
| "items": []interface{}{ | ||
| map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| map[string]interface{}{ | ||
| "type": "number", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "preserve valid fields", | ||
| input: map[string]interface{}{ | ||
| "type": "object", | ||
| "description": "A valid description", | ||
| "properties": map[string]interface{}{ | ||
| "location": map[string]interface{}{ | ||
| "type": "string", | ||
| "description": "The city", | ||
| "enum": []interface{}{"NYC", "LA", "SF"}, | ||
| }, | ||
| }, | ||
| "required": []interface{}{"location"}, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "description": "A valid description", | ||
| "properties": map[string]interface{}{ | ||
| "location": map[string]interface{}{ | ||
| "type": "string", | ||
| "description": "The city", | ||
| "enum": []interface{}{"NYC", "LA", "SF"}, | ||
| }, | ||
| }, | ||
| "required": []interface{}{"location"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "remove $defs field", | ||
| input: map[string]interface{}{ | ||
| "$defs": map[string]interface{}{ | ||
| "Address": map[string]interface{}{ | ||
| "type": "object", | ||
| }, | ||
| }, | ||
| "type": "object", | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| }, | ||
| }, | ||
| { | ||
| name: "remove ref field without dollar sign", | ||
| input: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "options": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "ref": "QuestionOption", | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "label": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "options": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "label": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "real world question tool schema", | ||
| input: map[string]interface{}{ | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "questions": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "options": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "ref": "QuestionOption", | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "label": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| expected: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "questions": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "options": map[string]interface{}{ | ||
| "type": "array", | ||
| "items": map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "label": map[string]interface{}{ | ||
| "type": "string", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| result := cleanFunctionParameters(tt.input) | ||
| if !reflect.DeepEqual(result, tt.expected) { | ||
| t.Errorf("cleanFunctionParameters() = %v, want %v", result, tt.expected) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Caution
🚨 Gemini buildToolCalls 逻辑反了:FunctionCall 存在时直接 return,导致永远不输出 tool_calls
buildToolCalls 中:
这会在 FunctionCall 存在时直接返回空数组;而后续又访问 item.FunctionCall.Arguments,逻辑自相矛盾。应当是 item.FunctionCall == nil 时返回空数组,否则构造 toolCall。
建议: 修正条件判断,并确保读取字段一致(FunctionName/Arguments)。