chore: use provider options instead of mutating request body for bedr…

src/handlers/responseHandlers.ts

@@ -37,7 +37,7 @@ import { anthropicMessagesJsonToStreamGenerator } from '../providers/anthropic-b
 export async function responseHandler(
   response: Response,
   streamingMode: boolean,
-  provider: string | Options,
+  providerOptions: Options,
   responseTransformer: string | undefined,
   requestURL: string,
   isCacheHit: boolean = false,
@@ -53,17 +53,16 @@ export async function responseHandler(
   let responseTransformerFunction: Function | undefined;
   const responseContentType = response.headers?.get('content-type');
   const isSuccessStatusCode = [200, 246].includes(response.status);
-
-  if (typeof provider == 'object') {
-    provider = provider.provider || '';
-  }
+  const provider = providerOptions.provider;
 
   const providerConfig = Providers[provider];
   let providerTransformers = Providers[provider]?.responseTransforms;
 
   if (providerConfig?.getConfig) {
-    providerTransformers =
-      providerConfig.getConfig(gatewayRequest).responseTransforms;
+    providerTransformers = providerConfig.getConfig({
+      params: gatewayRequest,
+      providerOptions,
+    }).responseTransforms;
   }
 
   // Checking status 200 so that errors are not considered as stream mode.

src/handlers/services/responseService.ts

@@ -82,7 +82,7 @@ export class ResponseService {
     return await responseHandler(
       response,
       this.context.isStreaming,
-      this.context.provider,
+      this.context.providerOption,
       responseTransformer,
       url,
       isCacheHit,

src/providers/bedrock/api.ts

@@ -113,7 +113,7 @@ const BedrockAPIConfig: BedrockAPIConfigInterface = {
             providerOptions
           );
       if (foundationModel) {
-        params.foundationModel = foundationModel;
+        providerOptions.foundationModel = foundationModel;
       }
     }
     if (fn === 'retrieveFile') {

src/providers/bedrock/index.ts

@@ -1,5 +1,4 @@
 import { AI21, ANTHROPIC, COHERE } from '../../globals';
-import { Params } from '../../types/requestBody';
 import { ProviderConfigs } from '../types';
 import BedrockAPIConfig from './api';
 import { BedrockCancelBatchResponseTransform } from './cancelBatch';
@@ -90,13 +89,13 @@ const BedrockConfig: ProviderConfigs = {
     getBatchOutput: BedrockGetBatchOutputRequestHandler,
     retrieveFileContent: BedrockRetrieveFileContentRequestHandler,
   },
-  getConfig: (params: Params) => {
+  getConfig: ({ params, providerOptions }) => {
     // To remove the region in case its a cross-region inference profile ID
     // https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference-support.html
     let config: ProviderConfigs = {};
 
     if (params.model) {
-      let providerModel = params.foundationModel || params.model;
+      let providerModel = providerOptions.foundationModel || params.model;
       providerModel = providerModel.replace(/^(us\.|eu\.)/, '');
       const providerModelArray = providerModel?.split('.');
       const provider = providerModelArray?.[0];

src/providers/google-vertex-ai/index.ts

@@ -54,7 +54,7 @@ import {
 
 const VertexConfig: ProviderConfigs = {
   api: VertexApiConfig,
-  getConfig: (params: Params) => {
+  getConfig: ({ params }) => {
     const requestConfig = {
       uploadFile: {},
       createBatch: GoogleBatchCreateConfig,

src/providers/stability-ai/index.ts

@@ -1,6 +1,5 @@
 import { ProviderConfigs } from '../types';
 import StabilityAIAPIConfig from './api';
-import { STABILITY_V1_MODELS } from './constants';
 import {
   StabilityAIImageGenerateV1Config,
   StabilityAIImageGenerateV1ResponseTransform,
@@ -13,7 +12,7 @@ import { isStabilityV1Model } from './utils';
 
 const StabilityAIConfig: ProviderConfigs = {
   api: StabilityAIAPIConfig,
-  getConfig: (params: Params) => {
+  getConfig: ({ params }) => {
     const model = params.model;
     if (typeof model === 'string' && isStabilityV1Model(model)) {
       return {

src/providers/types.ts

@@ -138,6 +138,13 @@ export interface ProviderConfigs {
   /** The configuration for each provider, indexed by provider name. */
   [key: string]: any;
   requestHandlers?: RequestHandlers;
+  getConfig?: ({
+    params,
+    providerOptions,
+  }: {
+    params: Params;
+    providerOptions: Options;
+  }) => any;
 }
 
 export interface BaseResponse {

src/services/transformToProviderRequest.ts

@@ -4,6 +4,8 @@ import ProviderConfigs from '../providers';
 import { endpointStrings, ProviderConfig } from '../providers/types';
 import { Options, Params } from '../types/requestBody';
 
+// TODO: Refactor this file to use the providerOptions object instead of the provider string
+
 /**
  * Helper function to set a nested property in an object.
  *
@@ -68,7 +70,7 @@ const getValue = (configParam: string, params: Params, paramConfig: any) => {
 export const transformUsingProviderConfig = (
   providerConfig: ProviderConfig,
   params: Params,
-  providerOptions?: Options
+  providerOptions: Options
 ) => {
   const transformedRequest: { [key: string]: any } = {};
 
@@ -137,7 +139,7 @@ const transformToProviderRequestJSON = (
   // Get the configuration for the specified provider
   let providerConfig = ProviderConfigs[provider];
   if (providerConfig.getConfig) {
-    providerConfig = providerConfig.getConfig(params)[fn];
+    providerConfig = providerConfig.getConfig({ params, providerOptions })[fn];
   } else {
     providerConfig = providerConfig[fn];
   }
@@ -152,11 +154,12 @@ const transformToProviderRequestJSON = (
 const transformToProviderRequestFormData = (
   provider: string,
   params: Params,
-  fn: string
+  fn: string,
+  providerOptions: Options
 ): FormData => {
   let providerConfig = ProviderConfigs[provider];
   if (providerConfig.getConfig) {
-    providerConfig = providerConfig.getConfig(params)[fn];
+    providerConfig = providerConfig.getConfig({ params, providerOptions })[fn];
   } else {
     providerConfig = providerConfig[fn];
   }
@@ -193,18 +196,23 @@ const transformToProviderRequestBody = (
   provider: string,
   requestBody: ReadableStream,
   requestHeaders: Record<string, string>,
+  providerOptions: Options,
   fn: string
 ) => {
-  if (ProviderConfigs[provider].getConfig) {
-    return ProviderConfigs[provider]
-      .getConfig({}, fn)
-      .requestTransforms[fn](requestBody, requestHeaders);
+  let providerConfig = ProviderConfigs[provider];
+  if (providerConfig.getConfig) {
+    providerConfig = providerConfig.getConfig({ params: {}, providerOptions })[
+      fn
+    ];
   } else {
-    return ProviderConfigs[provider].requestTransforms[fn](
-      requestBody,
-      requestHeaders
-    );
+    providerConfig = providerConfig[fn];
+  }
+
+  if (!providerConfig) {
+    throw new GatewayError(`${fn} is not supported by ${provider}`);
   }
+
+  return providerConfig.requestTransforms[fn](requestBody, requestHeaders);
 };
 
 /**
@@ -230,6 +238,7 @@ export const transformToProviderRequest = (
       provider,
       requestBody as ReadableStream,
       requestHeaders,
+      providerOptions,
       fn
     );
   }
@@ -242,6 +251,7 @@ export const transformToProviderRequest = (
       provider,
       requestBody as ReadableStream,
       requestHeaders,
+      providerOptions,
       fn
     );
   }
@@ -258,7 +268,12 @@ export const transformToProviderRequest = (
     providerAPIConfig.transformToFormData &&
     providerAPIConfig.transformToFormData({ gatewayRequestBody: params })
   )
-    return transformToProviderRequestFormData(provider, params as Params, fn);
+    return transformToProviderRequestFormData(
+      provider,
+      params as Params,
+      fn,
+      providerOptions
+    );
   return transformToProviderRequestJSON(
     provider,
     params as Params,

src/types/requestBody.ts

@@ -44,7 +44,7 @@ interface Strategy {
  */
 export interface Options {
   /** The name of the provider. */
-  provider: string | undefined;
+  provider: string;
   /** The name of the API key for the provider. */
   virtualKey?: string;
   /** The API key for the provider. */
@@ -95,6 +95,7 @@ export interface Options {
   awsBedrockModel?: string;
   awsServerSideEncryption?: string;
   awsServerSideEncryptionKMSKeyId?: string;
+  foundationModel?: string;
 
   /** Sagemaker specific */
   amznSagemakerCustomAttributes?: string;