Merge pull request #1479 from b4s36t4/fix/transform-types

Author: VisargD

src/providers/anthropic/chatComplete.ts

@@ -5,6 +5,7 @@ import {
   ContentType,
   SYSTEM_MESSAGE_ROLES,
   PromptCache,
+  ToolChoiceObject,
 } from '../../types/requestBody';
 import {
   ChatCompletionResponse,
@@ -422,7 +423,10 @@ export const AnthropicChatCompleteConfig: ProviderConfig = {
           else if (params.tool_choice === 'auto') return { type: 'auto' };
           else if (params.tool_choice === 'none') return { type: 'none' };
         } else if (typeof params.tool_choice === 'object') {
-          return { type: 'tool', name: params.tool_choice.function.name };
+          return {
+            type: 'tool',
+            name: (params.tool_choice as ToolChoiceObject).function.name,
+          };
         }
       }
       return null;

src/providers/bedrock/chatComplete.ts

@@ -10,6 +10,7 @@ import {
   ToolCall,
   SYSTEM_MESSAGE_ROLES,
   ContentType,
+  ToolChoiceObject,
 } from '../../types/requestBody';
 import {
   ChatCompletionResponse,
@@ -375,7 +376,7 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
         if (typeof params.tool_choice === 'object') {
           toolChoice = {
             tool: {
-              name: params.tool_choice.function.name,
+              name: (params.tool_choice as ToolChoiceObject).function.name,
             },
           };
         } else if (typeof params.tool_choice === 'string') {

src/providers/bedrock/countTokens.ts

@@ -2,7 +2,7 @@ import { ProviderConfig } from '../types';
 import { BedrockMessagesParams } from './types';
 import { transformUsingProviderConfig } from '../../services/transformToProviderRequest';
 import { BedrockConverseMessagesConfig } from './messages';
-import { Params } from '../../types/requestBody';
+import { Options, Params } from '../../types/requestBody';
 import { BEDROCK } from '../../globals';
 import { BedrockErrorResponseTransform } from './chatComplete';
 import { generateInvalidProviderResponseError } from '../utils';
@@ -13,11 +13,12 @@ export const BedrockConverseMessageCountTokensConfig: ProviderConfig = {
   messages: {
     param: 'input',
     required: true,
-    transform: (params: BedrockMessagesParams) => {
+    transform: (params: BedrockMessagesParams, providerOptions: Options) => {
       return {
         converse: transformUsingProviderConfig(
           BedrockConverseMessagesConfig,
-          params as Params
+          params as Params,
+          providerOptions
         ),
       };
     },
@@ -28,10 +29,11 @@ export const BedrockAnthropicMessageCountTokensConfig: ProviderConfig = {
   messages: {
     param: 'input',
     required: true,
-    transform: (params: BedrockMessagesParams) => {
+    transform: (params: BedrockMessagesParams, providerOptions: Options) => {
       const anthropicParams = transformUsingProviderConfig(
         AnthropicMessagesConfig,
-        params as Params
+        params as Params,
+        providerOptions
       );
       delete anthropicParams.model;
       anthropicParams.anthropic_version =

src/providers/bedrock/uploadFileUtils.ts

@@ -4,6 +4,7 @@ import {
   Message,
   MESSAGE_ROLES,
   Params,
+  ToolChoiceObject,
 } from '../../types/requestBody';
 import {
   ChatCompletionResponse,
@@ -252,7 +253,10 @@ const BedrockAnthropicChatCompleteConfig: ProviderConfig = {
           if (params.tool_choice === 'required') return { type: 'any' };
           else if (params.tool_choice === 'auto') return { type: 'auto' };
         } else if (typeof params.tool_choice === 'object') {
-          return { type: 'tool', name: params.tool_choice.function.name };
+          return {
+            type: 'tool',
+            name: (params.tool_choice as ToolChoiceObject).function.name,
+          };
         }
       }
       return null;

src/providers/openrouter/utils.ts

@@ -6,6 +6,10 @@ interface OpenrouterUsageParam {
 
 interface OpenRouterParams extends Params {
   reasoning?: OpenrouterReasoningParam;
+  usage?: OpenrouterUsageParam;
+  stream_options?: {
+    include_usage?: boolean;
+  };
 }
 
 type OpenrouterReasoningParam = {

src/providers/oracle/chatComplete.ts

@@ -34,8 +34,12 @@ export const OracleChatCompleteConfig: ProviderConfig = {
     {
       param: 'chatRequest',
       required: true,
-      transform: (params: Params) => {
-        return transformUsingProviderConfig(OracleChatDetailsConfig, params);
+      transform: (params: Params, providerOptions: Options) => {
+        return transformUsingProviderConfig(
+          OracleChatDetailsConfig,
+          params,
+          providerOptions
+        );
       },
     },
     {
@@ -182,9 +186,9 @@ export const OracleChatDetailsConfig: ProviderConfig = {
         if (tool.type === 'function') {
           transformedTools.push({
             type: 'FUNCTION',
-            description: tool.function.description,
-            parameters: tool.function.parameters,
-            name: tool.function.name,
+            description: tool.function?.description,
+            parameters: tool.function?.parameters,
+            name: tool.function?.name,
           });
         } else if (tool.type === 'custom') {
           transformedTools.push({

src/providers/types.ts

@@ -28,7 +28,7 @@ export interface ParameterConfig {
   /** Whether the parameter is required. */
   required?: boolean;
   /** A function to transform the value of the parameter. */
-  transform?: (params: Params, providerOptions?: Options) => any;
+  transform?: (params: any, providerOptions: Options) => any;
 }
 
 /**

src/services/transformToProviderRequest.ts

@@ -29,7 +29,7 @@ const getValue = (
   configParam: string,
   params: Params,
   paramConfig: any,
-  providerOptions?: Options
+  providerOptions: Options
 ) => {
   let value = params[configParam as keyof typeof params];
 
@@ -75,7 +75,7 @@ const getValue = (
 export const transformUsingProviderConfig = (
   providerConfig: ProviderConfig,
   params: Params,
-  providerOptions?: Options
+  providerOptions: Options
 ) => {
   const transformedRequest: { [key: string]: any } = {};