Merge branch 'main' into fix/azure-plugin-custom-host

Author: b4s36t4

plugins/panw-prisma-airs/manifest.json

@@ -2,14 +2,18 @@
   "id": "panwPrismaAirs",
   "name": "PANW Prisma AIRS Guardrail",
   "description": "Blocks prompt/response when Palo Alto Networks Prisma AI Runtime Security returns action=block.",
-  "credentials": [
-    {
-      "id": "AIRS_API_KEY",
-      "name": "AIRS API Key",
-      "type": "string",
-      "required": true
-    }
-  ],
+  "credentials": {
+    "type": "object",
+    "properties": {
+      "AIRS_API_KEY": {
+        "type": "string",
+        "label": "AIRS API Key",
+        "description": "The API key for Palo Alto Networks Prisma AI Runtime Security",
+        "encrypted": true
+      }
+    },
+    "required": ["AIRS_API_KEY"]
+  },
   "functions": [
     {
       "id": "intercept",

src/globals.ts

@@ -92,7 +92,9 @@ export const RECRAFTAI: string = 'recraft-ai';
 export const MILVUS: string = 'milvus';
 export const REPLICATE: string = 'replicate';
 export const LEPTON: string = 'lepton';
+export const KLUSTER_AI: string = 'kluster-ai';
 export const NSCALE: string = 'nscale';
+export const HYPERBOLIC: string = 'hyperbolic';
 
 export const VALID_PROVIDERS = [
   ANTHROPIC,
@@ -150,7 +152,9 @@ export const VALID_PROVIDERS = [
   REPLICATE,
   POWERED_BY,
   LEPTON,
+  KLUSTER_AI,
   NSCALE,
+  HYPERBOLIC,
 ];
 
 export const CONTENT_TYPES = {

src/providers/anthropic/chatComplete.ts

@@ -21,8 +21,8 @@ import { AnthropicStreamState } from './types';
 
 interface AnthropicTool extends PromptCache {
   name: string;
-  description: string;
-  input_schema: {
+  description?: string;
+  input_schema?: {
     type: string;
     properties: Record<
       string,
@@ -32,7 +32,12 @@ interface AnthropicTool extends PromptCache {
       }
     >;
     required: string[];
+    $defs: Record<string, any>;
   };
+  type?: string;
+  display_width_px?: number;
+  display_height_px?: number;
+  display_number?: number;
 }
 
 interface AnthropicToolResultContentItem {
@@ -130,7 +135,9 @@ const transformAssistantMessage = (msg: Message): AnthropicMessage => {
         type: 'tool_use',
         name: toolCall.function.name,
         id: toolCall.id,
-        input: JSON.parse(toolCall.function.arguments),
+        input: toolCall.function.arguments?.length
+          ? JSON.parse(toolCall.function.arguments)
+          : {},
       });
     });
   }
@@ -336,11 +343,18 @@ export const AnthropicChatCompleteConfig: ProviderConfig = {
                 type: tool.function.parameters?.type || 'object',
                 properties: tool.function.parameters?.properties || {},
                 required: tool.function.parameters?.required || [],
+                $defs: tool.function.parameters?.['$defs'] || {},
               },
               ...(tool.cache_control && {
                 cache_control: { type: 'ephemeral' },
               }),
             });
+          } else if (tool.computer) {
+            tools.push({
+              ...tool.computer,
+              name: 'computer',
+              type: tool.computer.name,
+            });
           }
         });
       }

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

@@ -341,6 +341,10 @@ export const VertexGoogleChatCompleteConfig: ProviderConfig = {
     param: 'generationConfig',
     transform: (params: Params) => transformGenerationConfig(params),
   },
+  seed: {
+    param: 'generationConfig',
+    transform: (params: Params) => transformGenerationConfig(params),
+  },
 };
 
 interface AnthorpicTextContentItem {

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

@@ -34,6 +34,9 @@ export function transformGenerationConfig(params: Params) {
   if (params['top_logprobs']) {
     generationConfig['logprobs'] = params['top_logprobs']; // range 1-5, openai supports 1-20
   }
+  if (params['seed']) {
+    generationConfig['seed'] = params['seed'];
+  }
   if (params?.response_format?.type === 'json_schema') {
     generationConfig['responseMimeType'] = 'application/json';
     recursivelyDeleteUnsupportedParameters(

src/providers/google/chatComplete.ts

@@ -57,6 +57,9 @@ const transformGenerationConfig = (params: Params) => {
   if (params['top_logprobs']) {
     generationConfig['logprobs'] = params['top_logprobs']; // range 1-5, openai supports 1-20
   }
+  if (params['seed']) {
+    generationConfig['seed'] = params['seed'];
+  }
   if (params?.response_format?.type === 'json_schema') {
     generationConfig['responseMimeType'] = 'application/json';
     recursivelyDeleteUnsupportedParameters(
@@ -415,6 +418,10 @@ export const GoogleChatCompleteConfig: ProviderConfig = {
     param: 'generationConfig',
     transform: (params: Params) => transformGenerationConfig(params),
   },
+  seed: {
+    param: 'generationConfig',
+    transform: (params: Params) => transformGenerationConfig(params),
+  },
 };
 
 export interface GoogleErrorResponse {

src/providers/hyperbolic/api.ts

@@ -0,0 +1,25 @@
+import { ProviderAPIConfig } from '../types';
+
+const HYPERBOLIC_API_URL = 'https://api.hyperbolic.xyz';
+
+const HyperbolicAPIConfig: ProviderAPIConfig = {
+  getBaseURL: () => HYPERBOLIC_API_URL,
+  headers: ({ providerOptions, fn }) => {
+    const headersObj: Record<string, string> = {
+      Authorization: `Bearer ${providerOptions.apiKey}`,
+    };
+    return headersObj;
+  },
+  getEndpoint: ({ fn }) => {
+    switch (fn) {
+      case 'chatComplete':
+        return '/v1/chat/completions';
+      case 'imageGenerate':
+        return '/v1/image/generation';
+      default:
+        return '';
+    }
+  },
+};
+
+export default HyperbolicAPIConfig;

src/providers/hyperbolic/chatComplete.ts

@@ -0,0 +1,60 @@
+import { HYPERBOLIC } from '../../globals';
+interface HyperbolicStreamChunk {
+  id: string;
+  object: string;
+  created: number;
+  model: string;
+  choices: {
+    index: number;
+    message: {
+      role?: string | null;
+      content?: string;
+    };
+    finish_reason: string | null;
+  }[];
+  usage: {
+    prompt_tokens: number;
+    total_tokens: number;
+    completion_tokens: number;
+  };
+}
+
+export const HyperbolicChatCompleteStreamChunkTransform = (
+  responseChunk: string
+) => {
+  let chunk = responseChunk.trim();
+  chunk = chunk.replace(/^data: /, '');
+  chunk = chunk.trim();
+
+  if (chunk === '[DONE]') {
+    return `data: ${chunk}\n\n`;
+  }
+
+  try {
+    const parsedChunk: HyperbolicStreamChunk = JSON.parse(chunk);
+    return (
+      `data: ${JSON.stringify({
+        id: parsedChunk.id,
+        object: parsedChunk.object,
+        created: parsedChunk.created,
+        model: parsedChunk.model,
+        provider: HYPERBOLIC,
+        choices: [
+          {
+            index: parsedChunk.choices[0].index,
+            message: parsedChunk.choices[0].message,
+            finish_reason: parsedChunk.choices[0].finish_reason,
+          },
+        ],
+        usage: {
+          prompt_tokens: parsedChunk.usage.prompt_tokens,
+          total_tokens: parsedChunk.usage.total_tokens,
+          completion_tokens: parsedChunk.usage.completion_tokens,
+        },
+      })}` + '\n\n'
+    );
+  } catch (error) {
+    console.error('Error parsing Hyperbolic stream chunk:', error);
+    return `data: ${chunk}\n\n`;
+  }
+};

src/providers/hyperbolic/imageGenerate.ts

@@ -0,0 +1,49 @@
+import { HYPERBOLIC } from '../../globals';
+import { ErrorResponse, ProviderConfig } from '../types';
+import { OpenAIErrorResponseTransform } from '../openai/utils';
+
+export const HyperbolicImageGenerateConfig: ProviderConfig = {
+  model: {
+    param: 'model',
+    required: true,
+  },
+  prompt: {
+    param: 'prompt',
+    required: true,
+  },
+  height: {
+    param: 'height',
+  },
+  width: {
+    param: 'width',
+  },
+  backend: {
+    param: 'backend',
+  },
+};
+
+interface HyperbolicImageObject {
+  url?: string;
+  b64_json?: string;
+  seed?: number;
+}
+
+interface HyperbolicImageGenerateResponse {
+  images: HyperbolicImageObject[];
+  model: string;
+  prompt: string;
+}
+
+export const HyperbolicImageGenerateResponseTransform: (
+  response: HyperbolicImageGenerateResponse | ErrorResponse,
+  responseStatus: number
+) => HyperbolicImageGenerateResponse | ErrorResponse = (
+  response,
+  responseStatus
+) => {
+  if (responseStatus !== 200 && 'error' in response) {
+    return OpenAIErrorResponseTransform(response, HYPERBOLIC);
+  }
+
+  return response;
+};

src/providers/hyperbolic/index.ts

@@ -0,0 +1,32 @@
+import { HYPERBOLIC } from '../../globals';
+import { chatCompleteParams, responseTransformers } from '../open-ai-base';
+import { ProviderConfigs } from '../types';
+import HyperbolicAPIConfig from './api';
+import { HyperbolicChatCompleteStreamChunkTransform } from './chatComplete';
+import {
+  HyperbolicImageGenerateConfig,
+  HyperbolicImageGenerateResponseTransform,
+} from './imageGenerate';
+
+const HyperbolicConfig: ProviderConfigs = {
+  chatComplete: chatCompleteParams(
+    [],
+    {},
+    {
+      top_k: { param: 'top_k', default: -1 },
+      min_p: { param: 'min_p', default: 0, min: 0, max: 1 },
+      repetition_penalty: { param: 'repetition_penalty', default: 1 },
+    }
+  ),
+  imageGenerate: HyperbolicImageGenerateConfig,
+  api: HyperbolicAPIConfig,
+  responseTransforms: {
+    ...responseTransformers(HYPERBOLIC, {
+      chatComplete: true,
+    }),
+    'stream-chatComplete': HyperbolicChatCompleteStreamChunkTransform,
+    imageGenerate: HyperbolicImageGenerateResponseTransform,
+  },
+};
+
+export default HyperbolicConfig;