holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #671 from patriceac/allow-empty-prompts

Browse Source 
Allow empty prompts (image modifiers only)
This commit is contained in:
cmdr2 2022-12-19 11:50:18 +05:30 committed by GitHub
commit 6afcf7570a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/media/js/main.js
View File

@ -913,20 +913,29 @@ function getPrompts(prompts) {
if (typeof prompts === 'undefined') { if (typeof prompts === 'undefined') {
prompts = promptField.value prompts = promptField.value
} }
if (prompts.trim() === '') { if (prompts.trim() === '' && activeTags.length === 0) {
return [''] return ['']
} }
prompts = prompts.split('\n') let promptsToMake = []
prompts = prompts.map(prompt => prompt.trim()) if (prompts.trim() !== '') {
prompts = prompts.filter(prompt => prompt !== '') prompts = prompts.split('\n')
prompts = prompts.map(prompt => prompt.trim())
let promptsToMake = applyPermuteOperator(prompts) prompts = prompts.filter(prompt => prompt !== '')
promptsToMake = applySetOperator(promptsToMake)
promptsToMake = applyPermuteOperator(prompts)
promptsToMake = applySetOperator(promptsToMake)
}
const newTags = activeTags.filter(tag => tag.inactive === undefined || tag.inactive === false) const newTags = activeTags.filter(tag => tag.inactive === undefined || tag.inactive === false)
if (newTags.length > 0) { if (newTags.length > 0) {
const promptTags = newTags.map(x => x.name).join(", ") const promptTags = newTags.map(x => x.name).join(", ")
promptsToMake = promptsToMake.map((prompt) => `${prompt}, ${promptTags}`) if (promptsToMake.length > 0) {
promptsToMake = promptsToMake.map((prompt) => `${prompt}, ${promptTags}`)
}
else
{
promptsToMake.push(promptTags)
}
} }
promptsToMake = applyPermuteOperator(promptsToMake) promptsToMake = applyPermuteOperator(promptsToMake)