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

Fix image gen prefix combining

Browse Source
This commit is contained in:
Cohee 2023-11-27 16:10:42 +02:00
parent ffc4f22012
commit 84811ec518
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/scripts/extensions/stable-diffusion/index.js
View File

@ -603,17 +603,19 @@ function getCharacterPrefix() {
* @returns {string} Combined string with a comma between them * @returns {string} Combined string with a comma between them
*/ */
function combinePrefixes(str1, str2, macro = '') { function combinePrefixes(str1, str2, macro = '') {
// Remove leading/trailing white spaces and commas from the strings
const process = (s) => s.trim().replace(/^,|,$/g, '').trim();
if (!str2) { if (!str2) {
return str1; return str1;
} }
// Remove leading/trailing white spaces and commas from the strings str1 = process(str1)
str1 = str1.trim().replace(/^,|,$/g, ''); str2 = process(str2);
str2 = str2.trim().replace(/^,|,$/g, '');
// Combine the strings with a comma between them) // Combine the strings with a comma between them)
const result = macro && str1.includes(macro) ? str1.replace(macro, str2) : `${str1}, ${str2},`; const result = macro && str1.includes(macro) ? str1.replace(macro, str2) : `${str1}, ${str2},`;
return result; return process(result);
} }
function onExpandInput() { function onExpandInput() {
@ -1297,8 +1299,8 @@ async function loadAutoModels() {
async function loadOpenAiModels() { async function loadOpenAiModels() {
return [ return [
{ value: 'dall-e-2', text: 'DALL-E 2' },
{ value: 'dall-e-3', text: 'DALL-E 3' }, { value: 'dall-e-3', text: 'DALL-E 3' },
{ value: 'dall-e-2', text: 'DALL-E 2' },
]; ];
} }
@ -1783,9 +1785,10 @@ async function generatePrompt(quietPrompt) {
} }
async function sendGenerationRequest(generationType, prompt, characterName = null, callback) { async function sendGenerationRequest(generationType, prompt, characterName = null, callback) {
const prefix = (generationType !== generationMode.BACKGROUND && generationType !== generationMode.FREE) const noCharPrefix = [generationMode.FREE, generationMode.BACKGROUND, generationMode.USER, generationMode.USER_MULTIMODAL];
? combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix()) const prefix = noCharPrefix.includes(generationType)
: extension_settings.sd.prompt_prefix; ? extension_settings.sd.prompt_prefix
: combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix());
const prefixedPrompt = combinePrefixes(prefix, prompt, '{prompt}'); const prefixedPrompt = combinePrefixes(prefix, prompt, '{prompt}');