Merge branch 'main' into importMiddleWareSigned

README.md

@@ -149,6 +149,7 @@ Gateway seamlessly integrates with popular agent frameworks. [Read the documenta
 |------------------------------|--------|-------------|---------|------|---------------|-------------------|
 | [Autogen](https://docs.portkey.ai/docs/welcome/agents/autogen)    | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |
 | [CrewAI](https://docs.portkey.ai/docs/welcome/agents/crewai)             | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |
+| [LangChain](https://docs.portkey.ai/docs/welcome/agents/langchain-agents)             | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |
 | [Phidata](https://docs.portkey.ai/docs/welcome/agents/phidata)             | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |
 | [Llama Index](https://docs.portkey.ai/docs/welcome/agents/llama-agents)             | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |
 | [Control Flow](https://docs.portkey.ai/docs/welcome/agents/control-flow) | ✅     | ✅          | ✅      | ✅   | ✅            | ✅                |

jest.config.js

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
+export default {
+  testEnvironment: 'node',
+  transform: {
+    '^.+.tsx?$': ['ts-jest', {}],
+  },
+  testTimeout: 30000, // Set default timeout to 30 seconds
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portkey-ai/gateway",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "A fast AI gateway by Portkey",
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
     "jest": "^29.7.0",
     "prettier": "3.2.5",
     "rollup": "^4.9.1",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.2.4",
     "tsx": "^4.7.0",
     "typescript-eslint": "^8.1.0",
     "wrangler": "^3.48.0"

plugins/aporia/validateProject.ts

@@ -4,7 +4,7 @@ import {
   PluginHandler,
   PluginParameters,
 } from '../types';
-import { getText, post } from '../utils';
+import { post } from '../utils';
 
 export const APORIA_BASE_URL = 'https://gr-prd.aporia.com';
 

src/errors/RouterError.ts

@@ -0,0 +1,9 @@
+export class RouterError extends Error {
+  constructor(
+    message: string,
+    public cause?: Error
+  ) {
+    super(message);
+    this.name = 'RouterError';
+  }
+}

src/globals.ts

@@ -1,3 +1,5 @@
+import { endpointStrings } from './providers/types';
+
 export const POWERED_BY: string = 'portkey';
 
 export const HEADER_KEYS: Record<string, string> = {
@@ -6,6 +8,7 @@ export const HEADER_KEYS: Record<string, string> = {
   PROVIDER: `x-${POWERED_BY}-provider`,
   TRACE_ID: `x-${POWERED_BY}-trace-id`,
   CACHE: `x-${POWERED_BY}-cache`,
+  METADATA: `x-${POWERED_BY}-metadata`,
   FORWARD_HEADERS: `x-${POWERED_BY}-forward-headers`,
   CUSTOM_HOST: `x-${POWERED_BY}-custom-host`,
   REQUEST_TIMEOUT: `x-${POWERED_BY}-request-timeout`,
@@ -104,3 +107,8 @@ export const CONTENT_TYPES = {
   HTML: 'text/html',
   GENERIC_IMAGE_PATTERN: 'image/',
 };
+
+export const MULTIPART_FORM_DATA_ENDPOINTS: endpointStrings[] = [
+  'createTranscription',
+  'createTranslation',
+];

src/handlers/chatCompletionsHandler.ts

@@ -1,3 +1,4 @@
+import { RouterError } from '../errors/RouterError';
 import {
   constructConfigFromRequestHeaders,
   tryTargetsRecursively,
@@ -30,13 +31,21 @@ export async function chatCompletionsHandler(c: Context): Promise<Response> {
     return tryTargetsResponse;
   } catch (err: any) {
     console.log('chatCompletion error', err.message);
+    let statusCode = 500;
+    let errorMessage = 'Something went wrong';
+
+    if (err instanceof RouterError) {
+      statusCode = 400;
+      errorMessage = err.message;
+    }
+
     return new Response(
       JSON.stringify({
         status: 'failure',
-        message: 'Something went wrong',
+        message: errorMessage,
       }),
       {
-        status: 500,
+        status: statusCode,
         headers: {
           'content-type': 'application/json',
         },

src/handlers/completionsHandler.ts

@@ -1,3 +1,4 @@
+import { RouterError } from '../errors/RouterError';
 import {
   constructConfigFromRequestHeaders,
   tryTargetsRecursively,
@@ -31,6 +32,14 @@ export async function completionsHandler(c: Context): Promise<Response> {
     return tryTargetsResponse;
   } catch (err: any) {
     console.log('completion error', err.message);
+    let statusCode = 500;
+    let errorMessage = 'Something went wrong';
+
+    if (err instanceof RouterError) {
+      statusCode = 400;
+      errorMessage = err.message;
+    }
+
     return new Response(
       JSON.stringify({
         status: 'failure',

src/handlers/createSpeechHandler.ts

@@ -0,0 +1,46 @@
+import {
+  constructConfigFromRequestHeaders,
+  tryTargetsRecursively,
+} from './handlerUtils';
+import { Context } from 'hono';
+
+/**
+ * Handles the '/audio/speech' API request by selecting the appropriate provider(s) and making the request to them.
+ *
+ * @param {Context} c - The Cloudflare Worker context.
+ * @returns {Promise<Response>} - The response from the provider.
+ * @throws Will throw an error if no provider options can be determined or if the request to the provider(s) fails.
+ * @throws Will throw an 500 error if the handler fails due to some reasons
+ */
+export async function createSpeechHandler(c: Context): Promise<Response> {
+  try {
+    let request = await c.req.json();
+    let requestHeaders = Object.fromEntries(c.req.raw.headers);
+    const camelCaseConfig = constructConfigFromRequestHeaders(requestHeaders);
+    const tryTargetsResponse = await tryTargetsRecursively(
+      c,
+      camelCaseConfig ?? {},
+      request,
+      requestHeaders,
+      'createSpeech',
+      'POST',
+      'config'
+    );
+
+    return tryTargetsResponse;
+  } catch (err: any) {
+    console.log('createSpeech error', err.message);
+    return new Response(
+      JSON.stringify({
+        status: 'failure',
+        message: 'Something went wrong',
+      }),
+      {
+        status: 500,
+        headers: {
+          'content-type': 'application/json',
+        },
+      }
+    );
+  }
+}

src/handlers/createTranscriptionHandler.ts

@@ -0,0 +1,48 @@
+import {
+  constructConfigFromRequestHeaders,
+  tryTargetsRecursively,
+} from './handlerUtils';
+import { Context } from 'hono';
+
+/**
+ * Handles the '/audio/transcriptions' API request by selecting the appropriate provider(s) and making the request to them.
+ *
+ * @param {Context} c - The Cloudflare Worker context.
+ * @returns {Promise<Response>} - The response from the provider.
+ * @throws Will throw an error if no provider options can be determined or if the request to the provider(s) fails.
+ * @throws Will throw an 500 error if the handler fails due to some reasons
+ */
+export async function createTranscriptionHandler(
+  c: Context
+): Promise<Response> {
+  try {
+    let request = await c.req.raw.formData();
+    let requestHeaders = Object.fromEntries(c.req.raw.headers);
+    const camelCaseConfig = constructConfigFromRequestHeaders(requestHeaders);
+    const tryTargetsResponse = await tryTargetsRecursively(
+      c,
+      camelCaseConfig ?? {},
+      request,
+      requestHeaders,
+      'createTranscription',
+      'POST',
+      'config'
+    );
+
+    return tryTargetsResponse;
+  } catch (err: any) {
+    console.log('createTranscription error', err.message);
+    return new Response(
+      JSON.stringify({
+        status: 'failure',
+        message: 'Something went wrong',
+      }),
+      {
+        status: 500,
+        headers: {
+          'content-type': 'application/json',
+        },
+      }
+    );
+  }
+}