From 2a30cf604de98ef6e44c2c0aca57688f541f3cf9 Mon Sep 17 00:00:00 2001 From: Marco Beretta <81851188+berry-13@users.noreply.github.com> Date: Mon, 15 Dec 2025 16:53:23 +0100 Subject: [PATCH] refactor: Consolidate imports from librechat-data-provider in tokens files --- api/models/tx.spec.js | 4 +--- api/utils/tokens.spec.js | 5 +---- packages/api/src/utils/tokens.ts | 22 +--------------------- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/api/models/tx.spec.js b/api/models/tx.spec.js index df1bec8619..11f9128837 100644 --- a/api/models/tx.spec.js +++ b/api/models/tx.spec.js @@ -1,6 +1,4 @@ -/** Note: No hard-coded values should be used in this file. */ -const { maxTokensMap } = require('@librechat/api'); -const { EModelEndpoint } = require('librechat-data-provider'); +const { EModelEndpoint, maxTokensMap } = require('librechat-data-provider'); const { defaultRate, tokenValues, diff --git a/api/utils/tokens.spec.js b/api/utils/tokens.spec.js index 0cfdc30227..a9448aae41 100644 --- a/api/utils/tokens.spec.js +++ b/api/utils/tokens.spec.js @@ -1,11 +1,8 @@ -/** Note: No hard-coded values should be used in this file. */ -const { EModelEndpoint } = require('librechat-data-provider'); +const { EModelEndpoint, maxTokensMap, maxOutputTokensMap } = require('librechat-data-provider'); const { - maxTokensMap, matchModelName, processModelData, getModelMaxTokens, - maxOutputTokensMap, findMatchingPattern, } = require('@librechat/api'); diff --git a/packages/api/src/utils/tokens.ts b/packages/api/src/utils/tokens.ts index d75936350f..571bc93052 100644 --- a/packages/api/src/utils/tokens.ts +++ b/packages/api/src/utils/tokens.ts @@ -1,27 +1,7 @@ import z from 'zod'; -import { - EModelEndpoint, - maxTokensMap, - maxOutputTokensMap, - TOKEN_DEFAULTS, - findMatchingPattern as findMatchingPatternSimple, - getModelMaxTokens as getModelMaxTokensSimple, - getModelMaxOutputTokens as getModelMaxOutputTokensSimple, - matchModelName as matchModelNameSimple, -} from 'librechat-data-provider'; +import { EModelEndpoint, maxTokensMap, maxOutputTokensMap } from 'librechat-data-provider'; import type { EndpointTokenConfig, TokenConfig } from '~/types'; -// Re-export from data-provider for backwards compatibility -export { maxTokensMap, maxOutputTokensMap, TOKEN_DEFAULTS }; - -// Re-export simple versions (for use without EndpointTokenConfig) -export { - findMatchingPatternSimple, - getModelMaxTokensSimple, - getModelMaxOutputTokensSimple, - matchModelNameSimple, -}; - /** * Finds the first matching pattern in the tokens map. * @param {string} modelName