Merge branch 'main' into chore/ignore-model-details-camel-case-conversion

Author: VisargD

src/globals.ts

@@ -229,3 +229,9 @@ export const documentMimeTypes = [
   fileExtensionMimeTypeMap.md,
   fileExtensionMimeTypeMap.txt,
 ];
+
+export enum BatchEndpoints {
+  CHAT_COMPLETIONS = '/v1/chat/completions',
+  COMPLETIONS = '/v1/completions',
+  EMBEDDINGS = '/v1/embeddings',
+}

src/handlers/handlerUtils.ts

@@ -667,13 +667,18 @@ export async function tryTargetsRecursively(
           `${currentJsonPath}.targets[${originalIndex}]`,
           currentInheritedConfig
         );
-        if (response?.headers.get('x-portkey-gateway-exception') === 'true') {
-          break;
-        }
+        const codes = currentTarget.strategy?.onStatusCodes;
+        const gatewayException =
+          response?.headers.get('x-portkey-gateway-exception') === 'true';
         if (
-          response?.ok &&
-          !currentTarget.strategy?.onStatusCodes?.includes(response?.status)
+          // If onStatusCodes is provided, and the response status is not in the list
+          (Array.isArray(codes) && !codes.includes(response?.status)) ||
+          // If onStatusCodes is not provided, and the response is ok
+          (!codes && response?.ok) ||
+          // If the response is a gateway exception
+          gatewayException
         ) {
+          // Skip the fallback
           break;
         }
       }
@@ -790,53 +795,35 @@ export async function tryTargetsRecursively(
         // tryPost always returns a Response.
         // TypeError will check for all unhandled exceptions.
         // GatewayError will check for all handled exceptions which cannot allow the request to proceed.
-        if (
-          error instanceof TypeError ||
-          error instanceof GatewayError ||
-          !error.response ||
-          (error.response && !(error.response instanceof Response))
-        ) {
-          console.error(
-            'tryTargetsRecursively error: ',
-            error.message,
-            error.cause,
-            error.stack
-          );
-          const errorMessage =
-            error instanceof GatewayError
-              ? error.message
-              : 'Something went wrong';
-          response = new Response(
-            JSON.stringify({
-              status: 'failure',
-              message: errorMessage,
-            }),
-            {
-              status: 500,
-              headers: {
-                'content-type': 'application/json',
-                // Add this header so that the fallback loop can be interrupted if its an exception.
-                'x-portkey-gateway-exception': 'true',
-              },
-            }
-          );
-        } else {
-          response = error.response;
-          if (isHandlingCircuitBreaker) {
-            await c.get('recordCircuitBreakerFailure')?.(
-              env(c),
-              currentInheritedConfig.id,
-              currentTarget.cbConfig,
-              currentJsonPath,
-              response.status
-            );
+        console.error(
+          'tryTargetsRecursively error: ',
+          error.message,
+          error.cause,
+          error.stack
+        );
+        const errorMessage =
+          error instanceof GatewayError
+            ? error.message
+            : 'Something went wrong';
+        response = new Response(
+          JSON.stringify({
+            status: 'failure',
+            message: errorMessage,
+          }),
+          {
+            status: 500,
+            headers: {
+              'content-type': 'application/json',
+              // Add this header so that the fallback loop can be interrupted if its an exception.
+              'x-portkey-gateway-exception': 'true',
+            },
           }
-        }
+        );
       }
       break;
   }
 
-  return response;
+  return response!;
 }
 
 export function constructConfigFromRequestHeaders(
@@ -944,10 +931,13 @@ export function constructConfigFromRequestHeaders(
       requestHeaders[`x-${POWERED_BY}-vertex-storage-bucket-name`],
     filename: requestHeaders[`x-${POWERED_BY}-provider-file-name`],
     vertexModelName: requestHeaders[`x-${POWERED_BY}-provider-model`],
+    vertexBatchEndpoint:
+      requestHeaders[`x-${POWERED_BY}-provider-batch-endpoint`],
   };
 
   const fireworksConfig = {
     fireworksAccountId: requestHeaders[`x-${POWERED_BY}-fireworks-account-id`],
+    fireworksFileLength: requestHeaders[`x-${POWERED_BY}-file-upload-size`],
   };
 
   const anthropicConfig = {

src/handlers/services/responseService.ts

@@ -62,13 +62,6 @@ export class ResponseService {
 
     this.updateHeaders(finalMappedResponse, cache.cacheStatus, retryAttempt);
 
-    if (!finalMappedResponse.ok) {
-      const errorObj: any = new Error(await finalMappedResponse.clone().text());
-      errorObj.status = finalMappedResponse.status;
-      errorObj.response = finalMappedResponse;
-      throw errorObj;
-    }
-
     return {
       response: finalMappedResponse,
       responseJson,

src/handlers/streamHandlerUtils.ts

@@ -309,7 +309,7 @@ export function createLineSplitter(): TransformStream {
       leftover = lines.pop() || '';
       for (const line of lines) {
         if (line.trim()) {
-          controller.enqueue(line);
+          controller.enqueue(line.trim());
         }
       }
       return;

src/providers/deepseek/chatComplete.ts

@@ -27,6 +27,10 @@ export const DeepSeekChatCompleteConfig: ProviderConfig = {
       });
     },
   },
+  response_format: {
+    param: 'response_format',
+    default: null,
+  },
   max_tokens: {
     param: 'max_tokens',
     default: 100,

src/providers/fireworks-ai/api.ts

@@ -21,8 +21,23 @@ const FireworksAIAPIConfig: ProviderAPIConfig = {
       Accept: 'application/json',
     };
   },
-  getEndpoint: ({ fn, gatewayRequestBodyJSON: gatewayRequestBody, c }) => {
+  getEndpoint: ({
+    fn,
+    gatewayRequestBodyJSON: gatewayRequestBody,
+    c,
+    gatewayRequestURL,
+  }) => {
     const model = gatewayRequestBody?.model;
+
+    const jobIdIndex = ['cancelFinetune'].includes(fn ?? '') ? -2 : -1;
+    const jobId = gatewayRequestURL.split('/').at(jobIdIndex);
+
+    const url = new URL(gatewayRequestURL);
+    const params = url.searchParams;
+
+    const size = params.get('limit') ?? 50;
+    const page = params.get('after') ?? '1';
+
     switch (fn) {
       case 'complete':
         return '/completions';
@@ -33,7 +48,7 @@ const FireworksAIAPIConfig: ProviderAPIConfig = {
       case 'imageGenerate':
         return `/image_generation/${model}`;
       case 'uploadFile':
-        return `/datasets`;
+        return '';
       case 'retrieveFile': {
         const datasetId = c.req.param('id');
         return `/datasets/${datasetId}`;
@@ -45,13 +60,13 @@ const FireworksAIAPIConfig: ProviderAPIConfig = {
         return `/datasets/${datasetId}`;
       }
       case 'createFinetune':
-        return `/fineTuningJobs`;
+        return `/supervisedFineTuningJobs`;
       case 'retrieveFinetune':
-        return `/fineTuningJobs/${c.req.param('jobId')}`;
+        return `/supervisedFineTuningJobs/${jobId}`;
       case 'listFinetunes':
-        return `/fineTuningJobs`;
+        return `/supervisedFineTuningJobs?pageToken=${page}&pageSize=${size}`;
       case 'cancelFinetune':
-        return `/fineTuningJobs/${c.req.param('jobId')}`;
+        return `/supervisedFineTuningJobs/${jobId}`;
       default:
         return '';
     }

src/providers/fireworks-ai/cancelFinetune.ts

@@ -0,0 +1,84 @@
+import { FIREWORKS_AI } from '../../globals';
+import { Params } from '../../types/requestBody';
+import { RequestHandler } from '../types';
+import FireworksAIAPIConfig from './api';
+import { fireworkFinetuneToOpenAIFinetune } from './utils';
+
+export const FireworkCancelFinetuneResponseTransform = (
+  response: any,
+  status: number
+) => {
+  if (status !== 200) {
+    const error = response?.error || 'Failed to cancel finetune';
+    return new Response(JSON.stringify({ error: { message: error } }), {
+      status: status || 500,
+    });
+  }
+
+  return fireworkFinetuneToOpenAIFinetune(response);
+};
+
+export const FireworksCancelFinetuneRequestHandler: RequestHandler<
+  Params
+> = async ({ requestBody, requestURL, providerOptions, c }) => {
+  const headers = await FireworksAIAPIConfig.headers({
+    c,
+    fn: 'cancelFinetune',
+    providerOptions,
+    transformedRequestUrl: requestURL,
+    transformedRequestBody: requestBody,
+  });
+
+  const baseURL = await FireworksAIAPIConfig.getBaseURL({
+    c,
+    gatewayRequestURL: requestURL,
+    providerOptions,
+  });
+
+  const endpoint = FireworksAIAPIConfig.getEndpoint({
+    c,
+    fn: 'cancelFinetune',
+    gatewayRequestBodyJSON: requestBody,
+    gatewayRequestURL: requestURL,
+    providerOptions,
+  });
+
+  try {
+    const request = await fetch(baseURL + endpoint, {
+      method: 'DELETE',
+      headers,
+      body: JSON.stringify(requestBody),
+    });
+
+    if (!request.ok) {
+      const error = await request.json();
+      return new Response(
+        JSON.stringify({
+          error: { message: (error as any).error },
+          provider: FIREWORKS_AI,
+        }),
+        {
+          status: 500,
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        }
+      );
+    }
+
+    const response = await request.json();
+
+    const mappedResponse = fireworkFinetuneToOpenAIFinetune(response as any);
+
+    return new Response(JSON.stringify(mappedResponse), {
+      status: 200,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (error) {
+    const errorMessage =
+      error instanceof Error ? error.message : 'Unknown error';
+    return new Response(JSON.stringify({ error: { message: errorMessage } }), {
+      status: 500,
+    });
+  }
+};