@notic/agent-engine 1.0.1 → 1.1.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.md +1 -0
- package/dist/adapter/AnthropicAdapter.d.ts.map +1 -1
- package/dist/adapter/AnthropicAdapter.js +8 -12
- package/dist/adapter/AnthropicAdapter.js.map +1 -1
- package/dist/adapter/GeminiAdapter.d.ts.map +1 -1
- package/dist/adapter/GeminiAdapter.js +10 -14
- package/dist/adapter/GeminiAdapter.js.map +1 -1
- package/dist/adapter/OpenAIAdapter.d.ts.map +1 -1
- package/dist/adapter/OpenAIAdapter.js +40 -23
- package/dist/adapter/OpenAIAdapter.js.map +1 -1
- package/dist/agent/Agent.d.ts +10 -0
- package/dist/agent/Agent.d.ts.map +1 -1
- package/dist/agent/Agent.js +66 -17
- package/dist/agent/Agent.js.map +1 -1
- package/dist/message/Message.d.ts +12 -0
- package/dist/message/Message.d.ts.map +1 -1
- package/dist/message/Message.js +62 -21
- package/dist/message/Message.js.map +1 -1
- package/dist/prompt/PromptBuilder.d.ts.map +1 -1
- package/dist/prompt/PromptBuilder.js +28 -11
- package/dist/prompt/PromptBuilder.js.map +1 -1
- package/dist/session/Session.d.ts +2 -0
- package/dist/session/Session.d.ts.map +1 -1
- package/dist/session/Session.js +13 -3
- package/dist/session/Session.js.map +1 -1
- package/dist/stream/StreamParser.d.ts +8 -4
- package/dist/stream/StreamParser.d.ts.map +1 -1
- package/dist/stream/StreamParser.js +22 -6
- package/dist/stream/StreamParser.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamParser.d.ts","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EACL,YAAY,EACZ,WAAW,EAEZ,MAAM,eAAe,CAAC;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAkB;
|
|
1
|
+
{"version":3,"file":"StreamParser.d.ts","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,WAAW,EAEZ,MAAM,eAAe,CAAC;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,MAAM,CAAC,CAAQ;IAMvB;;KAEC;IACD,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,WAAW,EAAE;IA0G/B;;OAEG;IACH,MAAM,IAAI,WAAW,EAAE;IAgDvB;;OAEG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,2CAA2C;IAC3C,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAED,6BAA6B;IAC7B,IAAI,kBAAkB,IAAI,OAAO,CAIhC;IAED,sCAAsC;IACtC,IAAI,KAAK,IAAI,KAAK,GAAG,SAAS,CAE7B;IAMD;;KAEC;IACD,KAAK,IAAI,IAAI;IAab,OAAO,CAAC,YAAY;CA6BrB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.StreamParser = void 0;
|
|
4
4
|
const Message_1 = require("../message/Message");
|
|
5
5
|
const Role_1 = require("../message/Role");
|
|
6
|
+
const Usage_1 = require("../message/Usage");
|
|
6
7
|
const StreamEvent_1 = require("./StreamEvent");
|
|
7
8
|
/**
|
|
8
9
|
* 流式解析器
|
|
@@ -26,16 +27,22 @@ class StreamParser {
|
|
|
26
27
|
_toolCalls = new Map();
|
|
27
28
|
_finishReason;
|
|
28
29
|
_finished = false;
|
|
30
|
+
_usage;
|
|
29
31
|
//========================
|
|
30
32
|
//喂入Chunk
|
|
31
33
|
// ========================
|
|
32
34
|
/**
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
* 喂入一个 OpenAI stream chunk,返回本次产出的事件
|
|
36
|
+
*/
|
|
35
37
|
feed(chunk) {
|
|
36
38
|
const events = [];
|
|
37
39
|
try {
|
|
38
|
-
|
|
40
|
+
// 先处理 usage —— OpenAI stream 启用 include_usage 时,
|
|
41
|
+
// 最后一个 chunk 通常 choices 为空但 usage 有值,必须先于 choices 短路捕获。
|
|
42
|
+
if (chunk?.usage) {
|
|
43
|
+
this._usage = Usage_1.Usage.fromRaw(chunk.usage);
|
|
44
|
+
}
|
|
45
|
+
const choices = chunk?.choices;
|
|
39
46
|
if (!choices || choices.length === 0)
|
|
40
47
|
return events;
|
|
41
48
|
const choice = choices[0];
|
|
@@ -183,18 +190,23 @@ class StreamParser {
|
|
|
183
190
|
this._textBuffer.length > 0 ||
|
|
184
191
|
this._toolCalls.size > 0;
|
|
185
192
|
}
|
|
193
|
+
/** 当前累积的 Usage(如流尚未传回则为 undefined) */
|
|
194
|
+
get usage() {
|
|
195
|
+
return this._usage;
|
|
196
|
+
}
|
|
186
197
|
// ========================
|
|
187
198
|
// 重置
|
|
188
199
|
// ========================
|
|
189
200
|
/**
|
|
190
|
-
|
|
191
|
-
|
|
201
|
+
* 重置解析器状态,可复用于下一轮
|
|
202
|
+
*/
|
|
192
203
|
reset() {
|
|
193
204
|
this._thinkingBuffer = "";
|
|
194
205
|
this._textBuffer = "";
|
|
195
206
|
this._toolCalls.clear();
|
|
196
207
|
this._finishReason = undefined;
|
|
197
208
|
this._finished = false;
|
|
209
|
+
this._usage = undefined;
|
|
198
210
|
}
|
|
199
211
|
// ========================
|
|
200
212
|
// 内部
|
|
@@ -218,7 +230,11 @@ class StreamParser {
|
|
|
218
230
|
arguments: acc.argsBuffer,
|
|
219
231
|
});
|
|
220
232
|
}
|
|
221
|
-
|
|
233
|
+
const msg = new Message_1.Message(Role_1.Role.Assistant, parts);
|
|
234
|
+
if (this._usage) {
|
|
235
|
+
msg.usage = this._usage;
|
|
236
|
+
}
|
|
237
|
+
return msg;
|
|
222
238
|
}
|
|
223
239
|
}
|
|
224
240
|
exports.StreamParser = StreamParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamParser.js","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,0CAAuC;AAEvC,+CAIuB;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,MAAa,YAAY;IACf,eAAe,GAAW,EAAE,CAAC;IAC7B,WAAW,GAAW,EAAE,CAAC;IACzB,UAAU,GAAqC,IAAI,GAAG,EAAE,CAAC;IACzD,aAAa,CAAgB;IAC7B,SAAS,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"StreamParser.js","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":"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"}
|