openai 4.20.1 → 4.22.0

package/src/lib/AbstractChatCompletionRunner.ts

@@ -6,7 +6,6 @@ import {
   type ChatCompletionMessage,
   type ChatCompletionMessageParam,
   type ChatCompletionCreateParams,
-  type ChatCompletionAssistantMessageParam,
   type ChatCompletionTool,
 } from "../resources/chat/completions";
 import { APIUserAbortError, OpenAIError } from "../error";
@@ -90,7 +89,10 @@ export abstract class AbstractChatCompletionRunner<
   }
 
   protected _addMessage(message: ChatCompletionMessageParam, emit = true) {
+    if (!('content' in message)) message.content = null;
+
     this.messages.push(message);
+
     if (emit) {
       this._emit('message', message);
       if ((isFunctionMessage(message) || isToolMessage(message)) && message.content) {
@@ -213,7 +215,7 @@ export abstract class AbstractChatCompletionRunner<
   }
 
   #getFinalContent(): string | null {
-    return this.#getFinalMessage().content;
+    return this.#getFinalMessage().content ?? null;
   }
 
   /**
@@ -225,12 +227,12 @@ export abstract class AbstractChatCompletionRunner<
     return this.#getFinalContent();
   }
 
-  #getFinalMessage(): ChatCompletionAssistantMessageParam {
+  #getFinalMessage(): ChatCompletionMessage {
     let i = this.messages.length;
     while (i-- > 0) {
       const message = this.messages[i];
       if (isAssistantMessage(message)) {
-        return message;
+        return { ...message, content: message.content ?? null };
       }
     }
     throw new OpenAIError('stream ended without producing a ChatCompletionMessage with role=assistant');
@@ -251,6 +253,9 @@ export abstract class AbstractChatCompletionRunner<
       if (isAssistantMessage(message) && message?.function_call) {
         return message.function_call;
       }
+      if (isAssistantMessage(message) && message?.tool_calls?.length) {
+        return message.tool_calls.at(-1)?.function;
+      }
     }
 
     return;
@@ -269,7 +274,18 @@ export abstract class AbstractChatCompletionRunner<
     for (let i = this.messages.length - 1; i >= 0; i--) {
       const message = this.messages[i];
       if (isFunctionMessage(message) && message.content != null) {
-        return message.content as string;
+        return message.content;
+      }
+      if (
+        isToolMessage(message) &&
+        message.content != null &&
+        this.messages.some(
+          (x) =>
+            x.role === 'assistant' &&
+            x.tool_calls?.some((y) => y.type === 'function' && y.id === message.tool_call_id),
+        )
+      ) {
+        return message.content;
       }
     }
 
@@ -329,7 +345,9 @@ export abstract class AbstractChatCompletionRunner<
 
   protected _emit<Event extends keyof Events>(event: Event, ...args: EventParameters<Events, Event>) {
     // make sure we don't emit any events after end
-    if (this.#ended) return;
+    if (this.#ended) {
+      return;
+    }
 
     if (event === 'end') {
       this.#ended = true;
@@ -375,7 +393,7 @@ export abstract class AbstractChatCompletionRunner<
   protected _emitFinal() {
     const completion = this._chatCompletions[this._chatCompletions.length - 1];
     if (completion) this._emit('finalChatCompletion', completion);
-    const finalMessage = this.messages[this.messages.length - 1];
+    const finalMessage = this.#getFinalMessage();
     if (finalMessage) this._emit('finalMessage', finalMessage);
     const finalContent = this.#getFinalContent();
     if (finalContent) this._emit('finalContent', finalContent);
@@ -569,7 +587,9 @@ export abstract class AbstractChatCompletionRunner<
       if (!message) {
         throw new OpenAIError(`missing message in ChatCompletion response`);
       }
-      if (!message.tool_calls) return;
+      if (!message.tool_calls) {
+        return;
+      }
 
       for (const tool_call of message.tool_calls) {
         if (tool_call.type !== 'function') continue;
@@ -607,9 +627,13 @@ export abstract class AbstractChatCompletionRunner<
         const content = this.#stringifyFunctionCallResult(rawContent);
         this._addMessage({ role, tool_call_id, content });
 
-        if (singleFunctionToCall) return;
+        if (singleFunctionToCall) {
+          return;
+        }
       }
     }
+
+    return;
   }
 
   #stringifyFunctionCallResult(rawContent: unknown): string {
@@ -626,10 +650,10 @@ type CustomEvents<Event extends string> = {
   : (...args: any[]) => void;
 };
 
-type ListenerForEvent<
-  Events extends CustomEvents<any>,
-  Event extends keyof Events,
-> = Event extends keyof AbstractChatCompletionRunnerEvents ? AbstractChatCompletionRunnerEvents[Event]
+type ListenerForEvent<Events extends CustomEvents<any>, Event extends keyof Events> = Event extends (
+  keyof AbstractChatCompletionRunnerEvents
+) ?
+  AbstractChatCompletionRunnerEvents[Event]
 : Events[Event];
 
 type ListenersForEvent<Events extends CustomEvents<any>, Event extends keyof Events> = Array<{