Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions internal/adapter/tool_bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strconv"
"strings"

"github.com/Mag1cFall/Gemini-Web2API/internal/logging"
"github.com/santhosh-tekuri/jsonschema/v6"
)

Expand Down Expand Up @@ -210,16 +211,22 @@ func domainsPermit(rawURL string, allowed, blocked []string) bool {
return (len(allowed) == 0 || domainAllowed(rawURL, allowed)) && !domainAllowed(rawURL, blocked)
}

// Parse 解析工具调用并验证结构化输出,调用块组之前的文字作为正文与调用一起返回,调用块组之后的内容丢弃
// Parse 解析工具调用并验证结构化输出,调用块组之前的文字作为正文与调用一起返回,调用块组之后的内容丢弃;请求没有强制工具调用时,未写完或全部未声明的调用块按正文结束处理
func (b ToolBridge) Parse(text string) (string, []ToolCall, error) {
if len(b.Definitions) > 0 {
before, blocks, found, err := splitCallBlocks(text)
if found {
if strings.EqualFold(strings.TrimSpace(b.Choice), "none") {
return "", nil, fmt.Errorf("模型在 tool_choice=none 时返回了工具调用")
}
empty := strings.TrimSpace(before) == ""
if err != nil {
return "", nil, err
if empty || b.requiresTool() || b.explicitTool() != "" {
return "", nil, err
}
// 模型把调用块写坏了,但调用块之前的文字是完整回答:按正文结束,不因此让整条回答失败
logging.Warn(logging.SourceRequest, "模型写出的调用块不完整,按正文结束", "原因", err.Error())
return before, nil, nil
}
if b.SingleCall {
blocks = blocks[:1]
Expand All @@ -228,6 +235,13 @@ func (b ToolBridge) Parse(text string) (string, []ToolCall, error) {
if err != nil {
return "", nil, err
}
if len(calls) == 0 {
// 模型只写出了未声明的工具调用:请求没有强制工具调用时按正文回答
if empty {
return "", nil, fmt.Errorf("模型返回了未声明的工具 %q", blocks[0].Name)
}
return before, nil, nil
}
return before, calls, nil
}
}
Expand Down
10 changes: 8 additions & 2 deletions internal/adapter/tool_protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"unicode"

"github.com/Mag1cFall/Gemini-Web2API/internal/gemini"
"github.com/Mag1cFall/Gemini-Web2API/internal/logging"
)

// callStartPattern 匹配调用块的开头,上游以 Markdown 转义方括号时前面带反斜杠
Expand Down Expand Up @@ -210,7 +211,7 @@ func structureFollows(after string) bool {
return location != nil && location[0] == 0
}

// resolveCalls 按声明把调用块转为工具调用:工具名去掉前导下划线后匹配,参数按 Schema 还原类型后校验
// resolveCalls 按声明把调用块转为工具调用:工具名去掉前导下划线后匹配,参数按 Schema 还原类型后校验;请求没有强制工具调用时丢弃未声明的工具调用
func (b ToolBridge) resolveCalls(blocks []callBlock) ([]ToolCall, error) {
if len(blocks) == 0 {
return nil, fmt.Errorf("模型返回的工具调用为空")
Expand All @@ -222,7 +223,12 @@ func (b ToolBridge) resolveCalls(blocks []callBlock) ([]ToolCall, error) {
name = strings.TrimLeft(name, "_")
}
if !b.hasTool(name) {
return nil, fmt.Errorf("模型返回了未声明的工具 %q", block.Name)
if b.requiresTool() || b.explicitTool() != "" {
return nil, fmt.Errorf("模型返回了未声明的工具 %q", block.Name)
}
// 模型写出了未声明的工具调用,例如它自己写出了官网内置工具的调用:请求没有强制工具调用时丢弃该调用,不因此让整条回答失败
logging.Warn(logging.SourceRequest, "丢弃模型返回的未声明工具调用", "工具", block.Name)
continue
}
if b.explicitTool() != "" && name != b.explicitTool() {
return nil, fmt.Errorf("模型返回工具 %q,预期工具 %q", name, b.explicitTool())
Expand Down
35 changes: 35 additions & 0 deletions internal/adapter/tool_protocol_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,38 @@ func TestSplitCallGateWaitsForLineAfterUnclosedBacktick(t *testing.T) {
}
}
}

// TestToolBridgeToleratesInvalidCalls 验证请求没有强制工具调用时,未声明的工具调用与写坏的调用块按正文结束处理,强制工具调用或没有正文时仍返回错误,合法的调用块照常解析
func TestToolBridgeToleratesInvalidCalls(t *testing.T) {
definitions := []ToolDefinition{{Name: "echo", Parameters: json.RawMessage(`{"type":"object","properties":{"text":{"type":"string"}}}`)}}
undeclared := "这是回答。[Call:google:search]\n[Arg:query]\n```\nx\n```\n[/Arg]\n[/Call]"
incomplete := "这是回答。[Call:echo]\n[Arg:text]\n```\n还没写完"
for _, tc := range []struct{ name, choice, reply string }{
{"未声明的工具", "auto", undeclared},
{"写坏的调用块", "auto", incomplete},
{"客户端恢复历史时的未声明工具", "", undeclared},
} {
bridge := ToolBridge{Choice: tc.choice, Definitions: definitions}
text, calls, err := bridge.Parse(tc.reply)
if err != nil || len(calls) != 0 || text != "这是回答。" {
t.Fatalf("%s:正文 %q 调用 %+v 错误 %v", tc.name, text, calls, err)
}
}
for _, tc := range []struct{ name, choice, reply string }{
{"required 时未声明的工具", "required", undeclared},
{"指定工具时写坏的调用块", "function:echo", incomplete},
} {
bridge := ToolBridge{Choice: tc.choice, Definitions: definitions}
if _, _, err := bridge.Parse(tc.reply); err == nil {
t.Fatalf("%s:强制工具调用时应返回错误", tc.name)
}
}
if _, _, err := (ToolBridge{Choice: "auto", Definitions: definitions}).Parse(undeclared[len("这是回答。"):]); err == nil {
t.Fatal("调用块之前没有正文时,未声明的工具调用应返回错误")
}
bridge := ToolBridge{Choice: "auto", Definitions: definitions}
text, calls, err := bridge.Parse("好的。[Call:echo]\n[Arg:text]\n```\nhi\n```\n[/Arg]\n[/Call]")
if err != nil || text != "好的。" || len(calls) != 1 || calls[0].Name != "echo" {
t.Fatalf("合法调用:正文 %q 调用 %+v 错误 %v", text, calls, err)
}
}