@agentica/core 0.44.0-dev.20260313-2 → 0.44.1

package/src/utils/ChatGptCompletionStreamingUtil.ts

@@ -1,91 +1,91 @@
-import type { ChatCompletion, ChatCompletionChunk } from "openai/resources";
-
-import { ChatGptCompletionMessageUtil, MPSC, streamDefaultReaderToAsyncGenerator, StreamUtil, toAsyncGenerator } from ".";
-
-async function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletionChunk>, eventProcessor: (props: {
-  stream: AsyncGenerator<string, undefined, undefined>;
-  done: () => boolean;
-  get: () => string;
-  join: () => Promise<string>;
-}) => void, abortSignal?: AbortSignal) {
-  const streamContext = new Map<number, { content: string; mpsc: MPSC<string> }>();
-
-  const nullableCompletion = await StreamUtil.reduce<ChatCompletionChunk, Promise<ChatCompletion>>(stream, async (accPromise, chunk) => {
-    const acc = await accPromise;
-    const registerContext = (
-      choices: ChatCompletionChunk.Choice[],
-    ) => {
-      for (const choice of choices) {
-        // Handle content first, even if finish_reason is present
-        if (choice.delta.content != null && choice.delta.content !== "") {
-          // Process content logic (moved up from below)
-          if (streamContext.has(choice.index)) {
-            const context = streamContext.get(choice.index)!;
-            context.content += choice.delta.content;
-            context.mpsc.produce(choice.delta.content);
-          }
-          else {
-            const mpsc = new MPSC<string>();
-
-            streamContext.set(choice.index, {
-              content: choice.delta.content,
-              mpsc,
-            });
-            mpsc.produce(choice.delta.content);
-
-            eventProcessor({
-              stream: streamDefaultReaderToAsyncGenerator(mpsc.consumer.getReader()),
-              done: () => mpsc.done(),
-              get: () => streamContext.get(choice.index)?.content ?? "",
-              join: async () => {
-                await mpsc.waitClosed();
-                return streamContext.get(choice.index)!.content;
-              },
-            });
-          }
-        }
-
-        // Handle finish_reason after content processing
-        if (choice.finish_reason != null) {
-          const context = streamContext.get(choice.index);
-          if (context != null) {
-            context.mpsc.close();
-          }
-        }
-      }
-    };
-    if (acc.object === "chat.completion.chunk") {
-      registerContext([acc, chunk].flatMap(v => v.choices ?? []));
-      return ChatGptCompletionMessageUtil.merge([acc, chunk]);
-    }
-    registerContext(chunk.choices ?? []);
-    return ChatGptCompletionMessageUtil.accumulate(acc, chunk);
-  }, { abortSignal });
-
-  if (nullableCompletion == null) {
-    throw new Error(
-      "StreamUtil.reduce did not produce a ChatCompletion. Possible causes: the input stream was empty, invalid, or closed prematurely. "
-      + "To debug: check that the stream is properly initialized and contains valid ChatCompletionChunk data. "
-      + "You may also enable verbose logging upstream to inspect the stream contents. "
-      + `Stream locked: ${stream.locked}.`,
-    );
-  }
-
-  if ((nullableCompletion.object as string) === "chat.completion.chunk") {
-    const completion = ChatGptCompletionMessageUtil.merge([nullableCompletion as unknown as ChatCompletionChunk]);
-    completion.choices.forEach((choice) => {
-      if (choice.message.content != null && choice.message.content !== "") {
-        eventProcessor({
-          stream: toAsyncGenerator(choice.message.content),
-          done: () => true,
-          get: () => choice.message.content!,
-          join: async () => choice.message.content!,
-        });
-      }
-    });
-    return completion;
-  }
-  return nullableCompletion;
-}
-
-export { reduceStreamingWithDispatch };
+import type { ChatCompletion, ChatCompletionChunk } from "openai/resources";
+
+import { ChatGptCompletionMessageUtil, MPSC, streamDefaultReaderToAsyncGenerator, StreamUtil, toAsyncGenerator } from ".";
+
+async function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletionChunk>, eventProcessor: (props: {
+  stream: AsyncGenerator<string, undefined, undefined>;
+  done: () => boolean;
+  get: () => string;
+  join: () => Promise<string>;
+}) => void, abortSignal?: AbortSignal) {
+  const streamContext = new Map<number, { content: string; mpsc: MPSC<string> }>();
+
+  const nullableCompletion = await StreamUtil.reduce<ChatCompletionChunk, Promise<ChatCompletion>>(stream, async (accPromise, chunk) => {
+    const acc = await accPromise;
+    const registerContext = (
+      choices: ChatCompletionChunk.Choice[],
+    ) => {
+      for (const choice of choices) {
+        // Handle content first, even if finish_reason is present
+        if (choice.delta.content != null && choice.delta.content !== "") {
+          // Process content logic (moved up from below)
+          if (streamContext.has(choice.index)) {
+            const context = streamContext.get(choice.index)!;
+            context.content += choice.delta.content;
+            context.mpsc.produce(choice.delta.content);
+          }
+          else {
+            const mpsc = new MPSC<string>();
+
+            streamContext.set(choice.index, {
+              content: choice.delta.content,
+              mpsc,
+            });
+            mpsc.produce(choice.delta.content);
+
+            eventProcessor({
+              stream: streamDefaultReaderToAsyncGenerator(mpsc.consumer.getReader()),
+              done: () => mpsc.done(),
+              get: () => streamContext.get(choice.index)?.content ?? "",
+              join: async () => {
+                await mpsc.waitClosed();
+                return streamContext.get(choice.index)!.content;
+              },
+            });
+          }
+        }
+
+        // Handle finish_reason after content processing
+        if (choice.finish_reason != null) {
+          const context = streamContext.get(choice.index);
+          if (context != null) {
+            context.mpsc.close();
+          }
+        }
+      }
+    };
+    if (acc.object === "chat.completion.chunk") {
+      registerContext([acc, chunk].flatMap(v => v.choices ?? []));
+      return ChatGptCompletionMessageUtil.merge([acc, chunk]);
+    }
+    registerContext(chunk.choices ?? []);
+    return ChatGptCompletionMessageUtil.accumulate(acc, chunk);
+  }, { abortSignal });
+
+  if (nullableCompletion == null) {
+    throw new Error(
+      "StreamUtil.reduce did not produce a ChatCompletion. Possible causes: the input stream was empty, invalid, or closed prematurely. "
+      + "To debug: check that the stream is properly initialized and contains valid ChatCompletionChunk data. "
+      + "You may also enable verbose logging upstream to inspect the stream contents. "
+      + `Stream locked: ${stream.locked}.`,
+    );
+  }
+
+  if ((nullableCompletion.object as string) === "chat.completion.chunk") {
+    const completion = ChatGptCompletionMessageUtil.merge([nullableCompletion as unknown as ChatCompletionChunk]);
+    completion.choices.forEach((choice) => {
+      if (choice.message.content != null && choice.message.content !== "") {
+        eventProcessor({
+          stream: toAsyncGenerator(choice.message.content),
+          done: () => true,
+          get: () => choice.message.content!,
+          join: async () => choice.message.content!,
+        });
+      }
+    });
+    return completion;
+  }
+  return nullableCompletion;
+}
+
+export { reduceStreamingWithDispatch };

package/src/utils/ChatGptTokenUsageAggregator.spec.ts

@@ -1,226 +1,226 @@
-import type { CompletionUsage } from "openai/resources";
-
-import { ChatGptTokenUsageAggregator } from "./ChatGptTokenUsageAggregator";
-
-describe("chatGptTokenUsageAggregator", () => {
-  describe("sum", () => {
-    it("should sum basic token usage", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-      };
-
-      const usage2: CompletionUsage = {
-        prompt_tokens: 20,
-        completion_tokens: 10,
-        total_tokens: 30,
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result).toEqual({
-        prompt_tokens: 30,
-        completion_tokens: 15,
-        total_tokens: 45,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 0,
-          reasoning_tokens: 0,
-          rejected_prediction_tokens: 0,
-        },
-        prompt_tokens_details: {
-          audio_tokens: 0,
-          cached_tokens: 0,
-        },
-      });
-    });
-
-    it("should handle undefined values", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-      };
-
-      const usage2: CompletionUsage = {
-      // @ts-expect-error - intended to be undefined
-        prompt_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        completion_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        total_tokens: undefined,
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result).toEqual({
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 0,
-          reasoning_tokens: 0,
-          rejected_prediction_tokens: 0,
-        },
-        prompt_tokens_details: {
-          audio_tokens: 0,
-          cached_tokens: 0,
-        },
-      });
-    });
-
-    it("should sum completion token details", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 3,
-          reasoning_tokens: 1,
-          rejected_prediction_tokens: 1,
-        },
-      };
-
-      const usage2: CompletionUsage = {
-        prompt_tokens: 20,
-        completion_tokens: 10,
-        total_tokens: 30,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 7,
-          reasoning_tokens: 2,
-          rejected_prediction_tokens: 1,
-        },
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result.completion_tokens_details).toEqual({
-        accepted_prediction_tokens: 10,
-        reasoning_tokens: 3,
-        rejected_prediction_tokens: 2,
-      });
-    });
-
-    it("should handle undefined completion token details", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 3,
-          reasoning_tokens: 1,
-          rejected_prediction_tokens: 1,
-        },
-      };
-
-      const usage2: CompletionUsage = {
-        prompt_tokens: 20,
-        completion_tokens: 10,
-        total_tokens: 30,
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result.completion_tokens_details).toEqual({
-        accepted_prediction_tokens: 3,
-        reasoning_tokens: 1,
-        rejected_prediction_tokens: 1,
-      });
-    });
-
-    it("should sum prompt token details", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-        prompt_tokens_details: {
-          audio_tokens: 3,
-          cached_tokens: 2,
-        },
-      };
-
-      const usage2: CompletionUsage = {
-        prompt_tokens: 20,
-        completion_tokens: 10,
-        total_tokens: 30,
-        prompt_tokens_details: {
-          audio_tokens: 7,
-          cached_tokens: 3,
-        },
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result.prompt_tokens_details).toEqual({
-        audio_tokens: 10,
-        cached_tokens: 5,
-      });
-    });
-
-    it("should handle undefined prompt token details", () => {
-      const usage1: CompletionUsage = {
-        prompt_tokens: 10,
-        completion_tokens: 5,
-        total_tokens: 15,
-        prompt_tokens_details: {
-          audio_tokens: 3,
-          cached_tokens: 2,
-        },
-      };
-
-      const usage2: CompletionUsage = {
-        prompt_tokens: 20,
-        completion_tokens: 10,
-        total_tokens: 30,
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result.prompt_tokens_details).toEqual({
-        audio_tokens: 3,
-        cached_tokens: 2,
-      });
-    });
-
-    it("should handle all undefined values", () => {
-      const usage1: CompletionUsage = {
-      // @ts-expect-error - intended to be undefined
-        prompt_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        completion_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        total_tokens: undefined,
-        completion_tokens_details: undefined,
-        prompt_tokens_details: undefined,
-      };
-
-      const usage2: CompletionUsage = {
-      // @ts-expect-error - intended to be undefined
-        prompt_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        completion_tokens: undefined,
-        // @ts-expect-error - intended to be undefined
-        total_tokens: undefined,
-        completion_tokens_details: undefined,
-        prompt_tokens_details: undefined,
-      };
-
-      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
-
-      expect(result).toEqual({
-        prompt_tokens: 0,
-        completion_tokens: 0,
-        total_tokens: 0,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 0,
-          reasoning_tokens: 0,
-          rejected_prediction_tokens: 0,
-        },
-        prompt_tokens_details: {
-          audio_tokens: 0,
-          cached_tokens: 0,
-        },
-      });
-    });
-  });
-});
+import type { CompletionUsage } from "openai/resources";
+
+import { ChatGptTokenUsageAggregator } from "./ChatGptTokenUsageAggregator";
+
+describe("chatGptTokenUsageAggregator", () => {
+  describe("sum", () => {
+    it("should sum basic token usage", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+      };
+
+      const usage2: CompletionUsage = {
+        prompt_tokens: 20,
+        completion_tokens: 10,
+        total_tokens: 30,
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result).toEqual({
+        prompt_tokens: 30,
+        completion_tokens: 15,
+        total_tokens: 45,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 0,
+          reasoning_tokens: 0,
+          rejected_prediction_tokens: 0,
+        },
+        prompt_tokens_details: {
+          audio_tokens: 0,
+          cached_tokens: 0,
+        },
+      });
+    });
+
+    it("should handle undefined values", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+      };
+
+      const usage2: CompletionUsage = {
+      // @ts-expect-error - intended to be undefined
+        prompt_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        completion_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        total_tokens: undefined,
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result).toEqual({
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 0,
+          reasoning_tokens: 0,
+          rejected_prediction_tokens: 0,
+        },
+        prompt_tokens_details: {
+          audio_tokens: 0,
+          cached_tokens: 0,
+        },
+      });
+    });
+
+    it("should sum completion token details", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 3,
+          reasoning_tokens: 1,
+          rejected_prediction_tokens: 1,
+        },
+      };
+
+      const usage2: CompletionUsage = {
+        prompt_tokens: 20,
+        completion_tokens: 10,
+        total_tokens: 30,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 7,
+          reasoning_tokens: 2,
+          rejected_prediction_tokens: 1,
+        },
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result.completion_tokens_details).toEqual({
+        accepted_prediction_tokens: 10,
+        reasoning_tokens: 3,
+        rejected_prediction_tokens: 2,
+      });
+    });
+
+    it("should handle undefined completion token details", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 3,
+          reasoning_tokens: 1,
+          rejected_prediction_tokens: 1,
+        },
+      };
+
+      const usage2: CompletionUsage = {
+        prompt_tokens: 20,
+        completion_tokens: 10,
+        total_tokens: 30,
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result.completion_tokens_details).toEqual({
+        accepted_prediction_tokens: 3,
+        reasoning_tokens: 1,
+        rejected_prediction_tokens: 1,
+      });
+    });
+
+    it("should sum prompt token details", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        prompt_tokens_details: {
+          audio_tokens: 3,
+          cached_tokens: 2,
+        },
+      };
+
+      const usage2: CompletionUsage = {
+        prompt_tokens: 20,
+        completion_tokens: 10,
+        total_tokens: 30,
+        prompt_tokens_details: {
+          audio_tokens: 7,
+          cached_tokens: 3,
+        },
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result.prompt_tokens_details).toEqual({
+        audio_tokens: 10,
+        cached_tokens: 5,
+      });
+    });
+
+    it("should handle undefined prompt token details", () => {
+      const usage1: CompletionUsage = {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        prompt_tokens_details: {
+          audio_tokens: 3,
+          cached_tokens: 2,
+        },
+      };
+
+      const usage2: CompletionUsage = {
+        prompt_tokens: 20,
+        completion_tokens: 10,
+        total_tokens: 30,
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result.prompt_tokens_details).toEqual({
+        audio_tokens: 3,
+        cached_tokens: 2,
+      });
+    });
+
+    it("should handle all undefined values", () => {
+      const usage1: CompletionUsage = {
+      // @ts-expect-error - intended to be undefined
+        prompt_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        completion_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        total_tokens: undefined,
+        completion_tokens_details: undefined,
+        prompt_tokens_details: undefined,
+      };
+
+      const usage2: CompletionUsage = {
+      // @ts-expect-error - intended to be undefined
+        prompt_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        completion_tokens: undefined,
+        // @ts-expect-error - intended to be undefined
+        total_tokens: undefined,
+        completion_tokens_details: undefined,
+        prompt_tokens_details: undefined,
+      };
+
+      const result = ChatGptTokenUsageAggregator.sum(usage1, usage2);
+
+      expect(result).toEqual({
+        prompt_tokens: 0,
+        completion_tokens: 0,
+        total_tokens: 0,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 0,
+          reasoning_tokens: 0,
+          rejected_prediction_tokens: 0,
+        },
+        prompt_tokens_details: {
+          audio_tokens: 0,
+          cached_tokens: 0,
+        },
+      });
+    });
+  });
+});