@agentica/core 0.32.3 → 0.32.4

package/src/utils/StreamUtil.spec.ts

@@ -149,7 +149,7 @@ describe("streamUtil", () => {
       const stringResult = await StreamUtil.reduce<number, string>(
         stringStream,
         (acc, cur) => acc + cur.toString(),
-        "",
+        { initial: ""},
       );
 
       expect(stringResult).toBe("123");
@@ -160,7 +160,7 @@ describe("streamUtil", () => {
       const sumResult = await StreamUtil.reduce<number, number>(
         sumStream,
         (acc, cur) => acc + cur,
-        0,
+        { initial: 0 },
       );
 
       expect(sumResult).toBe(15);
@@ -171,6 +171,7 @@ describe("streamUtil", () => {
       const noInitialResult = await StreamUtil.reduce<number>(
         noInitialStream,
         (acc, cur) => acc + cur,
+        { initial: 0 },
       );
 
       expect(noInitialResult).toBe(10);
@@ -181,7 +182,7 @@ describe("streamUtil", () => {
       const emptyResult = await StreamUtil.reduce<number, string>(
         emptyStream,
         (acc, cur) => acc + cur.toString(),
-        "initial value",
+        { initial: "initial value" },
       );
 
       expect(emptyResult).toBe("initial value");
@@ -192,6 +193,7 @@ describe("streamUtil", () => {
       const emptyNoInitialResult = await StreamUtil.reduce<number>(
         emptyNoInitialStream,
         (acc, cur) => acc + cur,
+        { initial: 0 },
       );
 
       expect(emptyNoInitialResult).toBeNull();
@@ -202,7 +204,7 @@ describe("streamUtil", () => {
       const stringResult = await StreamUtil.reduce<number, string>(
         stringStream,
         (acc, cur) => acc + cur.toString(),
-        "",
+        { initial: "" },
       );
 
       expect(stringResult).toBe("123");
@@ -213,6 +215,7 @@ describe("streamUtil", () => {
       const noInitialResult = await StreamUtil.reduce<number>(
         noInitialStream,
         (acc, cur) => acc + cur,
+        { initial: 0 },
       );
 
       expect(noInitialResult).toBe(10);
@@ -229,7 +232,7 @@ describe("streamUtil", () => {
           }
           return [...acc, `item${cur}`];
         },
-        [],
+        { initial: [] },
       );
 
       expect(transformResult).toEqual(["item1", "item2", "item3"]);
@@ -240,7 +243,7 @@ describe("streamUtil", () => {
       const emptyResult = await StreamUtil.reduce<number, string>(
         emptyStream,
         (acc, cur) => acc + cur.toString(),
-        "initial",
+        { initial: "initial" },
       );
 
       expect(emptyResult).toBe("initial");
@@ -256,7 +259,7 @@ describe("streamUtil", () => {
       const delayResult = await StreamUtil.reduce<number, number>(
         delayStream,
         (acc, cur) => acc + cur,
-        0,
+        { initial: 0 },
       );
 
       expect(delayResult).toBe(6);
@@ -274,7 +277,7 @@ describe("streamUtil", () => {
             }
             return acc + cur;
           },
-          0,
+          { initial: 0 },
         ),
       ).rejects.toThrow("Test error");
     });
@@ -285,7 +288,7 @@ describe("streamUtil", () => {
       const result = await StreamUtil.reduce<number | null | undefined, number>(
         stream,
         (acc, cur) => (acc ?? 0) + (cur ?? 0),
-        0,
+        { initial: 0 },
       );
 
       expect(result).toBe(9); // 1 + 0 + 3 + 0 + 5 = 9

package/src/utils/StreamUtil.ts

@@ -4,12 +4,12 @@
  * Utility functions for streams.
  */
 
-async function readAll<T>(stream: ReadableStream<T>): Promise<T[]> {
+async function readAll<T>(stream: ReadableStream<T>, abortSignal?: AbortSignal): Promise<T[]> {
   const reader = stream.getReader();
   const result: T[] = [];
   while (true) {
     const { done, value } = await reader.read();
-    if (done) {
+    if (done || abortSignal?.aborted === true) {
       break;
     }
     result.push(value);
@@ -17,12 +17,16 @@ async function readAll<T>(stream: ReadableStream<T>): Promise<T[]> {
   return result;
 }
 
-async function reduce<T, R = T>(stream: ReadableStream<T>, reducer: (acc: T | R, cur: T) => R, initial?: R): Promise<R | null> {
+async function reduce<T, R = T>(stream: ReadableStream<T>, reducer: (acc: T | R, cur: T) => R, options: { initial?: R, abortSignal?: AbortSignal }): Promise<R | null> {
   const reader = stream.getReader();
   const iterator = streamDefaultReaderToAsyncGenerator(reader);
-  let acc = (initial ?? null) as R | null | T;
+  let acc = (options.initial ?? null) as R | null | T;
 
   for await (const value of iterator) {
+    if (options.abortSignal?.aborted === true) {
+      break;
+    }
+
     if (acc === null) {
       acc = value;
       continue;
@@ -49,28 +53,28 @@ export async function* toAsyncGenerator<T>(value: T): AsyncGenerator<T, undefine
   yield value;
 }
 
-export async function* streamDefaultReaderToAsyncGenerator<T>(reader: ReadableStreamDefaultReader<T>): AsyncGenerator<Awaited<T>, undefined, undefined> {
+export async function* streamDefaultReaderToAsyncGenerator<T>(reader: ReadableStreamDefaultReader<T>, abortSignal?: AbortSignal): AsyncGenerator<Awaited<T>, undefined, undefined> {
   while (true) {
     const { done, value } = await reader.read();
-    if (done) {
+    if (done || abortSignal?.aborted === true) {
       break;
     }
     yield value;
   }
 }
 
-function transform<T, R>(stream: ReadableStream<T>, transformer: (value: T) => R): ReadableStream<R> {
+function transform<T, R>(stream: ReadableStream<T>, transformer: (value: T) => R, abortSignal?: AbortSignal): ReadableStream<R> {
   const reader = stream.getReader();
 
   return new ReadableStream<R>({
     pull: async (controller) => {
       const { done, value } = await reader.read();
-      if (!done) {
-        controller.enqueue(transformer(value));
-      }
-      else {
+      if (done === true || abortSignal?.aborted === true) {
         controller.close();
+        return;
       }
+      
+      controller.enqueue(transformer(value));
     },
   });
 }

package/src/utils/request.ts

@@ -61,6 +61,7 @@ export const getChatCompletionWithStreamingFunction = <Model extends ILlmSchema.
     completion.toReadableStream() as ReadableStream<Uint8Array>,
     value =>
       ChatGptCompletionMessageUtil.transformCompletionChunk(value),
+    props.abortSignal,
   ).tee();
 
   const [streamForAggregate, streamForReturn] = temporaryStream.tee();
@@ -69,7 +70,7 @@ export const getChatCompletionWithStreamingFunction = <Model extends ILlmSchema.
     const reader = streamForAggregate.getReader();
     while (true) {
       const chunk = await reader.read();
-      if (chunk.done) {
+      if (chunk.done || props.abortSignal?.aborted === true) {
         break;
       }
       if (chunk.value.usage != null) {
@@ -87,11 +88,11 @@ export const getChatCompletionWithStreamingFunction = <Model extends ILlmSchema.
     id: v4(),
     type: "response",
     source,
-    stream: streamDefaultReaderToAsyncGenerator(streamForStream.getReader()),
+    stream: streamDefaultReaderToAsyncGenerator(streamForStream.getReader(), props.abortSignal),
     body: event.body,
     options: event.options,
     join: async () => {
-      const chunks = await StreamUtil.readAll(streamForJoin);
+      const chunks = await StreamUtil.readAll(streamForJoin, props.abortSignal);
       return ChatGptCompletionMessageUtil.merge(chunks);
     },
     created_at: new Date().toISOString(),