@aituber-onair/chat 0.50.0 → 0.51.0
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/README.ja.md +22 -7
- package/README.md +22 -7
- package/dist/cjs/backend.d.ts +20 -0
- package/dist/cjs/backend.d.ts.map +1 -0
- package/dist/cjs/backend.js +115 -0
- package/dist/cjs/backend.js.map +1 -0
- package/dist/cjs/constants/xai.d.ts +6 -1
- package/dist/cjs/constants/xai.d.ts.map +1 -1
- package/dist/cjs/constants/xai.js +29 -7
- package/dist/cjs/constants/xai.js.map +1 -1
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/services/ChatServiceFactory.d.ts.map +1 -1
- package/dist/cjs/services/ChatServiceFactory.js +9 -18
- package/dist/cjs/services/ChatServiceFactory.js.map +1 -1
- package/dist/cjs/services/providers/gemini/GeminiChatService.d.ts.map +1 -1
- package/dist/cjs/services/providers/gemini/GeminiChatService.js +3 -0
- package/dist/cjs/services/providers/gemini/GeminiChatService.js.map +1 -1
- package/dist/cjs/services/providers/gemini/geminiMessageConverter.d.ts +5 -0
- package/dist/cjs/services/providers/gemini/geminiMessageConverter.d.ts.map +1 -1
- package/dist/cjs/services/providers/gemini/geminiMessageConverter.js +16 -0
- package/dist/cjs/services/providers/gemini/geminiMessageConverter.js.map +1 -1
- package/dist/cjs/services/providers/openai/openaiRequestBuilder.d.ts.map +1 -1
- package/dist/cjs/services/providers/openai/openaiRequestBuilder.js +27 -5
- package/dist/cjs/services/providers/openai/openaiRequestBuilder.js.map +1 -1
- package/dist/cjs/services/providers/openai/responsesParser.d.ts.map +1 -1
- package/dist/cjs/services/providers/openai/responsesParser.js +71 -6
- package/dist/cjs/services/providers/openai/responsesParser.js.map +1 -1
- package/dist/cjs/services/providers/xai/XAIChatServiceProvider.d.ts.map +1 -1
- package/dist/cjs/services/providers/xai/XAIChatServiceProvider.js +1 -0
- package/dist/cjs/services/providers/xai/XAIChatServiceProvider.js.map +1 -1
- package/dist/esm/backend.d.ts +20 -0
- package/dist/esm/backend.d.ts.map +1 -0
- package/dist/esm/backend.js +111 -0
- package/dist/esm/backend.js.map +1 -0
- package/dist/esm/constants/xai.d.ts +6 -1
- package/dist/esm/constants/xai.d.ts.map +1 -1
- package/dist/esm/constants/xai.js +27 -6
- package/dist/esm/constants/xai.js.map +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/services/ChatServiceFactory.d.ts.map +1 -1
- package/dist/esm/services/ChatServiceFactory.js +9 -18
- package/dist/esm/services/ChatServiceFactory.js.map +1 -1
- package/dist/esm/services/providers/gemini/GeminiChatService.d.ts.map +1 -1
- package/dist/esm/services/providers/gemini/GeminiChatService.js +4 -1
- package/dist/esm/services/providers/gemini/GeminiChatService.js.map +1 -1
- package/dist/esm/services/providers/gemini/geminiMessageConverter.d.ts +5 -0
- package/dist/esm/services/providers/gemini/geminiMessageConverter.d.ts.map +1 -1
- package/dist/esm/services/providers/gemini/geminiMessageConverter.js +15 -0
- package/dist/esm/services/providers/gemini/geminiMessageConverter.js.map +1 -1
- package/dist/esm/services/providers/openai/openaiRequestBuilder.d.ts.map +1 -1
- package/dist/esm/services/providers/openai/openaiRequestBuilder.js +27 -5
- package/dist/esm/services/providers/openai/openaiRequestBuilder.js.map +1 -1
- package/dist/esm/services/providers/openai/responsesParser.d.ts.map +1 -1
- package/dist/esm/services/providers/openai/responsesParser.js +71 -6
- package/dist/esm/services/providers/openai/responsesParser.js.map +1 -1
- package/dist/esm/services/providers/xai/XAIChatServiceProvider.d.ts.map +1 -1
- package/dist/esm/services/providers/xai/XAIChatServiceProvider.js +2 -1
- package/dist/esm/services/providers/xai/XAIChatServiceProvider.js.map +1 -1
- package/dist/umd/aituber-onair-chat.js +249 -32
- package/dist/umd/aituber-onair-chat.min.js +9 -9
- package/package.json +6 -1
|
@@ -19,5 +19,10 @@ type VisionConverterOptions = ConverterOptions & {
|
|
|
19
19
|
export declare function mapRoleToGemini(role: string): string;
|
|
20
20
|
export declare function convertMessagesToGeminiFormat(messages: Message[], options?: ConverterOptions): GeminiMessage[];
|
|
21
21
|
export declare function convertVisionMessagesToGeminiFormat(messages: MessageWithVision[], options?: VisionConverterOptions): Promise<GeminiMessage[]>;
|
|
22
|
+
export declare function extractGeminiSystemInstruction(messages: readonly (Message | MessageWithVision)[]): {
|
|
23
|
+
parts: {
|
|
24
|
+
text: string;
|
|
25
|
+
}[];
|
|
26
|
+
} | undefined;
|
|
22
27
|
export {};
|
|
23
28
|
//# sourceMappingURL=geminiMessageConverter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geminiMessageConverter.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/gemini/geminiMessageConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAG5D,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,GAAG,EAAE,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,sBAAsB,GAAG,gBAAgB,GAAG;IAC/C,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWpD;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,gBAAqB,GAC7B,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"geminiMessageConverter.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/gemini/geminiMessageConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAG5D,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,GAAG,EAAE,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,sBAAsB,GAAG,gBAAgB,GAAG;IAC/C,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWpD;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,gBAAqB,GAC7B,aAAa,EAAE,CA4CjB;AAED,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,EAAE,CAAC,CAiF1B;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,SAAS,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,GACjD;IAAE,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,GAAG,SAAS,CAW3C"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.mapRoleToGemini = mapRoleToGemini;
|
|
4
4
|
exports.convertMessagesToGeminiFormat = convertMessagesToGeminiFormat;
|
|
5
5
|
exports.convertVisionMessagesToGeminiFormat = convertVisionMessagesToGeminiFormat;
|
|
6
|
+
exports.extractGeminiSystemInstruction = extractGeminiSystemInstruction;
|
|
6
7
|
const chatServiceHttpClient_1 = require("../../../utils/chatServiceHttpClient");
|
|
7
8
|
function mapRoleToGemini(role) {
|
|
8
9
|
switch (role) {
|
|
@@ -28,6 +29,8 @@ function convertMessagesToGeminiFormat(messages, options = {}) {
|
|
|
28
29
|
currentRole = null;
|
|
29
30
|
};
|
|
30
31
|
for (const msg of messages) {
|
|
32
|
+
if (msg.role === 'system')
|
|
33
|
+
continue;
|
|
31
34
|
const role = mapRoleToGemini(msg.role);
|
|
32
35
|
if (msg.tool_calls) {
|
|
33
36
|
pushCurrent();
|
|
@@ -70,6 +73,8 @@ async function convertVisionMessagesToGeminiFormat(messages, options = {}) {
|
|
|
70
73
|
currentRole = null;
|
|
71
74
|
};
|
|
72
75
|
for (const msg of messages) {
|
|
76
|
+
if (msg.role === 'system')
|
|
77
|
+
continue;
|
|
73
78
|
const role = mapRoleToGemini(msg.role);
|
|
74
79
|
if (msg.tool_calls) {
|
|
75
80
|
pushCurrent();
|
|
@@ -122,6 +127,17 @@ async function convertVisionMessagesToGeminiFormat(messages, options = {}) {
|
|
|
122
127
|
pushCurrent();
|
|
123
128
|
return geminiMessages;
|
|
124
129
|
}
|
|
130
|
+
function extractGeminiSystemInstruction(messages) {
|
|
131
|
+
const parts = messages.flatMap((message) => {
|
|
132
|
+
if (message.role !== 'system')
|
|
133
|
+
return [];
|
|
134
|
+
if (typeof message.content === 'string') {
|
|
135
|
+
return message.content ? [{ text: message.content }] : [];
|
|
136
|
+
}
|
|
137
|
+
return message.content.flatMap((block) => block.type === 'text' && block.text ? [{ text: block.text }] : []);
|
|
138
|
+
});
|
|
139
|
+
return parts.length > 0 ? { parts } : undefined;
|
|
140
|
+
}
|
|
125
141
|
function createFunctionCallPart(call, options) {
|
|
126
142
|
options.callIdMap?.set(call.id, call.function.name);
|
|
127
143
|
const context = options.functionCallContextMap?.get(call.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geminiMessageConverter.js","sourceRoot":"","sources":["../../../../../src/services/providers/gemini/geminiMessageConverter.ts"],"names":[],"mappings":";;AAwBA,0CAWC;AAED,
|
|
1
|
+
{"version":3,"file":"geminiMessageConverter.js","sourceRoot":"","sources":["../../../../../src/services/providers/gemini/geminiMessageConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiRequestBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/openai/openaiRequestBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,eAAe,EACf,OAAO,EACP,iBAAiB,EACjB,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGrE,KAAK,oBAAoB,GAAG,WAAW,CACrC,sBAAsB,CAAC,gBAAgB,CAAC,CACzC,CAAC;AA6BF,KAAK,6BAA6B,GAAG;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAaF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,UAAU,EACV,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,SAAS,GACV,EAAE,6BAA6B,GAAG,GAAG,CAiIrC;AAED,KAAK,8BAA8B,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,SAAS,GACV,EAAE,8BAA8B,GAAG,MAAM,GAAG,SAAS,CA2BrD;AAmBD,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,GACxC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"openaiRequestBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/openai/openaiRequestBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,eAAe,EACf,OAAO,EACP,iBAAiB,EACjB,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGrE,KAAK,oBAAoB,GAAG,WAAW,CACrC,sBAAsB,CAAC,gBAAgB,CAAC,CACzC,CAAC;AA6BF,KAAK,6BAA6B,GAAG;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAaF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,UAAU,EACV,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,SAAS,GACV,EAAE,6BAA6B,GAAG,GAAG,CAiIrC;AAED,KAAK,8BAA8B,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,SAAS,GACV,EAAE,8BAA8B,GAAG,MAAM,GAAG,SAAS,CA2BrD;AAmBD,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,GACxC,GAAG,EAAE,CAgEP;AAED,wBAAgB,sCAAsC,CACpD,QAAQ,EAAE,CAAC,OAAO,GAAG,iBAAiB,CAAC,EAAE,GACxC,GAAG,EAAE,CA2BP"}
|
|
@@ -190,11 +190,22 @@ function validateMCPCompatibility(endpoint, mcpServers) {
|
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
192
|
function cleanMessagesForResponsesAPI(messages) {
|
|
193
|
-
return messages.
|
|
194
|
-
|
|
195
|
-
|
|
193
|
+
return messages.flatMap((msg) => {
|
|
194
|
+
if (msg.role === 'assistant' && msg.provider_content?.length) {
|
|
195
|
+
return msg.provider_content;
|
|
196
|
+
}
|
|
197
|
+
if (msg.role === 'tool' && msg.tool_call_id) {
|
|
198
|
+
return [
|
|
199
|
+
{
|
|
200
|
+
type: 'function_call_output',
|
|
201
|
+
call_id: msg.tool_call_id,
|
|
202
|
+
output: msg.content,
|
|
203
|
+
},
|
|
204
|
+
];
|
|
205
|
+
}
|
|
206
|
+
const items = [];
|
|
196
207
|
const cleanMsg = {
|
|
197
|
-
role: role,
|
|
208
|
+
role: msg.role === 'tool' ? 'user' : msg.role,
|
|
198
209
|
};
|
|
199
210
|
// Handle content (text or vision).
|
|
200
211
|
if (typeof msg.content === 'string') {
|
|
@@ -223,7 +234,18 @@ function cleanMessagesForResponsesAPI(messages) {
|
|
|
223
234
|
else {
|
|
224
235
|
cleanMsg.content = msg.content;
|
|
225
236
|
}
|
|
226
|
-
|
|
237
|
+
const hasContent = typeof cleanMsg.content !== 'string' || cleanMsg.content.length > 0;
|
|
238
|
+
if (hasContent)
|
|
239
|
+
items.push(cleanMsg);
|
|
240
|
+
if (msg.role === 'assistant' && msg.tool_calls) {
|
|
241
|
+
items.push(...msg.tool_calls.map((call) => ({
|
|
242
|
+
type: 'function_call',
|
|
243
|
+
call_id: call.id,
|
|
244
|
+
name: call.function.name,
|
|
245
|
+
arguments: call.function.arguments,
|
|
246
|
+
})));
|
|
247
|
+
}
|
|
248
|
+
return items;
|
|
227
249
|
});
|
|
228
250
|
}
|
|
229
251
|
function cleanMessagesForMistralChatCompletions(messages) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiRequestBuilder.js","sourceRoot":"","sources":["../../../../../src/services/providers/openai/openaiRequestBuilder.ts"],"names":[],"mappings":";;AAoFA,wDA+IC;AAUD,0DAiCC;AAmBD,
|
|
1
|
+
{"version":3,"file":"openaiRequestBuilder.js","sourceRoot":"","sources":["../../../../../src/services/providers/openai/openaiRequestBuilder.ts"],"names":[],"mappings":";;AAoFA,wDA+IC;AAUD,0DAiCC;AAmBD,oEAkEC;AAED,wFA6BC;AAlYD,kDAQ4B;AAC5B,kDAIiC;AAQjC,2DAAiE;AAMjE,MAAM,+BAA+B,GAAuC;IAC1E,CAAC,2BAAoB,CAAC,UAAU,CAAC,EAAE,GAAG;IACtC,CAAC,2BAAoB,CAAC,KAAK,CAAC,EAAE,IAAI;IAClC,CAAC,2BAAoB,CAAC,MAAM,CAAC,EAAE,IAAI;IACnC,CAAC,2BAAoB,CAAC,IAAI,CAAC,EAAE,IAAI;IACjC,CAAC,2BAAoB,CAAC,SAAS,CAAC,EAAE,IAAI;IACtC,CAAC,2BAAoB,CAAC,IAAI,CAAC,EAAE,KAAK;CACnC,CAAC;AAEF,MAAM,yBAAyB,GAA0C;IACvE,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,GAAG,EAAE,IAAI;IACT,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,KAAK;IACZ,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,4CAA4C,GAAG,IAAI,GAAG,CAAC;IAC3D,mBAAmB;IACnB,UAAU;IACV,SAAS;IACT,QAAQ;IACR,OAAO;CACR,CAAC,CAAC;AAkBH,SAAS,qBAAqB,CAAC,cAAoC;IACjE,IAAI,cAAc,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC1C,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,GAAG,cAAc,CAAC,WAAW;KAC9B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,UAAU,EACV,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,SAAS,GACqB;IAC9B,MAAM,cAAc,GAAG,QAAQ,KAAK,yCAA6B,CAAC;IAElE,wBAAwB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAQ;QAChB,KAAK;QACL,MAAM;KACP,CAAC;IAEF,gEAAgE;IAChE,wEAAwE;IACxE,qEAAqE;IACrE,MAAM,UAAU,GAAG,uBAAuB,CAAC;QACzC,QAAQ;QACR,KAAK;QACL,cAAc;QACd,gBAAgB;QAChB,SAAS;KACV,CAAC,CAAC;IAEH,IAAI,cAAc,EAAE,CAAC;QACnB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACtC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,kEAAkE;YAClE,IAAI,6BAA6B,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5C,4DAA4D;gBAC5D,gEAAgE;gBAChE,qEAAqE;gBACrE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,IAAI,cAAc,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,QAAQ;YACX,QAAQ,KAAK,SAAS;gBACpB,CAAC,CAAC,sCAAsC,CAAC,QAAQ,CAAC;gBAClD,CAAC,CAAC,QAAQ,CAAC;IACjB,CAAC;IAED,iCAAiC;IACjC,IAAI,IAAA,uBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;QACvB,2CAA2C;QAC3C,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,gBAAgB,EAAE,CAAC;gBACrB,IAAI,CAAC,SAAS,GAAG;oBACf,GAAG,IAAI,CAAC,SAAS;oBACjB,MAAM,EAAE,gBAAgB;iBACzB,CAAC;gBACF,sEAAsE;gBACtE,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC;gBAClC,CAAC;YACH,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,GAAG;oBACV,GAAG,IAAI,CAAC,IAAI;oBACZ,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;oBACxB,SAAS;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,2DAA2D;YAC3D,IAAI,gBAAgB,EAAE,CAAC;gBACrB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YAC3C,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,GAAG;gBACV,GAAG,IAAI,CAAC,IAAI;gBACZ,MAAM,EAAE,qBAAqB,CAAC,cAAc,CAAC;aAC9C,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACxC,CAAC;IACH,CAAC;IAED,IACE,QAAQ,KAAK,SAAS;QACtB,IAAA,yCAA6B,EAAC,KAAK,CAAC;QACpC,gBAAgB;QAChB,IAAA,oCAAwB,EAAC,gBAAgB,CAAC,EAC1C,CAAC;QACD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAED,IAAI,QAAQ,KAAK,OAAO,IAAI,gBAAgB,EAAE,CAAC;QAC7C,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAED,IAAI,QAAQ,KAAK,UAAU,IAAI,gBAAgB,EAAE,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG;YACd,IAAI,EAAE,gBAAgB,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;SAC3D,CAAC;QACF,IAAI,gBAAgB,KAAK,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,IAAA,8CAA0B,EAAC;QACjD,KAAK;QACL,UAAU;QACV,cAAc;KACf,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC;QAE7B,kDAAkD;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAUD,SAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,SAAS,GACsB;IAC/B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,cAAc,GAAG,6BAA6B,CAAC,QAAQ,CAAC;QAC5D,CAAC,CAAC,cAAc,KAAK,SAAS;YAC5B,CAAC,CAAC,IAAA,oCAA6B,EAAC,cAAc,CAAC;YAC/C,CAAC,CAAC,SAAS;QACb,CAAC,CAAC,IAAA,oCAA6B,EAAC,cAAc,CAAC,CAAC;IAElD,IACE,QAAQ,KAAK,QAAQ;QACrB,CAAC,IAAA,uBAAW,EAAC,KAAK,CAAC;QACnB,cAAc,KAAK,SAAS,EAC5B,CAAC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,wBAAwB,GAC5B,gBAAgB,IAAI,IAAA,iDAAqC,EAAC,KAAK,CAAC,CAAC;IAEnE,OAAO,IAAI,CAAC,GAAG,CACb,cAAc,IAAI,CAAC,EACnB,+BAA+B,CAAC,cAAc,CAAC,EAC/C,yBAAyB,CAAC,wBAAwB,CAAC,CACpD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,QAAgB,EAChB,UAA6B;IAE7B,IACE,UAAU,CAAC,MAAM,GAAG,CAAC;QACrB,QAAQ,KAAK,gDAAoC,EACjD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,2DAA2D;YACzD,qBAAqB,QAAQ,IAAI;YACjC,6CAA6C,yCAA6B,IAAI;YAC9E,6DAA6D,CAChE,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,4BAA4B,CAC1C,QAAyC;IAEzC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC9B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;YAC7D,OAAO,GAAG,CAAC,gBAAgB,CAAC;QAC9B,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YAC5C,OAAO;gBACL;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,GAAG,CAAC,YAAY;oBACzB,MAAM,EAAE,GAAG,CAAC,OAAO;iBACpB;aACF,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAU,EAAE,CAAC;QAExB,MAAM,QAAQ,GAAQ;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;SAC9C,CAAC;QAEF,mCAAmC;QACnC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACpC,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QACjC,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,qEAAqE;YACrE,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;gBAChD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,oDAAoD;oBACpD,OAAO;wBACL,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,KAAK,CAAC,IAAI;qBACjB,CAAC;gBACJ,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACtC,0DAA0D;oBAC1D,OAAO;wBACL,IAAI,EAAE,aAAa;wBACnB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG;qBAC/B,CAAC;gBACJ,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QACjC,CAAC;QAED,MAAM,UAAU,GACd,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACtE,IAAI,UAAU;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErC,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAC/C,KAAK,CAAC,IAAI,CACR,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC/B,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,IAAI,CAAC,EAAE;gBAChB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;gBACxB,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;aACnC,CAAC,CAAC,CACJ,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,sCAAsC,CACpD,QAAyC;IAEzC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,QAAQ,GAAQ;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC/B,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;YAChD,IACE,KAAK,CAAC,IAAI,KAAK,WAAW;gBAC1B,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;gBACnC,OAAO,KAAK,CAAC,SAAS,EAAE,GAAG,KAAK,QAAQ,EACxC,CAAC;gBACD,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG;iBAC/B,CAAC;YACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,6BAA6B,CAAC,QAAgB;IACrD,OAAO,4CAA4C,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsesParser.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/openai/responsesParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAU1E,KAAK,qBAAqB,GAAG;IAC3B,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EAC9B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"responsesParser.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/openai/responsesParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAU1E,KAAK,qBAAqB,GAAG;IAC3B,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EAC9B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,kBAAkB,CAAC,CA6F7B;AAoID;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,GAAG,EACT,OAAO,GAAE,qBAA0B,GAClC,kBAAkB,CAkDpB"}
|
|
@@ -12,6 +12,7 @@ async function parseOpenAIResponsesStream(res, onPartial, options = {}) {
|
|
|
12
12
|
const dec = new TextDecoder();
|
|
13
13
|
const textBlocks = [];
|
|
14
14
|
const toolCallsMap = new Map();
|
|
15
|
+
const providerItems = new Map();
|
|
15
16
|
let responseStatus;
|
|
16
17
|
let incompleteDetails;
|
|
17
18
|
let usage;
|
|
@@ -37,7 +38,7 @@ async function parseOpenAIResponsesStream(res, onPartial, options = {}) {
|
|
|
37
38
|
else if (line === '' && eventType && eventData) {
|
|
38
39
|
try {
|
|
39
40
|
const json = JSON.parse(eventData);
|
|
40
|
-
handleResponsesSSEEvent(eventType, json, onPartial, textBlocks, toolCallsMap,
|
|
41
|
+
handleResponsesSSEEvent(eventType, json, onPartial, textBlocks, toolCallsMap, providerItems, (metadata) => {
|
|
41
42
|
if (metadata.responseStatus !== undefined) {
|
|
42
43
|
responseStatus = metadata.responseStatus;
|
|
43
44
|
}
|
|
@@ -62,8 +63,10 @@ async function parseOpenAIResponsesStream(res, onPartial, options = {}) {
|
|
|
62
63
|
type: 'tool_use',
|
|
63
64
|
id: tool.id,
|
|
64
65
|
name: tool.name,
|
|
65
|
-
input: tool.
|
|
66
|
+
input: (0, safeJsonParse_1.safeParseToolCallInput)(tool.arguments, options.onJsonError),
|
|
66
67
|
}));
|
|
68
|
+
const providerContent = Array.from(providerItems.values());
|
|
69
|
+
const text = streamTextAccumulator_1.StreamTextAccumulator.getFullText(textBlocks);
|
|
67
70
|
return {
|
|
68
71
|
blocks: [...textBlocks, ...toolBlocks],
|
|
69
72
|
stop_reason: toolBlocks.length ? 'tool_use' : 'end',
|
|
@@ -71,11 +74,21 @@ async function parseOpenAIResponsesStream(res, onPartial, options = {}) {
|
|
|
71
74
|
response_status: responseStatus,
|
|
72
75
|
incomplete_details: incompleteDetails,
|
|
73
76
|
usage,
|
|
77
|
+
...(providerContent.length > 0
|
|
78
|
+
? {
|
|
79
|
+
assistant_message: {
|
|
80
|
+
role: 'assistant',
|
|
81
|
+
content: text,
|
|
82
|
+
provider_content: providerContent,
|
|
83
|
+
},
|
|
84
|
+
}
|
|
85
|
+
: {}),
|
|
74
86
|
};
|
|
75
87
|
}
|
|
76
|
-
function handleResponsesSSEEvent(eventType, data, onPartial, textBlocks, toolCallsMap,
|
|
88
|
+
function handleResponsesSSEEvent(eventType, data, onPartial, textBlocks, toolCallsMap, providerItems, onMetadata) {
|
|
77
89
|
switch (eventType) {
|
|
78
90
|
case 'response.output_item.added':
|
|
91
|
+
rememberProviderItem(providerItems, data.item);
|
|
79
92
|
if (data.item?.type === 'message' && Array.isArray(data.item.content)) {
|
|
80
93
|
data.item.content.forEach((c) => {
|
|
81
94
|
if (c.type === 'output_text' && c.text) {
|
|
@@ -86,9 +99,41 @@ function handleResponsesSSEEvent(eventType, data, onPartial, textBlocks, toolCal
|
|
|
86
99
|
}
|
|
87
100
|
else if (data.item?.type === 'function_call') {
|
|
88
101
|
toolCallsMap.set(data.item.id, {
|
|
89
|
-
id: data.item.id,
|
|
102
|
+
id: data.item.call_id ?? data.item.id,
|
|
103
|
+
name: data.item.name,
|
|
104
|
+
arguments: data.item.arguments ?? '',
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
break;
|
|
108
|
+
case 'response.function_call_arguments.delta': {
|
|
109
|
+
const tool = toolCallsMap.get(data.item_id);
|
|
110
|
+
if (tool && typeof data.delta === 'string') {
|
|
111
|
+
tool.arguments += data.delta;
|
|
112
|
+
}
|
|
113
|
+
const item = providerItems.get(data.item_id);
|
|
114
|
+
if (item && typeof data.delta === 'string') {
|
|
115
|
+
item.arguments = `${item.arguments ?? ''}${data.delta}`;
|
|
116
|
+
}
|
|
117
|
+
break;
|
|
118
|
+
}
|
|
119
|
+
case 'response.function_call_arguments.done': {
|
|
120
|
+
const tool = toolCallsMap.get(data.item_id);
|
|
121
|
+
if (tool && typeof data.arguments === 'string') {
|
|
122
|
+
tool.arguments = data.arguments;
|
|
123
|
+
}
|
|
124
|
+
const item = providerItems.get(data.item_id);
|
|
125
|
+
if (item && typeof data.arguments === 'string') {
|
|
126
|
+
item.arguments = data.arguments;
|
|
127
|
+
}
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
case 'response.output_item.done':
|
|
131
|
+
rememberProviderItem(providerItems, data.item);
|
|
132
|
+
if (data.item?.type === 'function_call') {
|
|
133
|
+
toolCallsMap.set(data.item.id, {
|
|
134
|
+
id: data.item.call_id ?? data.item.id,
|
|
90
135
|
name: data.item.name,
|
|
91
|
-
|
|
136
|
+
arguments: data.item.arguments ?? '',
|
|
92
137
|
});
|
|
93
138
|
}
|
|
94
139
|
break;
|
|
@@ -124,6 +169,14 @@ function handleResponsesSSEEvent(eventType, data, onPartial, textBlocks, toolCal
|
|
|
124
169
|
break;
|
|
125
170
|
}
|
|
126
171
|
}
|
|
172
|
+
function rememberProviderItem(items, item) {
|
|
173
|
+
if (!item || typeof item !== 'object')
|
|
174
|
+
return;
|
|
175
|
+
const key = typeof item.id === 'string' && item.id
|
|
176
|
+
? item.id
|
|
177
|
+
: `output-item-${items.size}`;
|
|
178
|
+
items.set(key, { ...item });
|
|
179
|
+
}
|
|
127
180
|
function extractResponsesMetadata(data, fallbackStatus) {
|
|
128
181
|
const response = data?.response ?? data;
|
|
129
182
|
return {
|
|
@@ -149,7 +202,7 @@ function parseOpenAIResponsesOneShot(data, options = {}) {
|
|
|
149
202
|
if (outputItem.type === 'function_call') {
|
|
150
203
|
blocks.push({
|
|
151
204
|
type: 'tool_use',
|
|
152
|
-
id: outputItem.id,
|
|
205
|
+
id: outputItem.call_id ?? outputItem.id,
|
|
153
206
|
name: outputItem.name,
|
|
154
207
|
input: (0, safeJsonParse_1.safeParseToolCallInput)(outputItem.arguments, options.onJsonError),
|
|
155
208
|
});
|
|
@@ -163,6 +216,18 @@ function parseOpenAIResponsesOneShot(data, options = {}) {
|
|
|
163
216
|
response_status: data?.status,
|
|
164
217
|
incomplete_details: data?.incomplete_details ?? null,
|
|
165
218
|
usage: data?.usage,
|
|
219
|
+
...(Array.isArray(data?.output) && data.output.length > 0
|
|
220
|
+
? {
|
|
221
|
+
assistant_message: {
|
|
222
|
+
role: 'assistant',
|
|
223
|
+
content: blocks
|
|
224
|
+
.filter((block) => block.type === 'text')
|
|
225
|
+
.map((block) => block.text)
|
|
226
|
+
.join(''),
|
|
227
|
+
provider_content: data.output,
|
|
228
|
+
},
|
|
229
|
+
}
|
|
230
|
+
: {}),
|
|
166
231
|
};
|
|
167
232
|
}
|
|
168
233
|
//# sourceMappingURL=responsesParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsesParser.js","sourceRoot":"","sources":["../../../../../src/services/providers/openai/responsesParser.ts"],"names":[],"mappings":";;AAkBA,
|
|
1
|
+
{"version":3,"file":"responsesParser.js","sourceRoot":"","sources":["../../../../../src/services/providers/openai/responsesParser.ts"],"names":[],"mappings":";;AAkBA,gEAiGC;AAuID,kEAqDC;AA7SD,gEAAsE;AACtE,gFAA6E;AAY7E;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,GAAa,EACb,SAA8B,EAC9B,UAAiC,EAAE;IAEnC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAK,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;IAE9B,MAAM,UAAU,GAAoB,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAe,CAAC;IAC5C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAe,CAAC;IAC7C,IAAI,cAAkC,CAAC;IACvC,IAAI,iBAAyD,CAAC;IAC9D,IAAI,KAAsC,CAAC;IAE3C,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAI;YAAE,MAAM;QAChB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3C,0DAA0D;QAC1D,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,SAAS,GAAG,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,gCAAgC;QAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAE7B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;iBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;iBAAM,IAAI,IAAI,KAAK,EAAE,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;gBACjD,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACnC,uBAAuB,CACrB,SAAS,EACT,IAAI,EACJ,SAAS,EACT,UAAU,EACV,YAAY,EACZ,aAAa,EACb,CAAC,QAAQ,EAAE,EAAE;wBACX,IAAI,QAAQ,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;4BAC1C,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;wBAC3C,CAAC;wBACD,IAAI,QAAQ,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;4BAC7C,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;wBACjD,CAAC;wBACD,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;4BACjC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;wBACzB,CAAC;oBACH,CAAC,CACF,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBACxC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAC;gBACvD,CAAC;gBACD,SAAS,GAAG,EAAE,CAAC;gBACf,SAAS,GAAG,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAoB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CACvE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACT,IAAI,EAAE,UAAU;QAChB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,KAAK,EAAE,IAAA,sCAAsB,EAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC;KACnE,CAAC,CACH,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,6CAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAE3D,OAAO;QACL,MAAM,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC;QACtC,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;QACnD,SAAS,EAAE,cAAc,KAAK,YAAY;QAC1C,eAAe,EAAE,cAAc;QAC/B,kBAAkB,EAAE,iBAAiB;QACrC,KAAK;QACL,GAAG,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YAC5B,CAAC,CAAC;gBACE,iBAAiB,EAAE;oBACjB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,IAAI;oBACb,gBAAgB,EAAE,eAAe;iBAClC;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,SAAiB,EACjB,IAAS,EACT,SAA8B,EAC9B,UAA2B,EAC3B,YAA8B,EAC9B,aAA+B,EAC/B,UAAiD;IAEjD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,4BAA4B;YAC/B,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE;oBACnC,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;wBACvC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;wBAClB,6CAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;oBACnD,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC/C,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC7B,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE;oBACrC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;oBACpB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE;iBACrC,CAAC,CAAC;YACL,CAAC;YACD,MAAM;QAER,KAAK,wCAAwC,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC3C,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC;YAC/B,CAAC;YACD,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC3C,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1D,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,uCAAuC,CAAC,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,CAAC;YACD,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,2BAA2B;YAC9B,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;gBACxC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC7B,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE;oBACrC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;oBACpB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE;iBACrC,CAAC,CAAC;YACL,CAAC;YACD,MAAM;QAER,KAAK,6BAA6B;YAChC,IACE,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,aAAa;gBACjC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,EAClC,CAAC;gBACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1B,6CAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM;QAER,KAAK,4BAA4B,CAAC;QAClC,KAAK,6BAA6B,CAAC,CAAC,CAAC;YACnC,MAAM,SAAS,GACb,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;YACzE,IAAI,SAAS,EAAE,CAAC;gBACd,SAAS,CAAC,SAAS,CAAC,CAAC;gBACrB,6CAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACtD,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,2BAA2B,CAAC;QACjC,KAAK,4BAA4B,CAAC;QAClC,KAAK,4BAA4B,CAAC;QAClC,KAAK,0BAA0B,CAAC;QAChC,KAAK,yBAAyB;YAC5B,MAAM;QAER,KAAK,oBAAoB;YACvB,UAAU,CAAC,wBAAwB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;YACxD,MAAM;QAER,KAAK,qBAAqB;YACxB,UAAU,CAAC,wBAAwB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;YACzD,MAAM;QAER;YACE,MAAM;IACV,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAuB,EAAE,IAAS;IAC9D,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO;IAC9C,MAAM,GAAG,GACP,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE;QACpC,CAAC,CAAC,IAAI,CAAC,EAAE;QACT,CAAC,CAAC,eAAe,KAAK,CAAC,IAAI,EAAE,CAAC;IAClC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,wBAAwB,CAC/B,IAAS,EACT,cAA0C;IAM1C,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC;IAExC,OAAO;QACL,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,cAAc;QAClD,iBAAiB,EAAE,QAAQ,EAAE,kBAAkB,IAAI,IAAI;QACvD,KAAK,EAAE,QAAQ,EAAE,KAAK;KACvB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,2BAA2B,CACzC,IAAS,EACT,UAAiC,EAAE;IAEnC,MAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAe,EAAE,EAAE;YACtC,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxD,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;oBAC1C,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;wBACnD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACxC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,EAAE;oBACvC,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,KAAK,EAAE,IAAA,sCAAsB,EAC3B,UAAU,CAAC,SAAS,EACpB,OAAO,CAAC,WAAW,CACpB;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,MAAM;QACN,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;QAC3E,SAAS,EAAE,IAAI,EAAE,MAAM,KAAK,YAAY;QACxC,eAAe,EAAE,IAAI,EAAE,MAAM;QAC7B,kBAAkB,EAAE,IAAI,EAAE,kBAAkB,IAAI,IAAI;QACpD,KAAK,EAAE,IAAI,EAAE,KAAK;QAClB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YACvD,CAAC,CAAC;gBACE,iBAAiB,EAAE;oBACjB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,MAAM;yBACZ,MAAM,CACL,CAAC,KAAK,EAAqD,EAAE,CAC3D,KAAK,CAAC,IAAI,KAAK,MAAM,CACxB;yBACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;yBAC1B,IAAI,CAAC,EAAE,CAAC;oBACX,gBAAgB,EAAE,IAAI,CAAC,MAAM;iBAC9B;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XAIChatServiceProvider.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/xai/XAIChatServiceProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"XAIChatServiceProvider.d.ts","sourceRoot":"","sources":["../../../../../src/services/providers/xai/XAIChatServiceProvider.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAIhC;;GAEG;AACH,qBAAa,sBACX,YAAW,mBAAmB,CAAC,qBAAqB,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,WAAW;IA4B9D;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAY9B;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAI7B;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB,qBAAqB,IAAI,kBAAkB;IAI3C;;OAEG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI9C,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB;CAGjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XAIChatServiceProvider.js","sourceRoot":"","sources":["../../../../../src/services/providers/xai/XAIChatServiceProvider.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"XAIChatServiceProvider.js","sourceRoot":"","sources":["../../../../../src/services/providers/xai/XAIChatServiceProvider.ts"],"names":[],"mappings":";;;AAAA,gDAYgC;AAEhC,qDAAkD;AAOlD,0CAAoD;AAEpD;;GAEG;AACH,MAAa,sBAAsB;IAGjC;;OAEG;IACH,iBAAiB,CAAC,OAA8B;QAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC;YACrC,KAAK;YACL,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE;YACpC,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE;YAChD,sBAAsB,EAAE,CAAC,WAAW,EAAE,EAAE,CACtC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC;YAC1C,QAAQ,EAAE,UAAU;SACrB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAiC,OAAO,CAAC,KAAK,CAAC;QAE1D,OAAO,IAAI,+BAAc,CACvB,OAAO,CAAC,MAAM,EACd,KAAK,EACL,WAAW,EACX,KAAK,EACL,OAAO,CAAC,QAAQ,IAAI,uCAAiC,EACrD,OAAO,CAAC,cAAc,EACtB,IAAA,iCAA2B,EACzB,KAAK,EACL,OAAO,CAAC,gBAAgB,IAAI,IAAA,kCAA4B,EAAC,KAAK,CAAC,CAChE,CACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO;YACL,oBAAc;YACd,oBAAc;YACd,oBAAc;YACd,+BAAyB;YACzB,mCAA6B;YAC7B,mCAA6B;YAC7B,uCAAiC;SAClC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,uCAAiC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACK,qBAAqB;QAC3B,OAAO,uCAAiC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,qBAAqB,EAAE,KAAK,aAAa,CAAC;IACxD,CAAC;IAED,qBAAqB;QACnB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,sBAAsB,CAAC,KAAa;QAClC,OAAO,IAAA,sBAAgB,EAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,6BAA6B,CAAC,KAAa;QACzC,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC;IAC1E,CAAC;CACF;AA3FD,wDA2FC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { Message, ToolChatCompletion, ToolResultBlock } from './types';
|
|
2
|
+
export interface ChatBackendProviderCapabilities {
|
|
3
|
+
readonly text: true;
|
|
4
|
+
readonly streaming: boolean;
|
|
5
|
+
readonly tools: boolean;
|
|
6
|
+
}
|
|
7
|
+
/** Returns the execution capabilities known for a built-in Chat provider. */
|
|
8
|
+
export declare function getChatBackendProviderCapabilities(provider: string): ChatBackendProviderCapabilities | undefined;
|
|
9
|
+
export interface BuildToolContinuationMessagesInput {
|
|
10
|
+
readonly provider: string;
|
|
11
|
+
readonly messages: readonly Message[];
|
|
12
|
+
readonly completion: Pick<ToolChatCompletion, 'assistant_message' | 'blocks'>;
|
|
13
|
+
readonly toolResults: readonly ToolResultBlock[];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Builds the provider-compatible history required after a Tool call.
|
|
17
|
+
* The input arrays and messages are never mutated.
|
|
18
|
+
*/
|
|
19
|
+
export declare function buildToolContinuationMessages(input: BuildToolContinuationMessagesInput): Message[];
|
|
20
|
+
//# sourceMappingURL=backend.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,kBAAkB,EAClB,eAAe,EAEhB,MAAM,SAAS,CAAC;AAsCjB,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,6EAA6E;AAC7E,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,GACf,+BAA+B,GAAG,SAAS,CAO7C;AAED,MAAM,WAAW,kCAAkC;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,GAAG,QAAQ,CAAC,CAAC;IAC9E,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;CAClD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,kCAAkC,GACxC,OAAO,EAAE,CAkBX"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
const KNOWN_CHAT_PROVIDERS = new Set([
|
|
2
|
+
'claude',
|
|
3
|
+
'claude-agent-sdk',
|
|
4
|
+
'codex-sdk',
|
|
5
|
+
'copilot-sdk',
|
|
6
|
+
'deepseek',
|
|
7
|
+
'gemini',
|
|
8
|
+
'gemini-nano',
|
|
9
|
+
'kimi',
|
|
10
|
+
'mistral',
|
|
11
|
+
'openai',
|
|
12
|
+
'openai-compatible',
|
|
13
|
+
'openrouter',
|
|
14
|
+
'plamo',
|
|
15
|
+
'sakana',
|
|
16
|
+
'xai',
|
|
17
|
+
'zai',
|
|
18
|
+
]);
|
|
19
|
+
const TOOL_SUPPORTED_PROVIDERS = new Set([
|
|
20
|
+
'claude',
|
|
21
|
+
'deepseek',
|
|
22
|
+
'gemini',
|
|
23
|
+
'kimi',
|
|
24
|
+
'mistral',
|
|
25
|
+
'openai',
|
|
26
|
+
'openai-compatible',
|
|
27
|
+
'openrouter',
|
|
28
|
+
'plamo',
|
|
29
|
+
'sakana',
|
|
30
|
+
'xai',
|
|
31
|
+
'zai',
|
|
32
|
+
]);
|
|
33
|
+
const NON_STREAMING_PROVIDERS = new Set(['codex-sdk']);
|
|
34
|
+
/** Returns the execution capabilities known for a built-in Chat provider. */
|
|
35
|
+
export function getChatBackendProviderCapabilities(provider) {
|
|
36
|
+
if (!KNOWN_CHAT_PROVIDERS.has(provider))
|
|
37
|
+
return undefined;
|
|
38
|
+
return {
|
|
39
|
+
text: true,
|
|
40
|
+
streaming: !NON_STREAMING_PROVIDERS.has(provider),
|
|
41
|
+
tools: TOOL_SUPPORTED_PROVIDERS.has(provider),
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Builds the provider-compatible history required after a Tool call.
|
|
46
|
+
* The input arrays and messages are never mutated.
|
|
47
|
+
*/
|
|
48
|
+
export function buildToolContinuationMessages(input) {
|
|
49
|
+
const isClaude = input.provider === 'claude';
|
|
50
|
+
const messages = input.messages.filter((message) => !isEmptyClaudeAssistantMessage(isClaude, message));
|
|
51
|
+
const toolUses = input.completion.blocks.filter((block) => block.type === 'tool_use');
|
|
52
|
+
const assistantMessage = input.completion.assistant_message ??
|
|
53
|
+
buildAssistantToolCall(isClaude, toolUses);
|
|
54
|
+
if (!isEmptyClaudeAssistantMessage(isClaude, assistantMessage)) {
|
|
55
|
+
messages.push({ ...assistantMessage });
|
|
56
|
+
}
|
|
57
|
+
messages.push(...buildToolResultMessages(isClaude, input.toolResults));
|
|
58
|
+
return messages;
|
|
59
|
+
}
|
|
60
|
+
function isEmptyClaudeAssistantMessage(isClaude, message) {
|
|
61
|
+
if (!isClaude || message.role !== 'assistant') {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
const content = message.content;
|
|
65
|
+
return Array.isArray(content) && content.length === 0;
|
|
66
|
+
}
|
|
67
|
+
function buildAssistantToolCall(isClaude, toolUses) {
|
|
68
|
+
if (isClaude) {
|
|
69
|
+
return {
|
|
70
|
+
role: 'assistant',
|
|
71
|
+
content: toolUses.map((toolUse) => ({
|
|
72
|
+
type: 'tool_use',
|
|
73
|
+
id: toolUse.id,
|
|
74
|
+
name: toolUse.name,
|
|
75
|
+
input: toolUse.input ?? {},
|
|
76
|
+
})),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
role: 'assistant',
|
|
81
|
+
content: [],
|
|
82
|
+
tool_calls: toolUses.map((toolUse) => ({
|
|
83
|
+
id: toolUse.id,
|
|
84
|
+
type: 'function',
|
|
85
|
+
function: {
|
|
86
|
+
name: toolUse.name,
|
|
87
|
+
arguments: JSON.stringify(toolUse.input ?? {}),
|
|
88
|
+
},
|
|
89
|
+
})),
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function buildToolResultMessages(isClaude, toolResults) {
|
|
93
|
+
if (isClaude) {
|
|
94
|
+
return toolResults.map((result) => ({
|
|
95
|
+
role: 'user',
|
|
96
|
+
content: [
|
|
97
|
+
{
|
|
98
|
+
type: 'tool_result',
|
|
99
|
+
tool_use_id: result.tool_use_id,
|
|
100
|
+
content: result.content,
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
}));
|
|
104
|
+
}
|
|
105
|
+
return toolResults.map((result) => ({
|
|
106
|
+
role: 'tool',
|
|
107
|
+
tool_call_id: result.tool_use_id,
|
|
108
|
+
content: result.content,
|
|
109
|
+
}));
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=backend.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
export declare const ENDPOINT_XAI_CHAT_COMPLETIONS_API = "https://api.x.ai/v1/chat/completions";
|
|
2
|
+
export declare const MODEL_GROK_4_6 = "grok-4.6";
|
|
2
3
|
export declare const MODEL_GROK_4_5 = "grok-4.5";
|
|
3
4
|
export declare const MODEL_GROK_4_3 = "grok-4.3";
|
|
4
5
|
export declare const MODEL_GROK_4_20_REASONING = "grok-4.20-0309-reasoning";
|
|
5
6
|
export declare const MODEL_GROK_4_20_NON_REASONING = "grok-4.20-0309-non-reasoning";
|
|
6
7
|
export declare const MODEL_GROK_4_1_FAST_REASONING = "grok-4-1-fast-reasoning";
|
|
7
8
|
export declare const MODEL_GROK_4_1_FAST_NON_REASONING = "grok-4-1-fast-non-reasoning";
|
|
8
|
-
export type XaiReasoningEffort = 'none' | 'low' | 'medium' | 'high';
|
|
9
|
+
export type XaiReasoningEffort = 'none' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
9
10
|
export declare const XAI_VISION_SUPPORTED_MODELS: string[];
|
|
10
11
|
/**
|
|
11
12
|
* Check if a model supports vision capabilities
|
|
@@ -15,6 +16,10 @@ export declare function isXaiVisionModel(model: string): boolean;
|
|
|
15
16
|
* Check if a model supports the xAI reasoning_effort parameter
|
|
16
17
|
*/
|
|
17
18
|
export declare function isXaiReasoningEffortModel(model: string): boolean;
|
|
19
|
+
/**
|
|
20
|
+
* Get documented reasoning_effort values for an xAI model
|
|
21
|
+
*/
|
|
22
|
+
export declare function getXaiSupportedReasoningEfforts(model: string): readonly XaiReasoningEffort[];
|
|
18
23
|
/**
|
|
19
24
|
* Check if a model supports disabling reasoning with reasoning_effort none
|
|
20
25
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xai.d.ts","sourceRoot":"","sources":["../../../src/constants/xai.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,yCACN,CAAC;AAGzC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AACpE,eAAO,MAAM,6BAA6B,iCAAiC,CAAC;AAC5E,eAAO,MAAM,6BAA6B,4BAA4B,CAAC;AACvE,eAAO,MAAM,iCAAiC,gCAAgC,CAAC;AAE/E,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"xai.d.ts","sourceRoot":"","sources":["../../../src/constants/xai.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,yCACN,CAAC;AAGzC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AACpE,eAAO,MAAM,6BAA6B,iCAAiC,CAAC;AAC5E,eAAO,MAAM,6BAA6B,4BAA4B,CAAC;AACvE,eAAO,MAAM,iCAAiC,gCAAgC,CAAC;AAE/E,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAG9E,eAAO,MAAM,2BAA2B,UAQvC,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,MAAM,GACZ,SAAS,kBAAkB,EAAE,CAc/B;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,GACZ,kBAAkB,GAAG,SAAS,CAMhC;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EACb,eAAe,CAAC,EAAE,kBAAkB,GACnC,kBAAkB,GAAG,SAAS,CAehC"}
|