Merge pull request #1436 from narengogi/fix/bedrock-count-tokens-ignore-region

remove region identifier prefix when making request to count tokens endpoint

Author: VisargD

src/providers/anthropic/api.ts

@@ -3,12 +3,7 @@ import { ProviderAPIConfig } from '../types';
 const AnthropicAPIConfig: ProviderAPIConfig = {
   getBaseURL: () => 'https://api.anthropic.com/v1',
 
-  headers: ({
-    providerOptions,
-    fn,
-    headers: requestHeaders,
-    gatewayRequestBody,
-  }) => {
+  headers: ({ providerOptions, fn, gatewayRequestBody }) => {
     const apiKey =
       providerOptions.apiKey || providerOptions.anthropicApiKey || '';
     const headers: Record<string, string> = {

src/providers/bedrock/api.ts

@@ -7,6 +7,7 @@ import {
   generateAWSHeaders,
   getFoundationModelFromInferenceProfile,
   providerAssumedRoleCredentials,
+  getBedrockModelWithoutRegion,
 } from './utils';
 import { GatewayError } from '../../errors/GatewayError';
 
@@ -234,7 +235,10 @@ const BedrockAPIConfig: BedrockAPIConfigInterface = {
       return `/model-invocation-job/${batchId}/stop`;
     }
     const { model, stream } = gatewayRequestBody;
-    const uriEncodedModel = encodeURIComponent(decodeURIComponent(model ?? ''));
+    const decodedModel = decodeURIComponent(model ?? '');
+    const uriEncodedModel = encodeURIComponent(decodedModel);
+    const modelWithoutRegion = getBedrockModelWithoutRegion(decodedModel);
+    const uriEncodedModelWithoutRegion = encodeURIComponent(modelWithoutRegion);
     if (!model && !BEDROCK_NO_MODEL_ENDPOINTS.includes(fn as endpointStrings)) {
       throw new GatewayError('Model is required');
     }
@@ -305,7 +309,7 @@ const BedrockAPIConfig: BedrockAPIConfigInterface = {
         return `/model-customization-jobs/${jobId}/stop`;
       }
       case 'messagesCountTokens': {
-        return `/model/${uriEncodedModel}/count-tokens`;
+        return `/model/${uriEncodedModelWithoutRegion}/count-tokens`;
       }
       default:
         return '';

src/providers/bedrock/index.ts

@@ -85,6 +85,7 @@ import {
   BedrockConverseMessageCountTokensConfig,
   BedrockConverseMessageCountTokensResponseTransform,
 } from './countTokens';
+import { getBedrockModelWithoutRegion } from './utils';
 
 const BedrockConfig: ProviderConfigs = {
   api: BedrockAPIConfig,
@@ -101,7 +102,7 @@ const BedrockConfig: ProviderConfigs = {
 
     if (params.model) {
       let providerModel = providerOptions.foundationModel || params.model;
-      providerModel = providerModel.replace(/^(us\.|eu\.|apac\.)/, '');
+      providerModel = getBedrockModelWithoutRegion(providerModel);
       const providerModelArray = providerModel?.split('.');
       const provider = providerModelArray?.[0];
       const model = providerModelArray?.slice(1).join('.');

src/providers/bedrock/utils.ts

@@ -537,3 +537,7 @@ export const getBedrockErrorChunk = (id: string, model: string) => {
     `data: [DONE]\n\n`,
   ];
 };
+
+export const getBedrockModelWithoutRegion = (model: string) => {
+  return model.replace(/^(us\.|eu\.|apac\.|au\.|ca\.|jp\.|global\.)/, '');
+};