Merge branch 'main' into feature/add-qualifire-integration

Author: drorIvry

package-lock.json

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

package.json

@@ -940,6 +940,7 @@ export function constructConfigFromRequestHeaders(
     vertexModelName: requestHeaders[`x-${POWERED_BY}-provider-model`],
     vertexBatchEndpoint:
       requestHeaders[`x-${POWERED_BY}-provider-batch-endpoint`],
+    anthropicBeta: requestHeaders[`x-${POWERED_BY}-anthropic-beta`],
   };
 
   const fireworksConfig = {

src/handlers/handlerUtils.ts

@@ -435,9 +435,9 @@ export const BedrockMessagesResponseTransform = (
   _gatewayRequestUrl: string,
   gatewayRequest: Params
 ): MessagesResponse | ErrorResponse => {
-  if (responseStatus !== 200 && 'error' in response) {
+  if (responseStatus !== 200) {
     return (
-      BedrockErrorResponseTransform(response) ||
+      BedrockErrorResponseTransform(response as BedrockErrorResponse) ||
       generateInvalidProviderResponseError(response, BEDROCK)
     );
   }
@@ -513,6 +513,36 @@ const transformContentBlock = (
   return undefined;
 };
 
+function createContentBlockStartEvent(
+  parsedChunk: BedrockChatCompleteStreamChunk
+): RawContentBlockStartEvent {
+  const contentBlockStartEvent: RawContentBlockStartEvent = JSON.parse(
+    ANTHROPIC_CONTENT_BLOCK_START_EVENT
+  );
+
+  if (parsedChunk.start?.toolUse && parsedChunk.start.toolUse.toolUseId) {
+    contentBlockStartEvent.content_block = {
+      type: 'tool_use',
+      id: parsedChunk.start.toolUse.toolUseId,
+      name: parsedChunk.start.toolUse.name,
+      input: {},
+    };
+  } else if (parsedChunk.delta?.reasoningContent?.text) {
+    contentBlockStartEvent.content_block = {
+      type: 'thinking',
+      thinking: '',
+      signature: '',
+    };
+  } else if (parsedChunk.delta?.reasoningContent?.redactedContent) {
+    contentBlockStartEvent.content_block = {
+      type: 'redacted_thinking',
+      data: parsedChunk.delta.reasoningContent.redactedContent,
+    };
+  }
+
+  return contentBlockStartEvent;
+}
+
 export const BedrockConverseMessagesStreamChunkTransform = (
   responseChunk: string,
   fallbackId: string,
@@ -545,9 +575,8 @@ export const BedrockConverseMessagesStreamChunkTransform = (
       returnChunk += `event: content_block_stop\ndata: ${JSON.stringify(previousBlockStopEvent)}\n\n`;
     }
     streamState.currentContentBlockIndex = parsedChunk.contentBlockIndex;
-    const contentBlockStartEvent: RawContentBlockStartEvent = JSON.parse(
-      ANTHROPIC_CONTENT_BLOCK_START_EVENT
-    );
+    const contentBlockStartEvent: RawContentBlockStartEvent =
+      createContentBlockStartEvent(parsedChunk);
     contentBlockStartEvent.index = parsedChunk.contentBlockIndex;
     returnChunk += `event: content_block_start\ndata: ${JSON.stringify(contentBlockStartEvent)}\n\n`;
     const contentBlockDeltaEvent = transformContentBlock(parsedChunk);

src/providers/bedrock/messages.ts

@@ -62,16 +62,23 @@ export const GoogleApiConfig: ProviderAPIConfig = {
     }
     return `https://${vertexRegion}-aiplatform.googleapis.com`;
   },
-  headers: async ({ c, providerOptions }) => {
+  headers: async ({ c, providerOptions, gatewayRequestBody }) => {
     const { apiKey, vertexServiceAccountJson } = providerOptions;
     let authToken = apiKey;
     if (vertexServiceAccountJson) {
       authToken = await getAccessToken(c, vertexServiceAccountJson);
     }
 
+    const anthropicBeta =
+      providerOptions?.['anthropicBeta'] ??
+      gatewayRequestBody?.['anthropic_beta'];
+
     return {
       'Content-Type': 'application/json',
       Authorization: `Bearer ${authToken}`,
+      ...(anthropicBeta && {
+        'anthropic-beta': anthropicBeta,
+      }),
     };
   },
   getEndpoint: ({