refac
This commit is contained in:
@@ -2009,6 +2009,17 @@
|
|||||||
return features;
|
return features;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getStopTokens = () => {
|
||||||
|
const stop = params?.stop ?? $settings?.params?.stop;
|
||||||
|
if (!stop) return undefined;
|
||||||
|
|
||||||
|
const tokens = Array.isArray(stop) ? stop : stop.split(',').map((s) => s.trim());
|
||||||
|
|
||||||
|
return tokens
|
||||||
|
.filter(Boolean)
|
||||||
|
.map((token) => decodeURIComponent(JSON.parse(`"${token.replace(/"/g, '\\"')}"`)));
|
||||||
|
};
|
||||||
|
|
||||||
const sendMessageSocket = async (model, _messages, _history, responseMessageId, _chatId) => {
|
const sendMessageSocket = async (model, _messages, _history, responseMessageId, _chatId) => {
|
||||||
const responseMessage = _history.messages[responseMessageId];
|
const responseMessage = _history.messages[responseMessageId];
|
||||||
const userMessage = _history.messages[responseMessage.parentId];
|
const userMessage = _history.messages[responseMessage.parentId];
|
||||||
@@ -2170,12 +2181,7 @@
|
|||||||
params: {
|
params: {
|
||||||
...$settings?.params,
|
...$settings?.params,
|
||||||
...params,
|
...params,
|
||||||
stop:
|
stop: getStopTokens()
|
||||||
(params?.stop ?? $settings?.params?.stop ?? undefined)
|
|
||||||
? (params?.stop.split(',').map((token) => token.trim()) ?? $settings.params.stop).map(
|
|
||||||
(str) => decodeURIComponent(JSON.parse('"' + str.replace(/\"/g, '\\"') + '"'))
|
|
||||||
)
|
|
||||||
: undefined
|
|
||||||
},
|
},
|
||||||
|
|
||||||
files: (files?.length ?? 0) > 0 ? files : undefined,
|
files: (files?.length ?? 0) > 0 ? files : undefined,
|
||||||
|
|||||||
@@ -218,7 +218,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
info.params.system = system.trim() === '' ? null : system;
|
info.params.system = system.trim() === '' ? null : system;
|
||||||
info.params.stop = params.stop ? params.stop.split(',').filter((s) => s.trim()) : null;
|
info.params.stop = params.stop
|
||||||
|
? (typeof params.stop === 'string' ? params.stop.split(',') : params.stop).filter(
|
||||||
|
(s) => s.trim()
|
||||||
|
)
|
||||||
|
: null;
|
||||||
Object.keys(info.params).forEach((key) => {
|
Object.keys(info.params).forEach((key) => {
|
||||||
if (info.params[key] === '' || info.params[key] === null) {
|
if (info.params[key] === '' || info.params[key] === null) {
|
||||||
delete info.params[key];
|
delete info.params[key];
|
||||||
|
|||||||
Reference in New Issue
Block a user