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

#310 Force add character name for groups

Browse Source
This commit is contained in:
SillyLossy
2023-05-15 11:17:05 +03:00
parent 54017e6777
commit 91edeb9cd2
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
public/script.js
View File

@ -1793,7 +1793,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} else { } else {
this_mes_ch_name = charName; this_mes_ch_name = charName;
} }
if (coreChat[j]['is_name']) { if (coreChat[j]['is_name'] || selected_group) {
chat2[i] = this_mes_ch_name + ': ' + coreChat[j]['mes'] + '\n'; chat2[i] = this_mes_ch_name + ': ' + coreChat[j]['mes'] + '\n';
} else { } else {
chat2[i] = coreChat[j]['mes'] + '\n'; chat2[i] = coreChat[j]['mes'] + '\n';
@ -2177,16 +2177,21 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
generate_data = getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, maxContext, isImpersonate); generate_data = getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, maxContext, isImpersonate);
} }
} }
else if (main_api == 'textgenerationwebui') {
if (main_api == 'textgenerationwebui') {
generate_data = getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate); generate_data = getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate);
} }
else if (main_api == 'novel') {
if (main_api == 'novel') {
const this_settings = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]]; const this_settings = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]];
generate_data = getNovelGenerationData(finalPromt, this_settings); generate_data = getNovelGenerationData(finalPromt, this_settings);
} }
else if (main_api == 'openai') {
let generate_url = getGenerateUrl();
console.log('rungenerate calling API');
if (main_api == 'openai') {
let [prompt, counts] = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type); let [prompt, counts] = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type);
generate_data = { prompt : prompt };
// counts will return false if the user has not enabled the token breakdown feature // counts will return false if the user has not enabled the token breakdown feature
if (counts) { if (counts) {
@ -2227,23 +2232,12 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
setInContextMessages(openai_messages_count, type); setInContextMessages(openai_messages_count, type);
} else if (main_api == 'poe') {
generate_data = { prompt : finalPromt };
}
if (power_user.console_log_prompts) {
console.log(generate_data.prompt);
}
let generate_url = getGenerateUrl();
console.log('rungenerate calling API');
if (main_api == 'openai') {
if (isStreamingEnabled() && type !== 'quiet') { if (isStreamingEnabled() && type !== 'quiet') {
streamingProcessor.generator = await sendOpenAIRequest(type, generate_data.prompt, streamingProcessor.abortController.signal); streamingProcessor.generator = await sendOpenAIRequest(type, prompt, streamingProcessor.abortController.signal);
} }
else { else {
sendOpenAIRequest(type, generate_data.prompt).then(onSuccess).catch(onError); sendOpenAIRequest(type, prompt).then(onSuccess).catch(onError);
} }
} }
else if (main_api == 'kobold' && horde_settings.use_horde) { else if (main_api == 'kobold' && horde_settings.use_horde) {
@ -6226,7 +6220,6 @@ $(document).ready(function () {
'#shadow_popup', '#shadow_popup',
'#world_popup', '#world_popup',
'.ui-widget', '.ui-widget',
'.text_pole',
]; ];
for (const id of forbiddenTargets) { for (const id of forbiddenTargets) {
if (clickTarget.closest(id).length > 0) { if (clickTarget.closest(id).length > 0) {
@ -6248,10 +6241,7 @@ $(document).ready(function () {
} }
}); });
$(document).on('click', '.inline-drawer-toggle', function (e) { $(document).on('click', '.inline-drawer-toggle', function () {
if ($(e.target).hasClass('text_pole')) {
return;
};
var icon = $(this).find('.inline-drawer-icon'); var icon = $(this).find('.inline-drawer-icon');
icon.toggleClass('down up'); icon.toggleClass('down up');
icon.toggleClass('fa-circle-chevron-down fa-circle-chevron-up'); icon.toggleClass('fa-circle-chevron-down fa-circle-chevron-up');