Merge branch 'main' into feat/ft-batch-improvements

Author: b4s36t4

src/providers/anthropic/chatComplete.ts

@@ -362,11 +362,15 @@ export const AnthropicChatCompleteConfig: ProviderConfig = {
                 cache_control: { type: 'ephemeral' },
               }),
             });
-          } else if (tool.computer) {
+          } else if (tool.type) {
+            const toolOptions = tool[tool.type];
             tools.push({
-              ...tool.computer,
-              name: 'computer',
-              type: tool.computer.name,
+              ...(toolOptions && { ...toolOptions }),
+              name: tool.type,
+              type: toolOptions?.name,
+              ...(tool.cache_control && {
+                cache_control: { type: 'ephemeral' },
+              }),
             });
           }
         });

src/providers/bedrock/chatComplete.ts

@@ -315,13 +315,15 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
         | { cachePoint: { type: string } }
       > = [];
       params.tools?.forEach((tool) => {
-        tools.push({
-          toolSpec: {
-            name: tool.function.name,
-            description: tool.function.description,
-            inputSchema: { json: tool.function.parameters },
-          },
-        });
+        if (tool.function) {
+          tools.push({
+            toolSpec: {
+              name: tool.function.name,
+              description: tool.function.description,
+              inputSchema: { json: tool.function.parameters },
+            },
+          });
+        }
         if (tool.cache_control && !canBeAmazonModel) {
           tools.push({
             cachePoint: {
@@ -353,7 +355,8 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
           }
         }
       }
-      return { ...toolConfig, toolChoice };
+      // TODO: split this into two provider options, one for tools and one for toolChoice
+      return tools.length ? { ...toolConfig, toolChoice } : null;
     },
   },
   guardrailConfig: {

src/providers/bedrock/utils.ts

@@ -8,7 +8,7 @@ import {
   BedrockConverseAnthropicChatCompletionsParams,
   BedrockConverseCohereChatCompletionsParams,
 } from './chatComplete';
-import { Options } from '../../types/requestBody';
+import { Options, Tool } from '../../types/requestBody';
 import { GatewayError } from '../../errors/GatewayError';
 import { BedrockFinetuneRecord, BedrockInferenceProfile } from './types';
 import { FinetuneRequest } from '../types';
@@ -137,6 +137,25 @@ export const transformAnthropicAdditionalModelRequestFields = (
       additionalModelRequestFields['anthropic_beta'] = params['anthropic_beta'];
     }
   }
+  if (params.tools && params.tools.length) {
+    const anthropicTools: any[] = [];
+    params.tools.forEach((tool: Tool) => {
+      if (tool.type !== 'function') {
+        const toolOptions = tool[tool.type];
+        anthropicTools.push({
+          ...(toolOptions && { ...toolOptions }),
+          name: tool.type,
+          type: toolOptions?.name,
+          ...(tool.cache_control && {
+            cache_control: { type: 'ephemeral' },
+          }),
+        });
+      }
+    });
+    if (anthropicTools.length) {
+      additionalModelRequestFields['tools'] = anthropicTools;
+    }
+  }
   return additionalModelRequestFields;
 };
 

src/types/requestBody.ts

@@ -361,12 +361,8 @@ export interface Tool extends PromptCache {
   type: string;
   /** A description of the function. */
   function: Function;
-  computer?: {
-    name: string;
-    display_width_px: number;
-    display_height_px: number;
-    display_number: number;
-  };
+  // this is used to support tools like computer, web_search, etc.
+  [key: string]: any;
 }
 
 /**