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

fix: fallback tool calls from thinking on empty output

Browse Source
This commit is contained in:
MiY
2026-04-26 17:45:12 +08:00
parent e2dfe15f48
commit a505f2cb96
11 changed files with 162 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/toolcall/toolcalls_parse.go
View File

@@ -32,6 +32,21 @@ func ParseStandaloneToolCallsDetailed(text string, availableToolNames []string)
return parseToolCallsDetailedXMLOnly(text)
}
func ParseAssistantToolCallsDetailed(text, thinking string, availableToolNames []string) ToolCallParseResult {
textParsed := ParseStandaloneToolCallsDetailed(text, availableToolNames)
if len(textParsed.Calls) > 0 {
return textParsed
}
if strings.TrimSpace(text) != "" {
return textParsed
}
thinkingParsed := ParseStandaloneToolCallsDetailed(thinking, availableToolNames)
if len(thinkingParsed.Calls) > 0 {
return thinkingParsed
}
return textParsed
}
func parseToolCallsDetailedXMLOnly(text string) ToolCallParseResult {
result := ToolCallParseResult{}
trimmed := strings.TrimSpace(text)
@@ -74,7 +89,7 @@ func filterToolCallsDetailed(parsed []ParsedToolCall) ([]ParsedToolCall, []strin
func looksLikeToolCallSyntax(text string) bool {
lower := strings.ToLower(text)
return strings.Contains(lower, "<tool_calls")
return strings.Contains(lower, "<|dsml|tool_calls") || strings.Contains(lower, "<tool_calls")
}
func stripFencedCodeBlocks(text string) string {