Merge branch 'main' into feat/302AI-integration

Author: shiwo6324

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@portkey-ai/gateway",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "A fast AI gateway by Portkey",
   "repository": {
     "type": "git",

package.json

@@ -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/responseHandlers.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/handlers/services/responseService.ts

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

src/providers/bedrock/api.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/bedrock/index.ts

@@ -142,7 +142,8 @@ class AwsMultipartUploadHandler {
               this,
               partNumber,
               purpose ?? 'batch',
-              modelType ?? 'chat'
+              modelType ?? 'chat',
+              this.providerOptions
             );
           this.contentLength += uploadLength;
           partNumber++;
@@ -251,7 +252,8 @@ const transformAndUploadFileContentParts = async (
   handler: AwsMultipartUploadHandler,
   partNumber: number,
   purpose: string,
-  modelType: string
+  modelType: string,
+  providerOptions: Options
 ): Promise<[string, number]> => {
   let transformedChunkToUpload = '';
   const jsonLines = chunk.split('\n');
@@ -279,7 +281,11 @@ const transformAndUploadFileContentParts = async (
       }
       const transformedLine = {
         recordId: json.custom_id,
-        modelInput: transformUsingProviderConfig(providerConfig, json.body),
+        modelInput: transformUsingProviderConfig(
+          providerConfig,
+          json.body,
+          providerOptions
+        ),
       };
       transformedChunkToUpload += JSON.stringify(transformedLine) + '\r\n';
       buffer = buffer.slice(line.length + 1);

src/providers/bedrock/uploadFile.ts

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

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

@@ -122,7 +122,8 @@ export const GoogleFileUploadRequestHandler: RequestHandler<
           const toTranspose = purpose === 'batch' ? json.body : json;
           const transformedBody = transformUsingProviderConfig(
             providerConfig,
-            toTranspose
+            toTranspose,
+            providerOptions
           );
 
           delete transformedBody['model'];

src/providers/google-vertex-ai/uploadFile.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 {