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

refactor: enhance XML tool call parsing to support nested structures, CDATA, and repeated tags

Browse Source
This commit is contained in:
CJACK
2026-04-19 19:58:45 +08:00
parent 26d195f2a6
commit 0f2b5fee23
16 changed files with 550 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
internal/js/helpers/stream-tool-sieve/parse_payload.js
View File

@@ -19,7 +19,7 @@ const TOOL_CALL_MARKUP_ARGS_PATTERNS = [
/<(?:[a-z0-9_:-]+:)?args\b[^>]*>([\s\S]*?)<\/(?:[a-z0-9_:-]+:)?args>/i,
/<(?:[a-z0-9_:-]+:)?params\b[^>]*>([\s\S]*?)<\/(?:[a-z0-9_:-]+:)?params>/i,
];
const CDATA_PATTERN = /<!\[CDATA\[([\s\S]*?)]]>/i;
const CDATA_PATTERN = /^<!\[CDATA\[([\s\S]*?)]]>$/i;
const HTML_ENTITIES_PATTERN = /&[a-z0-9#]+;/gi;
const {
@@ -97,6 +97,9 @@ function parseMarkupSingleToolCall(attrs, inner) {
function parseMarkupInput(raw) {
const s = toStringSafe(raw).trim();
if (!s) {
return {};
}
// Prioritize XML-style KV tags (e.g., <arg>val</arg>)
const kv = parseMarkupKVObject(s);
if (Object.keys(kv).length > 0) {
@@ -125,19 +128,38 @@ function parseMarkupKVObject(text) {
if (!key) {
continue;
}
const valueRaw = extractRawTagValue(m[2]);
if (!valueRaw) {
const value = parseMarkupValue(m[2]);
if (value === undefined || value === null) {
continue;
}
try {
out[key] = JSON.parse(valueRaw);
} catch (_err) {
out[key] = valueRaw;
}
appendMarkupValue(out, key, value);
}
return out;
}
function parseMarkupValue(raw) {
const s = toStringSafe(extractRawTagValue(raw)).trim();
if (!s) {
return '';
}
if (s.includes('<') && s.includes('>')) {
const nested = parseMarkupInput(s);
if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
if (isOnlyRawValue(nested)) {
return toStringSafe(nested._raw);
}
return nested;
}
}
try {
return JSON.parse(s);
} catch (_err) {
return s;
}
}
function extractRawTagValue(inner) {
const s = toStringSafe(inner).trim();
if (!s) {
@@ -213,6 +235,27 @@ function parseToolCallInput(v) {
return {};
}
function appendMarkupValue(out, key, value) {
if (Object.prototype.hasOwnProperty.call(out, key)) {
const current = out[key];
if (Array.isArray(current)) {
current.push(value);
return;
}
out[key] = [current, value];
return;
}
out[key] = value;
}
function isOnlyRawValue(obj) {
if (!obj || typeof obj !== 'object' || Array.isArray(obj)) {
return false;
}
const keys = Object.keys(obj);
return keys.length === 1 && keys[0] === '_raw';
}
module.exports = {
stripFencedCodeBlocks,
parseMarkupToolCalls,