@aituber-onair/core 0.22.0 → 0.22.1
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.md +2 -1
- package/dist/core/AITuberOnAirCore.d.ts +2 -0
- package/dist/core/AITuberOnAirCore.js +58 -82
- package/dist/core/AITuberOnAirCore.js.map +1 -1
- package/dist/core/ChatProcessor.d.ts +8 -1
- package/dist/core/ChatProcessor.js +79 -66
- package/dist/core/ChatProcessor.js.map +1 -1
- package/dist/core/ToolExecutor.d.ts +3 -15
- package/dist/core/ToolExecutor.js +14 -29
- package/dist/core/ToolExecutor.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/services/chat/providers/claude/ClaudeSummarizer.js +4 -14
- package/dist/services/chat/providers/claude/ClaudeSummarizer.js.map +1 -1
- package/dist/services/chat/providers/gemini/GeminiSummarizer.js +4 -14
- package/dist/services/chat/providers/gemini/GeminiSummarizer.js.map +1 -1
- package/dist/services/chat/providers/openai/OpenAISummarizer.js +4 -14
- package/dist/services/chat/providers/openai/OpenAISummarizer.js.map +1 -1
- package/dist/services/chat/providers/summarizerUtils.d.ts +8 -0
- package/dist/services/chat/providers/summarizerUtils.js +21 -0
- package/dist/services/chat/providers/summarizerUtils.js.map +1 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -705,6 +705,7 @@ const mcpServers: MCPServerConfig[] = [
|
|
|
705
705
|
type: 'url',
|
|
706
706
|
url: 'https://mcp-server.example.com/',
|
|
707
707
|
name: 'example-mcp',
|
|
708
|
+
require_approval: 'never', // Optional: 'always' | 'never'
|
|
708
709
|
tool_configuration: { allowed_tools: ['example_tool'] },
|
|
709
710
|
authorization_token: 'YOUR_TOKEN',
|
|
710
711
|
},
|
|
@@ -1347,7 +1348,7 @@ Currently, the following AI provider is built-in:
|
|
|
1347
1348
|
|
|
1348
1349
|
- **OpenAI**: Supports models like GPT-4.1(including mini and nano), GPT-4, GPT-4o-mini, O3-mini, o1, o1-mini
|
|
1349
1350
|
- **Gemini**: Supports models like Gemini 2.5 Pro, Gemini 2.5 Flash, Gemini 2.5 Flash Lite Preview, Gemini 2.0 Flash, Gemini 2.0 Flash-Lite
|
|
1350
|
-
- **Claude**: Supports models like Claude
|
|
1351
|
+
- **Claude**: Supports models like Claude 4.6 Opus, Claude 4.5 Opus/Sonnet/Haiku, Claude 4 Sonnet/Opus, Claude 3.7 Sonnet, Claude 3.5 Haiku/Sonnet, Claude 3 Haiku
|
|
1351
1352
|
- **Z.ai**: Supports models like GLM-4.7, GLM-4.7 Flash/FlashX, GLM-4.6, GLM-4.6V Flash/FlashX
|
|
1352
1353
|
- **Kimi**: Supports Kimi K2.5 (`kimi-k2.5`) with vision support
|
|
1353
1354
|
- **OpenRouter**: Supports a curated OpenRouter model list (OpenAI/Claude/Gemini/Z.ai/Kimi)
|
|
@@ -108,6 +108,7 @@ export declare class AITuberOnAirCore extends EventEmitter {
|
|
|
108
108
|
* @param options Configuration options
|
|
109
109
|
*/
|
|
110
110
|
constructor(options: AITuberOnAirCoreOptions);
|
|
111
|
+
private buildChatServiceOptions;
|
|
111
112
|
/**
|
|
112
113
|
* Process text chat
|
|
113
114
|
* @param text User input text
|
|
@@ -121,6 +122,7 @@ export declare class AITuberOnAirCore extends EventEmitter {
|
|
|
121
122
|
* @returns Success or failure of processing
|
|
122
123
|
*/
|
|
123
124
|
processVisionChat(imageDataUrl: string, visionPrompt?: string): Promise<boolean>;
|
|
125
|
+
private withProcessing;
|
|
124
126
|
/**
|
|
125
127
|
* Stop speech playback
|
|
126
128
|
*/
|
|
@@ -89,61 +89,7 @@ export class AITuberOnAirCore extends EventEmitter {
|
|
|
89
89
|
model: options.model,
|
|
90
90
|
tools: this.toolExecutor.listDefinitions(),
|
|
91
91
|
};
|
|
92
|
-
|
|
93
|
-
switch (providerName) {
|
|
94
|
-
case 'openai': {
|
|
95
|
-
const providerOptions = options.providerOptions;
|
|
96
|
-
chatServiceOptions = {
|
|
97
|
-
...baseOptions,
|
|
98
|
-
...(providerOptions ?? {}),
|
|
99
|
-
};
|
|
100
|
-
break;
|
|
101
|
-
}
|
|
102
|
-
case 'openrouter': {
|
|
103
|
-
const providerOptions = options.providerOptions;
|
|
104
|
-
chatServiceOptions = {
|
|
105
|
-
...baseOptions,
|
|
106
|
-
...(providerOptions ?? {}),
|
|
107
|
-
};
|
|
108
|
-
break;
|
|
109
|
-
}
|
|
110
|
-
case 'gemini': {
|
|
111
|
-
const providerOptions = options.providerOptions;
|
|
112
|
-
chatServiceOptions = {
|
|
113
|
-
...baseOptions,
|
|
114
|
-
...(providerOptions ?? {}),
|
|
115
|
-
};
|
|
116
|
-
break;
|
|
117
|
-
}
|
|
118
|
-
case 'claude': {
|
|
119
|
-
const providerOptions = options.providerOptions;
|
|
120
|
-
chatServiceOptions = {
|
|
121
|
-
...baseOptions,
|
|
122
|
-
...(providerOptions ?? {}),
|
|
123
|
-
};
|
|
124
|
-
break;
|
|
125
|
-
}
|
|
126
|
-
case 'zai': {
|
|
127
|
-
const providerOptions = options.providerOptions;
|
|
128
|
-
chatServiceOptions = {
|
|
129
|
-
...baseOptions,
|
|
130
|
-
...(providerOptions ?? {}),
|
|
131
|
-
};
|
|
132
|
-
break;
|
|
133
|
-
}
|
|
134
|
-
case 'kimi': {
|
|
135
|
-
const providerOptions = options.providerOptions;
|
|
136
|
-
chatServiceOptions = {
|
|
137
|
-
...baseOptions,
|
|
138
|
-
...(providerOptions ?? {}),
|
|
139
|
-
};
|
|
140
|
-
break;
|
|
141
|
-
}
|
|
142
|
-
default:
|
|
143
|
-
chatServiceOptions =
|
|
144
|
-
baseOptions;
|
|
145
|
-
break;
|
|
146
|
-
}
|
|
92
|
+
const chatServiceOptions = this.buildChatServiceOptions(providerName, baseOptions, options.providerOptions);
|
|
147
93
|
// Add MCP servers for providers that support remote MCP
|
|
148
94
|
if ((providerName === 'claude' ||
|
|
149
95
|
providerName === 'openai' ||
|
|
@@ -182,32 +128,57 @@ export class AITuberOnAirCore extends EventEmitter {
|
|
|
182
128
|
}
|
|
183
129
|
this.log('AITuberOnAirCore initialized');
|
|
184
130
|
}
|
|
131
|
+
buildChatServiceOptions(providerName, baseOptions, providerOptions) {
|
|
132
|
+
switch (providerName) {
|
|
133
|
+
case 'openai': {
|
|
134
|
+
return {
|
|
135
|
+
...baseOptions,
|
|
136
|
+
...providerOptions,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
case 'openrouter': {
|
|
140
|
+
return {
|
|
141
|
+
...baseOptions,
|
|
142
|
+
...providerOptions,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
case 'gemini': {
|
|
146
|
+
return {
|
|
147
|
+
...baseOptions,
|
|
148
|
+
...providerOptions,
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
case 'claude': {
|
|
152
|
+
return {
|
|
153
|
+
...baseOptions,
|
|
154
|
+
...providerOptions,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
case 'zai': {
|
|
158
|
+
return {
|
|
159
|
+
...baseOptions,
|
|
160
|
+
...providerOptions,
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
case 'kimi': {
|
|
164
|
+
return {
|
|
165
|
+
...baseOptions,
|
|
166
|
+
...providerOptions,
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
default:
|
|
170
|
+
return baseOptions;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
185
173
|
/**
|
|
186
174
|
* Process text chat
|
|
187
175
|
* @param text User input text
|
|
188
176
|
* @returns Success or failure of processing
|
|
189
177
|
*/
|
|
190
178
|
async processChat(text) {
|
|
191
|
-
|
|
192
|
-
this.log('Already processing another chat');
|
|
193
|
-
return false;
|
|
194
|
-
}
|
|
195
|
-
try {
|
|
196
|
-
this.isProcessing = true;
|
|
197
|
-
this.emit(AITuberOnAirCoreEvent.PROCESSING_START, { text });
|
|
198
|
-
// Process text chat
|
|
179
|
+
return this.withProcessing({ text }, async () => {
|
|
199
180
|
await this.chatProcessor.processTextChat(text);
|
|
200
|
-
|
|
201
|
-
}
|
|
202
|
-
catch (error) {
|
|
203
|
-
this.log('Error in processChat:', error);
|
|
204
|
-
this.emit(AITuberOnAirCoreEvent.ERROR, error);
|
|
205
|
-
return false;
|
|
206
|
-
}
|
|
207
|
-
finally {
|
|
208
|
-
this.isProcessing = false;
|
|
209
|
-
this.emit(AITuberOnAirCoreEvent.PROCESSING_END);
|
|
210
|
-
}
|
|
181
|
+
}, 'Error in processChat:');
|
|
211
182
|
}
|
|
212
183
|
/**
|
|
213
184
|
* Process image-based chat
|
|
@@ -216,23 +187,28 @@ export class AITuberOnAirCore extends EventEmitter {
|
|
|
216
187
|
* @returns Success or failure of processing
|
|
217
188
|
*/
|
|
218
189
|
async processVisionChat(imageDataUrl, visionPrompt) {
|
|
219
|
-
|
|
220
|
-
this.log('Already processing another chat');
|
|
221
|
-
return false;
|
|
222
|
-
}
|
|
223
|
-
try {
|
|
224
|
-
this.isProcessing = true;
|
|
225
|
-
this.emit(AITuberOnAirCoreEvent.PROCESSING_START, { type: 'vision' });
|
|
190
|
+
return this.withProcessing({ type: 'vision' }, async () => {
|
|
226
191
|
// Update vision prompt if provided
|
|
227
192
|
if (visionPrompt) {
|
|
228
193
|
this.chatProcessor.updateOptions({ visionPrompt });
|
|
229
194
|
}
|
|
230
195
|
// Process image in ChatProcessor
|
|
231
196
|
await this.chatProcessor.processVisionChat(imageDataUrl);
|
|
197
|
+
}, 'Error in processVisionChat:');
|
|
198
|
+
}
|
|
199
|
+
async withProcessing(startPayload, action, errorMessage) {
|
|
200
|
+
if (this.isProcessing) {
|
|
201
|
+
this.log('Already processing another chat');
|
|
202
|
+
return false;
|
|
203
|
+
}
|
|
204
|
+
try {
|
|
205
|
+
this.isProcessing = true;
|
|
206
|
+
this.emit(AITuberOnAirCoreEvent.PROCESSING_START, startPayload);
|
|
207
|
+
await action();
|
|
232
208
|
return true;
|
|
233
209
|
}
|
|
234
210
|
catch (error) {
|
|
235
|
-
this.log(
|
|
211
|
+
this.log(errorMessage, error);
|
|
236
212
|
this.emit(AITuberOnAirCoreEvent.ERROR, error);
|
|
237
213
|
return false;
|
|
238
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AITuberOnAirCore.js","sourceRoot":"","sources":["../../src/core/AITuberOnAirCore.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AITuberOnAirCore.js","sourceRoot":"","sources":["../../src/core/AITuberOnAirCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ export declare class ChatProcessor extends EventEmitter {
|
|
|
40
40
|
private chatStartTime;
|
|
41
41
|
private processingChat;
|
|
42
42
|
private toolCallback?;
|
|
43
|
-
private
|
|
43
|
+
private maxHops;
|
|
44
44
|
/**
|
|
45
45
|
* Constructor
|
|
46
46
|
* @param chatService Chat service
|
|
@@ -110,6 +110,13 @@ export declare class ChatProcessor extends EventEmitter {
|
|
|
110
110
|
* @returns Maximum tokens for vision
|
|
111
111
|
*/
|
|
112
112
|
private getMaxTokensForVision;
|
|
113
|
+
private isClaudeProvider;
|
|
114
|
+
private getToolUseBlocks;
|
|
115
|
+
private getToolResultBlocks;
|
|
116
|
+
private isEmptyClaudeAssistantMessage;
|
|
117
|
+
private buildAssistantToolCall;
|
|
118
|
+
private buildToolMessages;
|
|
119
|
+
private buildNextMessages;
|
|
113
120
|
private runToolLoop;
|
|
114
121
|
}
|
|
115
122
|
export {};
|
|
@@ -21,8 +21,8 @@ export class ChatProcessor extends EventEmitter {
|
|
|
21
21
|
this.options = options;
|
|
22
22
|
this.memoryManager = memoryManager;
|
|
23
23
|
this.toolCallback = toolCallback;
|
|
24
|
-
// Initialize
|
|
25
|
-
this.
|
|
24
|
+
// Initialize maxHops from options with default value of 6
|
|
25
|
+
this.maxHops = options.maxHops ?? 6;
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* Add message to chat log
|
|
@@ -70,9 +70,9 @@ export class ChatProcessor extends EventEmitter {
|
|
|
70
70
|
*/
|
|
71
71
|
updateOptions(newOptions) {
|
|
72
72
|
this.options = { ...this.options, ...newOptions };
|
|
73
|
-
// Update
|
|
73
|
+
// Update maxHops if maxHops is included in the new options
|
|
74
74
|
if (newOptions.maxHops !== undefined) {
|
|
75
|
-
this.
|
|
75
|
+
this.maxHops = newOptions.maxHops;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
/**
|
|
@@ -247,18 +247,84 @@ export class ChatProcessor extends EventEmitter {
|
|
|
247
247
|
// Fallback to regular chat settings
|
|
248
248
|
return this.getMaxTokensForChat();
|
|
249
249
|
}
|
|
250
|
+
isClaudeProvider() {
|
|
251
|
+
return this.chatService.provider === 'claude';
|
|
252
|
+
}
|
|
253
|
+
getToolUseBlocks(blocks) {
|
|
254
|
+
return blocks.filter((b) => b.type === 'tool_use');
|
|
255
|
+
}
|
|
256
|
+
getToolResultBlocks(blocks) {
|
|
257
|
+
return blocks.filter((b) => b.type === 'tool_result');
|
|
258
|
+
}
|
|
259
|
+
isEmptyClaudeAssistantMessage(isClaude, message) {
|
|
260
|
+
if (!isClaude || message.role !== 'assistant') {
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
263
|
+
const content = message.content;
|
|
264
|
+
return Array.isArray(content) && content.length === 0;
|
|
265
|
+
}
|
|
266
|
+
buildAssistantToolCall(isClaude, toolUses) {
|
|
267
|
+
if (isClaude) {
|
|
268
|
+
return {
|
|
269
|
+
role: 'assistant',
|
|
270
|
+
content: toolUses.map((u) => ({
|
|
271
|
+
type: 'tool_use',
|
|
272
|
+
id: u.id,
|
|
273
|
+
name: u.name,
|
|
274
|
+
input: u.input ?? {},
|
|
275
|
+
})),
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
return {
|
|
279
|
+
role: 'assistant',
|
|
280
|
+
content: [],
|
|
281
|
+
tool_calls: toolUses.map((u) => ({
|
|
282
|
+
id: u.id,
|
|
283
|
+
type: 'function',
|
|
284
|
+
function: {
|
|
285
|
+
name: u.name,
|
|
286
|
+
arguments: JSON.stringify(u.input || {}),
|
|
287
|
+
},
|
|
288
|
+
})),
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
buildToolMessages(isClaude, toolResults) {
|
|
292
|
+
if (isClaude) {
|
|
293
|
+
return toolResults.map((r) => ({
|
|
294
|
+
role: 'user',
|
|
295
|
+
content: [
|
|
296
|
+
{
|
|
297
|
+
type: r.type,
|
|
298
|
+
tool_use_id: r.tool_use_id,
|
|
299
|
+
content: r.content,
|
|
300
|
+
},
|
|
301
|
+
],
|
|
302
|
+
}));
|
|
303
|
+
}
|
|
304
|
+
return toolResults.map((r) => ({
|
|
305
|
+
role: 'tool',
|
|
306
|
+
tool_call_id: r.tool_use_id,
|
|
307
|
+
content: r.content,
|
|
308
|
+
}));
|
|
309
|
+
}
|
|
310
|
+
buildNextMessages(isClaude, currentMessages, assistantToolCall, toolMessages) {
|
|
311
|
+
const cleaned = currentMessages.filter((m) => !this.isEmptyClaudeAssistantMessage(isClaude, m));
|
|
312
|
+
if (!this.isEmptyClaudeAssistantMessage(isClaude, assistantToolCall)) {
|
|
313
|
+
cleaned.push(assistantToolCall);
|
|
314
|
+
}
|
|
315
|
+
toolMessages.forEach((m) => cleaned.push(m));
|
|
316
|
+
return cleaned;
|
|
317
|
+
}
|
|
250
318
|
async runToolLoop(send, once, visionSource) {
|
|
251
319
|
let toSend = send;
|
|
252
320
|
let hops = 0;
|
|
253
321
|
let first = true;
|
|
254
322
|
// check if the chat service is claude
|
|
255
|
-
const isClaude = this.
|
|
256
|
-
while (hops++ < this.
|
|
323
|
+
const isClaude = this.isClaudeProvider();
|
|
324
|
+
while (hops++ < this.maxHops) {
|
|
257
325
|
const { blocks, stop_reason } = await once(toSend, first, (t) => this.emit('assistantPartialResponse', t));
|
|
258
326
|
first = false;
|
|
259
|
-
blocks
|
|
260
|
-
.filter((b) => b.type === 'tool_result')
|
|
261
|
-
.forEach((b) => this.emit('assistantPartialResponse', b.content));
|
|
327
|
+
this.getToolResultBlocks(blocks).forEach((b) => this.emit('assistantPartialResponse', b.content));
|
|
262
328
|
if (stop_reason === 'end') {
|
|
263
329
|
const full = blocks
|
|
264
330
|
.map((b) => b.type === 'text'
|
|
@@ -286,65 +352,12 @@ export class ChatProcessor extends EventEmitter {
|
|
|
286
352
|
/* ---------- tool_use ---------- */
|
|
287
353
|
if (!this.toolCallback)
|
|
288
354
|
throw new Error('Tool callback missing');
|
|
289
|
-
const toolUses =
|
|
355
|
+
const toolUses = this.getToolUseBlocks(blocks);
|
|
290
356
|
const toolResults = await this.toolCallback(toolUses);
|
|
291
|
-
const assistantToolCall = isClaude
|
|
292
|
-
|
|
293
|
-
role: 'assistant',
|
|
294
|
-
content: toolUses.map((u) => ({
|
|
295
|
-
type: 'tool_use',
|
|
296
|
-
id: u.id,
|
|
297
|
-
name: u.name,
|
|
298
|
-
input: u.input ?? {},
|
|
299
|
-
})),
|
|
300
|
-
}
|
|
301
|
-
: {
|
|
302
|
-
role: 'assistant',
|
|
303
|
-
content: [],
|
|
304
|
-
tool_calls: toolUses.map((u) => ({
|
|
305
|
-
id: u.id,
|
|
306
|
-
type: 'function',
|
|
307
|
-
function: {
|
|
308
|
-
name: u.name,
|
|
309
|
-
arguments: JSON.stringify(u.input || {}),
|
|
310
|
-
},
|
|
311
|
-
})),
|
|
312
|
-
};
|
|
313
|
-
const toolMsgs = toolResults.map((r) => {
|
|
314
|
-
if (isClaude) {
|
|
315
|
-
return {
|
|
316
|
-
role: 'user',
|
|
317
|
-
content: [
|
|
318
|
-
{
|
|
319
|
-
type: r.type,
|
|
320
|
-
tool_use_id: r.tool_use_id,
|
|
321
|
-
content: r.content,
|
|
322
|
-
},
|
|
323
|
-
],
|
|
324
|
-
};
|
|
325
|
-
}
|
|
326
|
-
return {
|
|
327
|
-
role: 'tool',
|
|
328
|
-
tool_call_id: r.tool_use_id,
|
|
329
|
-
content: r.content,
|
|
330
|
-
};
|
|
331
|
-
});
|
|
357
|
+
const assistantToolCall = this.buildAssistantToolCall(isClaude, toolUses);
|
|
358
|
+
const toolMsgs = this.buildToolMessages(isClaude, toolResults);
|
|
332
359
|
/* build messages for the next turn */
|
|
333
|
-
const cleaned =
|
|
334
|
-
if (isClaude &&
|
|
335
|
-
m.role === 'assistant' &&
|
|
336
|
-
Array.isArray(m.content) &&
|
|
337
|
-
m.content.length === 0) {
|
|
338
|
-
return false;
|
|
339
|
-
}
|
|
340
|
-
return true;
|
|
341
|
-
});
|
|
342
|
-
if (!(isClaude &&
|
|
343
|
-
Array.isArray(assistantToolCall.content) &&
|
|
344
|
-
assistantToolCall.content.length === 0)) {
|
|
345
|
-
cleaned.push(assistantToolCall);
|
|
346
|
-
}
|
|
347
|
-
toolMsgs.forEach((m) => cleaned.push(m));
|
|
360
|
+
const cleaned = this.buildNextMessages(isClaude, toSend, assistantToolCall, toolMsgs);
|
|
348
361
|
toSend = cleaned;
|
|
349
362
|
}
|
|
350
363
|
// It is rare to reach this point. Just log it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatProcessor.js","sourceRoot":"","sources":["../../src/core/ChatProcessor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ChatProcessor.js","sourceRoot":"","sources":["../../src/core/ChatProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,23 +6,11 @@ export declare class ToolExecutor {
|
|
|
6
6
|
register<P, R>(definition: ToolDefinition, fn: Handler<P, R>): void;
|
|
7
7
|
setMCPServers(servers: MCPServerConfig[]): void;
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
* @param toolName Tool name to check
|
|
11
|
-
* @returns True if this is an MCP tool
|
|
12
|
-
*/
|
|
13
|
-
private isMCPTool;
|
|
14
|
-
/**
|
|
15
|
-
* Extract MCP server name from tool name
|
|
16
|
-
* @param toolName Tool name (e.g., "mcp_deepwiki_search")
|
|
17
|
-
* @returns Server name (e.g., "deepwiki")
|
|
18
|
-
*/
|
|
19
|
-
private extractMCPServerName;
|
|
20
|
-
/**
|
|
21
|
-
* Extract actual tool name from MCP tool name
|
|
9
|
+
* Parse MCP tool name
|
|
22
10
|
* @param toolName Tool name (e.g., "mcp_deepwiki_search")
|
|
23
|
-
* @returns
|
|
11
|
+
* @returns Parsed MCP tool parts or null for non-MCP tools
|
|
24
12
|
*/
|
|
25
|
-
private
|
|
13
|
+
private parseMCPToolName;
|
|
26
14
|
/**
|
|
27
15
|
* Execute MCP tool call
|
|
28
16
|
* @param block Tool use block
|
|
@@ -13,36 +13,21 @@ export class ToolExecutor {
|
|
|
13
13
|
this.mcpServers = servers;
|
|
14
14
|
}
|
|
15
15
|
/**
|
|
16
|
-
*
|
|
17
|
-
* @param toolName Tool name to check
|
|
18
|
-
* @returns True if this is an MCP tool
|
|
19
|
-
*/
|
|
20
|
-
isMCPTool(toolName) {
|
|
21
|
-
return toolName.startsWith('mcp_') && toolName.includes('_');
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* Extract MCP server name from tool name
|
|
16
|
+
* Parse MCP tool name
|
|
25
17
|
* @param toolName Tool name (e.g., "mcp_deepwiki_search")
|
|
26
|
-
* @returns
|
|
18
|
+
* @returns Parsed MCP tool parts or null for non-MCP tools
|
|
27
19
|
*/
|
|
28
|
-
|
|
20
|
+
parseMCPToolName(toolName) {
|
|
29
21
|
// Format: mcp_{serverName}_{toolName}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return parts[1]; // Return server name
|
|
22
|
+
if (!toolName.startsWith('mcp_')) {
|
|
23
|
+
return null;
|
|
33
24
|
}
|
|
34
|
-
throw new Error(`Invalid MCP tool name format: ${toolName}`);
|
|
35
|
-
}
|
|
36
|
-
/**
|
|
37
|
-
* Extract actual tool name from MCP tool name
|
|
38
|
-
* @param toolName Tool name (e.g., "mcp_deepwiki_search")
|
|
39
|
-
* @returns Actual tool name (e.g., "search")
|
|
40
|
-
*/
|
|
41
|
-
extractMCPToolName(toolName) {
|
|
42
|
-
// Format: mcp_{serverName}_{toolName}
|
|
43
25
|
const parts = toolName.split('_');
|
|
44
26
|
if (parts.length >= 3 && parts[0] === 'mcp') {
|
|
45
|
-
return
|
|
27
|
+
return {
|
|
28
|
+
serverName: parts[1],
|
|
29
|
+
toolName: parts.slice(2).join('_'),
|
|
30
|
+
};
|
|
46
31
|
}
|
|
47
32
|
throw new Error(`Invalid MCP tool name format: ${toolName}`);
|
|
48
33
|
}
|
|
@@ -51,9 +36,8 @@ export class ToolExecutor {
|
|
|
51
36
|
* @param block Tool use block
|
|
52
37
|
* @returns Tool result block
|
|
53
38
|
*/
|
|
54
|
-
async executeMCPTool(block) {
|
|
55
|
-
const serverName =
|
|
56
|
-
const toolName = this.extractMCPToolName(block.name);
|
|
39
|
+
async executeMCPTool(block, mcpTool) {
|
|
40
|
+
const { serverName, toolName } = mcpTool;
|
|
57
41
|
const mcpServer = this.mcpServers.find((server) => server.name === serverName);
|
|
58
42
|
if (!mcpServer) {
|
|
59
43
|
throw new Error(`MCP server '${serverName}' not found`);
|
|
@@ -96,8 +80,9 @@ export class ToolExecutor {
|
|
|
96
80
|
.filter((b) => b.type === 'tool_use')
|
|
97
81
|
.map(async (b) => {
|
|
98
82
|
// Check if this is an MCP tool
|
|
99
|
-
|
|
100
|
-
|
|
83
|
+
const mcpTool = this.parseMCPToolName(b.name);
|
|
84
|
+
if (mcpTool) {
|
|
85
|
+
return this.executeMCPTool(b, mcpTool);
|
|
101
86
|
}
|
|
102
87
|
// Handle regular tools
|
|
103
88
|
const entry = this.registry.get(b.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolExecutor.js","sourceRoot":"","sources":["../../src/core/ToolExecutor.ts"],"names":[],"mappings":"AASA,MAAM,OAAO,YAAY;IAAzB;QACU,aAAQ,GAAG,IAAI,GAAG,EAAgD,CAAC;QACnE,eAAU,GAAsB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolExecutor.js","sourceRoot":"","sources":["../../src/core/ToolExecutor.ts"],"names":[],"mappings":"AASA,MAAM,OAAO,YAAY;IAAzB;QACU,aAAQ,GAAG,IAAI,GAAG,EAAgD,CAAC;QACnE,eAAU,GAAsB,EAAE,CAAC;IAwI7C,CAAC;IAtIC,QAAQ,CAAO,UAA0B,EAAE,EAAiB;QAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,SAAS,UAAU,CAAC,IAAI,sBAAsB,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,OAA0B;QACtC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACK,gBAAgB,CACtB,QAAgB;QAEhB,sCAAsC;QACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;YAC5C,OAAO;gBACL,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;gBACpB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;aACnC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,cAAc,CAC1B,KAAmB,EACnB,OAAiD;QAEjD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CACpC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CACvC,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,aAAa,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC;YACH,8CAA8C;YAC9C,MAAM,OAAO,GAA2B;gBACtC,cAAc,EAAE,kBAAkB;aACnC,CAAC;YAEF,IAAI,SAAS,CAAC,mBAAmB,EAAE,CAAC;gBAClC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,SAAS,CAAC,mBAAmB,EAAE,CAAC;YACvE,CAAC;YAED,4DAA4D;YAC5D,wDAAwD;YACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAC,GAAG,UAAU,QAAQ,EAAE,EAAE;gBACjE,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;aACxC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,UAAU,EAAE,CACvE,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAErC,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,KAAK,CAAC,EAAE;gBACrB,OAAO,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,KAAK,CAAC,EAAE;gBACrB,OAAO,EAAE,8BAA8B,KAAK,CAAC,OAAO,EAAE;aACvD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAsB;QAC9B,MAAM,KAAK,GAAG,MAAM;aACjB,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;aACvD,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACf,+BAA+B;YAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACzC,CAAC;YAED,uBAAuB;YACvB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;YAE1B,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS;gBAClC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC;oBACjB,UAAU;oBACV,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAC5B,UAAU,CACR,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,EAC3C,GAAG,CAAC,MAAO,CAAC,SAAS,CACtB,CACF;iBACF,CAAC;gBACJ,CAAC,CAAC,MAAM,UAAU,CAAC;YAErB,OAAwB;gBACtB,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,CAAC,CAAC,EAAE;gBACjB,OAAO,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtE,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,eAAe;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC;CACF"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Modularized library of AITuber OnAir core features
|
|
4
4
|
*/
|
|
5
5
|
export * from './types';
|
|
6
|
-
export { type ChatService, ChatServiceFactory, type ChatServiceOptions, type ChatServiceProvider, OpenAIChatService, OpenAIChatServiceProvider, GeminiChatService, GeminiChatServiceProvider, ClaudeChatService, ClaudeChatServiceProvider, ZAIChatService, ZAIChatServiceProvider, KimiChatService, KimiChatServiceProvider, type Message, type MessageWithVision, type VisionBlock, type ChatType, type ToolDefinition, type ToolUseBlock, type ToolResultBlock, type ToolChatCompletion, type MCPServerConfig, type ChatResponseLength, CHAT_RESPONSE_LENGTH, MAX_TOKENS_BY_LENGTH, DEFAULT_MAX_TOKENS, DEFAULT_VISION_PROMPT, getMaxTokensForResponseLength, MODEL_GPT_5_NANO, MODEL_GPT_5_MINI, MODEL_GPT_5, MODEL_GPT_5_1, MODEL_GPT_4_1, MODEL_GPT_4_1_MINI, MODEL_GPT_4_1_NANO, MODEL_GPT_4O, MODEL_GPT_4O_MINI, MODEL_GPT_4_5_PREVIEW, MODEL_O3_MINI, MODEL_O1, MODEL_O1_MINI, GPT_5_MODELS, isGPT5Model, VISION_SUPPORTED_MODELS, ENDPOINT_OPENAI_CHAT_COMPLETIONS_API, ENDPOINT_OPENAI_RESPONSES_API, GPT5_PRESETS, type GPT5PresetKey, MODEL_GEMINI_2_5_PRO, MODEL_GEMINI_2_5_FLASH, MODEL_GEMINI_2_5_FLASH_LITE, MODEL_GEMINI_2_5_FLASH_LITE_PREVIEW_06_17, MODEL_GEMINI_2_0_FLASH, MODEL_GEMINI_2_0_FLASH_LITE, GEMINI_VISION_SUPPORTED_MODELS, ENDPOINT_GEMINI_API, MODEL_CLAUDE_3_HAIKU, MODEL_CLAUDE_3_5_HAIKU, MODEL_CLAUDE_3_5_SONNET, MODEL_CLAUDE_3_7_SONNET, MODEL_CLAUDE_4_SONNET, MODEL_CLAUDE_4_OPUS, MODEL_CLAUDE_4_5_OPUS, MODEL_CLAUDE_4_5_SONNET, MODEL_CLAUDE_4_5_HAIKU, CLAUDE_VISION_SUPPORTED_MODELS, ENDPOINT_CLAUDE_API, MODEL_GLM_4_7, MODEL_GLM_4_7_FLASHX, MODEL_GLM_4_7_FLASH, MODEL_GLM_4_6, MODEL_GLM_4_6V, MODEL_GLM_4_6V_FLASHX, MODEL_GLM_4_6V_FLASH, ZAI_VISION_SUPPORTED_MODELS, ENDPOINT_ZAI_CHAT_COMPLETIONS_API, MODEL_KIMI_K2_5, KIMI_VISION_SUPPORTED_MODELS, ENDPOINT_KIMI_CHAT_COMPLETIONS_API, MODEL_GPT_OSS_20B_FREE, MODEL_MOONSHOTAI_KIMI_K2_5, MODEL_OPENAI_GPT_5_1_CHAT, MODEL_OPENAI_GPT_5_1_CODEX, MODEL_OPENAI_GPT_5_MINI, MODEL_OPENAI_GPT_5_NANO, MODEL_OPENAI_GPT_4O, MODEL_OPENAI_GPT_4_1_MINI, MODEL_OPENAI_GPT_4_1_NANO, MODEL_ANTHROPIC_CLAUDE_OPUS_4, MODEL_ANTHROPIC_CLAUDE_SONNET_4, MODEL_ANTHROPIC_CLAUDE_3_7_SONNET, MODEL_ANTHROPIC_CLAUDE_3_5_SONNET, MODEL_ANTHROPIC_CLAUDE_4_5_HAIKU, MODEL_GOOGLE_GEMINI_2_5_PRO, MODEL_GOOGLE_GEMINI_2_5_FLASH, MODEL_GOOGLE_GEMINI_2_5_FLASH_LITE_PREVIEW_09_2025, MODEL_ZAI_GLM_4_7_FLASH, MODEL_ZAI_GLM_4_5_AIR, MODEL_ZAI_GLM_4_5_AIR_FREE, OPENROUTER_FREE_MODELS, OPENROUTER_VISION_SUPPORTED_MODELS, ENDPOINT_OPENROUTER_API, textToScreenplay as chatTextToScreenplay, screenplayToText as chatScreenplayToText, EmotionParser as ChatEmotionParser, } from '@aituber-onair/chat';
|
|
6
|
+
export { type ChatService, ChatServiceFactory, type ChatServiceOptions, type ChatServiceProvider, OpenAIChatService, OpenAIChatServiceProvider, GeminiChatService, GeminiChatServiceProvider, ClaudeChatService, ClaudeChatServiceProvider, ZAIChatService, ZAIChatServiceProvider, KimiChatService, KimiChatServiceProvider, type Message, type MessageWithVision, type VisionBlock, type ChatType, type ToolDefinition, type ToolUseBlock, type ToolResultBlock, type ToolChatCompletion, type MCPServerConfig, type ChatResponseLength, CHAT_RESPONSE_LENGTH, MAX_TOKENS_BY_LENGTH, DEFAULT_MAX_TOKENS, DEFAULT_VISION_PROMPT, getMaxTokensForResponseLength, MODEL_GPT_5_NANO, MODEL_GPT_5_MINI, MODEL_GPT_5, MODEL_GPT_5_1, MODEL_GPT_4_1, MODEL_GPT_4_1_MINI, MODEL_GPT_4_1_NANO, MODEL_GPT_4O, MODEL_GPT_4O_MINI, MODEL_GPT_4_5_PREVIEW, MODEL_O3_MINI, MODEL_O1, MODEL_O1_MINI, GPT_5_MODELS, isGPT5Model, VISION_SUPPORTED_MODELS, ENDPOINT_OPENAI_CHAT_COMPLETIONS_API, ENDPOINT_OPENAI_RESPONSES_API, GPT5_PRESETS, type GPT5PresetKey, MODEL_GEMINI_2_5_PRO, MODEL_GEMINI_2_5_FLASH, MODEL_GEMINI_2_5_FLASH_LITE, MODEL_GEMINI_2_5_FLASH_LITE_PREVIEW_06_17, MODEL_GEMINI_2_0_FLASH, MODEL_GEMINI_2_0_FLASH_LITE, GEMINI_VISION_SUPPORTED_MODELS, ENDPOINT_GEMINI_API, MODEL_CLAUDE_3_HAIKU, MODEL_CLAUDE_3_5_HAIKU, MODEL_CLAUDE_3_5_SONNET, MODEL_CLAUDE_3_7_SONNET, MODEL_CLAUDE_4_SONNET, MODEL_CLAUDE_4_OPUS, MODEL_CLAUDE_4_5_OPUS, MODEL_CLAUDE_4_6_OPUS, MODEL_CLAUDE_4_5_SONNET, MODEL_CLAUDE_4_5_HAIKU, CLAUDE_VISION_SUPPORTED_MODELS, ENDPOINT_CLAUDE_API, MODEL_GLM_4_7, MODEL_GLM_4_7_FLASHX, MODEL_GLM_4_7_FLASH, MODEL_GLM_4_6, MODEL_GLM_4_6V, MODEL_GLM_4_6V_FLASHX, MODEL_GLM_4_6V_FLASH, ZAI_VISION_SUPPORTED_MODELS, ENDPOINT_ZAI_CHAT_COMPLETIONS_API, MODEL_KIMI_K2_5, KIMI_VISION_SUPPORTED_MODELS, ENDPOINT_KIMI_CHAT_COMPLETIONS_API, MODEL_GPT_OSS_20B_FREE, MODEL_MOONSHOTAI_KIMI_K2_5, MODEL_OPENAI_GPT_5_1_CHAT, MODEL_OPENAI_GPT_5_1_CODEX, MODEL_OPENAI_GPT_5_MINI, MODEL_OPENAI_GPT_5_NANO, MODEL_OPENAI_GPT_4O, MODEL_OPENAI_GPT_4_1_MINI, MODEL_OPENAI_GPT_4_1_NANO, MODEL_ANTHROPIC_CLAUDE_OPUS_4, MODEL_ANTHROPIC_CLAUDE_SONNET_4, MODEL_ANTHROPIC_CLAUDE_3_7_SONNET, MODEL_ANTHROPIC_CLAUDE_3_5_SONNET, MODEL_ANTHROPIC_CLAUDE_4_5_HAIKU, MODEL_GOOGLE_GEMINI_2_5_PRO, MODEL_GOOGLE_GEMINI_2_5_FLASH, MODEL_GOOGLE_GEMINI_2_5_FLASH_LITE_PREVIEW_09_2025, MODEL_ZAI_GLM_4_7_FLASH, MODEL_ZAI_GLM_4_5_AIR, MODEL_ZAI_GLM_4_5_AIR_FREE, OPENROUTER_FREE_MODELS, OPENROUTER_VISION_SUPPORTED_MODELS, ENDPOINT_OPENROUTER_API, textToScreenplay as chatTextToScreenplay, screenplayToText as chatScreenplayToText, EmotionParser as ChatEmotionParser, } from '@aituber-onair/chat';
|
|
7
7
|
export { EventEmitter } from './core/EventEmitter';
|
|
8
8
|
export type { MemoryOptions, Summarizer } from './core/MemoryManager';
|
|
9
9
|
export { MemoryManager } from './core/MemoryManager';
|
package/dist/index.js
CHANGED
|
@@ -23,7 +23,7 @@ GPT5_PRESETS,
|
|
|
23
23
|
// Gemini model constants
|
|
24
24
|
MODEL_GEMINI_2_5_PRO, MODEL_GEMINI_2_5_FLASH, MODEL_GEMINI_2_5_FLASH_LITE, MODEL_GEMINI_2_5_FLASH_LITE_PREVIEW_06_17, MODEL_GEMINI_2_0_FLASH, MODEL_GEMINI_2_0_FLASH_LITE, GEMINI_VISION_SUPPORTED_MODELS, ENDPOINT_GEMINI_API,
|
|
25
25
|
// Claude model constants
|
|
26
|
-
MODEL_CLAUDE_3_HAIKU, MODEL_CLAUDE_3_5_HAIKU, MODEL_CLAUDE_3_5_SONNET, MODEL_CLAUDE_3_7_SONNET, MODEL_CLAUDE_4_SONNET, MODEL_CLAUDE_4_OPUS, MODEL_CLAUDE_4_5_OPUS, MODEL_CLAUDE_4_5_SONNET, MODEL_CLAUDE_4_5_HAIKU, CLAUDE_VISION_SUPPORTED_MODELS, ENDPOINT_CLAUDE_API,
|
|
26
|
+
MODEL_CLAUDE_3_HAIKU, MODEL_CLAUDE_3_5_HAIKU, MODEL_CLAUDE_3_5_SONNET, MODEL_CLAUDE_3_7_SONNET, MODEL_CLAUDE_4_SONNET, MODEL_CLAUDE_4_OPUS, MODEL_CLAUDE_4_5_OPUS, MODEL_CLAUDE_4_6_OPUS, MODEL_CLAUDE_4_5_SONNET, MODEL_CLAUDE_4_5_HAIKU, CLAUDE_VISION_SUPPORTED_MODELS, ENDPOINT_CLAUDE_API,
|
|
27
27
|
// Z.ai model constants
|
|
28
28
|
MODEL_GLM_4_7, MODEL_GLM_4_7_FLASHX, MODEL_GLM_4_7_FLASH, MODEL_GLM_4_6, MODEL_GLM_4_6V, MODEL_GLM_4_6V_FLASHX, MODEL_GLM_4_6V_FLASH, ZAI_VISION_SUPPORTED_MODELS, ENDPOINT_ZAI_CHAT_COMPLETIONS_API,
|
|
29
29
|
// Kimi model constants
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ENDPOINT_CLAUDE_API, MODEL_CLAUDE_3_HAIKU, DEFAULT_SUMMARY_PROMPT_TEMPLATE, } from '@aituber-onair/chat';
|
|
2
|
+
import { createSummaryContext, summarizeWithFallback, } from '../summarizerUtils';
|
|
2
3
|
/**
|
|
3
4
|
* Implementation of summarization functionality using Claude
|
|
4
5
|
*/
|
|
@@ -22,14 +23,8 @@ export class ClaudeSummarizer {
|
|
|
22
23
|
* @returns Summarized text
|
|
23
24
|
*/
|
|
24
25
|
async summarize(messages, maxLength = 256, customPrompt) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const promptTemplate = customPrompt || this.defaultPromptTemplate;
|
|
28
|
-
const systemPrompt = promptTemplate.replace('{maxLength}', maxLength.toString());
|
|
29
|
-
// Join message content
|
|
30
|
-
const conversationText = messages
|
|
31
|
-
.map((msg) => `${msg.role}: ${msg.content}`)
|
|
32
|
-
.join('\n');
|
|
26
|
+
const { systemPrompt, conversationText } = createSummaryContext(messages, maxLength, this.defaultPromptTemplate, customPrompt);
|
|
27
|
+
return summarizeWithFallback(messages, async () => {
|
|
33
28
|
// API request
|
|
34
29
|
const response = await fetch(ENDPOINT_CLAUDE_API, {
|
|
35
30
|
method: 'POST',
|
|
@@ -56,12 +51,7 @@ export class ClaudeSummarizer {
|
|
|
56
51
|
}
|
|
57
52
|
const data = await response.json();
|
|
58
53
|
return data.content?.[0]?.text || '';
|
|
59
|
-
}
|
|
60
|
-
catch (error) {
|
|
61
|
-
console.error('Error in summarize:', error);
|
|
62
|
-
// Error fallback - simple summary
|
|
63
|
-
return `${messages.length} messages. Latest topic: ${messages[messages.length - 1]?.content.substring(0, 50) || 'none'}...`;
|
|
64
|
-
}
|
|
54
|
+
});
|
|
65
55
|
}
|
|
66
56
|
}
|
|
67
57
|
//# sourceMappingURL=ClaudeSummarizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClaudeSummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/claude/ClaudeSummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClaudeSummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/claude/ClaudeSummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAK3B;;;;;OAKG;IACH,YACE,MAAc,EACd,QAAgB,oBAAoB,EACpC,wBAAgC,+BAA+B;QAE/D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CACb,QAAmB,EACnB,YAAoB,GAAG,EACvB,YAAqB;QAErB,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,oBAAoB,CAC7D,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,YAAY,CACb,CAAC;QAEF,OAAO,qBAAqB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAChD,cAAc;YACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,mBAAmB,EAAE;gBAChD,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,WAAW,EAAE,IAAI,CAAC,MAAM;oBACxB,mBAAmB,EAAE,YAAY;oBACjC,2CAA2C,EAAE,MAAM;iBACpD;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,MAAM;4BACZ,OAAO,EAAE,GAAG,YAAY,OAAO,gBAAgB,EAAE;yBAClD;qBACF;oBACD,UAAU,EAAE,SAAS;iBACtB,CAAC;aACH,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,UAAU,EAAE,CACvE,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ENDPOINT_GEMINI_API, MODEL_GEMINI_2_0_FLASH_LITE, DEFAULT_SUMMARY_PROMPT_TEMPLATE, } from '@aituber-onair/chat';
|
|
2
|
+
import { createSummaryContext, summarizeWithFallback, } from '../summarizerUtils';
|
|
2
3
|
/**
|
|
3
4
|
* Implementation of summarization functionality using Gemini
|
|
4
5
|
*/
|
|
@@ -22,14 +23,8 @@ export class GeminiSummarizer {
|
|
|
22
23
|
* @returns Summarized text
|
|
23
24
|
*/
|
|
24
25
|
async summarize(messages, maxLength = 256, customPrompt) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const promptTemplate = customPrompt || this.defaultPromptTemplate;
|
|
28
|
-
const systemPrompt = promptTemplate.replace('{maxLength}', maxLength.toString());
|
|
29
|
-
// Join message content
|
|
30
|
-
const conversationText = messages
|
|
31
|
-
.map((msg) => `${msg.role}: ${msg.content}`)
|
|
32
|
-
.join('\n');
|
|
26
|
+
const { systemPrompt, conversationText } = createSummaryContext(messages, maxLength, this.defaultPromptTemplate, customPrompt);
|
|
27
|
+
return summarizeWithFallback(messages, async () => {
|
|
33
28
|
// Create the endpoint URL with API key
|
|
34
29
|
const apiUrl = `${ENDPOINT_GEMINI_API}/models/${this.model}:generateContent?key=${this.apiKey}`;
|
|
35
30
|
// API request
|
|
@@ -74,12 +69,7 @@ export class GeminiSummarizer {
|
|
|
74
69
|
return data.candidates[0].content.parts[0].text || '';
|
|
75
70
|
}
|
|
76
71
|
return '';
|
|
77
|
-
}
|
|
78
|
-
catch (error) {
|
|
79
|
-
console.error('Error in summarize:', error);
|
|
80
|
-
// Error fallback - simple summary
|
|
81
|
-
return `${messages.length} messages. Latest topic: ${messages[messages.length - 1]?.content.substring(0, 50) || 'none'}...`;
|
|
82
|
-
}
|
|
72
|
+
});
|
|
83
73
|
}
|
|
84
74
|
}
|
|
85
75
|
//# sourceMappingURL=GeminiSummarizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeminiSummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/gemini/GeminiSummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"GeminiSummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/gemini/GeminiSummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAK3B;;;;;OAKG;IACH,YACE,MAAc,EACd,QAAgB,2BAA2B,EAC3C,wBAAgC,+BAA+B;QAE/D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CACb,QAAmB,EACnB,YAAoB,GAAG,EACvB,YAAqB;QAErB,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,oBAAoB,CAC7D,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,YAAY,CACb,CAAC;QAEF,OAAO,qBAAqB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAChD,uCAAuC;YACvC,MAAM,MAAM,GAAG,GAAG,mBAAmB,WAAW,IAAI,CAAC,KAAK,wBAAwB,IAAI,CAAC,MAAM,EAAE,CAAC;YAEhG,cAAc;YACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE;gBACnC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,MAAM;4BACZ,KAAK,EAAE;gCACL;oCACE,IAAI,EAAE,YAAY;iCACnB;gCACD;oCACE,IAAI,EAAE,gBAAgB;iCACvB;6BACF;yBACF;qBACF;oBACD,gBAAgB,EAAE;wBAChB,WAAW,EAAE,GAAG;wBAChB,IAAI,EAAE,EAAE;wBACR,IAAI,EAAE,IAAI;wBACV,eAAe,EAAE,SAAS;qBAC3B;iBACF,CAAC;aACH,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,UAAU,EAAE,CACvE,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,sDAAsD;YACtD,IACE,IAAI,CAAC,UAAU;gBACf,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;gBAC1B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO;gBAC1B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;gBAChC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAC3C,CAAC;gBACD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACxD,CAAC;YAED,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ENDPOINT_OPENAI_CHAT_COMPLETIONS_API, MODEL_GPT_4O_MINI, DEFAULT_SUMMARY_PROMPT_TEMPLATE, } from '@aituber-onair/chat';
|
|
2
|
+
import { createSummaryContext, summarizeWithFallback, } from '../summarizerUtils';
|
|
2
3
|
/**
|
|
3
4
|
* Implementation of summarization functionality using OpenAI
|
|
4
5
|
*/
|
|
@@ -22,14 +23,8 @@ export class OpenAISummarizer {
|
|
|
22
23
|
* @returns Summarized text
|
|
23
24
|
*/
|
|
24
25
|
async summarize(messages, maxLength = 256, customPrompt) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const promptTemplate = customPrompt || this.defaultPromptTemplate;
|
|
28
|
-
const systemPrompt = promptTemplate.replace('{maxLength}', maxLength.toString());
|
|
29
|
-
// Join message content
|
|
30
|
-
const conversationText = messages
|
|
31
|
-
.map((msg) => `${msg.role}: ${msg.content}`)
|
|
32
|
-
.join('\n');
|
|
26
|
+
const { systemPrompt, conversationText } = createSummaryContext(messages, maxLength, this.defaultPromptTemplate, customPrompt);
|
|
27
|
+
return summarizeWithFallback(messages, async () => {
|
|
33
28
|
// API request
|
|
34
29
|
const response = await fetch(ENDPOINT_OPENAI_CHAT_COMPLETIONS_API, {
|
|
35
30
|
method: 'POST',
|
|
@@ -58,12 +53,7 @@ export class OpenAISummarizer {
|
|
|
58
53
|
}
|
|
59
54
|
const data = await response.json();
|
|
60
55
|
return data.choices[0]?.message?.content || '';
|
|
61
|
-
}
|
|
62
|
-
catch (error) {
|
|
63
|
-
console.error('Error in summarize:', error);
|
|
64
|
-
// Error fallback - simple summary
|
|
65
|
-
return `${messages.length} messages. Latest topic: ${messages[messages.length - 1]?.content.substring(0, 50) || 'none'}...`;
|
|
66
|
-
}
|
|
56
|
+
});
|
|
67
57
|
}
|
|
68
58
|
}
|
|
69
59
|
//# sourceMappingURL=OpenAISummarizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAISummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/openai/OpenAISummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,iBAAiB,EACjB,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"OpenAISummarizer.js","sourceRoot":"","sources":["../../../../../src/services/chat/providers/openai/OpenAISummarizer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,iBAAiB,EACjB,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAK3B;;;;;OAKG;IACH,YACE,MAAc,EACd,QAAgB,iBAAiB,EACjC,wBAAgC,+BAA+B;QAE/D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CACb,QAAmB,EACnB,YAAoB,GAAG,EACvB,YAAqB;QAErB,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,oBAAoB,CAC7D,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,YAAY,CACb,CAAC;QAEF,OAAO,qBAAqB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAChD,cAAc;YACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oCAAoC,EAAE;gBACjE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;iBACvC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,YAAY;yBACtB;wBACD;4BACE,IAAI,EAAE,MAAM;4BACZ,OAAO,EAAE,gBAAgB;yBAC1B;qBACF;oBACD,qBAAqB,EAAE,SAAS;iBACjC,CAAC;aACH,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,UAAU,EAAE,CACvE,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Message } from '@aituber-onair/chat';
|
|
2
|
+
type SummaryContext = {
|
|
3
|
+
systemPrompt: string;
|
|
4
|
+
conversationText: string;
|
|
5
|
+
};
|
|
6
|
+
export declare const createSummaryContext: (messages: Message[], maxLength: number, defaultPromptTemplate: string, customPrompt?: string) => SummaryContext;
|
|
7
|
+
export declare const summarizeWithFallback: (messages: Message[], summarize: () => Promise<string>) => Promise<string>;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export const createSummaryContext = (messages, maxLength, defaultPromptTemplate, customPrompt) => {
|
|
2
|
+
const promptTemplate = customPrompt || defaultPromptTemplate;
|
|
3
|
+
const systemPrompt = promptTemplate.replace('{maxLength}', maxLength.toString());
|
|
4
|
+
const conversationText = messages
|
|
5
|
+
.map((msg) => `${msg.role}: ${msg.content}`)
|
|
6
|
+
.join('\n');
|
|
7
|
+
return { systemPrompt, conversationText };
|
|
8
|
+
};
|
|
9
|
+
export const summarizeWithFallback = async (messages, summarize) => {
|
|
10
|
+
try {
|
|
11
|
+
return await summarize();
|
|
12
|
+
}
|
|
13
|
+
catch (error) {
|
|
14
|
+
console.error('Error in summarize:', error);
|
|
15
|
+
return buildSummaryFallback(messages);
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
const buildSummaryFallback = (messages) => {
|
|
19
|
+
return `${messages.length} messages. Latest topic: ${messages[messages.length - 1]?.content.substring(0, 50) || 'none'}...`;
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=summarizerUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"summarizerUtils.js","sourceRoot":"","sources":["../../../../src/services/chat/providers/summarizerUtils.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,QAAmB,EACnB,SAAiB,EACjB,qBAA6B,EAC7B,YAAqB,EACL,EAAE;IAClB,MAAM,cAAc,GAAG,YAAY,IAAI,qBAAqB,CAAC;IAC7D,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CACzC,aAAa,EACb,SAAS,CAAC,QAAQ,EAAE,CACrB,CAAC;IACF,MAAM,gBAAgB,GAAG,QAAQ;SAC9B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;SAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,QAAmB,EACnB,SAAgC,EACf,EAAE;IACnB,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC5C,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,QAAmB,EAAU,EAAE;IAC3D,OAAO,GAAG,QAAQ,CAAC,MAAM,4BACvB,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAC7D,KAAK,CAAC;AACR,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aituber-onair/core",
|
|
3
|
-
"version": "0.22.
|
|
3
|
+
"version": "0.22.1",
|
|
4
4
|
"description": "Core library for AITuber OnAir providing voice synthesis and chat processing",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"author": "shinshin86 (https://github.com/shinshin86)",
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@aituber-onair/chat": "^0.
|
|
24
|
+
"@aituber-onair/chat": "^0.11.1",
|
|
25
25
|
"@aituber-onair/voice": "^0.8.0"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|