Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
chore: add token rate support for 11/06 models (#1146)
Danny Avila48c087cc0645
diff --git a/.env.example b/.env.exampleindex 3527c281bc..3b948ce3da 100644--- a/.env.example+++ b/.env.example@@ -97,7 +97,7 @@ DEBUG_OPENAI=false # Set to true to enable debug mode for the OpenAI endpoint# Identify the available models, separated by commas *without spaces*.# The first will be default.# Leave it blank to use internal settings.-# OPENAI_MODELS=gpt-3.5-turbo,gpt-3.5-turbo-16k,gpt-3.5-turbo-0301,text-davinci-003,gpt-4,gpt-4-0314,gpt-4-0613+# OPENAI_MODELS=gpt-3.5-turbo-1106,gpt-4-1106-preview,gpt-3.5-turbo,gpt-3.5-turbo-16k,gpt-3.5-turbo-0301,text-davinci-003,gpt-4,gpt-4-0314,gpt-4-0613# Titling is enabled by default when initiating a conversation.# Uncomment the following variable to disable this feature.diff --git a/api/models/tx.js b/api/models/tx.jsindex 96f0f80b5a..339c1e3402 100644--- a/api/models/tx.js+++ b/api/models/tx.js@@ -10,6 +10,8 @@ const tokenValues = {'32k': { prompt: 60, completion: 120 },'4k': { prompt: 1.5, completion: 2 },'16k': { prompt: 3, completion: 4 },+ 'gpt-3.5-turbo-1106': { prompt: 1, completion: 2 },+ 'gpt-4-1106': { prompt: 10, completion: 30 },};/**@@ -26,8 +28,12 @@ const getValueKey = (model) => {if (modelName.includes('gpt-3.5-turbo-16k')) {return '16k';+ } else if (modelName.includes('gpt-3.5-turbo-1106')) {+ return 'gpt-3.5-turbo-1106';} else if (modelName.includes('gpt-3.5')) {return '4k';+ } else if (modelName.includes('gpt-4-1106')) {+ return 'gpt-4-1106';} else if (modelName.includes('gpt-4-32k')) {return '32k';} else if (modelName.includes('gpt-4')) {diff --git a/api/models/tx.spec.js b/api/models/tx.spec.jsindex adbaa8f764..135298bf2b 100644--- a/api/models/tx.spec.js+++ b/api/models/tx.spec.js@@ -1,4 +1,4 @@-const { getValueKey, getMultiplier, defaultRate } = require('./tx');+const { getValueKey, getMultiplier, defaultRate, tokenValues } = require('./tx');describe('getValueKey', () => {it('should return "16k" for model name containing "gpt-3.5-turbo-16k"', () => {@@ -20,12 +20,28 @@ describe('getValueKey', () => {it('should return undefined for model names that do not match any known patterns', () => {expect(getValueKey('gpt-5-some-other-info')).toBeUndefined();});++ it('should return "gpt-3.5-turbo-1106" for model name containing "gpt-3.5-turbo-1106"', () => {+ expect(getValueKey('gpt-3.5-turbo-1106-some-other-info')).toBe('gpt-3.5-turbo-1106');+ expect(getValueKey('openai/gpt-3.5-turbo-1106')).toBe('gpt-3.5-turbo-1106');+ expect(getValueKey('gpt-3.5-turbo-1106/openai')).toBe('gpt-3.5-turbo-1106');+ });++ it('should return "gpt-4-1106" for model name containing "gpt-4-1106"', () => {+ expect(getValueKey('gpt-4-1106-some-other-info')).toBe('gpt-4-1106');+ expect(getValueKey('gpt-4-1106-vision-preview')).toBe('gpt-4-1106');+ expect(getValueKey('gpt-4-1106-preview')).toBe('gpt-4-1106');+ expect(getValueKey('openai/gpt-4-1106')).toBe('gpt-4-1106');+ expect(getValueKey('gpt-4-1106/openai/')).toBe('gpt-4-1106');+ });});describe('getMultiplier', () => {it('should return the correct multiplier for a given valueKey and tokenType', () => {- expect(getMultiplier({ valueKey: '8k', tokenType: 'prompt' })).toBe(30);- expect(getMultiplier({ valueKey: '8k', tokenType: 'completion' })).toBe(60);+ expect(getMultiplier({ valueKey: '8k', tokenType: 'prompt' })).toBe(tokenValues['8k'].prompt);+ expect(getMultiplier({ valueKey: '8k', tokenType: 'completion' })).toBe(+ tokenValues['8k'].completion,+ );});it('should return defaultRate if tokenType is provided but not found in tokenValues', () => {@@ -33,7 +49,9 @@ describe('getMultiplier', () => {});it('should derive the valueKey from the model if not provided', () => {- expect(getMultiplier({ tokenType: 'prompt', model: 'gpt-4-some-other-info' })).toBe(30);+ expect(getMultiplier({ tokenType: 'prompt', model: 'gpt-4-some-other-info' })).toBe(+ tokenValues['8k'].prompt,+ );});it('should return 1 if only model or tokenType is missing', () => {@@ -41,6 +59,33 @@ describe('getMultiplier', () => {expect(getMultiplier({ model: 'gpt-4-some-other-info' })).toBe(1);});+ it('should return the correct multiplier for gpt-3.5-turbo-1106', () => {+ expect(getMultiplier({ valueKey: 'gpt-3.5-turbo-1106', tokenType: 'prompt' })).toBe(+ tokenValues['gpt-3.5-turbo-1106'].prompt,+ );+ expect(getMultiplier({ valueKey: 'gpt-3.5-turbo-1106', tokenType: 'completion' })).toBe(+ tokenValues['gpt-3.5-turbo-1106'].completion,+ );+ });++ it('should return the correct multiplier for gpt-4-1106', () => {+ expect(getMultiplier({ valueKey: 'gpt-4-1106', tokenType: 'prompt' })).toBe(+ tokenValues['gpt-4-1106'].prompt,+ );+ expect(getMultiplier({ valueKey: 'gpt-4-1106', tokenType: 'completion' })).toBe(+ tokenValues['gpt-4-1106'].completion,+ );+ });++ it('should derive the valueKey from the model if not provided for new models', () => {+ expect(+ getMultiplier({ tokenType: 'prompt', model: 'gpt-3.5-turbo-1106-some-other-info' }),+ ).toBe(tokenValues['gpt-3.5-turbo-1106'].prompt);+ expect(getMultiplier({ tokenType: 'completion', model: 'gpt-4-1106-vision-preview' })).toBe(+ tokenValues['gpt-4-1106'].completion,+ );+ });+it('should return defaultRate if derived valueKey does not match any known patterns', () => {expect(getMultiplier({ tokenType: 'prompt', model: 'gpt-5-some-other-info' })).toBe(defaultRate,diff --git a/api/utils/tokens.js b/api/utils/tokens.jsindex e38db5a5d3..b422acee46 100644--- a/api/utils/tokens.js+++ b/api/utils/tokens.js@@ -49,6 +49,8 @@ const maxTokensMap = {'gpt-3.5-turbo-0301': 4095,'gpt-3.5-turbo-16k': 15999,'gpt-3.5-turbo-16k-0613': 15999,+ 'gpt-3.5-turbo-1106': 16380, // -5 from max+ 'gpt-4-1106': 127995, // -5 from max};/**diff --git a/api/utils/tokens.spec.js b/api/utils/tokens.spec.jsindex 2b2d5904f7..5cf488c2ca 100644--- a/api/utils/tokens.spec.js+++ b/api/utils/tokens.spec.js@@ -1,16 +1,16 @@-const { getModelMaxTokens, matchModelName } = require('./tokens');+const { getModelMaxTokens, matchModelName, maxTokensMap } = require('./tokens');describe('getModelMaxTokens', () => {test('should return correct tokens for exact match', () => {- expect(getModelMaxTokens('gpt-4-32k-0613')).toBe(32767);+ expect(getModelMaxTokens('gpt-4-32k-0613')).toBe(maxTokensMap['gpt-4-32k-0613']);});test('should return correct tokens for partial match', () => {- expect(getModelMaxTokens('gpt-4-32k-unknown')).toBe(32767);+ expect(getModelMaxTokens('gpt-4-32k-unknown')).toBe(maxTokensMap['gpt-4-32k']);});test('should return correct tokens for partial match (OpenRouter)', () => {- expect(getModelMaxTokens('openai/gpt-4-32k')).toBe(32767);+ expect(getModelMaxTokens('openai/gpt-4-32k')).toBe(maxTokensMap['gpt-4-32k']);});test('should return undefined for no match', () => {@@ -18,11 +18,13 @@ describe('getModelMaxTokens', () => {});test('should return correct tokens for another exact match', () => {- expect(getModelMaxTokens('gpt-3.5-turbo-16k-0613')).toBe(15999);+ expect(getModelMaxTokens('gpt-3.5-turbo-16k-0613')).toBe(+ maxTokensMap['gpt-3.5-turbo-16k-0613'],+ );});test('should return correct tokens for another partial match', () => {- expect(getModelMaxTokens('gpt-3.5-turbo-unknown')).toBe(4095);+ expect(getModelMaxTokens('gpt-3.5-turbo-unknown')).toBe(maxTokensMap['gpt-3.5-turbo']);});test('should return undefined for undefined input', () => {@@ -36,6 +38,30 @@ describe('getModelMaxTokens', () => {test('should return undefined for number input', () => {expect(getModelMaxTokens(123)).toBeUndefined();});++ // 11/06 Update+ test('should return correct tokens for gpt-3.5-turbo-1106 exact match', () => {+ expect(getModelMaxTokens('gpt-3.5-turbo-1106')).toBe(maxTokensMap['gpt-3.5-turbo-1106']);+ });++ test('should return correct tokens for gpt-4-1106 exact match', () => {+ expect(getModelMaxTokens('gpt-4-1106')).toBe(maxTokensMap['gpt-4-1106']);+ });++ test('should return correct tokens for gpt-3.5-turbo-1106 partial match', () => {+ expect(getModelMaxTokens('something-/gpt-3.5-turbo-1106')).toBe(+ maxTokensMap['gpt-3.5-turbo-1106'],+ );+ expect(getModelMaxTokens('gpt-3.5-turbo-1106/something-/')).toBe(+ maxTokensMap['gpt-3.5-turbo-1106'],+ );+ });++ test('should return correct tokens for gpt-4-1106 partial match', () => {+ expect(getModelMaxTokens('gpt-4-1106/something')).toBe(maxTokensMap['gpt-4-1106']);+ expect(getModelMaxTokens('gpt-4-1106-preview')).toBe(maxTokensMap['gpt-4-1106']);+ expect(getModelMaxTokens('gpt-4-1106-vision-preview')).toBe(maxTokensMap['gpt-4-1106']);+ });});describe('matchModelName', () => {@@ -57,4 +83,24 @@ describe('matchModelName', () => {expect(matchModelName(123)).toBeUndefined();expect(matchModelName({})).toBeUndefined();});++ // 11/06 Update+ it('should return the exact model name for gpt-3.5-turbo-1106 if it exists in maxTokensMap', () => {+ expect(matchModelName('gpt-3.5-turbo-1106')).toBe('gpt-3.5-turbo-1106');+ });++ it('should return the exact model name for gpt-4-1106 if it exists in maxTokensMap', () => {+ expect(matchModelName('gpt-4-1106')).toBe('gpt-4-1106');+ });++ it('should return the closest matching key for gpt-3.5-turbo-1106 partial matches', () => {+ expect(matchModelName('gpt-3.5-turbo-1106/something')).toBe('gpt-3.5-turbo-1106');+ expect(matchModelName('something/gpt-3.5-turbo-1106')).toBe('gpt-3.5-turbo-1106');+ });++ it('should return the closest matching key for gpt-4-1106 partial matches', () => {+ expect(matchModelName('something/gpt-4-1106')).toBe('gpt-4-1106');+ expect(matchModelName('gpt-4-1106-preview')).toBe('gpt-4-1106');+ expect(matchModelName('gpt-4-1106-vision-preview')).toBe('gpt-4-1106');+ });});