@agentica/core 0.32.3-dev.1 → 0.32.3-dev.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,41 +18,39 @@ function reduceStreamingWithDispatch(stream, eventProcessor) {
18
18
  const acc = yield accPromise;
19
19
  const registerContext = (choices) => {
20
20
  for (const choice of choices) {
21
- /**
22
- * @TODO fix it
23
- * Sometimes, the complete message arrives along with a finish reason.
24
- */
21
+ // Handle content first, even if finish_reason is present
22
+ if (choice.delta.content != null && choice.delta.content !== "") {
23
+ // Process content logic (moved up from below)
24
+ if (streamContext.has(choice.index)) {
25
+ const context = streamContext.get(choice.index);
26
+ context.content += choice.delta.content;
27
+ context.mpsc.produce(choice.delta.content);
28
+ }
29
+ else {
30
+ const mpsc = new _1.MPSC();
31
+ streamContext.set(choice.index, {
32
+ content: choice.delta.content,
33
+ mpsc,
34
+ });
35
+ mpsc.produce(choice.delta.content);
36
+ eventProcessor({
37
+ stream: (0, _1.streamDefaultReaderToAsyncGenerator)(mpsc.consumer.getReader()),
38
+ done: () => mpsc.done(),
39
+ get: () => { var _a, _b; return (_b = (_a = streamContext.get(choice.index)) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : ""; },
40
+ join: () => __awaiter(this, void 0, void 0, function* () {
41
+ yield mpsc.waitClosed();
42
+ return streamContext.get(choice.index).content;
43
+ }),
44
+ });
45
+ }
46
+ }
47
+ // Handle finish_reason after content processing
25
48
  if (choice.finish_reason != null) {
26
49
  const context = streamContext.get(choice.index);
27
50
  if (context != null) {
28
51
  context.mpsc.close();
29
52
  }
30
- continue;
31
- }
32
- if (choice.delta.content == null || choice.delta.content === "") {
33
- continue;
34
53
  }
35
- if (streamContext.has(choice.index)) {
36
- const context = streamContext.get(choice.index);
37
- context.content += choice.delta.content;
38
- context.mpsc.produce(choice.delta.content);
39
- continue;
40
- }
41
- const mpsc = new _1.MPSC();
42
- streamContext.set(choice.index, {
43
- content: choice.delta.content,
44
- mpsc,
45
- });
46
- mpsc.produce(choice.delta.content);
47
- eventProcessor({
48
- stream: (0, _1.streamDefaultReaderToAsyncGenerator)(mpsc.consumer.getReader()),
49
- done: () => mpsc.done(),
50
- get: () => { var _a, _b; return (_b = (_a = streamContext.get(choice.index)) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : ""; },
51
- join: () => __awaiter(this, void 0, void 0, function* () {
52
- yield mpsc.waitClosed();
53
- return streamContext.get(choice.index).content;
54
- }),
55
- });
56
54
  }
57
55
  };
58
56
  if (acc.object === "chat.completion.chunk") {
@@ -68,6 +66,20 @@ function reduceStreamingWithDispatch(stream, eventProcessor) {
68
66
  + "You may also enable verbose logging upstream to inspect the stream contents. "
69
67
  + `Stream locked: ${stream.locked}.`);
70
68
  }
69
+ if (nullableCompletion.object === "chat.completion.chunk") {
70
+ const completion = _1.ChatGptCompletionMessageUtil.merge([nullableCompletion]);
71
+ completion.choices.forEach((choice) => {
72
+ if (choice.message.content != null && choice.message.content !== "") {
73
+ eventProcessor({
74
+ stream: (0, _1.toAsyncGenerator)(choice.message.content),
75
+ done: () => true,
76
+ get: () => choice.message.content,
77
+ join: () => __awaiter(this, void 0, void 0, function* () { return choice.message.content; }),
78
+ });
79
+ }
80
+ });
81
+ return completion;
82
+ }
71
83
  return nullableCompletion;
72
84
  });
73
85
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ChatGptCompletionStreamingUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionStreamingUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ChatGptCompletionStreamingUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionStreamingUtil.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};