From 07aebc25df8f02731a28c08a43c4441c1e3ffc00 Mon Sep 17 00:00:00 2001
From: Emir Karabeg <emirkarabeg@berkeley.edu>
Date: Fri, 28 Feb 2025 01:23:12 -0800
Subject: [PATCH] fix(openai): removed parameter mode tool calling

---
 providers/openai/index.ts | 54 +++++----------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/providers/openai/index.ts b/providers/openai/index.ts
index 1cea690a85..501f9ab730 100644
--- a/providers/openai/index.ts
+++ b/providers/openai/index.ts
@@ -11,9 +11,6 @@ export const openaiProvider: ProviderConfig = {
   defaultModel: 'gpt-4o',
 
   executeRequest: async (request: ProviderRequest): Promise<ProviderResponse> => {
-    // Add tool execution mode with default of 'parameters-only'
-    const toolExecutionMode = 'parameters-only' // 'sync', 'parameters-only'
-
     if (!request.apiKey) {
       throw new Error('API key is required for OpenAI')
     }
@@ -81,49 +78,14 @@ export const openaiProvider: ProviderConfig = {
     }
 
     // Make the initial API request
-    const startTime = Date.now()
-    console.log(`[OpenAI Provider] Starting request at ${new Date(startTime).toISOString()}`)
-
-    const firstRequestStartTime = Date.now()
     let currentResponse = await openai.chat.completions.create(payload)
-    const firstRequestEndTime = Date.now()
-    console.log(
-      `[OpenAI Provider] First request took ${firstRequestEndTime - firstRequestStartTime}ms`
-    )
-
-    // Extract content and token information
     let content = currentResponse.choices[0]?.message?.content || ''
     let tokens = {
       prompt: currentResponse.usage?.prompt_tokens || 0,
       completion: currentResponse.usage?.completion_tokens || 0,
       total: currentResponse.usage?.total_tokens || 0,
     }
-
-    // Extract tool calls if present
-    let toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
-    const toolCalls =
-      toolCallsInResponse?.map((toolCall) => ({
-        name: toolCall.function.name,
-        arguments: JSON.parse(toolCall.function.arguments),
-      })) || []
-
-    // If parameters-only mode or no tool calls, return immediately
-    if (toolExecutionMode === 'parameters-only' || !toolCalls.length) {
-      const endTime = Date.now()
-      console.log(
-        `[OpenAI Provider] Completed request at ${new Date(endTime).toISOString()} (${endTime - startTime}ms)`
-      )
-
-      return {
-        content,
-        model: request.model,
-        tokens,
-        toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
-        // No tool results since we didn't execute them
-      }
-    }
-
-    // If we reach here, we're in sync mode and need to execute tools
+    let toolCalls = []
     let toolResults = []
     let currentMessages = [...allMessages]
     let iterationCount = 0
@@ -132,6 +94,7 @@ export const openaiProvider: ProviderConfig = {
     try {
       while (iterationCount < MAX_ITERATIONS) {
         // Check for tool calls
+        const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
         if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
           break
         }
@@ -153,6 +116,10 @@ export const openaiProvider: ProviderConfig = {
             if (!result.success) continue
 
             toolResults.push(result.output)
+            toolCalls.push({
+              name: toolName,
+              arguments: toolArgs,
+            })
 
             // Add the tool call and result to messages
             currentMessages.push({
@@ -194,9 +161,6 @@ export const openaiProvider: ProviderConfig = {
           content = currentResponse.choices[0].message.content
         }
 
-        // Get new tool calls for next iteration
-        toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
-
         // Update token counts
         if (currentResponse.usage) {
           tokens.prompt += currentResponse.usage.prompt_tokens || 0
@@ -211,12 +175,6 @@ export const openaiProvider: ProviderConfig = {
       throw error
     }
 
-    const endTime = Date.now()
-    console.log(
-      `[OpenAI Provider] Completed request at ${new Date(endTime).toISOString()} (${endTime - startTime}ms)`
-    )
-    console.log(`[OpenAI Provider] Time taken: ${endTime - startTime}ms`)
-
     return {
       content,
       model: request.model,