refactor(playground): remove playgroundMaxTokens helper and update input handling
- Deleted the `playgroundMaxTokens` helper functions and their associated tests. - Updated `loadConfig` and `usePlaygroundState` to handle `max_tokens` directly without sanitization. - Simplified input handling in `usePlaygroundState` to directly set values without normalization.
This commit is contained in:
parent
4cd0e3651d
commit
427fb7eaf6
@ -21,7 +21,6 @@ import {
|
|||||||
STORAGE_KEYS,
|
STORAGE_KEYS,
|
||||||
DEFAULT_CONFIG,
|
DEFAULT_CONFIG,
|
||||||
} from '../../constants/playground.constants';
|
} from '../../constants/playground.constants';
|
||||||
import { sanitizePlaygroundInputs } from '../../helpers/playgroundMaxTokens';
|
|
||||||
|
|
||||||
const MESSAGES_STORAGE_KEY = 'playground_messages';
|
const MESSAGES_STORAGE_KEY = 'playground_messages';
|
||||||
|
|
||||||
@ -66,12 +65,16 @@ export const loadConfig = () => {
|
|||||||
const savedConfig = localStorage.getItem(STORAGE_KEYS.CONFIG);
|
const savedConfig = localStorage.getItem(STORAGE_KEYS.CONFIG);
|
||||||
if (savedConfig) {
|
if (savedConfig) {
|
||||||
const parsedConfig = JSON.parse(savedConfig);
|
const parsedConfig = JSON.parse(savedConfig);
|
||||||
|
const parsedMaxTokens = parseInt(parsedConfig?.inputs?.max_tokens, 10);
|
||||||
|
|
||||||
const mergedConfig = {
|
const mergedConfig = {
|
||||||
inputs: sanitizePlaygroundInputs({
|
inputs: {
|
||||||
...DEFAULT_CONFIG.inputs,
|
...DEFAULT_CONFIG.inputs,
|
||||||
...parsedConfig.inputs,
|
...parsedConfig.inputs,
|
||||||
}),
|
max_tokens: Number.isNaN(parsedMaxTokens)
|
||||||
|
? parsedConfig?.inputs?.max_tokens
|
||||||
|
: parsedMaxTokens,
|
||||||
|
},
|
||||||
parameterEnabled: {
|
parameterEnabled: {
|
||||||
...DEFAULT_CONFIG.parameterEnabled,
|
...DEFAULT_CONFIG.parameterEnabled,
|
||||||
...parsedConfig.parameterEnabled,
|
...parsedConfig.parameterEnabled,
|
||||||
|
|||||||
1
web/src/helpers/index.js
vendored
1
web/src/helpers/index.js
vendored
@ -30,4 +30,3 @@ export * from './boolean';
|
|||||||
export * from './dashboard';
|
export * from './dashboard';
|
||||||
export * from './passkey';
|
export * from './passkey';
|
||||||
export * from './statusCodeRules';
|
export * from './statusCodeRules';
|
||||||
export * from './playgroundMaxTokens';
|
|
||||||
|
|||||||
55
web/src/helpers/playgroundMaxTokens.js
vendored
55
web/src/helpers/playgroundMaxTokens.js
vendored
@ -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 <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
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),
|
|
||||||
};
|
|
||||||
};
|
|
||||||
43
web/src/helpers/playgroundMaxTokens.test.mjs
vendored
43
web/src/helpers/playgroundMaxTokens.test.mjs
vendored
@ -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');
|
|
||||||
22
web/src/hooks/playground/usePlaygroundState.js
vendored
22
web/src/hooks/playground/usePlaygroundState.js
vendored
@ -32,11 +32,7 @@ import {
|
|||||||
loadMessages,
|
loadMessages,
|
||||||
saveMessages,
|
saveMessages,
|
||||||
} from '../../components/playground/configStorage';
|
} from '../../components/playground/configStorage';
|
||||||
import {
|
import { processIncompleteThinkTags } from '../../helpers';
|
||||||
processIncompleteThinkTags,
|
|
||||||
normalizePlaygroundInputValue,
|
|
||||||
sanitizePlaygroundInputs,
|
|
||||||
} from '../../helpers';
|
|
||||||
|
|
||||||
export const usePlaygroundState = () => {
|
export const usePlaygroundState = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@ -125,10 +121,7 @@ export const usePlaygroundState = () => {
|
|||||||
|
|
||||||
// 配置更新函数
|
// 配置更新函数
|
||||||
const handleInputChange = useCallback((name, value) => {
|
const handleInputChange = useCallback((name, value) => {
|
||||||
setInputs((prev) => ({
|
setInputs((prev) => ({ ...prev, [name]: value }));
|
||||||
...prev,
|
|
||||||
[name]: normalizePlaygroundInputValue(name, value),
|
|
||||||
}));
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleParameterToggle = useCallback((paramName) => {
|
const handleParameterToggle = useCallback((paramName) => {
|
||||||
@ -174,9 +167,14 @@ export const usePlaygroundState = () => {
|
|||||||
// 配置导入/重置
|
// 配置导入/重置
|
||||||
const handleConfigImport = useCallback((importedConfig) => {
|
const handleConfigImport = useCallback((importedConfig) => {
|
||||||
if (importedConfig.inputs) {
|
if (importedConfig.inputs) {
|
||||||
setInputs((prev) =>
|
const parsedMaxTokens = parseInt(importedConfig.inputs.max_tokens, 10);
|
||||||
sanitizePlaygroundInputs({ ...prev, ...importedConfig.inputs }),
|
setInputs((prev) => ({
|
||||||
);
|
...prev,
|
||||||
|
...importedConfig.inputs,
|
||||||
|
max_tokens: Number.isNaN(parsedMaxTokens)
|
||||||
|
? importedConfig.inputs.max_tokens
|
||||||
|
: parsedMaxTokens,
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
if (importedConfig.parameterEnabled) {
|
if (importedConfig.parameterEnabled) {
|
||||||
setParameterEnabled((prev) => ({
|
setParameterEnabled((prev) => ({
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user