rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-08 08:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code clean-up

Browse Source
This commit is contained in:
Cohee 2024-04-14 19:31:38 +03:00
parent 5ce625fb6b
commit 607e85639c
3 changed files with 42 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/index.html
View File

@ -458,17 +458,14 @@
</span> </span>
</div> </div>
</div> </div>
<div class="range-block"> <div class="range-block" data-source="cohere">
<label for="websearch_toggle" title="Enable Cohere web-search connector" data-i18n="[title]Enable Cohere web-search connector" class="checkbox_label widthFreeExpand"> <label for="websearch_toggle" title="Enable Cohere web-search connector" data-i18n="[title]Enable Cohere web-search connector" class="checkbox_label widthFreeExpand">
<input id="websearch_toggle" type="checkbox" /><span data-i18n="Web-search"> <input id="websearch_toggle" type="checkbox" />
Web-search</span> <span data-i18n="Web-search">Web-search</span>
</label> </label>
<div class="toggle-description justifyLeft"> <div class="toggle-description justifyLeft">
<span data-i18n="Allow the model to use the web-search connector."> <span data-i18n="Allow the model to use the web-search connector.">
Allow the model to use the web-search connector. Allow the model to use the web-search connector.
</span><br>
<span data-i18n="When this is off, the model won't use the web-search connector.">
This is only available for the Cohere API.
</span> </span>
</div> </div>
</div> </div>

23
public/scripts/openai.js
View File

@ -209,7 +209,7 @@ const default_settings = {
top_a_openai: 1, top_a_openai: 1,
repetition_penalty_openai: 1, repetition_penalty_openai: 1,
stream_openai: false, stream_openai: false,
websearch_cohere: false, websearch_cohere: false,
openai_max_context: max_4k, openai_max_context: max_4k,
openai_max_tokens: 300, openai_max_tokens: 300,
wrap_in_quotes: false, wrap_in_quotes: false,
@ -279,7 +279,7 @@ const oai_settings = {
top_a_openai: 1, top_a_openai: 1,
repetition_penalty_openai: 1, repetition_penalty_openai: 1,
stream_openai: false, stream_openai: false,
websearch_cohere: false, websearch_cohere: false,
openai_max_context: max_4k, openai_max_context: max_4k,
openai_max_tokens: 300, openai_max_tokens: 300,
wrap_in_quotes: false, wrap_in_quotes: false,
@ -1618,7 +1618,6 @@ async function sendOpenAIRequest(type, messages, signal) {
const isImpersonate = type === 'impersonate'; const isImpersonate = type === 'impersonate';
const isContinue = type === 'continue'; const isContinue = type === 'continue';
const stream = oai_settings.stream_openai && !isQuiet && !isScale && !isAI21 && !(isGoogle && oai_settings.google_model.includes('bison')); const stream = oai_settings.stream_openai && !isQuiet && !isScale && !isAI21 && !(isGoogle && oai_settings.google_model.includes('bison'));
const websearch = oai_settings.websearch_cohere && isCohere;
const useLogprobs = !!power_user.request_token_probabilities; const useLogprobs = !!power_user.request_token_probabilities;
const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom); const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);
@ -1665,7 +1664,6 @@ async function sendOpenAIRequest(type, messages, signal) {
'top_p': Number(oai_settings.top_p_openai), 'top_p': Number(oai_settings.top_p_openai),
'max_tokens': oai_settings.openai_max_tokens, 'max_tokens': oai_settings.openai_max_tokens,
'stream': stream, 'stream': stream,
'websearch': websearch,
'logit_bias': logit_bias, 'logit_bias': logit_bias,
'stop': getCustomStoppingStrings(openai_max_stop_strings), 'stop': getCustomStoppingStrings(openai_max_stop_strings),
'chat_completion_source': oai_settings.chat_completion_source, 'chat_completion_source': oai_settings.chat_completion_source,
@ -1757,6 +1755,7 @@ async function sendOpenAIRequest(type, messages, signal) {
generate_data['frequency_penalty'] = Math.min(Math.max(Number(oai_settings.freq_pen_openai), 0), 1); generate_data['frequency_penalty'] = Math.min(Math.max(Number(oai_settings.freq_pen_openai), 0), 1);
generate_data['presence_penalty'] = Math.min(Math.max(Number(oai_settings.pres_pen_openai), 0), 1); generate_data['presence_penalty'] = Math.min(Math.max(Number(oai_settings.pres_pen_openai), 0), 1);
generate_data['stop'] = getCustomStoppingStrings(5); generate_data['stop'] = getCustomStoppingStrings(5);
generate_data['websearch'] = oai_settings.websearch_cohere;
} }
if ((isOAI || isOpenRouter || isMistral || isCustom || isCohere) && oai_settings.seed >= 0) { if ((isOAI || isOpenRouter || isMistral || isCustom || isCohere) && oai_settings.seed >= 0) {
@ -2257,7 +2256,7 @@ export class ChatCompletion {
const shouldSquash = (message) => { const shouldSquash = (message) => {
return !excludeList.includes(message.identifier) && message.role === 'system' && !message.name; return !excludeList.includes(message.identifier) && message.role === 'system' && !message.name;
} };
if (shouldSquash(message)) { if (shouldSquash(message)) {
if (lastMessage && shouldSquash(lastMessage)) { if (lastMessage && shouldSquash(lastMessage)) {
@ -2604,7 +2603,7 @@ function loadOpenAISettings(data, settings) {
oai_settings.min_p_openai = settings.min_p_openai ?? default_settings.min_p_openai; oai_settings.min_p_openai = settings.min_p_openai ?? default_settings.min_p_openai;
oai_settings.repetition_penalty_openai = settings.repetition_penalty_openai ?? default_settings.repetition_penalty_openai; oai_settings.repetition_penalty_openai = settings.repetition_penalty_openai ?? default_settings.repetition_penalty_openai;
oai_settings.stream_openai = settings.stream_openai ?? default_settings.stream_openai; oai_settings.stream_openai = settings.stream_openai ?? default_settings.stream_openai;
oai_settings.websearch_cohere = settings.websearch_cohere ?? default_settings.websearch_cohere; oai_settings.websearch_cohere = settings.websearch_cohere ?? default_settings.websearch_cohere;
oai_settings.openai_max_context = settings.openai_max_context ?? default_settings.openai_max_context; oai_settings.openai_max_context = settings.openai_max_context ?? default_settings.openai_max_context;
oai_settings.openai_max_tokens = settings.openai_max_tokens ?? default_settings.openai_max_tokens; oai_settings.openai_max_tokens = settings.openai_max_tokens ?? default_settings.openai_max_tokens;
oai_settings.bias_preset_selected = settings.bias_preset_selected ?? default_settings.bias_preset_selected; oai_settings.bias_preset_selected = settings.bias_preset_selected ?? default_settings.bias_preset_selected;
@ -2666,7 +2665,7 @@ function loadOpenAISettings(data, settings) {
if (settings.claude_use_sysprompt !== undefined) oai_settings.claude_use_sysprompt = !!settings.claude_use_sysprompt; if (settings.claude_use_sysprompt !== undefined) oai_settings.claude_use_sysprompt = !!settings.claude_use_sysprompt;
if (settings.use_alt_scale !== undefined) { oai_settings.use_alt_scale = !!settings.use_alt_scale; updateScaleForm(); } if (settings.use_alt_scale !== undefined) { oai_settings.use_alt_scale = !!settings.use_alt_scale; updateScaleForm(); }
$('#stream_toggle').prop('checked', oai_settings.stream_openai); $('#stream_toggle').prop('checked', oai_settings.stream_openai);
$('#websearch_toggle').prop('checked', oai_settings.websearch_cohere); $('#websearch_toggle').prop('checked', oai_settings.websearch_cohere);
$('#api_url_scale').val(oai_settings.api_url_scale); $('#api_url_scale').val(oai_settings.api_url_scale);
$('#openai_proxy_password').val(oai_settings.proxy_password); $('#openai_proxy_password').val(oai_settings.proxy_password);
$('#claude_assistant_prefill').val(oai_settings.assistant_prefill); $('#claude_assistant_prefill').val(oai_settings.assistant_prefill);
@ -2961,7 +2960,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
personality_format: settings.personality_format, personality_format: settings.personality_format,
group_nudge_prompt: settings.group_nudge_prompt, group_nudge_prompt: settings.group_nudge_prompt,
stream_openai: settings.stream_openai, stream_openai: settings.stream_openai,
websearch_cohere: settings.websearch_cohere, websearch_cohere: settings.websearch_cohere,
prompts: settings.prompts, prompts: settings.prompts,
prompt_order: settings.prompt_order, prompt_order: settings.prompt_order,
api_url_scale: settings.api_url_scale, api_url_scale: settings.api_url_scale,
@ -3338,7 +3337,7 @@ function onSettingsPresetChange() {
personality_format: ['#personality_format_textarea', 'personality_format', false], personality_format: ['#personality_format_textarea', 'personality_format', false],
group_nudge_prompt: ['#group_nudge_prompt_textarea', 'group_nudge_prompt', false], group_nudge_prompt: ['#group_nudge_prompt_textarea', 'group_nudge_prompt', false],
stream_openai: ['#stream_toggle', 'stream_openai', true], stream_openai: ['#stream_toggle', 'stream_openai', true],
websearch_cohere: ['#websearch_toggle', 'websearch_cohere', false], websearch_cohere: ['#websearch_toggle', 'websearch_cohere', true],
prompts: ['', 'prompts', false], prompts: ['', 'prompts', false],
prompt_order: ['', 'prompt_order', false], prompt_order: ['', 'prompt_order', false],
api_url_scale: ['#api_url_scale', 'api_url_scale', false], api_url_scale: ['#api_url_scale', 'api_url_scale', false],
@ -4033,7 +4032,7 @@ export function isImageInliningSupported() {
'gemini-1.0-pro-vision-latest', 'gemini-1.0-pro-vision-latest',
'gemini-1.5-pro-latest', 'gemini-1.5-pro-latest',
'gemini-pro-vision', 'gemini-pro-vision',
'claude-3' 'claude-3',
]; ];
switch (oai_settings.chat_completion_source) { switch (oai_settings.chat_completion_source) {
@ -4258,8 +4257,8 @@ $(document).ready(async function () {
oai_settings.stream_openai = !!$('#stream_toggle').prop('checked'); oai_settings.stream_openai = !!$('#stream_toggle').prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#websearch_toggle').on('change', function () { $('#websearch_toggle').on('change', function () {
oai_settings.websearch_cohere = !!$('#websearch_toggle').prop('checked'); oai_settings.websearch_cohere = !!$('#websearch_toggle').prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();
}); });

76
src/endpoints/backends/chat-completions.js
View File

@ -537,56 +537,36 @@ async function sendCohereRequest(request, response) {
try { try {
const convertedHistory = convertCohereMessages(request.body.messages); const convertedHistory = convertCohereMessages(request.body.messages);
const connectors = [];
if (request.body.websearch) {
connectors.push({
id: 'web-search',
});
}
// https://docs.cohere.com/reference/chat // https://docs.cohere.com/reference/chat
requestBody = {}; const requestBody = {
stream: Boolean(request.body.stream),
if (request.body.websearch) { model: request.body.model,
requestBody = { message: convertedHistory.userPrompt,
stream: Boolean(request.body.stream), preamble: convertedHistory.systemPrompt,
model: request.body.model, chat_history: convertedHistory.chatHistory,
message: convertedHistory.userPrompt, temperature: request.body.temperature,
preamble: convertedHistory.systemPrompt, max_tokens: request.body.max_tokens,
chat_history: convertedHistory.chatHistory, k: request.body.top_k,
temperature: request.body.temperature, p: request.body.top_p,
max_tokens: request.body.max_tokens, seed: request.body.seed,
k: request.body.top_k, stop_sequences: request.body.stop,
p: request.body.top_p, frequency_penalty: request.body.frequency_penalty,
seed: request.body.seed, presence_penalty: request.body.presence_penalty,
stop_sequences: request.body.stop, prompt_truncation: 'AUTO_PRESERVE_ORDER',
frequency_penalty: request.body.frequency_penalty, connectors: connectors,
presence_penalty: request.body.presence_penalty, documents: [],
prompt_truncation: 'AUTO_PRESERVE_ORDER', tools: [],
connectors: [{"id": "web-search"}], // TODO tool_results: [],
documents: [], search_queries_only: false,
tools: [], };
tool_results: [],
search_queries_only: false,
};
}
else {
requestBody = {
stream: Boolean(request.body.stream),
model: request.body.model,
message: convertedHistory.userPrompt,
preamble: convertedHistory.systemPrompt,
chat_history: convertedHistory.chatHistory,
temperature: request.body.temperature,
max_tokens: request.body.max_tokens,
k: request.body.top_k,
p: request.body.top_p,
seed: request.body.seed,
stop_sequences: request.body.stop,
frequency_penalty: request.body.frequency_penalty,
presence_penalty: request.body.presence_penalty,
prompt_truncation: 'AUTO_PRESERVE_ORDER',
connectors: [], // TODO
documents: [],
tools: [],
tool_results: [],
search_queries_only: false,
};
}
console.log('Cohere request:', requestBody); console.log('Cohere request:', requestBody);