fix(core): token usage and response event type for none stream mode. (#524)

Author: samchon

packages/core/src/events/AgenticaResponseEvent.ts

@@ -17,9 +17,9 @@ export interface AgenticaResponseEvent extends AgenticaEventBase<"response"> {
   body: OpenAI.ChatCompletionCreateParamsStreaming;
 
   /**
-   * The text content stream.
+   * The response data.
    */
-  stream: AsyncGenerator<OpenAI.ChatCompletionChunk, undefined, undefined>;
+  response: AgenticaResponseEvent.Response;
 
   /**
    * Options for the request.
@@ -31,3 +31,14 @@ export interface AgenticaResponseEvent extends AgenticaEventBase<"response"> {
    */
   join: () => Promise<OpenAI.ChatCompletion>;
 }
+export namespace AgenticaResponseEvent {
+  export type Response = StreamResponse | NonStreamResponse;
+  export interface StreamResponse {
+    stream: true;
+    data: AsyncGenerator<OpenAI.ChatCompletionChunk, undefined, undefined>;
+  }
+  export interface NonStreamResponse {
+    stream: false;
+    data: OpenAI.ChatCompletion;
+  }
+}

packages/core/src/factory/events.ts

@@ -330,7 +330,7 @@ export function createResponseEvent(props: {
   source: AgenticaEventSource;
   body: OpenAI.ChatCompletionCreateParamsStreaming;
   options?: OpenAI.RequestOptions | undefined;
-  stream: AsyncGenerator<OpenAI.ChatCompletionChunk, undefined, undefined>;
+  response: AgenticaResponseEvent.Response;
   join: () => Promise<OpenAI.ChatCompletion>;
 }): AgenticaResponseEvent {
   const id: string = v4();
@@ -343,7 +343,7 @@ export function createResponseEvent(props: {
     source: props.source,
     body: props.body,
     options: props.options,
-    stream: props.stream,
+    response: props.response,
     join: props.join,
   };
 }

packages/core/src/utils/request.ts

@@ -63,6 +63,27 @@ export function getChatCompletionFunction(props: {
     })();
 
     if ("toReadableStream" in completion === false) {
+      if (completion.usage != null) {
+        AgenticaTokenUsageAggregator.aggregate({
+          kind: source,
+          completionUsage: completion.usage,
+          usage: props.usage,
+        });
+      }
+      void props.dispatch({
+        id: v4(),
+        type: "response",
+        request_id: event.id,
+        source,
+        response: {
+          stream: false,
+          data: completion,
+        },
+        body: event.body as OpenAI.ChatCompletionCreateParamsStreaming,
+        options: event.options,
+        join: async () => completion,
+        created_at: new Date().toISOString(),
+      }).catch(() => {});
       return {
         type: "none-stream",
         value: completion,
@@ -101,7 +122,10 @@ export function getChatCompletionFunction(props: {
       type: "response",
       request_id: event.id,
       source,
-      stream: streamDefaultReaderToAsyncGenerator(streamForStream.getReader(), props.abortSignal),
+      response: {
+        stream: true,
+        data: streamDefaultReaderToAsyncGenerator(streamForStream.getReader(), props.abortSignal),
+      },
       body: event.body as OpenAI.ChatCompletionCreateParamsStreaming,
       options: event.options,
       join: async () => {

pnpm-lock.yaml

@@ -21,8 +21,8 @@ catalogs:
     typescript: ~5.9.3
   typia:
     "@ryoppippi/unplugin-typia": ^2.6.4
-    "@samchon/openapi": ^6.0.0
-    typia: ^11.0.0
+    "@samchon/openapi": ^6.0.1
+    typia: ^11.0.3
   vite:
     vitest: ^3.0.9
 onlyBuiltDependencies: