diff --git a/web/src/components/playground/configStorage.js b/web/src/components/playground/configStorage.js index 273d39f9..d201ed6a 100644 --- a/web/src/components/playground/configStorage.js +++ b/web/src/components/playground/configStorage.js @@ -21,7 +21,6 @@ import { STORAGE_KEYS, DEFAULT_CONFIG, } from '../../constants/playground.constants'; -import { sanitizePlaygroundInputs } from '../../helpers/playgroundMaxTokens'; const MESSAGES_STORAGE_KEY = 'playground_messages'; @@ -66,12 +65,16 @@ export const loadConfig = () => { const savedConfig = localStorage.getItem(STORAGE_KEYS.CONFIG); if (savedConfig) { const parsedConfig = JSON.parse(savedConfig); + const parsedMaxTokens = parseInt(parsedConfig?.inputs?.max_tokens, 10); const mergedConfig = { - inputs: sanitizePlaygroundInputs({ + inputs: { ...DEFAULT_CONFIG.inputs, ...parsedConfig.inputs, - }), + max_tokens: Number.isNaN(parsedMaxTokens) + ? parsedConfig?.inputs?.max_tokens + : parsedMaxTokens, + }, parameterEnabled: { ...DEFAULT_CONFIG.parameterEnabled, ...parsedConfig.parameterEnabled, diff --git a/web/src/helpers/index.js b/web/src/helpers/index.js index 1c959d8d..a86c3bca 100644 --- a/web/src/helpers/index.js +++ b/web/src/helpers/index.js @@ -30,4 +30,3 @@ export * from './boolean'; export * from './dashboard'; export * from './passkey'; export * from './statusCodeRules'; -export * from './playgroundMaxTokens'; diff --git a/web/src/helpers/playgroundMaxTokens.js b/web/src/helpers/playgroundMaxTokens.js deleted file mode 100644 index 19d5f2c4..00000000 --- a/web/src/helpers/playgroundMaxTokens.js +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright (C) 2025 QuantumNous - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . - -For commercial licensing, please contact support@quantumnous.com -*/ - -export const normalizeMaxTokensValue = (value) => { - if (typeof value === 'number') { - return Number.isFinite(value) && value >= 0 ? Math.floor(value) : null; - } - - if (typeof value === 'string') { - const trimmed = value.trim(); - if (trimmed === '') { - return null; - } - - const parsed = Number(trimmed); - return Number.isFinite(parsed) && parsed >= 0 ? Math.floor(parsed) : null; - } - - return null; -}; - -export const normalizePlaygroundInputValue = (name, value) => { - if (name === 'max_tokens') { - return normalizeMaxTokensValue(value); - } - - return value; -}; - -export const sanitizePlaygroundInputs = (inputs) => { - if (!inputs) { - return inputs; - } - - return { - ...inputs, - max_tokens: normalizeMaxTokensValue(inputs.max_tokens), - }; -}; diff --git a/web/src/helpers/playgroundMaxTokens.test.mjs b/web/src/helpers/playgroundMaxTokens.test.mjs deleted file mode 100644 index 3503ca9a..00000000 --- a/web/src/helpers/playgroundMaxTokens.test.mjs +++ /dev/null @@ -1,43 +0,0 @@ -import assert from 'node:assert/strict'; - -import { - normalizeMaxTokensValue, - normalizePlaygroundInputValue, - sanitizePlaygroundInputs, -} from './playgroundMaxTokens.js'; - -assert.equal(normalizeMaxTokensValue(8192), 8192); -assert.equal(normalizeMaxTokensValue('8192'), 8192); -assert.equal(normalizeMaxTokensValue(' 8192 '), 8192); -assert.equal(normalizeMaxTokensValue(''), null); -assert.equal(normalizeMaxTokensValue('abc'), null); -assert.equal(normalizeMaxTokensValue(-1), null); -assert.equal(normalizeMaxTokensValue(1.9), 1); - -assert.equal(normalizePlaygroundInputValue('max_tokens', '2048'), 2048); -assert.equal(normalizePlaygroundInputValue('max_tokens', 'bad'), null); -assert.equal(normalizePlaygroundInputValue('seed', 'bad'), 'bad'); - -assert.deepEqual( - sanitizePlaygroundInputs({ - model: 'gpt-4o', - max_tokens: '2048', - }), - { - model: 'gpt-4o', - max_tokens: 2048, - }, -); - -assert.deepEqual( - sanitizePlaygroundInputs({ - model: 'gpt-4o', - max_tokens: 'bad', - }), - { - model: 'gpt-4o', - max_tokens: null, - }, -); - -console.log('playground max_tokens tests passed'); diff --git a/web/src/hooks/playground/usePlaygroundState.js b/web/src/hooks/playground/usePlaygroundState.js index 9818db91..130df90d 100644 --- a/web/src/hooks/playground/usePlaygroundState.js +++ b/web/src/hooks/playground/usePlaygroundState.js @@ -32,11 +32,7 @@ import { loadMessages, saveMessages, } from '../../components/playground/configStorage'; -import { - processIncompleteThinkTags, - normalizePlaygroundInputValue, - sanitizePlaygroundInputs, -} from '../../helpers'; +import { processIncompleteThinkTags } from '../../helpers'; export const usePlaygroundState = () => { const { t } = useTranslation(); @@ -125,10 +121,7 @@ export const usePlaygroundState = () => { // 配置更新函数 const handleInputChange = useCallback((name, value) => { - setInputs((prev) => ({ - ...prev, - [name]: normalizePlaygroundInputValue(name, value), - })); + setInputs((prev) => ({ ...prev, [name]: value })); }, []); const handleParameterToggle = useCallback((paramName) => { @@ -174,9 +167,14 @@ export const usePlaygroundState = () => { // 配置导入/重置 const handleConfigImport = useCallback((importedConfig) => { if (importedConfig.inputs) { - setInputs((prev) => - sanitizePlaygroundInputs({ ...prev, ...importedConfig.inputs }), - ); + const parsedMaxTokens = parseInt(importedConfig.inputs.max_tokens, 10); + setInputs((prev) => ({ + ...prev, + ...importedConfig.inputs, + max_tokens: Number.isNaN(parsedMaxTokens) + ? importedConfig.inputs.max_tokens + : parsedMaxTokens, + })); } if (importedConfig.parameterEnabled) { setParameterEnabled((prev) => ({