finish port

Author: 404Wolf

examples/tool-calls-beta-zod.ts

@@ -63,37 +63,41 @@ async function main() {
     const { choices } = message;
     const firstChoice = choices.at(0)!;
 
-    console.log(`${firstChoice.message.content}\n`); // text
-    // each tool call (could be many)
-    for (const toolCall of firstChoice.message.tool_calls ?? []) {
-      if (toolCall.type === 'function') {
-        console.log(`${toolCall.function.name}(${JSON.stringify(toolCall.function.arguments, null, 2)})\n`);
+    // When we get a tool call request it's null
+    if (firstChoice.message.content !== null) {
+      console.log(`${firstChoice.message.content}\n`);
+    } else {
+      // each tool call (could be many)
+      for (const toolCall of firstChoice.message.tool_calls ?? []) {
+        if (toolCall.type === 'function') {
+          console.log(`${toolCall.function.name}(${JSON.stringify(toolCall.function.arguments, null, 2)})\n`);
+        }
       }
     }
 
     console.log(`└─`.padEnd(process.stdout.columns, '─'));
     console.log();
     console.log();
 
-    // const defaultResponse = await runner.generateToolResponse();
-    // if (defaultResponse && typeof defaultResponse.content !== 'string') {
-    //   console.log(`┌─ Response `.padEnd(process.stdout.columns, '─'));
-    //   console.log();
+    const defaultResponse = await runner.generateToolResponse();
+    if (defaultResponse && Array.isArray(defaultResponse)) {
+      console.log(`┌─ Response `.padEnd(process.stdout.columns, '─'));
+      console.log();
 
-    //   for (const block of defaultResponse.content) {
-    //     if (block.type === 'tool_result') {
-    //       const toolUseBlock = message.content.find((b): b is BetaToolUseBlock => {
-    //         return b.type === 'tool_use' && b.id === block.tool_use_id;
-    //       })!;
-    //       console.log(`${toolUseBlock.name}(): ${block.content}`);
-    //     }
-    //   }
+      for (const toolResponse of defaultResponse) {
+        if (toolResponse.role === 'tool') {
+          const toolCall = firstChoice.message.tool_calls?.find((tc) => tc.id === toolResponse.tool_call_id);
+          if (toolCall && toolCall.type === 'function') {
+            console.log(`${toolCall.function.name}(): ${toolResponse.content}`);
+          }
+        }
+      }
 
-    //   console.log();
-    //   console.log(`└─`.padEnd(process.stdout.columns, '─'));
-    //   console.log();
-    //   console.log();
-    // }
+      console.log();
+      console.log(`└─`.padEnd(process.stdout.columns, '─'));
+      console.log();
+      console.log();
+    }
   }
 }
 

src/lib/beta/BetaToolRunner.ts

@@ -1,3 +1,5 @@
+import type { OpenAI } from '../..';
+import { OpenAIError } from '../../core/error';
 import type {
   ChatCompletion,
   ChatCompletionCreateParams,
@@ -6,8 +8,6 @@ import type {
   ChatCompletionTool,
   ChatCompletionToolMessageParam,
 } from '../../resources/chat/completions';
-import type { OpenAI } from '../..';
-import { OpenAIError } from '../../core/error';
 import type { BetaRunnableTool } from './BetaRunnableTool';
 // BetaMessage, BetaMessageParam, BetaToolUnion, MessageCreateParams
 // import { BetaMessageStream } from '../BetaMessageStream';
@@ -72,11 +72,6 @@ export class BetaToolRunner<Stream extends boolean> {
     this.#completion = promiseWithResolvers();
   }
 
-  get #firstChoiceInCurrentMessage(): ChatCompletionMessageParam | null {
-    const lastMessage = this.#state.params.messages[this.#state.params.messages.length - 1];
-    return lastMessage ?? null;
-  }
-
   async *[Symbol.asyncIterator](): AsyncIterator<
     Stream extends true ?
       ChatCompletionStream // TODO: for now!
@@ -130,13 +125,16 @@ export class BetaToolRunner<Stream extends boolean> {
           }
 
           // TODO: we should probably hit the user with a callback or somehow offer for them to choice between the choices
-          if (!this.#firstChoiceInCurrentMessage) {
+          if (!this.#message) {
             throw new Error('No choices found in message'); // TODO: use better error
           }
 
           if (!this.#mutated) {
-            // this.#state.params.messages.push({ role, content }); TODO: we want to add all
-            this.#state.params.messages.push(this.#firstChoiceInCurrentMessage);
+            const completion = await this.#message;
+            // TODO: what if it is empty?
+            if (completion?.choices && completion.choices.length > 0 && completion.choices[0]!.message) {
+              this.#state.params.messages.push(completion.choices[0]!.message);
+            }
           }
 
           const toolMessages = await this.#generateToolResponse(await this.#message);
@@ -230,11 +228,12 @@ export class BetaToolRunner<Stream extends boolean> {
     if (this.#toolResponse !== undefined) {
       return this.#toolResponse;
     }
-    this.#toolResponse = generateToolResponse(
+    const toolsResponse = generateToolResponse(
       lastMessage,
       this.#state.params.tools.filter((tool): tool is BetaRunnableTool<any> => 'run' in tool),
     );
-    return this.#toolResponse;
+    this.#toolResponse = toolsResponse;
+    return toolsResponse;
   }
 
   /**
@@ -349,7 +348,7 @@ async function generateToolResponse(
   if (
     !lastMessage ||
     lastMessage.role !== 'assistant' ||
-    !lastMessage.content ||
+    // !lastMessage.content || TODO: openai doesn't give content at the same time. ensure this is really always true though
     typeof lastMessage.content === 'string'
   ) {
     return null;
@@ -381,6 +380,10 @@ async function generateToolResponse(
 
         try {
           let input = toolUse.function.arguments;
+          // TODO: is this always safe?
+          if (typeof input === 'string') {
+            input = JSON.parse(input);
+          }
           input = tool.parse(input);
 
           const result = await tool.run(input);