-
Notifications
You must be signed in to change notification settings - Fork 377
也许修复了工具调用的问题 #259
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
base: dev
Are you sure you want to change the base?
也许修复了工具调用的问题 #259
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,6 +115,12 @@ func parseSingleXMLToolCall(block string) (ParsedToolCall, bool) { | |
| if err := dec.DecodeElement(&node, &t); err == nil { | ||
| inner := strings.TrimSpace(node.Inner) | ||
| if inner != "" { | ||
| if named := parseXMLNamedParameters(inner); len(named) > 0 { | ||
| for k, vv := range named { | ||
| params[k] = vv | ||
| } | ||
| break | ||
| } | ||
| unescapedInner := html.UnescapeString(inner) | ||
| if parsed := parseToolCallInput(unescapedInner); len(parsed) > 0 { | ||
| if len(parsed) == 1 { | ||
|
|
@@ -183,6 +189,55 @@ func parseSingleXMLToolCall(block string) (ParsedToolCall, bool) { | |
| return ParsedToolCall{Name: strings.TrimSpace(html.UnescapeString(name)), Input: params}, true | ||
| } | ||
|
|
||
| func parseXMLNamedParameters(innerXML string) map[string]any { | ||
| raw := strings.TrimSpace(innerXML) | ||
| if raw == "" { | ||
| return nil | ||
| } | ||
| dec := xml.NewDecoder(strings.NewReader("<root>" + raw + "</root>")) | ||
| out := map[string]any{} | ||
| for { | ||
| tok, err := dec.Token() | ||
| if err != nil { | ||
| break | ||
| } | ||
| start, ok := tok.(xml.StartElement) | ||
| if !ok { | ||
| continue | ||
| } | ||
| if !strings.EqualFold(start.Name.Local, "parameter") { | ||
| continue | ||
| } | ||
| key := "" | ||
| for _, attr := range start.Attr { | ||
| if strings.EqualFold(strings.TrimSpace(attr.Name.Local), "name") { | ||
| key = strings.TrimSpace(attr.Value) | ||
| break | ||
| } | ||
| } | ||
| var v string | ||
| if err := dec.DecodeElement(&v, &start); err != nil { | ||
| continue | ||
| } | ||
| val := normalizeToolParamValue(v) | ||
| if key == "" { | ||
| continue | ||
| } | ||
| out[key] = val | ||
| } | ||
| if len(out) == 0 { | ||
| return nil | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func normalizeToolParamValue(v string) string { | ||
| if strings.Contains(v, "\n") { | ||
| return strings.Trim(v, "\n") | ||
| } | ||
|
Comment on lines
+235
to
+237
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Useful? React with 👍 / 👎. |
||
| return strings.TrimSpace(v) | ||
| } | ||
|
|
||
| func stripTopLevelXMLParameters(inner string) string { | ||
| out := strings.TrimSpace(inner) | ||
| for { | ||
|
|
@@ -316,7 +371,7 @@ func parseInvokeFunctionCallStyle(text string) (ParsedToolCall, bool) { | |
| continue | ||
| } | ||
| k := strings.TrimSpace(pm[1]) | ||
| v := strings.TrimSpace(html.UnescapeString(pm[2])) | ||
| v := normalizeToolParamValue(unwrapXMLCDATA(html.UnescapeString(pm[2]))) | ||
| if k != "" { | ||
| input[k] = v | ||
| } | ||
|
|
@@ -347,7 +402,7 @@ func parseToolUseFunctionStyle(text string) (ParsedToolCall, bool) { | |
| continue | ||
| } | ||
| k := strings.TrimSpace(pm[1]) | ||
| v := strings.TrimSpace(html.UnescapeString(pm[2])) | ||
| v := normalizeToolParamValue(unwrapXMLCDATA(html.UnescapeString(pm[2]))) | ||
| if k != "" { | ||
| input[k] = v | ||
| } | ||
|
|
@@ -457,3 +512,11 @@ func asString(v any) string { | |
| s, _ := v.(string) | ||
| return s | ||
| } | ||
|
|
||
| func unwrapXMLCDATA(s string) string { | ||
| t := strings.TrimSpace(s) | ||
| if strings.HasPrefix(t, "<![CDATA[") && strings.HasSuffix(t, "]]>") && len(t) >= len("<![CDATA[")+len("]]>") { | ||
| return t[len("<![CDATA[") : len(t)-len("]]>")] | ||
| } | ||
| return s | ||
| } | ||
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.
The JS stream parser mirrors the same regression: for any value containing a newline,
normalizeParamValueremoves only leading/trailing newlines and preserves surrounding spaces. A common formatted payload (<parameter name="path">\n README.md\n</parameter>) becomes" README.md", so streamed tool-call arguments can carry invalid path/command values even though they are just XML indentation artifacts.Useful? React with 👍 / 👎.