@modular-prompt/driver 0.13.1 → 0.13.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cache-controller.d.ts +4 -1
- package/dist/cache-controller.d.ts.map +1 -1
- package/dist/google-genai/google-genai-cache-controller.d.ts +1 -1
- package/dist/google-genai/google-genai-cache-controller.d.ts.map +1 -1
- package/dist/google-genai/google-genai-cache-controller.js +4 -4
- package/dist/google-genai/google-genai-cache-controller.js.map +1 -1
- package/dist/mlx-ml/mlx-cache-controller.d.ts +3 -4
- package/dist/mlx-ml/mlx-cache-controller.d.ts.map +1 -1
- package/dist/mlx-ml/mlx-cache-controller.js +46 -22
- package/dist/mlx-ml/mlx-cache-controller.js.map +1 -1
- package/dist/mlx-ml/mlx-driver.js +2 -2
- package/dist/mlx-ml/mlx-driver.js.map +1 -1
- package/dist/mlx-ml/process/response-processor.js +1 -1
- package/dist/mlx-ml/process/response-processor.js.map +1 -1
- package/dist/mlx-ml/tool-call-parser/content-parsers.d.ts +9 -0
- package/dist/mlx-ml/tool-call-parser/content-parsers.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/content-parsers.js +223 -0
- package/dist/mlx-ml/tool-call-parser/content-parsers.js.map +1 -0
- package/dist/mlx-ml/tool-call-parser/detector.d.ts +16 -0
- package/dist/mlx-ml/tool-call-parser/detector.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/detector.js +58 -0
- package/dist/mlx-ml/tool-call-parser/detector.js.map +1 -0
- package/dist/mlx-ml/tool-call-parser/index.d.ts +7 -0
- package/dist/mlx-ml/tool-call-parser/index.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/index.js +136 -0
- package/dist/mlx-ml/tool-call-parser/index.js.map +1 -0
- package/dist/mlx-ml/tool-call-parser/tool-formatter.d.ts +8 -0
- package/dist/mlx-ml/tool-call-parser/tool-formatter.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/tool-formatter.js +88 -0
- package/dist/mlx-ml/tool-call-parser/tool-formatter.js.map +1 -0
- package/dist/mlx-ml/tool-call-parser/types.d.ts +18 -0
- package/dist/mlx-ml/tool-call-parser/types.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/types.js +2 -0
- package/dist/mlx-ml/tool-call-parser/types.js.map +1 -0
- package/dist/mlx-ml/tool-call-parser/utils.d.ts +5 -0
- package/dist/mlx-ml/tool-call-parser/utils.d.ts.map +1 -0
- package/dist/mlx-ml/tool-call-parser/utils.js +77 -0
- package/dist/mlx-ml/tool-call-parser/utils.js.map +1 -0
- package/package.json +3 -1
- package/src/mlx-ml/python/utils/token_utils.py +8 -38
- package/dist/mlx-ml/tool-call-parser.d.ts +0 -30
- package/dist/mlx-ml/tool-call-parser.d.ts.map +0 -1
- package/dist/mlx-ml/tool-call-parser.js +0 -642
- package/dist/mlx-ml/tool-call-parser.js.map +0 -1
|
@@ -0,0 +1,223 @@
|
|
|
1
|
+
import { coerceValue, extractBracketedValue } from './utils.js';
|
|
2
|
+
export function normalizeJsonToolCall(obj) {
|
|
3
|
+
if (typeof obj !== 'object' || obj === null)
|
|
4
|
+
return null;
|
|
5
|
+
const rec = obj;
|
|
6
|
+
// {"name": "...", "arguments"|"parameters": {...}}
|
|
7
|
+
if (rec.name && typeof rec.name === 'string') {
|
|
8
|
+
let args = rec.arguments || rec.parameters || {};
|
|
9
|
+
if (typeof args === 'string') {
|
|
10
|
+
try {
|
|
11
|
+
args = JSON.parse(args);
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
args = {};
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (typeof args !== 'object' || args === null)
|
|
18
|
+
args = {};
|
|
19
|
+
return { name: rec.name, arguments: args };
|
|
20
|
+
}
|
|
21
|
+
// {"function": {"name": "...", "arguments": {...}}}
|
|
22
|
+
if (rec.function && typeof rec.function === 'object' && rec.function !== null) {
|
|
23
|
+
const func = rec.function;
|
|
24
|
+
if (func.name && typeof func.name === 'string') {
|
|
25
|
+
let args = func.arguments || func.parameters || {};
|
|
26
|
+
if (typeof args === 'string') {
|
|
27
|
+
try {
|
|
28
|
+
args = JSON.parse(args);
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
args = {};
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (typeof args !== 'object' || args === null)
|
|
35
|
+
args = {};
|
|
36
|
+
return { name: func.name, arguments: args };
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// {"tool": {"name": "...", ...}}
|
|
40
|
+
if (rec.tool && typeof rec.tool === 'object' && rec.tool !== null) {
|
|
41
|
+
const tool = rec.tool;
|
|
42
|
+
if (tool.name && typeof tool.name === 'string') {
|
|
43
|
+
let args = tool.arguments || tool.parameters || {};
|
|
44
|
+
if (typeof args !== 'object' || args === null)
|
|
45
|
+
args = {};
|
|
46
|
+
return { name: tool.name, arguments: args };
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
export const jsonParser = {
|
|
52
|
+
name: 'json',
|
|
53
|
+
parse(content) {
|
|
54
|
+
try {
|
|
55
|
+
const parsed = JSON.parse(content);
|
|
56
|
+
if (Array.isArray(parsed)) {
|
|
57
|
+
const results = parsed
|
|
58
|
+
.map(item => normalizeJsonToolCall(item))
|
|
59
|
+
.filter((item) => item !== null);
|
|
60
|
+
return results.length > 0 ? results : null;
|
|
61
|
+
}
|
|
62
|
+
return normalizeJsonToolCall(parsed);
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
export const gemma4Parser = {
|
|
70
|
+
name: 'gemma4',
|
|
71
|
+
parse(content) {
|
|
72
|
+
const match = content.match(/^call:([\w.-]+)\{([\s\S]*)\}$/);
|
|
73
|
+
if (!match)
|
|
74
|
+
return null;
|
|
75
|
+
const name = match[1];
|
|
76
|
+
const argsStr = match[2].trim();
|
|
77
|
+
const args = {};
|
|
78
|
+
if (argsStr) {
|
|
79
|
+
const normalized = argsStr.replace(/<\|"\|>/g, '"');
|
|
80
|
+
let pos = 0;
|
|
81
|
+
while (pos < normalized.length) {
|
|
82
|
+
const keyMatch = normalized.slice(pos).match(/^(\w+):/);
|
|
83
|
+
if (!keyMatch)
|
|
84
|
+
break;
|
|
85
|
+
const key = keyMatch[1];
|
|
86
|
+
pos += keyMatch[0].length;
|
|
87
|
+
const ch = normalized[pos];
|
|
88
|
+
let value;
|
|
89
|
+
if (ch === '"') {
|
|
90
|
+
let end = pos + 1;
|
|
91
|
+
while (end < normalized.length && normalized[end] !== '"') {
|
|
92
|
+
if (normalized[end] === '\\')
|
|
93
|
+
end++;
|
|
94
|
+
end++;
|
|
95
|
+
}
|
|
96
|
+
value = normalized.slice(pos + 1, end);
|
|
97
|
+
pos = end + 1;
|
|
98
|
+
}
|
|
99
|
+
else if (ch === '[' || ch === '{') {
|
|
100
|
+
const extracted = extractBracketedValue(normalized, pos);
|
|
101
|
+
if (!extracted)
|
|
102
|
+
break;
|
|
103
|
+
value = extracted;
|
|
104
|
+
pos += value.length;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
const endMatch = normalized.slice(pos).match(/^([^,}]*)/);
|
|
108
|
+
value = endMatch ? endMatch[1].trim() : '';
|
|
109
|
+
pos += endMatch ? endMatch[0].length : 0;
|
|
110
|
+
}
|
|
111
|
+
args[key] = coerceValue(value);
|
|
112
|
+
const sep = normalized.slice(pos).match(/^\s*,\s*/);
|
|
113
|
+
if (sep)
|
|
114
|
+
pos += sep[0].length;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
return { name, arguments: args };
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
export const pythonicParser = {
|
|
121
|
+
name: 'pythonic',
|
|
122
|
+
parse(content) {
|
|
123
|
+
const match = content.match(/^\[(\w+)\((.*)\)\]$/s);
|
|
124
|
+
if (!match)
|
|
125
|
+
return null;
|
|
126
|
+
const name = match[1];
|
|
127
|
+
const argsStr = match[2].trim();
|
|
128
|
+
const args = {};
|
|
129
|
+
if (argsStr) {
|
|
130
|
+
let pos = 0;
|
|
131
|
+
while (pos < argsStr.length) {
|
|
132
|
+
const keyMatch = argsStr.slice(pos).match(/^(\w+)\s*=\s*/);
|
|
133
|
+
if (!keyMatch)
|
|
134
|
+
break;
|
|
135
|
+
const key = keyMatch[1];
|
|
136
|
+
pos += keyMatch[0].length;
|
|
137
|
+
const ch = argsStr[pos];
|
|
138
|
+
let value;
|
|
139
|
+
if (ch === '[' || ch === '{') {
|
|
140
|
+
const extracted = extractBracketedValue(argsStr, pos);
|
|
141
|
+
if (!extracted)
|
|
142
|
+
break;
|
|
143
|
+
value = extracted;
|
|
144
|
+
pos += value.length;
|
|
145
|
+
}
|
|
146
|
+
else if (ch === '"' || ch === "'") {
|
|
147
|
+
const quote = ch;
|
|
148
|
+
let end = pos + 1;
|
|
149
|
+
while (end < argsStr.length && argsStr[end] !== quote) {
|
|
150
|
+
if (argsStr[end] === '\\')
|
|
151
|
+
end++;
|
|
152
|
+
end++;
|
|
153
|
+
}
|
|
154
|
+
value = argsStr.slice(pos + 1, end);
|
|
155
|
+
pos = end + 1;
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
const endMatch = argsStr.slice(pos).match(/^([^,)]*)/);
|
|
159
|
+
value = endMatch ? endMatch[1].trim() : '';
|
|
160
|
+
pos += endMatch ? endMatch[0].length : 0;
|
|
161
|
+
}
|
|
162
|
+
args[key] = coerceValue(value);
|
|
163
|
+
const sep = argsStr.slice(pos).match(/^\s*,\s*/);
|
|
164
|
+
if (sep)
|
|
165
|
+
pos += sep[0].length;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return { name, arguments: args };
|
|
169
|
+
},
|
|
170
|
+
};
|
|
171
|
+
function parseXmlParams(paramsStr, paramRegex) {
|
|
172
|
+
const args = {};
|
|
173
|
+
let paramMatch;
|
|
174
|
+
while ((paramMatch = paramRegex.exec(paramsStr)) !== null) {
|
|
175
|
+
args[paramMatch[1]] = coerceValue(paramMatch[2].trim());
|
|
176
|
+
}
|
|
177
|
+
return args;
|
|
178
|
+
}
|
|
179
|
+
export const xmlParser = {
|
|
180
|
+
name: 'xml',
|
|
181
|
+
parse(content) {
|
|
182
|
+
// qwen3_coder: <function=name><parameter=key>value</parameter></function>
|
|
183
|
+
const qwenMatch = content.match(/<function=([\w.-]+)>([\s\S]*?)<\/function>/);
|
|
184
|
+
if (qwenMatch) {
|
|
185
|
+
return {
|
|
186
|
+
name: qwenMatch[1],
|
|
187
|
+
arguments: parseXmlParams(qwenMatch[2], /<parameter=(\w+)>([\s\S]*?)<\/parameter>/g),
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
// minimax: <invoke name="name"><parameter name="key">value</parameter></invoke>
|
|
191
|
+
const minimaxMatch = content.match(/<invoke\s+name="([\w.]+)">([\s\S]*?)<\/invoke>/);
|
|
192
|
+
if (minimaxMatch) {
|
|
193
|
+
return {
|
|
194
|
+
name: minimaxMatch[1],
|
|
195
|
+
arguments: parseXmlParams(minimaxMatch[2], /<parameter\s+name="(\w+)">([\s\S]*?)<\/parameter>/g),
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
// minicpm5: <function name="name"><param name="key">value</param></function>
|
|
199
|
+
const minicpmMatch = content.match(/<function\s+name="([\w.-]+)">([\s\S]*?)<\/function>/);
|
|
200
|
+
if (minicpmMatch) {
|
|
201
|
+
return {
|
|
202
|
+
name: minicpmMatch[1],
|
|
203
|
+
arguments: parseXmlParams(minicpmMatch[2], /<param\s+name="(\w+)">([\s\S]*?)<\/param>/g),
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
return null;
|
|
207
|
+
},
|
|
208
|
+
};
|
|
209
|
+
export const defaultContentParsers = [
|
|
210
|
+
jsonParser,
|
|
211
|
+
gemma4Parser,
|
|
212
|
+
pythonicParser,
|
|
213
|
+
xmlParser,
|
|
214
|
+
];
|
|
215
|
+
export function tryParsers(content, parsers = defaultContentParsers) {
|
|
216
|
+
for (const parser of parsers) {
|
|
217
|
+
const result = parser.parse(content);
|
|
218
|
+
if (result)
|
|
219
|
+
return result;
|
|
220
|
+
}
|
|
221
|
+
return null;
|
|
222
|
+
}
|
|
223
|
+
//# sourceMappingURL=content-parsers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"content-parsers.js","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/content-parsers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,UAAU,qBAAqB,CAAC,GAAY;IAChD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAEzD,MAAM,GAAG,GAAG,GAA8B,CAAC;IAE3C,mDAAmD;IACnD,IAAI,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,IAAI,IAAI,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QACjD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC;gBAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,IAAI,GAAG,EAAE,CAAC;YAAC,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,IAAI,GAAG,EAAE,CAAC;QACzD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAA+B,EAAE,CAAC;IACxE,CAAC;IAED,oDAAoD;IACpD,IAAI,GAAG,CAAC,QAAQ,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC9E,MAAM,IAAI,GAAG,GAAG,CAAC,QAAmC,CAAC;QACrD,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/C,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC;oBAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC;oBAAC,IAAI,GAAG,EAAE,CAAC;gBAAC,CAAC;YACvD,CAAC;YACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;gBAAE,IAAI,GAAG,EAAE,CAAC;YACzD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAA+B,EAAE,CAAC;QACzE,CAAC;IACH,CAAC;IAED,iCAAiC;IACjC,IAAI,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,GAAG,CAAC,IAA+B,CAAC;QACjD,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/C,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;gBAAE,IAAI,GAAG,EAAE,CAAC;YACzD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAA+B,EAAE,CAAC;QACzE,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,IAAI,EAAE,MAAM;IACZ,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,MAAM,OAAO,GAAG,MAAM;qBACnB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;qBACxC,MAAM,CAAC,CAAC,IAAI,EAA0B,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBAC3D,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7C,CAAC;YACD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,IAAI,EAAE,QAAQ;IACd,KAAK,CAAC,OAAe;QACnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,GAA4B,EAAE,CAAC;QAEzC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACpD,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,OAAO,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACxD,IAAI,CAAC,QAAQ;oBAAE,MAAM;gBACrB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAE1B,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,KAAa,CAAC;gBAElB,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBACf,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;oBAClB,OAAO,GAAG,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;wBAC1D,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI;4BAAE,GAAG,EAAE,CAAC;wBACpC,GAAG,EAAE,CAAC;oBACR,CAAC;oBACD,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;oBACvC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;gBAChB,CAAC;qBAAM,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBACpC,MAAM,SAAS,GAAG,qBAAqB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;oBACzD,IAAI,CAAC,SAAS;wBAAE,MAAM;oBACtB,KAAK,GAAG,SAAS,CAAC;oBAClB,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBAC1D,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3C,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;gBAE/B,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,GAAG;oBAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,IAAI,EAAE,UAAU;IAChB,KAAK,CAAC,OAAe;QACnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,GAA4B,EAAE,CAAC;QAEzC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,OAAO,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC3D,IAAI,CAAC,QAAQ;oBAAE,MAAM;gBACrB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAE1B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;gBACxB,IAAI,KAAa,CAAC;gBAElB,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBAC7B,MAAM,SAAS,GAAG,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBACtD,IAAI,CAAC,SAAS;wBAAE,MAAM;oBACtB,KAAK,GAAG,SAAS,CAAC;oBAClB,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;gBACtB,CAAC;qBAAM,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBACpC,MAAM,KAAK,GAAG,EAAE,CAAC;oBACjB,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;oBAClB,OAAO,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;wBACtD,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI;4BAAE,GAAG,EAAE,CAAC;wBACjC,GAAG,EAAE,CAAC;oBACR,CAAC;oBACD,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;oBACpC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBACvD,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3C,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;gBAE/B,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACjD,IAAI,GAAG;oBAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;CACF,CAAC;AAEF,SAAS,cAAc,CACrB,SAAiB,EACjB,UAAkB;IAElB,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,IAAI,UAAU,CAAC;IACf,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAkB;IACtC,IAAI,EAAE,KAAK;IACX,KAAK,CAAC,OAAe;QACnB,0EAA0E;QAC1E,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC9E,IAAI,SAAS,EAAE,CAAC;YACd,OAAO;gBACL,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAClB,SAAS,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,2CAA2C,CAAC;aACrF,CAAC;QACJ,CAAC;QAED,gFAAgF;QAChF,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACrF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;gBACrB,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,oDAAoD,CAAC;aACjG,CAAC;QACJ,CAAC;QAED,6EAA6E;QAC7E,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC1F,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;gBACrB,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,4CAA4C,CAAC;aACzF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAoB;IACpD,UAAU;IACV,YAAY;IACZ,cAAc;IACd,SAAS;CACV,CAAC;AAEF,MAAM,UAAU,UAAU,CACxB,OAAe,EACf,UAA2B,qBAAqB;IAEhD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { MlxRuntimeInfo } from '../process/types.js';
|
|
2
|
+
import type { DelimiterPair } from './types.js';
|
|
3
|
+
export interface DetectedDelimiter {
|
|
4
|
+
pair: DelimiterPair;
|
|
5
|
+
source: 'tool_call_format' | 'tool_parser_type' | 'special_tokens';
|
|
6
|
+
}
|
|
7
|
+
export interface DetectedMarker {
|
|
8
|
+
text: string;
|
|
9
|
+
}
|
|
10
|
+
export interface DetectionResult {
|
|
11
|
+
delimiters: DetectedDelimiter[];
|
|
12
|
+
marker: DetectedMarker | null;
|
|
13
|
+
}
|
|
14
|
+
export declare function detect(runtimeInfo: MlxRuntimeInfo | null): DetectionResult;
|
|
15
|
+
export declare function lookupDelimiters(parserType: string): DelimiterPair | null;
|
|
16
|
+
//# sourceMappingURL=detector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/detector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAqBhD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,GAAG,gBAAgB,CAAC;CACpE;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;CAC/B;AAED,wBAAgB,MAAM,CAAC,WAAW,EAAE,cAAc,GAAG,IAAI,GAAG,eAAe,CA0C1E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAEzE"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
const KNOWN_TOOL_PARSER_DELIMITERS = {
|
|
2
|
+
json_tools: { start: '<tool_call>', end: '</tool_call>' },
|
|
3
|
+
pythonic: { start: '<|tool_call_start|>', end: '<|tool_call_end|>' },
|
|
4
|
+
function_gemma: { start: '<start_function_call>', end: '<end_function_call>' },
|
|
5
|
+
mistral: { start: '[TOOL_CALLS]', end: '' },
|
|
6
|
+
kimi_k2: { start: '<|tool_calls_section_begin|>', end: '<|tool_calls_section_end|>' },
|
|
7
|
+
longcat: { start: '<longcat_tool_call>', end: '</longcat_tool_call>' },
|
|
8
|
+
glm47: { start: '<tool_call>', end: '</tool_call>' },
|
|
9
|
+
qwen3_coder: { start: '<tool_call>', end: '</tool_call>' },
|
|
10
|
+
minimax_m2: { start: '<minimax:tool_call>', end: '</minimax:tool_call>' },
|
|
11
|
+
gemma4: { start: '<|tool_call>', end: '<tool_call|>' },
|
|
12
|
+
};
|
|
13
|
+
const TOOL_CALL_TOKEN_KEYS = [
|
|
14
|
+
'tool_call', 'tool_call_explicit', 'tool_call_xml',
|
|
15
|
+
'tool_calls_section', 'function_call_tags',
|
|
16
|
+
'longcat_tool_call', 'minimax_tool_call',
|
|
17
|
+
];
|
|
18
|
+
export function detect(runtimeInfo) {
|
|
19
|
+
const delimiters = [];
|
|
20
|
+
let marker = null;
|
|
21
|
+
if (!runtimeInfo)
|
|
22
|
+
return { delimiters, marker };
|
|
23
|
+
const toolCallFormat = runtimeInfo.features?.chat_template?.tool_call_format;
|
|
24
|
+
if (toolCallFormat?.call_start && toolCallFormat?.call_end) {
|
|
25
|
+
delimiters.push({
|
|
26
|
+
pair: { start: toolCallFormat.call_start, end: toolCallFormat.call_end },
|
|
27
|
+
source: 'tool_call_format',
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
if (toolCallFormat?.tool_parser_type) {
|
|
31
|
+
const known = KNOWN_TOOL_PARSER_DELIMITERS[toolCallFormat.tool_parser_type];
|
|
32
|
+
if (known && known.end) {
|
|
33
|
+
delimiters.push({
|
|
34
|
+
pair: known,
|
|
35
|
+
source: 'tool_parser_type',
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
for (const key of TOOL_CALL_TOKEN_KEYS) {
|
|
40
|
+
const token = runtimeInfo.special_tokens?.[key];
|
|
41
|
+
if (token && typeof token === 'object' && 'start' in token) {
|
|
42
|
+
const pair = token;
|
|
43
|
+
delimiters.push({
|
|
44
|
+
pair: { start: pair.start.text, end: pair.end.text },
|
|
45
|
+
source: 'special_tokens',
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
const markerToken = runtimeInfo.special_tokens?.['tool_calls_marker'];
|
|
50
|
+
if (markerToken && typeof markerToken === 'object' && 'text' in markerToken) {
|
|
51
|
+
marker = { text: markerToken.text };
|
|
52
|
+
}
|
|
53
|
+
return { delimiters, marker };
|
|
54
|
+
}
|
|
55
|
+
export function lookupDelimiters(parserType) {
|
|
56
|
+
return KNOWN_TOOL_PARSER_DELIMITERS[parserType] ?? null;
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=detector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { MlxRuntimeInfo } from '../process/types.js';
|
|
2
|
+
import type { ToolCallParseResult } from './types.js';
|
|
3
|
+
export type { ToolCallParseResult } from './types.js';
|
|
4
|
+
export type { ContentParser, ParsedToolCall } from './types.js';
|
|
5
|
+
export { formatToolDefinitionsAsText } from './tool-formatter.js';
|
|
6
|
+
export declare function parseToolCalls(text: string, runtimeInfo: MlxRuntimeInfo | null): ToolCallParseResult;
|
|
7
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAKtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,cAAc,GAAG,IAAI,GACjC,mBAAmB,CAqBrB"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { detect } from './detector.js';
|
|
2
|
+
import { tryParsers, jsonParser, normalizeJsonToolCall } from './content-parsers.js';
|
|
3
|
+
import { escapeRegExp, extractJsonObject } from './utils.js';
|
|
4
|
+
export { formatToolDefinitionsAsText } from './tool-formatter.js';
|
|
5
|
+
export function parseToolCalls(text, runtimeInfo) {
|
|
6
|
+
const { delimiters, marker } = detect(runtimeInfo);
|
|
7
|
+
// 1. デリミタベースの検出
|
|
8
|
+
for (const { pair } of delimiters) {
|
|
9
|
+
const result = parseWithDelimiters(text, pair.start, pair.end);
|
|
10
|
+
if (result.toolCalls.length > 0)
|
|
11
|
+
return result;
|
|
12
|
+
}
|
|
13
|
+
// 2. マーカートークン(Mistral型)
|
|
14
|
+
if (marker) {
|
|
15
|
+
const result = parseMistralStyle(text, marker.text);
|
|
16
|
+
if (result.toolCalls.length > 0)
|
|
17
|
+
return result;
|
|
18
|
+
}
|
|
19
|
+
// 3. コードブロック
|
|
20
|
+
const codeBlockResult = parseCodeBlocks(text);
|
|
21
|
+
if (codeBlockResult.toolCalls.length > 0)
|
|
22
|
+
return codeBlockResult;
|
|
23
|
+
// 4. 汎用フォールバック
|
|
24
|
+
return parseGeneric(text);
|
|
25
|
+
}
|
|
26
|
+
function parseWithDelimiters(text, startDelimiter, endDelimiter) {
|
|
27
|
+
const toolCalls = [];
|
|
28
|
+
let content = text;
|
|
29
|
+
let callIndex = 0;
|
|
30
|
+
const regex = new RegExp(escapeRegExp(startDelimiter) + '([\\s\\S]*?)' + escapeRegExp(endDelimiter), 'g');
|
|
31
|
+
let match;
|
|
32
|
+
while ((match = regex.exec(text)) !== null) {
|
|
33
|
+
const innerContent = match[1].trim();
|
|
34
|
+
const parsed = tryParsers(innerContent);
|
|
35
|
+
if (parsed) {
|
|
36
|
+
const calls = Array.isArray(parsed) ? parsed : [parsed];
|
|
37
|
+
for (const call of calls) {
|
|
38
|
+
toolCalls.push({
|
|
39
|
+
id: `call_${callIndex++}`,
|
|
40
|
+
name: call.name,
|
|
41
|
+
arguments: call.arguments || {},
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (toolCalls.length > 0) {
|
|
47
|
+
content = text.replace(regex, '').trim();
|
|
48
|
+
}
|
|
49
|
+
return { content, toolCalls };
|
|
50
|
+
}
|
|
51
|
+
function parseMistralStyle(text, markerText) {
|
|
52
|
+
const markerIndex = text.indexOf(markerText);
|
|
53
|
+
if (markerIndex === -1)
|
|
54
|
+
return { content: text, toolCalls: [] };
|
|
55
|
+
const content = text.substring(0, markerIndex).trim();
|
|
56
|
+
const callText = text.substring(markerIndex + markerText.length).trim();
|
|
57
|
+
const toolCalls = [];
|
|
58
|
+
let callIndex = 0;
|
|
59
|
+
try {
|
|
60
|
+
const parsed = JSON.parse(callText);
|
|
61
|
+
const items = Array.isArray(parsed) ? parsed : [parsed];
|
|
62
|
+
for (const item of items) {
|
|
63
|
+
if (item.name) {
|
|
64
|
+
toolCalls.push({
|
|
65
|
+
id: `call_${callIndex++}`,
|
|
66
|
+
name: item.name,
|
|
67
|
+
arguments: item.arguments || item.parameters || {},
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// skip
|
|
74
|
+
}
|
|
75
|
+
return { content, toolCalls };
|
|
76
|
+
}
|
|
77
|
+
function parseCodeBlocks(text) {
|
|
78
|
+
const toolCalls = [];
|
|
79
|
+
let content = text;
|
|
80
|
+
let callIndex = 0;
|
|
81
|
+
const regex = /```json:toolCall\s*\n([\s\S]*?)```/g;
|
|
82
|
+
let match;
|
|
83
|
+
while ((match = regex.exec(text)) !== null) {
|
|
84
|
+
const parsed = jsonParser.parse(match[1].trim());
|
|
85
|
+
if (parsed) {
|
|
86
|
+
const calls = Array.isArray(parsed) ? parsed : [parsed];
|
|
87
|
+
for (const call of calls) {
|
|
88
|
+
toolCalls.push({
|
|
89
|
+
id: `call_${callIndex++}`,
|
|
90
|
+
name: call.name,
|
|
91
|
+
arguments: call.arguments || {},
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (toolCalls.length > 0) {
|
|
97
|
+
content = text.replace(regex, '').trim();
|
|
98
|
+
}
|
|
99
|
+
return { content, toolCalls };
|
|
100
|
+
}
|
|
101
|
+
function parseGeneric(text) {
|
|
102
|
+
const toolCalls = [];
|
|
103
|
+
let content = text;
|
|
104
|
+
let callIndex = 0;
|
|
105
|
+
const matched = [];
|
|
106
|
+
for (let i = 0; i < text.length; i++) {
|
|
107
|
+
if (text[i] !== '{')
|
|
108
|
+
continue;
|
|
109
|
+
const jsonStr = extractJsonObject(text, i);
|
|
110
|
+
if (!jsonStr)
|
|
111
|
+
continue;
|
|
112
|
+
try {
|
|
113
|
+
const parsed = JSON.parse(jsonStr);
|
|
114
|
+
const normalized = normalizeJsonToolCall(parsed);
|
|
115
|
+
if (normalized) {
|
|
116
|
+
toolCalls.push({
|
|
117
|
+
id: `call_${callIndex++}`,
|
|
118
|
+
name: normalized.name,
|
|
119
|
+
arguments: normalized.arguments || {},
|
|
120
|
+
});
|
|
121
|
+
matched.push(jsonStr);
|
|
122
|
+
i += jsonStr.length - 1;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
// skip
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
if (matched.length > 0) {
|
|
130
|
+
for (const m of matched) {
|
|
131
|
+
content = content.replace(m, '').trim();
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return { content, toolCalls };
|
|
135
|
+
}
|
|
136
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,WAAkC;IAElC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAEnD,gBAAgB;IAChB,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC;IACjD,CAAC;IAED,wBAAwB;IACxB,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC;IACjD,CAAC;IAED,aAAa;IACb,MAAM,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,eAAe,CAAC;IAEjE,eAAe;IACf,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAY,EACZ,cAAsB,EACtB,YAAoB;IAEpB,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,KAAK,GAAG,IAAI,MAAM,CACtB,YAAY,CAAC,cAAc,CAAC,GAAG,cAAc,GAAG,YAAY,CAAC,YAAY,CAAC,EAC1E,GAAG,CACJ,CAAC;IAEF,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3C,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,SAAS,CAAC,IAAI,CAAC;oBACb,EAAE,EAAE,QAAQ,SAAS,EAAE,EAAE;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY,EAAE,UAAkB;IACzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,WAAW,KAAK,CAAC,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAEhE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACxE,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACxD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,SAAS,CAAC,IAAI,CAAC;oBACb,EAAE,EAAE,QAAQ,SAAS,EAAE,EAAE;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE;iBACnD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,KAAK,GAAG,qCAAqC,CAAC;IAEpD,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,SAAS,CAAC,IAAI,CAAC;oBACb,EAAE,EAAE,QAAQ,SAAS,EAAE,EAAE;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,SAAS;QAE9B,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO;YAAE,SAAS;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,UAAU,EAAE,CAAC;gBACf,SAAS,CAAC,IAAI,CAAC;oBACb,EAAE,EAAE,QAAQ,SAAS,EAAE,EAAE;oBACzB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,EAAE;iBACtC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtB,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ToolDefinition } from '../../types.js';
|
|
2
|
+
import type { SpecialToken, SpecialTokenPair } from '../../formatter/types.js';
|
|
3
|
+
export declare function formatToolDefinitionsAsText(tools: ToolDefinition[], specialTokens?: Record<string, SpecialToken | SpecialTokenPair>, toolCallFormat?: {
|
|
4
|
+
call_start?: string;
|
|
5
|
+
call_end?: string;
|
|
6
|
+
tool_parser_type?: string;
|
|
7
|
+
}): string;
|
|
8
|
+
//# sourceMappingURL=tool-formatter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-formatter.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/tool-formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AA+B/E,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,cAAc,EAAE,EACvB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CAAC,EAC/D,cAAc,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,GACrF,MAAM,CAoER"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
function formatProperties(lines, properties, required, depth = 1) {
|
|
2
|
+
const indent = ' '.repeat(depth);
|
|
3
|
+
for (const [name, schema] of Object.entries(properties)) {
|
|
4
|
+
const schemaObj = schema;
|
|
5
|
+
const req = required?.includes(name) ? ' (required)' : '';
|
|
6
|
+
const desc = schemaObj.description ? `: ${schemaObj.description}` : '';
|
|
7
|
+
const type = schemaObj.type || 'any';
|
|
8
|
+
if (type === 'array' && schemaObj.items) {
|
|
9
|
+
lines.push(`${indent}- ${name}: array${req}${desc}`);
|
|
10
|
+
const items = schemaObj.items;
|
|
11
|
+
if (items.properties) {
|
|
12
|
+
lines.push(`${indent} Each item:`);
|
|
13
|
+
formatProperties(lines, items.properties, items.required, depth + 2);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
else if (type === 'object' && schemaObj.properties) {
|
|
17
|
+
lines.push(`${indent}- ${name}: object${req}${desc}`);
|
|
18
|
+
formatProperties(lines, schemaObj.properties, schemaObj.required, depth + 1);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
lines.push(`${indent}- ${name}: ${type}${req}${desc}`);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export function formatToolDefinitionsAsText(tools, specialTokens, toolCallFormat) {
|
|
26
|
+
const lines = ['## Available Tools', ''];
|
|
27
|
+
lines.push('Instead of generating a text response, you can respond with tool call data.');
|
|
28
|
+
lines.push('The result of the tool execution will be provided as context in your next generation.');
|
|
29
|
+
lines.push('Choose a tool from the available list below, determine the appropriate arguments, and output a JSON string in the specified format.');
|
|
30
|
+
lines.push('If a required tool is not in the available list, report this to the user.');
|
|
31
|
+
lines.push('');
|
|
32
|
+
let exampleToolName;
|
|
33
|
+
let exampleArgs;
|
|
34
|
+
for (const tool of tools) {
|
|
35
|
+
lines.push(`### ${tool.name}`);
|
|
36
|
+
if (tool.description) {
|
|
37
|
+
lines.push(tool.description);
|
|
38
|
+
}
|
|
39
|
+
if (tool.parameters) {
|
|
40
|
+
const params = tool.parameters;
|
|
41
|
+
if (params.properties) {
|
|
42
|
+
lines.push('Parameters:');
|
|
43
|
+
formatProperties(lines, params.properties, params.required, 1);
|
|
44
|
+
if (!exampleToolName) {
|
|
45
|
+
exampleToolName = tool.name;
|
|
46
|
+
const argEntries = [];
|
|
47
|
+
for (const [name, schema] of Object.entries(params.properties)) {
|
|
48
|
+
const schemaObj = schema;
|
|
49
|
+
const val = schemaObj.type === 'number' ? '0' : schemaObj.type === 'boolean' ? 'true' : `"..."`;
|
|
50
|
+
argEntries.push(`"${name}": ${val}`);
|
|
51
|
+
}
|
|
52
|
+
exampleArgs = `{${argEntries.join(', ')}}`;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
lines.push(`Parameters: ${JSON.stringify(tool.parameters)}`);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
lines.push('');
|
|
60
|
+
}
|
|
61
|
+
const concreteExample = exampleToolName
|
|
62
|
+
? `{"name": "${exampleToolName}", "arguments": ${exampleArgs}}`
|
|
63
|
+
: '{"name": "tool_name", "arguments": {"key": "value"}}';
|
|
64
|
+
if (toolCallFormat?.call_start && toolCallFormat?.call_end) {
|
|
65
|
+
lines.push('To call a tool, respond ONLY with:');
|
|
66
|
+
lines.push(toolCallFormat.call_start);
|
|
67
|
+
lines.push(concreteExample);
|
|
68
|
+
lines.push(toolCallFormat.call_end);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const toolCallToken = specialTokens?.tool_call;
|
|
72
|
+
if (toolCallToken && 'start' in toolCallToken && 'end' in toolCallToken) {
|
|
73
|
+
const pair = toolCallToken;
|
|
74
|
+
lines.push('To call a tool, respond ONLY with:');
|
|
75
|
+
lines.push(`${pair.start.text}`);
|
|
76
|
+
lines.push(concreteExample);
|
|
77
|
+
lines.push(`${pair.end.text}`);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
lines.push('To call a tool, respond ONLY with the following format. Do not include any other text before or after the tool call block:');
|
|
81
|
+
lines.push('```json:toolCall');
|
|
82
|
+
lines.push(concreteExample);
|
|
83
|
+
lines.push('```');
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return lines.join('\n');
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=tool-formatter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-formatter.js","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/tool-formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { ToolCall } from '@modular-prompt/core';
|
|
2
|
+
export interface ToolCallParseResult {
|
|
3
|
+
content: string;
|
|
4
|
+
toolCalls: ToolCall[];
|
|
5
|
+
}
|
|
6
|
+
export interface ParsedToolCall {
|
|
7
|
+
name: string;
|
|
8
|
+
arguments: Record<string, unknown>;
|
|
9
|
+
}
|
|
10
|
+
export interface ContentParser {
|
|
11
|
+
readonly name: string;
|
|
12
|
+
parse(content: string): ParsedToolCall | ParsedToolCall[] | null;
|
|
13
|
+
}
|
|
14
|
+
export interface DelimiterPair {
|
|
15
|
+
start: string;
|
|
16
|
+
end: string;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function coerceValue(value: string | undefined): unknown;
|
|
2
|
+
export declare function extractBracketedValue(text: string, start: number): string | null;
|
|
3
|
+
export declare function extractJsonObject(text: string, start: number): string | null;
|
|
4
|
+
export declare function escapeRegExp(str: string): string;
|
|
5
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU9D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsBhF;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwB5E;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD"}
|