rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code clean-up

Browse Source
This commit is contained in:
Cohee1207
2023-08-19 18:51:20 +03:00
parent 438c78574f
commit e77cded357
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/scripts/openai.js
View File

@ -169,10 +169,10 @@ export const chat_completion_sources = {
}; };
const prefixMap = selected_group ? { const prefixMap = selected_group ? {
assistant: "", assistant: "",
user: "", user: "",
system: "OOC: " system: "OOC: "
} }
: { : {
assistant: "{{char}}:", assistant: "{{char}}:",
user: "{{user}}:", user: "{{user}}:",
@ -1080,10 +1080,10 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
const isScale = oai_settings.chat_completion_source == chat_completion_sources.SCALE; const isScale = oai_settings.chat_completion_source == chat_completion_sources.SCALE;
const isAI21 = oai_settings.chat_completion_source == chat_completion_sources.AI21; const isAI21 = oai_settings.chat_completion_source == chat_completion_sources.AI21;
const isTextCompletion = oai_settings.chat_completion_source == chat_completion_sources.OPENAI && (oai_settings.openai_model.startsWith('text-') || oai_settings.openai_model.startsWith('code-')); const isTextCompletion = oai_settings.chat_completion_source == chat_completion_sources.OPENAI && (oai_settings.openai_model.startsWith('text-') || oai_settings.openai_model.startsWith('code-'));
const stream = type !== 'quiet' && oai_settings.stream_openai && !isScale && !isAI21;
const isQuiet = type === 'quiet'; const isQuiet = type === 'quiet';
const stream = oai_settings.stream_openai && !isQuiet && !isScale && !isAI21;
if(isAI21) { if (isAI21) {
const joinedMsgs = openai_msgs_tosend.reduce((acc, obj) => { const joinedMsgs = openai_msgs_tosend.reduce((acc, obj) => {
const prefix = prefixMap[obj.role]; const prefix = prefixMap[obj.role];
return acc + (prefix ? (selected_group ? "\n" : prefix + " ") : "") + obj.content + "\n"; return acc + (prefix ? (selected_group ? "\n" : prefix + " ") : "") + obj.content + "\n";
@ -2836,8 +2836,8 @@ async function onConnectButtonClick(e) {
await writeSecret(SECRET_KEYS.AI21, api_key_ai21); await writeSecret(SECRET_KEYS.AI21, api_key_ai21);
} }
if (!secret_state[SECRET_KEYS.AI21] && !oai_settings.reverse_proxy) { if (!secret_state[SECRET_KEYS.AI21]) {
console.log('No secret key saved for Claude'); console.log('No secret key saved for AI21');
return; return;
} }
} }
@ -2976,7 +2976,7 @@ $(document).ready(async function () {
$('#use_ai21_tokenizer').on('change', function () { $('#use_ai21_tokenizer').on('change', function () {
oai_settings.use_ai21_tokenizer = !!$('#use_ai21_tokenizer').prop('checked'); oai_settings.use_ai21_tokenizer = !!$('#use_ai21_tokenizer').prop('checked');
oai_settings.use_ai21_tokenizer ? ai21_max = 8191: ai21_max = 9200; oai_settings.use_ai21_tokenizer ? ai21_max = 8191 : ai21_max = 9200;
oai_settings.openai_max_context = Math.min(ai21_max, oai_settings.openai_max_context); oai_settings.openai_max_context = Math.min(ai21_max, oai_settings.openai_max_context);
$('#openai_max_context').attr('max', ai21_max).val(oai_settings.openai_max_context).trigger('input'); $('#openai_max_context').attr('max', ai21_max).val(oai_settings.openai_max_context).trigger('input');
saveSettingsDebounced(); saveSettingsDebounced();