Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-18 01:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🪙 feat: Update token value for gpt-4o (#4387)

Browse source
This commit is contained in:
Hongkai Ye 2024-10-11 05:27:29 -07:00 • committed by GitHub
parent bab0152c58
commit bf5b87e0b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/models/tx.js
View file

@ -40,9 +40,9 @@ const tokenValues = Object.assign(
'o1-preview': { prompt: 15, completion: 60 }, 'o1-preview': { prompt: 15, completion: 60 },
'o1-mini': { prompt: 3, completion: 12 }, 'o1-mini': { prompt: 3, completion: 12 },
o1: { prompt: 15, completion: 60 }, o1: { prompt: 15, completion: 60 },
'gpt-4o-2024-08-06': { prompt: 2.5, completion: 10 },
'gpt-4o-mini': { prompt: 0.15, completion: 0.6 }, 'gpt-4o-mini': { prompt: 0.15, completion: 0.6 },
'gpt-4o': { prompt: 5, completion: 15 }, 'gpt-4o': { prompt: 2.5, completion: 10 },
'gpt-4o-2024-05-13': { prompt: 5, completion: 15 },
'gpt-4-1106': { prompt: 10, completion: 30 }, 'gpt-4-1106': { prompt: 10, completion: 30 },
'gpt-3.5-turbo-0125': { prompt: 0.5, completion: 1.5 }, 'gpt-3.5-turbo-0125': { prompt: 0.5, completion: 1.5 },
'claude-3-opus': { prompt: 15, completion: 75 }, 'claude-3-opus': { prompt: 15, completion: 75 },
@ -104,8 +104,8 @@ const getValueKey = (model, endpoint) => {
return 'o1-mini'; return 'o1-mini';
} else if (modelName.includes('o1')) { } else if (modelName.includes('o1')) {
return 'o1'; return 'o1';
} else if (modelName.includes('gpt-4o-2024-08-06')) { } else if (modelName.includes('gpt-4o-2024-05-13')) {
return 'gpt-4o-2024-08-06'; return 'gpt-4o-2024-05-13';
} else if (modelName.includes('gpt-4o-mini')) { } else if (modelName.includes('gpt-4o-mini')) {
return 'gpt-4o-mini'; return 'gpt-4o-mini';
} else if (modelName.includes('gpt-4o')) { } else if (modelName.includes('gpt-4o')) {

18
api/models/tx.spec.js
View file

@ -50,8 +50,10 @@ describe('getValueKey', () => {
}); });
it('should return "gpt-4o" for model type of "gpt-4o"', () => { it('should return "gpt-4o" for model type of "gpt-4o"', () => {
expect(getValueKey('gpt-4o-2024-05-13')).toBe('gpt-4o'); expect(getValueKey('gpt-4o-2024-08-06')).toBe('gpt-4o');
expect(getValueKey('gpt-4o-2024-08-06-0718')).toBe('gpt-4o');
expect(getValueKey('openai/gpt-4o')).toBe('gpt-4o'); expect(getValueKey('openai/gpt-4o')).toBe('gpt-4o');
expect(getValueKey('openai/gpt-4o-2024-08-06')).toBe('gpt-4o');
expect(getValueKey('gpt-4o-turbo')).toBe('gpt-4o'); expect(getValueKey('gpt-4o-turbo')).toBe('gpt-4o');
expect(getValueKey('gpt-4o-0125')).toBe('gpt-4o'); expect(getValueKey('gpt-4o-0125')).toBe('gpt-4o');
}); });
@ -60,14 +62,14 @@ describe('getValueKey', () => {
expect(getValueKey('gpt-4o-mini-2024-07-18')).toBe('gpt-4o-mini'); expect(getValueKey('gpt-4o-mini-2024-07-18')).toBe('gpt-4o-mini');
expect(getValueKey('openai/gpt-4o-mini')).toBe('gpt-4o-mini'); expect(getValueKey('openai/gpt-4o-mini')).toBe('gpt-4o-mini');
expect(getValueKey('gpt-4o-mini-0718')).toBe('gpt-4o-mini'); expect(getValueKey('gpt-4o-mini-0718')).toBe('gpt-4o-mini');
expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o'); expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o-mini');
}); });
it('should return "gpt-4o-2024-08-06" for model type of "gpt-4o-2024-08-06"', () => { it('should return "gpt-4o-2024-05-13" for model type of "gpt-4o-2024-05-13"', () => {
expect(getValueKey('gpt-4o-2024-08-06-2024-07-18')).toBe('gpt-4o-2024-08-06'); expect(getValueKey('gpt-4o-2024-05-13')).toBe('gpt-4o-2024-05-13');
expect(getValueKey('openai/gpt-4o-2024-08-06')).toBe('gpt-4o-2024-08-06'); expect(getValueKey('openai/gpt-4o-2024-05-13')).toBe('gpt-4o-2024-05-13');
expect(getValueKey('gpt-4o-2024-08-06-0718')).toBe('gpt-4o-2024-08-06'); expect(getValueKey('gpt-4o-2024-05-13-0718')).toBe('gpt-4o-2024-05-13');
expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o'); expect(getValueKey('gpt-4o-2024-05-13-0718')).not.toBe('gpt-4o');
}); });
it('should return "gpt-4o" for model type of "chatgpt-4o"', () => { it('should return "gpt-4o" for model type of "chatgpt-4o"', () => {
@ -134,7 +136,7 @@ describe('getMultiplier', () => {
}); });
it('should return the correct multiplier for gpt-4o', () => { it('should return the correct multiplier for gpt-4o', () => {
const valueKey = getValueKey('gpt-4o-2024-05-13'); const valueKey = getValueKey('gpt-4o-2024-08-06');
expect(getMultiplier({ valueKey, tokenType: 'prompt' })).toBe(tokenValues['gpt-4o'].prompt); expect(getMultiplier({ valueKey, tokenType: 'prompt' })).toBe(tokenValues['gpt-4o'].prompt);
expect(getMultiplier({ valueKey, tokenType: 'completion' })).toBe( expect(getMultiplier({ valueKey, tokenType: 'completion' })).toBe(
tokenValues['gpt-4o'].completion, tokenValues['gpt-4o'].completion,

1
api/utils/tokens.js
View file

@ -14,6 +14,7 @@ const openAIModels = {
'gpt-4-0125': 127500, // -500 from max 'gpt-4-0125': 127500, // -500 from max
'gpt-4o': 127500, // -500 from max 'gpt-4o': 127500, // -500 from max
'gpt-4o-mini': 127500, // -500 from max 'gpt-4o-mini': 127500, // -500 from max
'gpt-4o-2024-05-13': 127500, // -500 from max
'gpt-4o-2024-08-06': 127500, // -500 from max 'gpt-4o-2024-08-06': 127500, // -500 from max
'gpt-4-turbo': 127500, // -500 from max 'gpt-4-turbo': 127500, // -500 from max
'gpt-4-vision': 127500, // -500 from max 'gpt-4-vision': 127500, // -500 from max