forked from extern/easydiffusion
Update main.js
Fixing the parsing of Set and Permute operators in custom tags.
This commit is contained in:
parent
33e25d9241
commit
d492d3f738
@ -886,15 +886,15 @@ function getPrompts() {
|
|||||||
prompts = prompts.map(prompt => prompt.trim())
|
prompts = prompts.map(prompt => prompt.trim())
|
||||||
prompts = prompts.filter(prompt => prompt !== '')
|
prompts = prompts.filter(prompt => prompt !== '')
|
||||||
|
|
||||||
|
if (activeTags.length > 0) {
|
||||||
|
const promptTags = activeTags.map(x => x.name).join(", ")
|
||||||
|
prompts = prompts.map((prompt) => `${prompt}, ${promptTags}`)
|
||||||
|
}
|
||||||
|
|
||||||
let promptsToMake = applySetOperator(prompts)
|
let promptsToMake = applySetOperator(prompts)
|
||||||
promptsToMake = applyPermuteOperator(promptsToMake)
|
promptsToMake = applyPermuteOperator(promptsToMake)
|
||||||
|
|
||||||
if (activeTags.length <= 0) {
|
return promptsToMake
|
||||||
return promptsToMake
|
|
||||||
}
|
|
||||||
|
|
||||||
const promptTags = activeTags.map(x => x.name).join(", ")
|
|
||||||
return promptsToMake.map((prompt) => `${prompt}, ${promptTags}`)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function applySetOperator(prompts) {
|
function applySetOperator(prompts) {
|
||||||
|
Loading…
Reference in New Issue
Block a user