Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: Avoid Throwing Errors for Unsupported Token Count Endpoints 🪙 (#1356)

Browse source
This commit is contained in:
Danny Avila 2023-12-15 02:40:15 -05:00 • committed by GitHub
parent 561ce8e86a
commit ff59a2e41d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/app/clients/BaseClient.js
View file

@ -1,8 +1,9 @@
const crypto = require('crypto'); const crypto = require('crypto');
const TextStream = require('./TextStream'); const { supportsBalanceCheck } = require('librechat-data-provider');
const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('~/models'); const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('~/models');
const { addSpaceIfNeeded, isEnabled } = require('~/server/utils'); const { addSpaceIfNeeded, isEnabled } = require('~/server/utils');
const checkBalance = require('~/models/checkBalance'); const checkBalance = require('~/models/checkBalance');
const TextStream = require('./TextStream');
const { logger } = require('~/config'); const { logger } = require('~/config');
class BaseClient { class BaseClient {
@ -424,7 +425,7 @@ class BaseClient {
await this.saveMessageToDatabase(userMessage, saveOptions, user); await this.saveMessageToDatabase(userMessage, saveOptions, user);
} }
if (isEnabled(process.env.CHECK_BALANCE)) { if (isEnabled(process.env.CHECK_BALANCE) && supportsBalanceCheck[this.options.endpoint]) {
await checkBalance({ await checkBalance({
req: this.options.req, req: this.options.req,
res: this.options.res, res: this.options.res,

5
api/app/clients/callbacks/createStartHandler.js
View file

@ -1,5 +1,5 @@
const { promptTokensEstimate } = require('openai-chat-tokens'); const { promptTokensEstimate } = require('openai-chat-tokens');
const { EModelEndpoint } = require('librechat-data-provider'); const { EModelEndpoint, supportsBalanceCheck } = require('librechat-data-provider');
const { formatFromLangChain } = require('~/app/clients/prompts'); const { formatFromLangChain } = require('~/app/clients/prompts');
const checkBalance = require('~/models/checkBalance'); const checkBalance = require('~/models/checkBalance');
const { isEnabled } = require('~/server/utils'); const { isEnabled } = require('~/server/utils');
@ -49,7 +49,8 @@ const createStartHandler = ({
prelimPromptTokens += tokenBuffer; prelimPromptTokens += tokenBuffer;
try { try {
if (isEnabled(process.env.CHECK_BALANCE)) { // TODO: if plugins extends to non-OpenAI models, this will need to be updated
if (isEnabled(process.env.CHECK_BALANCE) && supportsBalanceCheck[EModelEndpoint.openAI]) {
const generations = const generations =
initialMessageCount && messages.length > initialMessageCount initialMessageCount && messages.length > initialMessageCount
? messages.slice(initialMessageCount) ? messages.slice(initialMessageCount)

6
packages/data-provider/src/schemas.ts
View file

@ -138,6 +138,12 @@ export const supportsFiles = {
[EModelEndpoint.assistant]: true, [EModelEndpoint.assistant]: true,
}; };
export const supportsBalanceCheck = {
[EModelEndpoint.openAI]: true,
[EModelEndpoint.azureOpenAI]: true,
[EModelEndpoint.gptPlugins]: true,
};
export const visionModels = ['gpt-4-vision', 'llava-13b']; export const visionModels = ['gpt-4-vision', 'llava-13b'];
export const eModelEndpointSchema = z.nativeEnum(EModelEndpoint); export const eModelEndpointSchema = z.nativeEnum(EModelEndpoint);