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

package/src/utils/ChatGptCompletionStreamingUtil.ts

@@ -1,6 +1,6 @@
 import type { ChatCompletion, ChatCompletionChunk } from "openai/resources";
 
-import { ChatGptCompletionMessageUtil, MPSC, streamDefaultReaderToAsyncGenerator, StreamUtil } from ".";
+import { ChatGptCompletionMessageUtil, MPSC, streamDefaultReaderToAsyncGenerator, StreamUtil, toAsyncGenerator } from ".";
 
 async function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletionChunk>, eventProcessor: (props: {
   stream: AsyncGenerator<string, undefined, undefined>;
@@ -12,51 +12,45 @@ async function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletion
 
   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) {
-        /**
-         * @TODO fix it
-         * Sometimes, the complete message arrives along with a finish reason.
-         */
+        // 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();
           }
-          continue;
         }
-
-        if (choice.delta.content == null || choice.delta.content === "") {
-          continue;
-        }
-
-        if (streamContext.has(choice.index)) {
-          const context = streamContext.get(choice.index)!;
-          context.content += choice.delta.content;
-          context.mpsc.produce(choice.delta.content);
-          continue;
-        }
-
-        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;
-          },
-        });
       }
     };
     if (acc.object === "chat.completion.chunk") {
@@ -75,6 +69,21 @@ async function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletion
       + `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;
 }
 

package/src/utils/MPSC.ts

@@ -7,13 +7,15 @@ export class MPSC<T> {
   public constructor() {
     this.queue = new AsyncQueue<T>();
     this.consumer = new ReadableStream<T>({
-      pull: async (controller) => {
-        const { value, done } = await this.queue.dequeue();
-        if (done === true) {
-          controller.close();
-          return;
+      start: async (controller) => {
+        while (true) {
+          const { value, done } = await this.queue.dequeue();
+          if (done === true) {
+            controller.close();
+            return;
+          }
+          controller.enqueue(value);
         }
-        controller.enqueue(value);
       },
     });
   }

package/src/utils/StreamUtil.ts

@@ -34,10 +34,10 @@ async function reduce<T, R = T>(stream: ReadableStream<T>, reducer: (acc: T | R,
   return acc as R;
 }
 
-function from<T>(value: T): ReadableStream<T> {
+function from<T>(...value: T[]): ReadableStream<T> {
   const stream = new ReadableStream<T>({
     start: (controller) => {
-      controller.enqueue(value);
+      value.forEach(v => controller.enqueue(v));
       controller.close();
     },
   });