delete additional_parameters

Portkey-AI · Dec 31, 2024 · 70524ae · 70524ae
1 parent e3d45cd
commit 70524ae
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/providers/google-vertex-ai/chatComplete.ts b/src/providers/google-vertex-ai/chatComplete.ts
@@ -39,7 +39,7 @@ import type {
   VertexLLamaChatCompleteResponse,
   GoogleSearchRetrievalTool,
 } from './types';
-import { getMimeType } from './utils';
+import { getMimeType, recursivelyDeleteUnsupportedParameters } from './utils';
 
 export const buildGoogleSearchRetrievalTool = (tool: Tool) => {
   const googleSearchRetrievalTool: GoogleSearchRetrievalTool = {
@@ -270,10 +270,7 @@ export const VertexGoogleChatCompleteConfig: ProviderConfig = {
       params.tools?.forEach((tool) => {
         if (tool.type === 'function') {
           // these are not supported by google
-          delete tool.function?.parameters?.additional_properties;
-          delete tool.function?.parameters?.additionalProperties;
-          delete tool.function?.parameters?.properties?.additional_properties;
-          delete tool.function?.parameters?.properties?.additionalProperties;
+          recursivelyDeleteUnsupportedParameters(tool.function?.parameters);
           delete tool.function?.strict;
 
           if (tool.function.name === 'googleSearchRetrieval') {

diff --git a/src/providers/google-vertex-ai/transformGenerationConfig.ts b/src/providers/google-vertex-ai/transformGenerationConfig.ts
@@ -1,5 +1,5 @@
 import { Params } from '../../types/requestBody';
-import { derefer } from './utils';
+import { derefer, recursivelyDeleteUnsupportedParameters } from './utils';
 /**
  * @see https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/gemini#request_body
  */
@@ -28,6 +28,9 @@ export function transformGenerationConfig(params: Params) {
   }
   if (params?.response_format?.type === 'json_schema') {
     generationConfig['responseMimeType'] = 'application/json';
+    recursivelyDeleteUnsupportedParameters(
+      params?.response_format?.json_schema?.schema
+    );
     let schema =
       params?.response_format?.json_schema?.schema ??
       params?.response_format?.json_schema;

diff --git a/src/providers/google-vertex-ai/utils.ts b/src/providers/google-vertex-ai/utils.ts
@@ -202,3 +202,21 @@ export const derefer = (spec: Record<string, any>, defs = null) => {
   }
   return original;
 };
+
+// Vertex AI does not support additionalProperties in JSON Schema
+// https://cloud.google.com/vertex-ai/docs/reference/rest/v1/Schema
+export const recursivelyDeleteUnsupportedParameters = (obj: any) => {
+  if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) return;
+  delete obj.additional_properties;
+  delete obj.additionalProperties;
+  for (const key in obj) {
+    if (obj[key] !== null && typeof obj[key] === 'object') {
+      recursivelyDeleteUnsupportedParameters(obj[key]);
+    }
+    if (key == 'anyOf' && Array.isArray(obj[key])) {
+      obj[key].forEach((item: any) => {
+        recursivelyDeleteUnsupportedParameters(item);
+      });
+    }
+  }
+};