lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-19 23:47:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix lowercase functioncall detection in stream tool sieve

Browse Source
This commit is contained in:
CJACK.
2026-04-01 01:50:56 +08:00
parent bfca84c2c7
commit 8a74dbff9c
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/adapter/openai/tool_sieve_core.go
View File

@@ -183,7 +183,7 @@ func findToolSegmentStart(s string) int {
return -1 return -1
} }
lower := strings.ToLower(s) lower := strings.ToLower(s)
keywords := []string{"tool_calls", "\"function\"", "function.name:", "functionCall", "\"tool_use\""} keywords := []string{"tool_calls", "\"function\"", "function.name:", "functioncall", "\"tool_use\""}
bestKeyIdx := -1 bestKeyIdx := -1
for _, kw := range keywords { for _, kw := range keywords {
idx := strings.Index(lower, kw) idx := strings.Index(lower, kw)
@@ -240,7 +240,7 @@ func consumeToolCapture(state *toolStreamSieveState, toolNames []string) (prefix
lower := strings.ToLower(captured) lower := strings.ToLower(captured)
keyIdx := -1 keyIdx := -1
keywords := []string{"tool_calls", "\"function\"", "function.name:", "functionCall", "\"tool_use\""} keywords := []string{"tool_calls", "\"function\"", "function.name:", "functioncall", "\"tool_use\""}
for _, kw := range keywords { for _, kw := range keywords {
idx := strings.Index(lower, kw) idx := strings.Index(lower, kw)
if idx >= 0 && (keyIdx < 0 || idx < keyIdx) { if idx >= 0 && (keyIdx < 0 || idx < keyIdx) {

22
internal/adapter/openai/tool_sieve_xml_test.go
View File

@@ -104,6 +104,7 @@ func TestFindToolSegmentStartDetectsXMLToolCalls(t *testing.T) {
want int want int
}{ }{
{"tool_calls_tag", "some text <tool_calls>\n", 10}, {"tool_calls_tag", "some text <tool_calls>\n", 10},
{"gemini_function_call_json", `some text {"functionCall":{"name":"search","args":{"q":"latest"}}}`, 10},
{"tool_call_tag", "prefix <tool_call>\n", 7}, {"tool_call_tag", "prefix <tool_call>\n", 7},
{"invoke_tag", "text <invoke name=\"foo\">body</invoke>", 5}, {"invoke_tag", "text <invoke name=\"foo\">body</invoke>", 5},
{"function_call_tag", "<function_call name=\"foo\">body</function_call>", 0}, {"function_call_tag", "<function_call name=\"foo\">body</function_call>", 0},
@@ -119,6 +120,27 @@ func TestFindToolSegmentStartDetectsXMLToolCalls(t *testing.T) {
} }
} }
func TestProcessToolSieveDetectsGeminiFunctionCallPayload(t *testing.T) {
var state toolStreamSieveState
events := processToolSieveChunk(&state, `{"functionCall":{"name":"search_web","args":{"query":"latest"}}}`, []string{"search_web"})
events = append(events, flushToolSieve(&state, []string{"search_web"})...)
var textContent string
var toolCalls int
for _, evt := range events {
if evt.Content != "" {
textContent += evt.Content
}
toolCalls += len(evt.ToolCalls)
}
if toolCalls != 1 {
t.Fatalf("expected one tool call from functionCall payload, got events=%#v", events)
}
if strings.Contains(strings.ToLower(textContent), "functioncall") {
t.Fatalf("functionCall json leaked into text content: %q", textContent)
}
}
func TestFindPartialXMLToolTagStart(t *testing.T) { func TestFindPartialXMLToolTagStart(t *testing.T) {
cases := []struct { cases := []struct {
name string name string