Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Antonio Cordero Balcazar
|
ee7ba94a30 | ||
|
Antonio Cordero Balcazar
|
3810320f6e | ||
|
Antonio Cordero Balcazar
|
c87c24924e | ||
|
Antonio Cordero Balcazar
|
e9092b877c | ||
|
Antonio Cordero Balcazar
|
a18e5e659c | ||
|
Antonio Cordero Balcazar
|
93f0102897 | ||
|
Antonio Cordero Balcazar
|
0b03e1773f | ||
|
Antonio Cordero Balcazar
|
830bd4f785 | ||
|
snomiao
|
b019c5604b | ||
|
Antonio Cordero Balcazar
|
42f7fc65cc | ||
|
Antonio Cordero Balcazar
|
956a47adbc | ||
|
Antonio Cordero Balcazar
|
faa55704cc | ||
|
Antonio Cordero Balcazar
|
8a960df0aa |
@@ -0,0 +1,24 @@
|
||||
name: Publish to Comfy registry
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- master
|
||||
paths:
|
||||
- "pyproject.toml"
|
||||
|
||||
jobs:
|
||||
publish-node:
|
||||
name: Publish Custom Node to registry
|
||||
runs-on: ubuntu-latest
|
||||
# if this is a forked repository. Skipping the workflow.
|
||||
if: github.event.repository.fork == false
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@v4
|
||||
- name: Publish Custom Node
|
||||
uses: Comfy-Org/publish-node-action@main
|
||||
with:
|
||||
## Add your own personal access token to your Github Repository secrets and reference it here.
|
||||
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
||||
Vendored
+1
-1
@@ -6,7 +6,7 @@
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Tests",
|
||||
"type": "python",
|
||||
"type": "debugpy",
|
||||
"request": "launch",
|
||||
"program": "tests/tests.py",
|
||||
"console": "integratedTerminal",
|
||||
|
||||
Vendored
+1
-1
@@ -9,7 +9,7 @@
|
||||
],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true,
|
||||
"python.analysis.typeCheckingMode": "basic",
|
||||
"python.analysis.typeCheckingMode": "off",
|
||||
"black-formatter.args": [
|
||||
"--line-length=120"
|
||||
]
|
||||
|
||||
@@ -1,57 +1,68 @@
|
||||
# Prompt Postprocessor for Stable Diffusion WebUI
|
||||
# Prompt PostProcessor for Stable Diffusion WebUI and ComfyUI
|
||||
|
||||
The Prompt Postprocessor for Stable Diffusion WebUI, formerly known as "sd-webui-sendtonegative", is an extension designed to process the prompt after other extensions have potentially modified it. This extension is compatible with the [AUTOMATIC1111 Stable Diffusion WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) and [SD.Next](https://github.com/vladmandic/automatic).
|
||||
The Prompt PostProcessor (PPP), formerly known as "sd-webui-sendtonegative", is an extension designed to process the prompt, possibly after other extensions have modified it. This extension is compatible with:
|
||||
|
||||
* [AUTOMATIC1111 Stable Diffusion WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
|
||||
* [Forge](https://github.com/lllyasviel/stable-diffusion-webui-forge)
|
||||
* [reForge](https://github.com/Panchovix/stable-diffusion-webui-reForge)
|
||||
* [SD.Next](https://github.com/vladmandic/automatic).
|
||||
* ...and probably other forks
|
||||
* [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
|
||||
|
||||
Currently this extension has these functions:
|
||||
|
||||
* Allows marking parts of the prompt and moves them to the negative prompt. This allows for useful tricks when using a wildcard extension since you can add negative content from choices made in the positive prompt.
|
||||
* Set values to local variables.
|
||||
* Filter content based on the loaded SD model version or a set variable.
|
||||
* Detect invalid wildcards and act on them.
|
||||
* Sending parts of the prompt to the negative prompt. This allows for useful tricks when using wildcards since you can add negative content from choices made in the positive prompt.
|
||||
* Set and modify local variables.
|
||||
* Filter content based on the loaded SD model or a variable.
|
||||
* Process wildcards. Compatible with Dynamic Prompts formats. Can also detect invalid wildcards and act as you choose.
|
||||
* Clean up the prompt and negative prompt.
|
||||
|
||||
Note: The extension must be loaded after the installed wildcards extension (or any other that modifies the prompt or has it's own syntax expressions). Extensions load by their folder name in alphanumeric order.
|
||||
Note: when used in an A1111 compatible webui, the extension must be loaded after any other extension that modifies the prompt (like another wildcards extension). Usually extensions load by their folder name in alphanumeric order, so if the extensions are not loading in the correct order just rename this extension's folder so the ordering works out. When in doubt, just rename this extension's folder with a "z" in front (for example) so that it is the last one to load, or manually set such folder name when installing it.
|
||||
|
||||
With the ["Dynamic Prompts" extension](https://github.com/adieyal/sd-dynamic-prompts) this happens by default due to default folder names for both extensions. But if this is not the case, you can just rename this extension's folder so the ordering works out.
|
||||
|
||||
With the ["AUTOMATIC1111 Wildcards" extension](https://github.com/AUTOMATIC1111/stable-diffusion-webui-wildcards) you will have to rename one of the folders, so that it loads before than this extension.
|
||||
|
||||
When in doubt, just rename this extension's folder with a "z" in front (for example) so that it is the last one to load, or manually set such folder name when installing it.
|
||||
If the extension runs before others, like Dynamic Prompts, and the "Process wildcards" is enabled, the wildcards will be processed by PPP and those extensions will not get them. If you disable processing the wildcards, and intend another extension to process them, you should keep the "What to do with remaining wildcards?" option as "ignore".
|
||||
|
||||
Notes:
|
||||
|
||||
1. It only recognizes regular A1111 prompt formats. So:
|
||||
1. Other than its own commands, it only recognizes regular A1111 prompt formats. So:
|
||||
|
||||
* **Attention**: `\[prompt\] (prompt) (prompt:weight)`
|
||||
* **Alternation**: `\[prompt1|prompt2|...\]`
|
||||
* **Scheduling**: `\[prompt1:prompt2:step\]`
|
||||
* **Extra networks**: `\<kind:model...\>`
|
||||
* **BREAK**: `prompt1 BREAK prompt2`
|
||||
* **Composable Diffusion**: `prompt1 AND prompt2`
|
||||
* **Composable Diffusion**: `prompt1:weight1 AND prompt2:weight2`
|
||||
|
||||
In SD.Next that means only the *A1111* or *Full* parsers. It will warn you if you use the *Compel* parser.
|
||||
2. It only recognizes wildcards in the *\_\_wildcard\_\_* and *{choice|choice}* formats.
|
||||
3. Since it should run after other extensions that apply to the prompt, the content should have already been processed by them and there should't be any non recognized syntax anymore.
|
||||
4. It does not create *AND/BREAK* constructs when moving content to the negative prompt.
|
||||
|
||||
Does not recognize tokenizer separators like "TE2:" and "TE3:", so sending to negative prompt from those sections of the prompt will not add them in the corresponding section of the negative prompt.
|
||||
|
||||
ComfyUI only supports natively the attention using parenthesis, so the ones with the braces will be converted. The other constructs are not natively supported but some custom nodes implement them.
|
||||
2. It recognizes wildcards in the *\_\_wildcard\_\_* and *{choice|choice}* formats (and almost everything that [Dynamic Prompts](https://github.com/adieyal/sd-dynamic-prompts) supports).
|
||||
3. It does not create *AND/BREAK* constructs when moving content to the negative prompt.
|
||||
|
||||
## Installation
|
||||
|
||||
On A1111 compatible webuis:
|
||||
|
||||
1. Go to Extensions > Install from URL
|
||||
2. Paste <https://github.com/acorderob/sd-webui-prompt-postprocessor> in the URL for extension's git repository text field
|
||||
3. Click the Install button
|
||||
4. Restart the webui
|
||||
|
||||
On SD.Next I recommend you disable the native wildcard processing.
|
||||
|
||||
On ComfyUI:
|
||||
|
||||
1. Go to Manager > Custom Nodes Manager
|
||||
2. Install through ComfyUI Manager
|
||||
3. Click Install via Git URL and enter <https://github.com/acorderob/sd-webui-prompt-postprocessor>
|
||||
4. Restart
|
||||
|
||||
## Usage
|
||||
|
||||
### Detection of remaining wildcards
|
||||
|
||||
This extension should run after any wildcard extensions, so any remaining wildcards present in the prompt or negative_prompt at this point of processing must be invalid. Usually you might not notice this problem until you check the image metadata, so this option gives you some ways to detect and treat the problem.
|
||||
|
||||
If you choose to not ignore wildcards, the extension will look for any *\_\_wildcard\_\_* or *{choice|choice}* constructs and act as configured.
|
||||
|
||||
### Commands
|
||||
|
||||
The extension uses now a new format for its commands. The format is similar to an extranetwork, but it has a "ppp:" prefix followed by the command, and then a space and any parameters (if any).
|
||||
The extension uses a format for its commands similar to an extranetwork, but it has a "ppp:" prefix followed by the command, and then a space and any parameters (if any).
|
||||
|
||||
```text
|
||||
<ppp:command parameters>
|
||||
@@ -63,7 +74,118 @@ When a command is associated with any content, it will be between an opening and
|
||||
<ppp:command parameters>content<ppp:/command>
|
||||
```
|
||||
|
||||
The `set` and `if` commands are the first to be processed.
|
||||
For wildcards and choices it uses the formats from the Dynamic Prompts extension, but sometimes with some additional options for more functionality.
|
||||
|
||||
### Choices
|
||||
|
||||
The generic format is:
|
||||
|
||||
```text
|
||||
{parameters$$opt1::choice1|opt2::choice2|opt3::choice3}
|
||||
```
|
||||
|
||||
Both the construct parameters (up to the '$$') and the individual choice options (up to the '::') are optional.
|
||||
|
||||
There is also a format where instead of "parameters$$" you just put the sampler, for compatibility with Dynamic Prompts.
|
||||
|
||||
The construct parameters can be written with the following options (all are optional):
|
||||
|
||||
* "**~**" or "**@**": sampler (for compatibility with Dynamic Prompts), but only "**~**" (random) is allowed.
|
||||
* "**r**": means it allows repetition of the choices.
|
||||
* "**n**" or "**n-m**" or "**n-**" or "**-m**": number or range of choices to select. Allows zero as the start of a range. Default is 1.
|
||||
* "**$$sep**": separator when multiple choices are selected. Default is set in settings.
|
||||
* "**$$**": end of the parameters.
|
||||
|
||||
The choice options are as follows:
|
||||
|
||||
* "**'identifiers'**": comma separated labels for the choice (optional, quotes can be single or double). Only makes sense inside a wildcard definition. Can be used when specifying the wildcard to select this specific choice. It's case insensitive.
|
||||
* "**n**": weight of the choice (optional, default 1).
|
||||
* "**if condition**": filters out the choice if the condition is false (optional; this is an extension to the Dynamic Prompts syntax). Same conditions as in the `if` command.
|
||||
* "**::**": end of choice options
|
||||
|
||||
Whitespace is allowed between parameters.
|
||||
|
||||
These are examples of formats you can use to insert a choice construct:
|
||||
|
||||
```text
|
||||
{opt1|5::opt2|3::opt3} # select 1 choice, two have weights
|
||||
{3$$opt1|5 if _is_sd1::opt2|opt3} # select 3 choices, one has a weight and a condition
|
||||
{2-3$$opt1|opt2|opt3} # select 2 to 3 choices
|
||||
{r2-3$$opt1|opt2|opt3} # select 2 to 3 choices allowing repetition
|
||||
{2-3$$ / $$opt1|opt2|opt3} # select 2 to 3 choices with separator " / "
|
||||
```
|
||||
|
||||
Notes:
|
||||
|
||||
* The Dynamic Prompts format `{2$$__flavours__}` does not work as expected. It will only output one value. You can write is as `{r2$$__flavours__}` to get two values, but they may repeat since the evaluation of the wildcard is independent of the choices selection.
|
||||
* Whitespace in the choices is not ignored like in Dynamic Prompts, but will be cleaned up if the appropriate settings are checked.
|
||||
|
||||
### Wildcards
|
||||
|
||||
The generic format is:
|
||||
|
||||
```text
|
||||
__parameters$$wildcard'filter'(var=value)__
|
||||
```
|
||||
|
||||
The parameters, the filter, and the setting of a variable are optional. The parameters follow the same format as for the choices.
|
||||
|
||||
The wildcard identifier can contain globbing formatting, to read multiple wildcards and merge their choices. Note that if there are no parameters specified, the globbing will use the ones from the first wildcard that matches and have parameters (sorted by keys), so if you don't want that you might want to specify them. Also note that, unlike with Dynamic Prompts, the wildcard name has to be specified with its full path (unless you use globbing).
|
||||
|
||||
The filter can be used to filter specific choices from the wildcard. The filtering works before applying the choice conditions (if any). The surrounding quotes can be single or double. The filter is a comma separated list of an integer (positional choice index; zero-based) or choice label. You can also compound them with "+". That is, the comma separated items act as an OR and the "+" inside them as an AND. Using labels can simplify the definitions of complex wildcards where you want to have direct access to specific choices on occasion (you don't need to create wildcards for each individual choice). There are some additional formats when using filters. You can specify "^wildcard" as a filter to use the filter of a previous wildcard in the chain. You can start the filter (regular or inherited) with "#" and it will not be applied to the current wildcard choices, but the filter will remain in memory to use by other descendant wildcards. You use "#" and "^" when you want to pass a filter to inner wildcards (see the test files).
|
||||
|
||||
The variable value only applies during the evaluation of the selected choices and is discarded afterward (the variable keeps its original value if there was one).
|
||||
|
||||
These are examples of formats you can use to insert a wildcard:
|
||||
|
||||
```text
|
||||
__path/wildcard__ # select 1 choice
|
||||
__path/wildcard'0'__ # select the first choice
|
||||
__path/wildcard'label'__ # select the choices with label "label"
|
||||
__path/wildcard'0,label1,label2'__ # select the first choice and those with labels "label1" or "label2"
|
||||
__path/wildcard'0,label1+label2'__ # select the first choice and those with both labels "label1" and "label2"
|
||||
__3$$path/wildcard__ # select 3 choices
|
||||
__2-3$$path/wildcard__ # select 2 to 3 choices
|
||||
__r2-3$$path/wildcard__ # select 2 to 3 choices allowing repetition
|
||||
__2-3$$ / $$path/wildcard__ # select 2 to 3 choices with separator " / "
|
||||
__path/wildcard(var=value)__ # select 1 choice using the specified variable value in the evaluation.
|
||||
```
|
||||
|
||||
#### Wildcard definitions
|
||||
|
||||
A wildcard definition can be:
|
||||
|
||||
* A txt file. The wildcard name will be the relative path of the file, without the extension. Each line will be a choice. Lines starting with "#" or empty are ignored. Doesn't support nesting.
|
||||
* An array or scalar value inside a json or yaml file. The wildcard name includes the relative folder path of the file, without the extension, but also the path of the value inside the file (if there is one). If the file contains a dictionary, the filename part is not used for the wildcard name. Supports nesting by having dictionaries inside dictionaries.
|
||||
|
||||
The best format is a yaml file with a dictionary of wildcards inside. An editor supporting yaml syntax is recommended.
|
||||
|
||||
In a choice, the content after a "#" is ignored.
|
||||
|
||||
If the first choice follows the format of wildcard parameters, it will be used as default parameters for that wildcard (see examples in the tests folder). The choices of the wildcard follow the same format as in the choices construct, or the object format of **Dynamic Prompts** (only in structured files). If using the object format for a choice you can use a new "if" property for the condition, and the "labels" property (an array of strings) in addition to the standard "weight" and "text"/"content".
|
||||
|
||||
```yaml
|
||||
{ labels: ["some_label"], weight: 2, if: "_is_pony", content: "the text" } # "text" property can be used instead of "content"
|
||||
```
|
||||
|
||||
Wildcard parameters in a json/yaml file can also be in object format, and support two additional properties, prefix and suffix:
|
||||
|
||||
```yaml
|
||||
{ sampler: "~", repeating: false, count: 2, prefix: "prefix-", suffix: "-suffix", separator: "/" }
|
||||
{ sampler: "~", repeating: false, from: 2, to: 3, prefix: "prefix-", suffix: "-suffix", separator: "/" }
|
||||
```
|
||||
|
||||
The prefix and suffix are added to the result along with the selected choices and separators. They can contain other constructs, but the separator can't.
|
||||
|
||||
It is recommended to use the object format for the wildcard parameters and for choices with complex options.
|
||||
|
||||
Wildcards can contain just one choice. In json and yaml formats this allows the use of a string value for the keys, rather than an array.
|
||||
|
||||
A choice inside a wildcard can also be a list or a dictionary of one element containing a list. These are considered anonymous wildcards. With a list it will be an anonymous wildcard with no choice options, and with a dictionary the key will be the options for the choice containing the anonymous wildcard and the value the choices of the anonymous wildcard. Anonymous wildcards can help formatting complex choice values that are used in only one place and thus creating a regular wildcard is not necessary. See test.yaml for examples.
|
||||
|
||||
#### Detection of remaining wildcards
|
||||
|
||||
This extension should run after any other wildcard extensions, so if you don't use the internal wildcards processing, any remaining wildcards present in the prompt or negative_prompt at this point must be invalid. Usually you might not notice this problem until you check the image metadata, so this option gives you some ways to detect and treat the problem.
|
||||
|
||||
### Set command
|
||||
|
||||
@@ -73,6 +195,27 @@ The format is:
|
||||
|
||||
```text
|
||||
<ppp:set varname>value<ppp:/set>
|
||||
<ppp:set varname evaluate>value<ppp:/set>
|
||||
<ppp:set varname add>value<ppp:/set>
|
||||
<ppp:set varname evaluate add>value<ppp:/set>
|
||||
```
|
||||
|
||||
The `evaluate` parameter makes it so the value of the variable is evaluated at this moment, instead of when it is used.
|
||||
|
||||
With the `add` parameter the value is added to the current value of the variable. It does not force an immediate evaluation of the old nor the added value.
|
||||
|
||||
The Dynamic Prompts format also works:
|
||||
|
||||
```text
|
||||
${var=value}
|
||||
${var=!value} # immediate evaluation
|
||||
```
|
||||
|
||||
If also supports the addition as an extension of the Dynamic Prompts format:
|
||||
|
||||
```text
|
||||
${var+=value}
|
||||
${var+=!value}
|
||||
```
|
||||
|
||||
### Echo command
|
||||
@@ -83,23 +226,59 @@ The format is:
|
||||
|
||||
```text
|
||||
<ppp:echo varname>
|
||||
<ppp:echo varname>default<ppp:/echo>
|
||||
```
|
||||
|
||||
The Dynamic Prompts format is:
|
||||
|
||||
```text
|
||||
${var}
|
||||
${var:default}
|
||||
```
|
||||
|
||||
### If command
|
||||
|
||||
This command allows you to filter content based on conditions.
|
||||
|
||||
The format is:
|
||||
The full format is:
|
||||
|
||||
```text
|
||||
<ppp:if condition1>content one<ppp:elif condition2>content two<ppp:else>other content<ppp:/if>
|
||||
```
|
||||
|
||||
The *conditionN* compares a variable with a value. The operation can be `eq`, `ne`, `gt`, `lt`, `ge`, `le` and the value can be a quoted string or an integer.
|
||||
The *conditionN* compares a variable with a value or a list of values. The allowed formats are:
|
||||
|
||||
The variable can be one set with the `set` command or special variables like:
|
||||
```text
|
||||
[not] variable
|
||||
[not] variable operation value
|
||||
variable [not] operation value
|
||||
[not] variable operation (value1,value2...)
|
||||
variable [not] operation (value1,value2...)
|
||||
```
|
||||
|
||||
* `_sd` : the loaded model version (`"sd1"`, `"sd2"`, `"sdxl"`)
|
||||
When there is no value it will check if the variable is truthy.
|
||||
|
||||
For a simple value the allowed operations are `eq`, `ne`, `gt`, `lt`, `ge`, `le`, `contains` and the value can be a quoted string or an integer.
|
||||
|
||||
For a list of values the allowed operations are `contains`, `in` and the value of the variable is checked against all the elements of the list until one matches.
|
||||
|
||||
The variable can be one set with the `set` or `add` commands or you can use internal variables like these (names starting with an underscore are reserved):
|
||||
|
||||
* `_model` : the loaded model identifier (`"sd1"`, `"sd2"`, `"sdxl"`, `"sd3"`, `"flux"`, `"auraflow"`). `_sd` also works but is deprecated.
|
||||
* `_modelname` : the loaded model filename (without path). `_sdname` also works but is deprecated.
|
||||
* `_modelfullname`: the loaded model filename (with path). `_sdfullname` also works but is deprecated.
|
||||
* `_modelclass`: the class used for the model. Note that this is dependent on the webui. In A1111 all SD versions use the same class. Can be used for new models that are not supported yet with the `_is_*` variables.
|
||||
* `_is_sd`: true if the loaded model version is any version of SD
|
||||
* `_is_sd1`: true if the loaded model version is SD 1.x
|
||||
* `_is_sd2`: true if the loaded model version is SD 2.x
|
||||
* `_is_sdxl`: true if the loaded model version is SDXL (includes Pony models)
|
||||
* `_is_ssd`: true if the loaded model version is SSD (Segmind Stable Diffusion 1B). Note that for an SSD model `_is_sdxl` will also be true.
|
||||
* `_is_sdxl_no_ssd`: true if the loaded model version is SDXL and not an SSD model.
|
||||
* `_is_pony`: true if the loaded model version is SDXL and a Pony model (based on its filename). Note that for a pony model `_is_sdxl` will also be true.
|
||||
* `_is_sdxl_no_pony`: true if the loaded model version is SDXL and not a Pony model.
|
||||
* `_is_sd3`: true if the loaded model version is SD 3.x
|
||||
* `_is_flux`: true if the loaded model is Flux
|
||||
* `_is_auraflow`: true if the loaded model is AuraFlow
|
||||
|
||||
Any `elif`s (there can be multiple) and the `else` are optional.
|
||||
|
||||
@@ -108,9 +287,9 @@ Any `elif`s (there can be multiple) and the `else` are optional.
|
||||
(multiline to be easier to read)
|
||||
|
||||
```text
|
||||
<ppp:if _sd eq "sd1"><lora:test_sd1> test sd1
|
||||
<ppp:elif _sd eq "sd2"><lora:test_sd2> test sd2
|
||||
<ppp:elif _sd eq "sdxl"><lora:test_sdxl> test sdxl
|
||||
<ppp:if _is_sd1><lora:test_sd1> test sd1x
|
||||
<ppp:elif _sd_pony><lora:test_pony> test pony
|
||||
<ppp:elif _sd_sdxl><lora:test_sdxl> test sdxl
|
||||
<ppp:else>unknown model
|
||||
<ppp:/if>
|
||||
```
|
||||
@@ -153,23 +332,7 @@ Then, if that option is chosen this extension will process it later and move tha
|
||||
|
||||
#### Old format
|
||||
|
||||
The old format is still supported (for now) and is like this:
|
||||
|
||||
```text
|
||||
<!content!>
|
||||
```
|
||||
|
||||
And an optional position can be specified like this:
|
||||
|
||||
```text
|
||||
<!!position!content!>
|
||||
```
|
||||
|
||||
With the insertion point like this:
|
||||
|
||||
```text
|
||||
<!!iN!!>
|
||||
```
|
||||
The old format (`<!...!>`) is not supported anymore.
|
||||
|
||||
### Notes on negative commands
|
||||
|
||||
@@ -182,8 +345,8 @@ The content of the negative commands is not processed and is copied as-is to the
|
||||
They will be translated to the negative prompt. For example:
|
||||
|
||||
* `(red<ppp:stn>square<ppp:/stn>:1.5)` will end up as `(square:1.5)` in the negative prompt
|
||||
* `(red[<ppp:stn>square<ppp:/stn>]:1.5)` will end up as `(square:1.35)` in the negative prompt (weight=1.5*0.9)
|
||||
* However `(red<ppp:stn>[square]<ppp:/stn>:1.5)` will end up as `([square]:1.5)` in the negative prompt. The content of the negative tag is copied as is, and not joined with the surrounding modifier.
|
||||
* `(red[<ppp:stn>square<ppp:/stn>]:1.5)` will end up as `(square:1.35)` in the negative prompt (weight=1.5*0.9) if the merge attention option is enabled or `([square]:1.5)` otherwise.
|
||||
* However `(red<ppp:stn>[square]<ppp:/stn>:1.5)` will end up as `([square]:1.5)` in the negative prompt. The content of the negative tag is copied as is, and is not merged with the surrounding modifier because the insertions happen after the attention merging.
|
||||
|
||||
#### Prompt editing constructs (alternation and scheduling)
|
||||
|
||||
@@ -196,37 +359,63 @@ This should still work as intended, and the only negative point i see is the unn
|
||||
|
||||
## Configuration
|
||||
|
||||
### A1111 (and compatible UIs) UI options
|
||||
|
||||
* **Force equal seeds**: Changes the image seeds and variation seeds to be equal to the first of the batch. This allows using the same values for all the images in a batch.
|
||||
* **Unlink seed**: Uses the specified seed for the prompt generation instead of the one from the image.
|
||||
* **Seed**: The seed to use for the prompt generation. If -1 a random one will be used for each image in the batch. This seed is only used for wildcards and choices.
|
||||
* **Variable seed**: If the seed is not -1 you can use this to increase it for the other images in the batch.
|
||||
|
||||
### ComfyUI specific inputs
|
||||
|
||||
* **model**: Connect here the MODEL or a string with the model class name used by ComfyUI. Needed for the model kind system variables.
|
||||
* **modelname**: Name of the model. Needed for the model name system variables and detection of pony (this also requieres for the model to be SDXL).
|
||||
* **seed**: Connect here the seed used. By default it is -1 (random).
|
||||
* **pos_prompt**: Connect here the prompt text, or fill it as a widget.
|
||||
* **neg_prompt**: Connect here the negative prompt text, or fill it as a widget.
|
||||
|
||||
### General settings
|
||||
|
||||
* **Debug**: writes debugging information to the console.
|
||||
* **Debug level**: what to write to the console. Note: in SD.Next debug messages only show if you launch it with the --debug argument.
|
||||
* **Pony substrings**: list of substrings to detect a Pony model.
|
||||
* **Apply in img2img**: check if you want to do the processing in img2img processes (does not apply to ComfyUI node).
|
||||
|
||||
### Wildcard settings
|
||||
|
||||
* **Process wildcards**: you can choose to process them with this extension or use a different one.
|
||||
* **Wildcards folders**: you can enter multiple folders separated by commas. In ComfyUI you can leave it empty and add a "wildcards" entry in the extra_model_paths.yaml file.
|
||||
* **What to do with remaining wildcards?**: select what do you want to do with any found wildcards.
|
||||
* **Ignore**: do not try to detect wildcards.
|
||||
* **Remove**: detect wildcards and remove them.
|
||||
* **Add visible warning**: detect wildcards and add a warning text to the prompt, that hopefully produces a noticeable generation.
|
||||
* **Stop the generation**: detect wildcards and stop the generation.
|
||||
|
||||
### Content removal settings
|
||||
|
||||
* **Remove extra network tags**: removes all extra network tags.
|
||||
* **Default separator used when adding multiple choices**: what do you want to use by default to separate multiple choices when the options allow it (by default it's ", ").
|
||||
* **Keep the order of selected choices**: if checked, a multiple choice construct will return them in the order they are in the construct.
|
||||
|
||||
### Send to negative prompt settings
|
||||
|
||||
* **Apply in img2img**: check if you want to do this processing in img2img processes.
|
||||
* **Separator used when adding to the negative prompt**: you can specify the separator used when adding to the negative prompt (by default it's ", ").
|
||||
* **Ignore repeated content**: it ignores repeated content to avoid repetitions in the negative prompt.
|
||||
* **Join attention modifiers (weights) when possible**: it joins attention modifiers when possible (joins into one, multipliying their values).
|
||||
|
||||
### Clean up settings
|
||||
|
||||
* **Apply in img2img**: check if you want to do this processing in img2img processes.
|
||||
* **Remove empty constructs**: removes attention/scheduling/alternation constructs when they are invalid.
|
||||
* **Remove extra separators**: removes unnecessary separators. This applies to the configured separator and regular commas.
|
||||
* **Remove additional extra separators**: removes unnecessary separators at start or end of lines. This applies to the configured separator and regular commas.
|
||||
* **Clean up around BREAKs**: removes consecutive BREAKs and unnecessary commas and space around them.
|
||||
* **Use EOL instead of Space before BREAKs**: add a newline before BREAKs.
|
||||
* **Clean up around ANDs**: removes consecutive ANDs and unnecessary commas and space around them.
|
||||
* **Use EOL instead of Space before ANDs**: add a newline before ANDs.
|
||||
* **Clean up around extra network tags**: removes spaces around them.
|
||||
* **Merge attention modifiers (weights) when possible**: it merges attention modifiers when possible (merges into one, multiplying their values). Only merges individually nested modifiers.
|
||||
* **Remove extra spaces**: removes other unnecessary spaces.
|
||||
|
||||
Please note that ComfyUI does not support the BREAK and AND constructs, but the related settings are kept in that UI.
|
||||
|
||||
### Content removal settings
|
||||
|
||||
* **Remove extra network tags**: removes all extra network tags.
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
"""
|
||||
@author: ACB
|
||||
@title: Prompt Post Processor
|
||||
@nickname: ACB PPP
|
||||
@description: Node for processing prompts. Includes the following options: send to negative prompt, set variables, if/elif/else command for conditional content, wildcards and choices.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
|
||||
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from .ppp_comfyui import PromptPostProcessorComfyUINode
|
||||
|
||||
NODE_CLASS_MAPPINGS = {"ACBPromptPostProcessor": PromptPostProcessorComfyUINode}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {"ACBPromptPostProcessor": "ACB Prompt Post Processor"}
|
||||
|
||||
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
|
||||
+105
@@ -0,0 +1,105 @@
|
||||
%import common (LETTER, DIGIT, INT, CNAME, SIGNED_NUMBER, NUMBER)
|
||||
|
||||
_WHITESPACE: /\s+/
|
||||
STRING: /("(?!"").*?(?<!\\)(\\\\)*?"|'(?!'').*?(?<!\\)(\\\\)*?')/i
|
||||
BOOLEAN: /true|false/i
|
||||
INDEX: INT | IDENTIFIER
|
||||
WILDCARD_NAME: /(?:(?!__|\$\$|[('"])\S)+/
|
||||
|
||||
// plain text and weights
|
||||
?plain: /((?!__|\bAND\b|\${)[^\\()\[\]:<>${]|\\.)+/s // exclude only the starting ones
|
||||
?plain_choice: /((?!__|\bAND\b|\${|\$\$)[^\\()\[\]:<>${|}~@]|\\.)+/s // add the specific internal choice ones
|
||||
?plain_alternate: /((?!__|\bAND\b|\${)[^\\()\[\]:<>${|]|\\.)+/s // add the specific internal alternate ones
|
||||
?plain_var: /((?!__|\bAND\b|\${)[^\\()\[\]:<>${}]|\\.)+/s // add the specific internal var ones
|
||||
?specialchars: /[_{()\[\]:<>]|\$(?![{$])/ // include only the starting ones
|
||||
?specialchars_negtag: /[_{()\[\]:<>!|}]|\$(?![{$])/ // add the internal negtag ones
|
||||
?specialchars_alternate: /[_{()\[\]:<>|]|\$(?![{$])/ // add the internal alternate ones
|
||||
?specialchars_choice: /[_{()\[\]:<>|}]|\$(?![{$])/ // add the internal choice ones
|
||||
?specialchars_var: /[_{()\[\]:<>}]|\$(?![{$])/ // add the internal var ones
|
||||
?numpar: _WHITESPACE? SIGNED_NUMBER _WHITESPACE?
|
||||
|
||||
start: promptcomp | content
|
||||
|
||||
// prompt composition with AND
|
||||
promptcomp.4: promptcomppart ( [ ":" numpar ] ( /\bAND\b/ promptcomppart [ ":" numpar ] )+ )+
|
||||
promptcomppart: content
|
||||
|
||||
// simple prompts
|
||||
?content.2: ( old_content | new_content | plain | specialchars )*
|
||||
?inside_content.2: ( new_content | plain | specialchars )*
|
||||
?content_choice.2: ( old_content | new_content | plain_choice | specialchars_choice )*
|
||||
?content_var.2: ( old_content | new_content | plain_var | specialchars_var )*
|
||||
?content_negtag.2: ( old_content | new_content_negtag | plain | specialchars_negtag )*
|
||||
?content_alternate.2: ( old_content | new_content | plain_alternate | specialchars_alternate )*
|
||||
?old_content.2: ( attention | scheduled | alternate | extranetworktag )+
|
||||
?new_content.3: ( variableset | variableuse | commandstn | commandstni | commandset | commandecho | commandif | wildcard | choices )+
|
||||
?new_content_negtag.3: ( variableset | variableuse | commandset | commandecho | commandif | wildcard | choices )+
|
||||
|
||||
// attention modifiers
|
||||
attention: ( "(" content [ ":" numpar ] ")" ) | ( "[" content "]" )
|
||||
|
||||
// prompt scheduling and alternation
|
||||
alternate: "[" alternateoption ( "|" alternateoption )+ "]"
|
||||
alternateoption: content_alternate
|
||||
scheduled: "[" [ content ":" ] content ":" numpar "]"
|
||||
|
||||
// extra network tags
|
||||
extranetworktag: "<" /(?!ppp:)\w+:/ inside_content ">"
|
||||
|
||||
// command: stn (send to negative)
|
||||
commandstn: "<ppp:stn" [ _WHITESPACE /s|e|p\d/ ] _WHITESPACE? ">" content_negtag "<ppp:/stn>"
|
||||
commandstni: "<ppp:stn" _WHITESPACE /i\d/ _WHITESPACE? ">"
|
||||
|
||||
// command: if
|
||||
commandif.2: commandif_if commandif_elif* commandif_else? "<ppp:/if>"
|
||||
commandif_if: "<ppp:if" _WHITESPACE condition _WHITESPACE? ">" ifvalue
|
||||
commandif_elif: "<ppp:elif" _WHITESPACE condition _WHITESPACE? ">" ifvalue
|
||||
commandif_else: "<ppp:else" _WHITESPACE? ">" ifvalue
|
||||
ifvalue: content
|
||||
|
||||
// conditions
|
||||
condition: conditionsimplevalue | conditionlistvalue | conditionnocomparison
|
||||
conditionnocomparison: ( /not/ _WHITESPACE )? IDENTIFIER
|
||||
conditionsimplevalue: ( /not/ _WHITESPACE )? IDENTIFIER _WHITESPACE ( /not/ _WHITESPACE )? /eq|ne|gt|lt|ge|le|contains/ _WHITESPACE SIMPLEVALUE
|
||||
conditionlistvalue: ( /not/ _WHITESPACE )? IDENTIFIER _WHITESPACE ( /not/ _WHITESPACE )? /contains|in/ _WHITESPACE listvalue
|
||||
IDENTIFIER: CNAME
|
||||
SIMPLEVALUE: STRING | NUMBER | BOOLEAN
|
||||
listvalue: "(" _WHITESPACE? SIMPLEVALUE ( _WHITESPACE? "," _WHITESPACE? SIMPLEVALUE )* _WHITESPACE? ")"
|
||||
|
||||
// command: set
|
||||
commandset: "<ppp:set" _WHITESPACE IDENTIFIER [ _WHITESPACE? /evaluate/ ] [ _WHITESPACE? /add/ ] _WHITESPACE? ">" content "<ppp:/set>"
|
||||
|
||||
// command: echo
|
||||
commandecho: "<ppp:echo" _WHITESPACE IDENTIFIER _WHITESPACE? ">" [ content "<ppp:/echo>" ]
|
||||
|
||||
// variable set
|
||||
variableset.2: "${" _WHITESPACE? IDENTIFIER _WHITESPACE? [ /\+/ ] "=" [ /!/ ] varvalue "}"
|
||||
|
||||
// variable use
|
||||
variableuse.2: "${" _WHITESPACE? IDENTIFIER _WHITESPACE? [ ":" varvalue ] "}"
|
||||
varvalue: content_var
|
||||
|
||||
// wildcards
|
||||
wildcard.2: "__" [ choicesoptions_sampler | ( choicesoptions _WHITESPACE? "$$" ) ] WILDCARD_NAME [ wc_filter ] [ wildcardvar ] "__"
|
||||
wc_filter: /["']/ ( [ /#/ ] wc_filter_or | ( /#?\^/ WILDCARD_NAME ) ) /["']/
|
||||
wc_filter_or: wc_filter_and ( _WHITESPACE? "," _WHITESPACE? wc_filter_and )*
|
||||
wc_filter_and: INDEX ( _WHITESPACE? "+" _WHITESPACE? INDEX )*
|
||||
wildcardvar: "(" _WHITESPACE? IDENTIFIER _WHITESPACE? "=" varvalue ")"
|
||||
|
||||
// choices
|
||||
choices.2: "{" [ choicesoptions_sampler | ( choicesoptions _WHITESPACE? "$$" ) ] choice ( "|" choice )* "}"
|
||||
|
||||
choicesoptions: [ choicesoptions_sampler ] [ _WHITESPACE? choicesoptions_rep ] ( ( [ _WHITESPACE? choicesoptions_from ] "-" [ _WHITESPACE? choicesoptions_to ] ) | [ _WHITESPACE? choicesoptions_num ] ) [ _WHITESPACE? choicesoptions_sep ]
|
||||
choicesoptions_sampler: /[~@]/ // ~ for random, @ for cyclical
|
||||
choicesoptions_rep: /r/
|
||||
choicesoptions_num: INT
|
||||
choicesoptions_from: INT
|
||||
choicesoptions_to: INT
|
||||
choicesoptions_sep: "$$" plain
|
||||
|
||||
choice: [ [ _WHITESPACE? choicelabels ] [ _WHITESPACE? choiceweight ] [ _WHITESPACE? choiceif ] _WHITESPACE? "::" ] choicevalue
|
||||
choicelabels: /["']/ IDENTIFIER ( _WHITESPACE? "," _WHITESPACE? IDENTIFIER )* /["']/
|
||||
choiceweight: NUMBER
|
||||
choiceif: "if" _WHITESPACE condition
|
||||
choicevalue: content_choice
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
import os
|
||||
|
||||
requirements_filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), "requirements.txt")
|
||||
|
||||
try:
|
||||
from modules.launch_utils import requirements_met, run_pip # A1111
|
||||
|
||||
if not requirements_met(requirements_filename):
|
||||
run_pip(f'install -r "{requirements_filename}"', "requirements for Prompt Post-Processor")
|
||||
except ImportError:
|
||||
import launch
|
||||
|
||||
launch.run_pip(f'install -r "{requirements_filename}"', "requirements for Prompt Post-Processor")
|
||||
@@ -0,0 +1,5 @@
|
||||
[Extension]
|
||||
Name = sd-webui-prompt-postprocessor
|
||||
|
||||
[Scripts]
|
||||
After = sd-dynamic-prompts, stable-diffusion-webui-wildcards
|
||||
@@ -0,0 +1,24 @@
|
||||
from collections import OrderedDict
|
||||
from typing import Tuple
|
||||
|
||||
|
||||
class PPPLRUCache:
|
||||
|
||||
ProcessInput = Tuple[int, int, str, str] # (seed, wildcards_hash, positive_prompt, negative_prompt)
|
||||
ProcessResult = Tuple[str, str] # (positive_prompt, negative_prompt)
|
||||
|
||||
def __init__(self, capacity: int):
|
||||
self.cache = OrderedDict()
|
||||
self.capacity = capacity
|
||||
|
||||
def get(self, key: ProcessInput) -> ProcessResult:
|
||||
if key not in self.cache:
|
||||
return None
|
||||
self.cache.move_to_end(key)
|
||||
return self.cache[key]
|
||||
|
||||
def put(self, key: ProcessInput, value: ProcessResult) -> None:
|
||||
self.cache[key] = value
|
||||
self.cache.move_to_end(key)
|
||||
if len(self.cache) > self.capacity:
|
||||
self.cache.popitem(last=False)
|
||||
+481
@@ -0,0 +1,481 @@
|
||||
# pylint: disable=missing-module-docstring, missing-class-docstring, missing-function-docstring, invalid-name
|
||||
|
||||
import os
|
||||
|
||||
# pylint: disable=import-error
|
||||
import folder_paths # type: ignore
|
||||
import nodes # type: ignore
|
||||
|
||||
from .ppp import PromptPostProcessor
|
||||
from .ppp_logging import DEBUG_LEVEL, PromptPostProcessorLogFactory
|
||||
from .ppp_wildcards import PPPWildcards
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit("This script must be run from ComfyUI")
|
||||
|
||||
|
||||
class PromptPostProcessorComfyUINode:
|
||||
|
||||
logger = None
|
||||
|
||||
def __init__(self):
|
||||
lf = PromptPostProcessorLogFactory()
|
||||
self.logger = lf.log
|
||||
grammar_filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), "grammar.lark")
|
||||
with open(grammar_filename, "r", encoding="utf-8") as file:
|
||||
self.grammar_content = file.read()
|
||||
self.wildcards_obj = PPPWildcards(lf.log)
|
||||
self.logger.info(f"{PromptPostProcessor.NAME} {PromptPostProcessor.VERSION} initialized")
|
||||
|
||||
class SmartType(str):
|
||||
def __ne__(self, other):
|
||||
if self == "*" or other == "*":
|
||||
return False
|
||||
selfset = set(self.split(","))
|
||||
otherset = set(other.split(","))
|
||||
return not otherset.issubset(selfset)
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"pos_prompt": (
|
||||
"STRING",
|
||||
{
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
"dynamicPrompts": False,
|
||||
"defaultInput": True,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"neg_prompt": (
|
||||
"STRING",
|
||||
{
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
"dynamicPrompts": False,
|
||||
"defaultInput": True,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
},
|
||||
"optional": {
|
||||
"model": (
|
||||
cls.SmartType("MODEL,STRING"),
|
||||
{
|
||||
"default": "",
|
||||
"placeholder": "internal model class name",
|
||||
"forceInput": True,
|
||||
},
|
||||
),
|
||||
"modelname": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"placeholder": "full path of the model",
|
||||
"defaultInput": True,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"seed": (
|
||||
"INT",
|
||||
{
|
||||
"default": -1,
|
||||
"defaultInput": True,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"debug_level": (
|
||||
[e.value for e in DEBUG_LEVEL],
|
||||
{
|
||||
"default": DEBUG_LEVEL.minimal.value,
|
||||
"tooltip": "Debug level",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"pony_substrings": (
|
||||
"STRING",
|
||||
{
|
||||
"default": PromptPostProcessor.DEFAULT_PONY_SUBSTRINGS,
|
||||
"placeholder": "comma separated list",
|
||||
"tooltip": "Comma separated list of substrings to look for in the modelname to determine if the model is a pony model",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"wc_process_wildcards": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Process wildcards in the prompt",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"wc_wildcards_folders": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"tooltip": "Comma separated list of wildcards folders",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"wc_if_wildcards": (
|
||||
[e.value for e in PromptPostProcessor.IFWILDCARDS_CHOICES],
|
||||
{
|
||||
"default": PromptPostProcessor.IFWILDCARDS_CHOICES.ignore.value,
|
||||
"tooltip": "How to handle invalid wildcards in the prompt",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"wc_choice_separator": (
|
||||
"STRING",
|
||||
{
|
||||
"default": PromptPostProcessor.DEFAULT_CHOICE_SEPARATOR,
|
||||
"tooltip": "Default separator for selected choices",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"wc_keep_choices_order": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Keep the order of the choices in the prompt",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"stn_separator": (
|
||||
"STRING",
|
||||
{
|
||||
"default": PromptPostProcessor.DEFAULT_STN_SEPARATOR,
|
||||
"tooltip": "Separator for the content added to the negative prompt",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"stn_ignore_repeats": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Ignore repeated content added to the negative prompt",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_extra_spaces": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Remove extra spaces",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_empty_constructs": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Remove empty constructs",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_extra_separators": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Remove extra separators",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_extra_separators2": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Remove extra separators (additional cases)",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_breaks": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Cleanup around BREAKs",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_breaks_eol": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Set BREAKs in their own line",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_ands": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Cleanup around ANDs",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_ands_eol": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Set ANDs in their own line",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_extranetwork_tags": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Clean up around extra network tags",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"cleanup_merge_attention": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": True,
|
||||
"tooltip": "Merge nested attention constructs",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
"remove_extranetwork_tags": (
|
||||
"BOOLEAN",
|
||||
{
|
||||
"default": False,
|
||||
"tooltip": "Remove extra network tags",
|
||||
"label_on": "Yes",
|
||||
"label_off": "No",
|
||||
"defaultInput": False,
|
||||
"forceInput": False,
|
||||
},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def VALIDATE_INPUTS(cls, input_types: dict[str, str]):
|
||||
it = cls.INPUT_TYPES()
|
||||
expected = {
|
||||
k: cls.SmartType("COMBO,STRING") if isinstance(v[0], list) else v[0] # we allow string for combos
|
||||
for k, v in {**it["required"], **it["optional"]}.items()
|
||||
}
|
||||
for input_name, input_type in input_types.items():
|
||||
t = expected[input_name]
|
||||
if input_type != t:
|
||||
return f"Invalid type for input '{input_name}': {input_type} (expected {t})"
|
||||
return True
|
||||
|
||||
RETURN_TYPES = (
|
||||
"STRING",
|
||||
"STRING",
|
||||
)
|
||||
RETURN_NAMES = (
|
||||
"pos_prompt",
|
||||
"neg_prompt",
|
||||
)
|
||||
|
||||
FUNCTION = "process"
|
||||
|
||||
CATEGORY = "ACB"
|
||||
|
||||
@classmethod
|
||||
def IS_CHANGED(
|
||||
cls,
|
||||
model,
|
||||
modelname,
|
||||
pos_prompt,
|
||||
neg_prompt,
|
||||
seed,
|
||||
debug_level, # pylint: disable=unused-argument
|
||||
pony_substrings,
|
||||
wc_process_wildcards,
|
||||
wc_wildcards_folders,
|
||||
wc_if_wildcards,
|
||||
wc_choice_separator,
|
||||
wc_keep_choices_order,
|
||||
stn_separator,
|
||||
stn_ignore_repeats,
|
||||
cleanup_extra_spaces,
|
||||
cleanup_empty_constructs,
|
||||
cleanup_extra_separators,
|
||||
cleanup_extra_separators2,
|
||||
cleanup_breaks,
|
||||
cleanup_breaks_eol,
|
||||
cleanup_ands,
|
||||
cleanup_ands_eol,
|
||||
cleanup_extranetwork_tags,
|
||||
cleanup_merge_attention,
|
||||
remove_extranetwork_tags,
|
||||
):
|
||||
if wc_process_wildcards:
|
||||
return float("NaN") # since we can't detect changes in wildcards we assume they are always changed when enabled
|
||||
new_run = { # everything except debug_level
|
||||
"model": model,
|
||||
"modelname": modelname,
|
||||
"pos_prompt": pos_prompt,
|
||||
"neg_prompt": neg_prompt,
|
||||
"seed": seed,
|
||||
"pony_substrings": pony_substrings,
|
||||
"process_wildcards": wc_process_wildcards,
|
||||
"wildcards_folders": wc_wildcards_folders,
|
||||
"if_wildcards": wc_if_wildcards,
|
||||
"choice_separator": wc_choice_separator,
|
||||
"keep_choices_order": wc_keep_choices_order,
|
||||
"stn_separator": stn_separator,
|
||||
"stn_ignore_repeats": stn_ignore_repeats,
|
||||
"cleanup_extra_spaces": cleanup_extra_spaces,
|
||||
"cleanup_empty_constructs": cleanup_empty_constructs,
|
||||
"cleanup_extra_separators": cleanup_extra_separators,
|
||||
"cleanup_extra_separators2": cleanup_extra_separators2,
|
||||
"cleanup_breaks": cleanup_breaks,
|
||||
"cleanup_breaks_eol": cleanup_breaks_eol,
|
||||
"cleanup_ands": cleanup_ands,
|
||||
"cleanup_ands_eol": cleanup_ands_eol,
|
||||
"cleanup_extranetwork_tags": cleanup_extranetwork_tags,
|
||||
"cleanup_merge_attention": cleanup_merge_attention,
|
||||
"remove_extranetwork_tags": remove_extranetwork_tags,
|
||||
}
|
||||
return new_run.__hash__
|
||||
# return float("NaN")
|
||||
|
||||
def process(
|
||||
self,
|
||||
model,
|
||||
modelname,
|
||||
pos_prompt,
|
||||
neg_prompt,
|
||||
seed,
|
||||
debug_level,
|
||||
pony_substrings,
|
||||
wc_process_wildcards,
|
||||
wc_wildcards_folders,
|
||||
wc_if_wildcards,
|
||||
wc_choice_separator,
|
||||
wc_keep_choices_order,
|
||||
stn_separator,
|
||||
stn_ignore_repeats,
|
||||
cleanup_extra_spaces,
|
||||
cleanup_empty_constructs,
|
||||
cleanup_extra_separators,
|
||||
cleanup_extra_separators2,
|
||||
cleanup_breaks,
|
||||
cleanup_breaks_eol,
|
||||
cleanup_ands,
|
||||
cleanup_ands_eol,
|
||||
cleanup_extranetwork_tags,
|
||||
cleanup_merge_attention,
|
||||
remove_extranetwork_tags,
|
||||
):
|
||||
modelclass = (
|
||||
model.model.model_config.__class__.__name__ if model is not None and not isinstance(model, str) else model
|
||||
) or ""
|
||||
if modelclass == "":
|
||||
self.logger.warning("Model class is not provided. System variables might not be properly set.")
|
||||
if modelname == "":
|
||||
self.logger.warning("Modelname is not provided. System variables will not be properly set.")
|
||||
env_info = {
|
||||
"app": "comfyui",
|
||||
"models_path": folder_paths.models_dir,
|
||||
"model_filename": modelname or "", # path is relative to checkpoints folder
|
||||
"model_class": modelclass,
|
||||
"is_sd1": modelclass in ("SD15", "SD15_instructpix2pix"),
|
||||
"is_sd2": modelclass in ("SD20", "SD21UnclipL", "SD21UnclipH"),
|
||||
"is_sdxl": (
|
||||
modelclass in ("SDXL", "SDXLRefiner", "SDXL_instructpix2pix", "Segmind_Vega", "KOALA_700M", "KOALA_1B")
|
||||
),
|
||||
"is_ssd": modelclass in ("SSD1B",),
|
||||
"is_sd3": modelclass in ("SD3",),
|
||||
"is_flux": modelclass in ("Flux",),
|
||||
"is_auraflow": modelclass in ("AuraFlow",),
|
||||
}
|
||||
# SVD_img2vid, SVD3D_u, SVD3_p, Stable_Zero123, SD_X4Upscaler,
|
||||
# Stable_Cascade_C, Stable_Cascade_B, StableAudio
|
||||
|
||||
if wc_wildcards_folders == "":
|
||||
wc_wildcards_folders = ",".join(folder_paths.get_folder_paths("wildcards") or [])
|
||||
if wc_wildcards_folders == "":
|
||||
wc_wildcards_folders = os.getenv("WILDCARD_DIR", PPPWildcards.DEFAULT_WILDCARDS_FOLDER)
|
||||
wildcards_folders = [
|
||||
(f if os.path.isabs(f) else os.path.abspath(os.path.join(folder_paths.models_dir, f)))
|
||||
for f in wc_wildcards_folders.split(",")
|
||||
if f.strip() != ""
|
||||
]
|
||||
options = {
|
||||
"debug_level": debug_level,
|
||||
"pony_substrings": pony_substrings,
|
||||
"process_wildcards": wc_process_wildcards,
|
||||
"if_wildcards": wc_if_wildcards,
|
||||
"choice_separator": wc_choice_separator,
|
||||
"keep_choices_order": wc_keep_choices_order,
|
||||
"stn_separator": stn_separator,
|
||||
"stn_ignore_repeats": stn_ignore_repeats,
|
||||
"cleanup_extra_spaces": cleanup_extra_spaces,
|
||||
"cleanup_empty_constructs": cleanup_empty_constructs,
|
||||
"cleanup_extra_separators": cleanup_extra_separators,
|
||||
"cleanup_extra_separators2": cleanup_extra_separators2,
|
||||
"cleanup_breaks": cleanup_breaks,
|
||||
"cleanup_breaks_eol": cleanup_breaks_eol,
|
||||
"cleanup_ands": cleanup_ands,
|
||||
"cleanup_ands_eol": cleanup_ands_eol,
|
||||
"cleanup_extranetwork_tags": cleanup_extranetwork_tags,
|
||||
"cleanup_merge_attention": cleanup_merge_attention,
|
||||
"remove_extranetwork_tags": remove_extranetwork_tags,
|
||||
}
|
||||
self.wildcards_obj.refresh_wildcards(debug_level, wildcards_folders if options["process_wildcards"] else None)
|
||||
ppp = PromptPostProcessor(
|
||||
self.logger, self.interrupt, env_info, options, self.grammar_content, self.wildcards_obj
|
||||
)
|
||||
pos_prompt, neg_prompt = ppp.process_prompt(pos_prompt, neg_prompt, seed if seed is not None else 1)
|
||||
return (
|
||||
pos_prompt,
|
||||
neg_prompt,
|
||||
)
|
||||
|
||||
def interrupt(self):
|
||||
nodes.interrupt_processing(True)
|
||||
+11
-6
@@ -1,8 +1,15 @@
|
||||
from enum import Enum
|
||||
import logging
|
||||
import sys
|
||||
import copy
|
||||
|
||||
|
||||
class DEBUG_LEVEL(Enum):
|
||||
none = "none"
|
||||
minimal = "minimal"
|
||||
full = "full"
|
||||
|
||||
|
||||
class PromptPostProcessorLogFactory: # pylint: disable=too-few-public-methods
|
||||
"""
|
||||
Factory class for creating loggers for the PromptPostProcessor module.
|
||||
@@ -42,7 +49,7 @@ class PromptPostProcessorLogFactory: # pylint: disable=too-few-public-methods
|
||||
colored_record = copy.copy(record)
|
||||
levelname = colored_record.levelname
|
||||
seq = self.COLORS.get(levelname, self.COLORS["RESET"])
|
||||
colored_record.levelname = f"{seq}{levelname}{self.COLORS['RESET']}"
|
||||
colored_record.levelname = f"{seq}{levelname:8s}{self.COLORS['RESET']}"
|
||||
return super().format(colored_record)
|
||||
|
||||
def __init__(self):
|
||||
@@ -61,9 +68,9 @@ class PromptPostProcessorLogFactory: # pylint: disable=too-few-public-methods
|
||||
ppplog.propagate = False
|
||||
if not ppplog.handlers:
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
handler.setFormatter(self.ColoredFormatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s"))
|
||||
handler.setFormatter(self.ColoredFormatter("%(asctime)s %(levelname)s %(message)s")) # Used in A1111 / Forge / reForge / ComfyUI, but not in SD.Next
|
||||
ppplog.addHandler(handler)
|
||||
ppplog.setLevel(logging.INFO)
|
||||
ppplog.setLevel(logging.DEBUG)
|
||||
self.log = PromptPostProcessorLogCustomAdapter(ppplog)
|
||||
|
||||
|
||||
@@ -76,12 +83,10 @@ class PromptPostProcessorLogCustomAdapter(logging.LoggerAdapter):
|
||||
def process(self, msg, kwargs):
|
||||
"""
|
||||
Process the log message and keyword arguments.
|
||||
|
||||
Args:
|
||||
msg (str): The log message.
|
||||
kwargs (dict): The keyword arguments.
|
||||
|
||||
Returns:
|
||||
tuple: A tuple containing the processed log message and keyword arguments.
|
||||
"""
|
||||
return f"[PromptPostProcessor] {msg}", kwargs
|
||||
return f"[PPP] {msg}", kwargs
|
||||
|
||||
@@ -0,0 +1,398 @@
|
||||
import fnmatch
|
||||
import os
|
||||
import json
|
||||
from typing import Optional
|
||||
import logging
|
||||
import yaml
|
||||
|
||||
from ppp_logging import DEBUG_LEVEL
|
||||
|
||||
|
||||
def deep_freeze(obj):
|
||||
"""
|
||||
Deep freeze an object.
|
||||
|
||||
Args:
|
||||
obj (object): The object to freeze.
|
||||
|
||||
Returns:
|
||||
object: The frozen object.
|
||||
"""
|
||||
if isinstance(obj, dict):
|
||||
return tuple((k, deep_freeze(v)) for k, v in sorted(obj.items()))
|
||||
elif isinstance(obj, list):
|
||||
return tuple(deep_freeze(i) for i in obj)
|
||||
elif isinstance(obj, set):
|
||||
return tuple(deep_freeze(i) for i in sorted(obj))
|
||||
else:
|
||||
return obj
|
||||
|
||||
|
||||
class PPPWildcard:
|
||||
"""
|
||||
A wildcard object.
|
||||
|
||||
Attributes:
|
||||
key (str): The key of the wildcard.
|
||||
file (str): The path to the file where the wildcard is defined.
|
||||
unprocessed_choices (list[str]): The unprocessed choices of the wildcard.
|
||||
choices (list[dict]): The processed choices of the wildcard.
|
||||
options (dict): The options of the wildcard.
|
||||
"""
|
||||
|
||||
def __init__(self, fullpath: str, key: str, choices: list[str]):
|
||||
self.key: str = key
|
||||
self.file: str = fullpath
|
||||
self.unprocessed_choices: list[str] = choices
|
||||
self.choices: list[dict] = None
|
||||
self.options: dict = None
|
||||
|
||||
def __hash__(self) -> int:
|
||||
t = (self.key, deep_freeze(self.unprocessed_choices))
|
||||
return hash(t)
|
||||
|
||||
|
||||
class PPPWildcards:
|
||||
"""
|
||||
A class to manage wildcards.
|
||||
|
||||
Attributes:
|
||||
wildcards (dict[str, PPPWildcard]): The wildcards.
|
||||
"""
|
||||
|
||||
DEFAULT_WILDCARDS_FOLDER = "wildcards"
|
||||
|
||||
def __init__(self, logger):
|
||||
self.__logger: logging.Logger = logger
|
||||
self.__debug_level = DEBUG_LEVEL.none
|
||||
self.__wildcards_folders = []
|
||||
self.__wildcard_files = {}
|
||||
self.wildcards: dict[str, PPPWildcard] = {}
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(deep_freeze(self.wildcards))
|
||||
|
||||
def refresh_wildcards(self, debug_level: DEBUG_LEVEL, wildcards_folders: Optional[list[str]]):
|
||||
"""
|
||||
Initialize the wildcards.
|
||||
"""
|
||||
self.__debug_level = debug_level
|
||||
self.__wildcards_folders = wildcards_folders
|
||||
if wildcards_folders is not None:
|
||||
# if self.debug_level != DEBUG_LEVEL.none:
|
||||
# self.logger.info("Initializing wildcards...")
|
||||
# t1 = time.time()
|
||||
for fullpath in list(self.__wildcard_files.keys()):
|
||||
path = os.path.dirname(fullpath)
|
||||
if not os.path.exists(fullpath) or not any(
|
||||
os.path.commonpath([path, folder]) == folder for folder in self.__wildcards_folders
|
||||
):
|
||||
self.__remove_wildcards_from_file(fullpath)
|
||||
for f in self.__wildcards_folders:
|
||||
self.__get_wildcards_in_directory(f, f)
|
||||
# t2 = time.time()
|
||||
# if self.debug_level != DEBUG_LEVEL.none:
|
||||
# self.logger.info(f"Wildcards init time: {t2 - t1:.3f} seconds")
|
||||
else:
|
||||
self.__wildcards_folders = []
|
||||
self.wildcards = {}
|
||||
self.__wildcard_files = {}
|
||||
|
||||
def get_wildcards(self, key: str) -> list[PPPWildcard]:
|
||||
"""
|
||||
Get all wildcards that match a key.
|
||||
|
||||
Args:
|
||||
key (str): The key to match.
|
||||
|
||||
Returns:
|
||||
list: A list of all wildcards that match the key.
|
||||
"""
|
||||
keys = sorted(fnmatch.filter(self.wildcards.keys(), key))
|
||||
return [self.wildcards[k] for k in keys]
|
||||
|
||||
def __get_keys_in_dict(self, dictionary: dict, prefix="") -> list[str]:
|
||||
"""
|
||||
Get all keys in a dictionary.
|
||||
|
||||
Args:
|
||||
dictionary (dict): The dictionary to check.
|
||||
prefix (str): The prefix for the current key.
|
||||
|
||||
Returns:
|
||||
list: A list of all keys in the dictionary, including nested keys.
|
||||
"""
|
||||
keys = []
|
||||
for key in dictionary.keys():
|
||||
if isinstance(dictionary[key], dict):
|
||||
keys.extend(self.__get_keys_in_dict(dictionary[key], prefix + key + "/"))
|
||||
else:
|
||||
keys.append(prefix + str(key))
|
||||
return keys
|
||||
|
||||
def __get_nested(self, dictionary: dict, keys: str) -> object:
|
||||
"""
|
||||
Get a nested value from a dictionary.
|
||||
|
||||
Args:
|
||||
dictionary (dict): The dictionary to check.
|
||||
keys (str): The keys to get the value from.
|
||||
|
||||
Returns:
|
||||
object: The value of the nested keys in the dictionary.
|
||||
"""
|
||||
keys = keys.split("/")
|
||||
current_dict = dictionary
|
||||
for key in keys:
|
||||
current_dict = current_dict.get(key)
|
||||
if current_dict is None:
|
||||
return None
|
||||
return current_dict
|
||||
|
||||
def __remove_wildcards_from_file(self, full_path: str, debug=True):
|
||||
"""
|
||||
Clear all wildcards in a file.
|
||||
|
||||
Args:
|
||||
full_path (str): The path to the file.
|
||||
debug (bool): Whether to print debug messages or not.
|
||||
"""
|
||||
last_modified_cached = self.__wildcard_files.get(full_path, None)
|
||||
if debug and last_modified_cached is not None and self.__debug_level != DEBUG_LEVEL.none:
|
||||
self.__logger.debug(f"Removing wildcards from file: {full_path}")
|
||||
if full_path in self.__wildcard_files.keys():
|
||||
del self.__wildcard_files[full_path]
|
||||
for key in list(self.wildcards.keys()):
|
||||
if self.wildcards[key].file == full_path:
|
||||
del self.wildcards[key]
|
||||
|
||||
def __get_wildcards_in_file(self, base, full_path: str):
|
||||
"""
|
||||
Get all wildcards in a file.
|
||||
|
||||
Args:
|
||||
base (str): The base path for the wildcards.
|
||||
full_path (str): The path to the file.
|
||||
"""
|
||||
last_modified = os.path.getmtime(full_path)
|
||||
last_modified_cached = self.__wildcard_files.get(full_path, None)
|
||||
if last_modified_cached is not None and last_modified == self.__wildcard_files[full_path]:
|
||||
return
|
||||
filename = os.path.basename(full_path)
|
||||
_, extension = os.path.splitext(filename)
|
||||
if extension not in (".txt", ".json", ".yaml", ".yml"):
|
||||
return
|
||||
self.__remove_wildcards_from_file(full_path, False)
|
||||
if last_modified_cached is not None and self.__debug_level != DEBUG_LEVEL.none:
|
||||
self.__logger.debug(f"Updating wildcards from file: {full_path}")
|
||||
if extension == ".txt":
|
||||
self.__get_wildcards_in_text_file(full_path, base)
|
||||
elif extension in (".json", ".yaml", ".yml"):
|
||||
self.__get_wildcards_in_structured_file(full_path, base)
|
||||
self.__wildcard_files[full_path] = last_modified
|
||||
|
||||
def is_dict_choices_options(self, d: dict) -> bool:
|
||||
"""
|
||||
Check if a dictionary is a valid choices options dictionary.
|
||||
|
||||
Args:
|
||||
d (dict): The dictionary to check.
|
||||
|
||||
Returns:
|
||||
bool: Whether the dictionary is a valid choices options dictionary or not.
|
||||
"""
|
||||
return all(
|
||||
k in ["sampler", "repeating", "count", "from", "to", "prefix", "suffix", "separator"] for k in d.keys()
|
||||
)
|
||||
|
||||
def is_dict_choice_options(self, d: dict) -> bool:
|
||||
"""
|
||||
Check if a dictionary is a valid choice options dictionary.
|
||||
|
||||
Args:
|
||||
d (dict): The dictionary to check.
|
||||
|
||||
Returns:
|
||||
bool: Whether the dictionary is a valid choice options dictionary or not.
|
||||
"""
|
||||
return all(k in ["labels", "weight", "if", "content", "text"] for k in d.keys())
|
||||
|
||||
def __get_choices(self, obj: object, full_path: str, key_parts: list[str]) -> list:
|
||||
"""
|
||||
We process the choices in the object and return them as a list.
|
||||
|
||||
Args:
|
||||
obj (object): the value of a wildcard
|
||||
full_path (str): path to the file where the wildcard is defined
|
||||
key_parts (list[str]): parts of the key for the wildcard
|
||||
|
||||
Returns:
|
||||
list: list of choices
|
||||
"""
|
||||
choices = None
|
||||
if obj is not None:
|
||||
if isinstance(obj, (str, dict)):
|
||||
choices = [obj]
|
||||
elif isinstance(obj, (int, float, bool)):
|
||||
choices = [str(obj)]
|
||||
elif isinstance(obj, list) and len(obj) > 0:
|
||||
choices = []
|
||||
for i, c in enumerate(obj):
|
||||
invalid_choice = False
|
||||
if isinstance(c, str):
|
||||
choice = c
|
||||
elif isinstance(c, (int, float, bool)):
|
||||
choice = str(c)
|
||||
elif isinstance(c, list):
|
||||
# we create an anonymous wildcard
|
||||
choice = self.__create_anonymous_wildcard(full_path, key_parts, i, c)
|
||||
elif isinstance(c, dict):
|
||||
if self.is_dict_choices_options(c) or self.is_dict_choice_options(c):
|
||||
# we assume it is a choice or wildcard parameters in object format
|
||||
choice = c
|
||||
choice_content = choice.get("content", choice.get("text", None))
|
||||
if choice_content is not None and isinstance(choice_content, list):
|
||||
# we create an anonymous wildcard
|
||||
choice["content"] = self.__create_anonymous_wildcard(
|
||||
full_path, key_parts, i, choice_content
|
||||
)
|
||||
if "text" in choice:
|
||||
del choice["text"]
|
||||
elif len(c) == 1:
|
||||
# we assume it is an anonymous wildcard with options
|
||||
firstkey = list(c.keys())[0]
|
||||
choice = self.__create_anonymous_wildcard(full_path, key_parts, i, c[firstkey], firstkey)
|
||||
else:
|
||||
invalid_choice = True
|
||||
else:
|
||||
invalid_choice = True
|
||||
if invalid_choice:
|
||||
self.__logger.warning(
|
||||
f"Invalid choice {i+1} in wildcard '{'/'.join(key_parts)}' in file '{full_path}'!"
|
||||
)
|
||||
else:
|
||||
choices.append(choice)
|
||||
return choices
|
||||
|
||||
def __create_anonymous_wildcard(self, full_path, key_parts, i, content, options=None):
|
||||
"""
|
||||
Create an anonymous wildcard.
|
||||
|
||||
Args:
|
||||
full_path (str): The path to the file that contains it.
|
||||
key_parts (list[str]): The parts of the key.
|
||||
i (int): The index of the wildcard.
|
||||
content (object): The content of the wildcard.
|
||||
options (str): The options for the choice where the wildcard is defined.
|
||||
|
||||
Returns:
|
||||
str: The resulting value for the choice.
|
||||
"""
|
||||
new_parts = key_parts + [f"#ANON_{i}"]
|
||||
self.__add_wildcard(content, full_path, new_parts)
|
||||
value = f"__{'/'.join(new_parts)}__"
|
||||
if options is not None:
|
||||
value = f"{options}::{value}"
|
||||
return value
|
||||
|
||||
def __add_wildcard(self, content: object, full_path: str, external_key_parts: list[str]):
|
||||
"""
|
||||
Add a wildcard to the wildcards dictionary.
|
||||
|
||||
Args:
|
||||
content (object): The content of the wildcard.
|
||||
full_path (str): The path to the file that contains it.
|
||||
external_key_parts (list[str]): The parts of the key.
|
||||
"""
|
||||
key_parts = external_key_parts.copy()
|
||||
if isinstance(content, dict):
|
||||
key_parts.pop()
|
||||
keys = self.__get_keys_in_dict(content)
|
||||
for key in keys:
|
||||
tmp_key_parts = key_parts.copy()
|
||||
tmp_key_parts.extend(key.split("/"))
|
||||
fullkey = "/".join(tmp_key_parts)
|
||||
if self.wildcards.get(fullkey, None) is not None:
|
||||
self.__logger.warning(
|
||||
f"Duplicate wildcard '{fullkey}' in file '{full_path}' and '{self.wildcards[fullkey].file}'!"
|
||||
)
|
||||
else:
|
||||
obj = self.__get_nested(content, key)
|
||||
choices = self.__get_choices(obj, full_path, tmp_key_parts)
|
||||
if choices is None:
|
||||
self.__logger.warning(f"Invalid wildcard '{fullkey}' in file '{full_path}'!")
|
||||
else:
|
||||
self.wildcards[fullkey] = PPPWildcard(full_path, fullkey, choices)
|
||||
return
|
||||
if isinstance(content, str):
|
||||
content = [content]
|
||||
elif isinstance(content, (int, float, bool)):
|
||||
content = [str(content)]
|
||||
if not isinstance(content, list):
|
||||
self.__logger.warning(f"Invalid wildcard in file '{full_path}'!")
|
||||
return
|
||||
fullkey = "/".join(key_parts)
|
||||
if self.wildcards.get(fullkey, None) is not None:
|
||||
self.__logger.warning(
|
||||
f"Duplicate wildcard '{fullkey}' in file '{full_path}' and '{self.wildcards[fullkey].file}'!"
|
||||
)
|
||||
else:
|
||||
choices = self.__get_choices(content, full_path, key_parts)
|
||||
if choices is None:
|
||||
self.__logger.warning(f"Invalid wildcard '{fullkey}' in file '{full_path}'!")
|
||||
else:
|
||||
self.wildcards[fullkey] = PPPWildcard(full_path, fullkey, choices)
|
||||
|
||||
def __get_wildcards_in_structured_file(self, full_path, base):
|
||||
"""
|
||||
Get all wildcards in a structured file.
|
||||
|
||||
Args:
|
||||
full_path (str): The path to the file.
|
||||
base (str): The base path for the wildcards.
|
||||
"""
|
||||
external_key: str = os.path.relpath(os.path.splitext(full_path)[0], base)
|
||||
external_key_parts = external_key.split(os.sep)
|
||||
_, extension = os.path.splitext(full_path)
|
||||
with open(full_path, "r", encoding="utf-8") as file:
|
||||
if extension == ".json":
|
||||
content = json.loads(file.read())
|
||||
else:
|
||||
content = yaml.safe_load(file)
|
||||
self.__add_wildcard(content, full_path, external_key_parts)
|
||||
|
||||
def __get_wildcards_in_text_file(self, full_path, base):
|
||||
"""
|
||||
Get all wildcards in a text file.
|
||||
|
||||
Args:
|
||||
full_path (str): The path to the file.
|
||||
base (str): The base path for the wildcards.
|
||||
"""
|
||||
external_key: str = os.path.relpath(os.path.splitext(full_path)[0], base)
|
||||
external_key_parts = external_key.split(os.sep)
|
||||
with open(full_path, "r", encoding="utf-8") as file:
|
||||
text_content = map(lambda x: x.strip("\n\r"), file.readlines())
|
||||
text_content = list(filter(lambda x: x.strip() != "" and not x.strip().startswith("#"), text_content))
|
||||
text_content = [x.split("#")[0].rstrip() if len(x.split("#")) > 1 else x for x in text_content]
|
||||
self.__add_wildcard(text_content, full_path, external_key_parts)
|
||||
|
||||
def __get_wildcards_in_directory(self, base: str, directory: str):
|
||||
"""
|
||||
Get all wildcards in a directory.
|
||||
|
||||
Args:
|
||||
base (str): The base path for the wildcards.
|
||||
directory (str): The path to the directory.
|
||||
"""
|
||||
if not os.path.exists(directory):
|
||||
self.__logger.warning(f"Wildcard directory '{directory}' does not exist!")
|
||||
return
|
||||
for filename in os.listdir(directory):
|
||||
full_path = os.path.abspath(os.path.join(directory, filename))
|
||||
if os.path.basename(full_path).startswith("."):
|
||||
continue
|
||||
if os.path.isdir(full_path):
|
||||
self.__get_wildcards_in_directory(base, full_path)
|
||||
elif os.path.isfile(full_path):
|
||||
self.__get_wildcards_in_file(base, full_path)
|
||||
@@ -0,0 +1,15 @@
|
||||
[project]
|
||||
name = "sd-webui-prompt-postprocessor"
|
||||
description = "Stable Diffusion WebUI & ComfyUI extension to post-process the prompt, including sending content from the prompt to the negative prompt and wildcards."
|
||||
version = "2.8.1"
|
||||
license = {file = "LICENSE.txt"}
|
||||
dependencies = ["lark"]
|
||||
|
||||
[project.urls]
|
||||
Repository = "https://github.com/acorderob/sd-webui-prompt-postprocessor"
|
||||
# Used by Comfy Registry https://comfyregistry.org
|
||||
|
||||
[tool.comfy]
|
||||
PublisherId = "acorderob"
|
||||
DisplayName = "sd-webui-prompt-postprocessor"
|
||||
Icon = ""
|
||||
@@ -0,0 +1,3 @@
|
||||
lark
|
||||
numpy
|
||||
pyyaml
|
||||
+495
-194
@@ -3,19 +3,24 @@ if __name__ == "__main__":
|
||||
|
||||
import sys
|
||||
import os
|
||||
import time
|
||||
import numpy as np
|
||||
|
||||
sys.path.insert(1, os.path.join(sys.path[0], ".."))
|
||||
sys.path.append(os.path.join(sys.path[0], ".."))
|
||||
|
||||
|
||||
from modules import scripts, shared, script_callbacks
|
||||
from modules.processing import StableDiffusionProcessing
|
||||
from modules.shared import opts
|
||||
from modules.paths import models_path
|
||||
import gradio as gr
|
||||
from ppp import PromptPostProcessor
|
||||
from ppp_logging import PromptPostProcessorLogFactory
|
||||
from ppp_logging import DEBUG_LEVEL, PromptPostProcessorLogFactory
|
||||
from ppp_cache import PPPLRUCache
|
||||
from ppp_wildcards import PPPWildcards
|
||||
|
||||
|
||||
class PromptPostProcessorScript(scripts.Script):
|
||||
class PromptPostProcessorA1111Script(scripts.Script):
|
||||
"""
|
||||
This class represents a script for prompt post-processing.
|
||||
It is responsible for processing prompts and applying various settings and cleanup operations.
|
||||
@@ -28,6 +33,7 @@ class PromptPostProcessorScript(scripts.Script):
|
||||
title(): Returns the title of the script.
|
||||
show(is_img2img): Determines whether the script should be shown based on the input type.
|
||||
process(p, *args, **kwargs): Processes the prompts and applies post-processing operations.
|
||||
ppp_interrupt(): Interrupts the generation.
|
||||
__on_ui_settings(): Callback function for UI settings.
|
||||
"""
|
||||
|
||||
@@ -43,12 +49,16 @@ class PromptPostProcessorScript(scripts.Script):
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
if not hasattr(self, "ppp_callbacks_added"):
|
||||
lf = PromptPostProcessorLogFactory()
|
||||
self.ppp_logger = lf.log
|
||||
self.ppp_debug = getattr(opts, "ppp_gen_debug", False) if opts is not None else False
|
||||
script_callbacks.on_ui_settings(self.__on_ui_settings)
|
||||
self.ppp_callbacks_added = True
|
||||
lf = PromptPostProcessorLogFactory()
|
||||
self.name = PromptPostProcessor.NAME
|
||||
self.ppp_logger = lf.log
|
||||
self.ppp_debug_level = DEBUG_LEVEL(getattr(opts, "ppp_gen_debug_level", DEBUG_LEVEL.none.value))
|
||||
self.lru_cache = PPPLRUCache(1000)
|
||||
grammar_filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../grammar.lark")
|
||||
with open(grammar_filename, "r", encoding="utf-8") as file:
|
||||
self.grammar_content = file.read()
|
||||
self.wildcards_obj = PPPWildcards(lf.log)
|
||||
self.ppp_logger.info(f"{PromptPostProcessor.NAME} {PromptPostProcessor.VERSION} initialized")
|
||||
|
||||
def title(self):
|
||||
"""
|
||||
@@ -71,7 +81,48 @@ class PromptPostProcessorScript(scripts.Script):
|
||||
"""
|
||||
return scripts.AlwaysVisible
|
||||
|
||||
def process(self, p: StableDiffusionProcessing, *args, **kwargs): # pylint: disable=unused-argument
|
||||
def ui(self, is_img2img):
|
||||
with gr.Accordion(PromptPostProcessor.NAME, open=False):
|
||||
force_equal_seeds = gr.Checkbox(
|
||||
label="Force equal seeds",
|
||||
info="Force all image seeds and variation seeds to be equal to the first one, disabling the default autoincrease.",
|
||||
default=False,
|
||||
# show_label=True,
|
||||
elem_id="ppp_force_equal_seeds",
|
||||
)
|
||||
gr.HTML(
|
||||
"""<br><div>Unlink the seed to use the specified one for the prompts instead of the image seed.
|
||||
This seed will only change for each image in the batch if the value is -1 or 'variable seed' is checked.</div>
|
||||
<div>Seeds are only used for the wildcards and choice constructs.</div>"""
|
||||
)
|
||||
unlink_seed = gr.Checkbox(
|
||||
label="Unlink seed",
|
||||
default=False,
|
||||
# show_label=True,
|
||||
elem_id="ppp_unlink_seed",
|
||||
)
|
||||
seed = gr.Number(
|
||||
label="Seed",
|
||||
default=-1,
|
||||
precision=0,
|
||||
# minimum=-1,
|
||||
# maximum=2**32 - 1,
|
||||
# step=1,
|
||||
# show_label=True,
|
||||
min_width=100,
|
||||
elem_id="ppp_seed",
|
||||
)
|
||||
variable_seed = gr.Checkbox(
|
||||
label="Variable seed",
|
||||
default=False,
|
||||
# show_label=True,
|
||||
elem_id="ppp_variable_seed",
|
||||
)
|
||||
return [force_equal_seeds, unlink_seed, seed, variable_seed]
|
||||
|
||||
def process(
|
||||
self, p: StableDiffusionProcessing, input_force_equal_seeds, input_unlink_seed, input_seed, input_variable_seed
|
||||
): # pylint: disable=arguments-differ
|
||||
"""
|
||||
Processes the prompts and applies post-processing operations.
|
||||
|
||||
@@ -81,29 +132,184 @@ class PromptPostProcessorScript(scripts.Script):
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
is_i2i = getattr(p, "init_images", [None])[0] is not None
|
||||
self.ppp_debug = getattr(opts, "ppp_gen_debug", False) if opts is not None else False
|
||||
if self.ppp_debug:
|
||||
self.ppp_logger.info(f"Post-processing prompts ({'i2i' if is_i2i else 't2i'} mode)")
|
||||
ppp = PromptPostProcessor(self, p, shared.state, opts, is_i2i)
|
||||
# processes regular prompts
|
||||
if (
|
||||
hasattr(p, "all_prompts")
|
||||
and p.all_prompts is not None
|
||||
and hasattr(p, "all_negative_prompts")
|
||||
and p.all_negative_prompts is not None
|
||||
):
|
||||
for i, (prompt, negative_prompt) in enumerate(zip(p.all_prompts, p.all_negative_prompts)):
|
||||
p.all_prompts[i], p.all_negative_prompts[i] = ppp.process_prompt(prompt, negative_prompt)
|
||||
t1 = time.time()
|
||||
if getattr(opts, "prompt_attention", "") == "Compel parser":
|
||||
self.ppp_logger.warning("Compel parser is not supported!")
|
||||
init_images = getattr(p, "init_images", [None]) or [None]
|
||||
is_i2i = bool(init_images[0])
|
||||
self.ppp_debug_level = DEBUG_LEVEL(getattr(opts, "ppp_gen_debug_level", DEBUG_LEVEL.none.value))
|
||||
do_i2i = getattr(opts, "ppp_gen_doi2i", False)
|
||||
if is_i2i and not do_i2i:
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info("Not processing the prompt for i2i")
|
||||
return
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info(f"Post-processing prompts ({'i2i' if is_i2i else 't2i'})")
|
||||
app = (
|
||||
"forge"
|
||||
if hasattr(p.sd_model, "model_config")
|
||||
else "sdnext" if hasattr(p.sd_model, "is_sdxl") and not hasattr(p.sd_model, "is_ssd") else "a1111"
|
||||
)
|
||||
env_info = {
|
||||
"app": app,
|
||||
"models_path": models_path,
|
||||
"model_filename": getattr(p.sd_model.sd_checkpoint_info, "filename", ""),
|
||||
"model_class": "",
|
||||
"is_sd1": False, # Stable Diffusion 1
|
||||
"is_sd2": False, # Stable Diffusion 2
|
||||
"is_sdxl": False, # Stable Diffusion XL
|
||||
"is_ssd": False, # Segmind Stable Diffusion 1B
|
||||
"is_sd3": False, # Stable Diffusion 3
|
||||
"is_flux": False, # Flux
|
||||
"is_auraflow": False, # AuraFlow
|
||||
}
|
||||
if app == "sdnext":
|
||||
# cannot differentiate SD1 and SD2, we set True to both
|
||||
# LatentDiffusion is for the original backend, StableDiffusionPipeline is for the diffusers backend
|
||||
env_info["model_class"] = p.sd_model.__class__.__name__
|
||||
env_info["is_sd1"] = p.sd_model.__class__.__name__ in ("LatentDiffusion", "StableDiffusionPipeline")
|
||||
env_info["is_sd2"] = p.sd_model.__class__.__name__ in ("LatentDiffusion", "StableDiffusionPipeline")
|
||||
env_info["is_sdxl"] = p.sd_model.__class__.__name__ == "StableDiffusionXLPipeline"
|
||||
env_info["is_ssd"] = False # ?
|
||||
env_info["is_sd3"] = p.sd_model.__class__.__name__ == "StableDiffusion3Pipeline"
|
||||
env_info["is_flux"] = p.sd_model.__class__.__name__ == "FluxPipeline"
|
||||
env_info["is_auraflow"] = p.sd_model.__class__.__name__ == "AuraFlowPipeline"
|
||||
elif app == "forge":
|
||||
env_info["model_class"] = p.sd_model.model_config.__class__.__name__
|
||||
env_info["is_sd1"] = getattr(p.sd_model, "is_sd1", False)
|
||||
env_info["is_sd2"] = getattr(p.sd_model, "is_sd2", False)
|
||||
env_info["is_sdxl"] = getattr(p.sd_model, "is_sdxl", False)
|
||||
env_info["is_ssd"] = False # ?
|
||||
env_info["is_sd3"] = getattr(p.sd_model, "is_sd3", False)
|
||||
env_info["is_flux"] = p.sd_model.model_config.__class__.__name__ == "Flux"
|
||||
env_info["is_auraflow"] = False # p.sd_model.model_config.__class__.__name__ == "AuraFlow"
|
||||
else: # assume A1111 compatible (p.sd_model.__class__.__name__=="DiffusionEngine")
|
||||
env_info["model_class"] = p.sd_model.__class__.__name__
|
||||
env_info["is_sd1"] = getattr(p.sd_model, "is_sd1", False)
|
||||
env_info["is_sd2"] = getattr(p.sd_model, "is_sd2", False)
|
||||
env_info["is_sdxl"] = getattr(p.sd_model, "is_sdxl", False)
|
||||
env_info["is_ssd"] = getattr(p.sd_model, "is_ssd", False)
|
||||
env_info["is_sd3"] = getattr(p.sd_model, "is_sd3", False)
|
||||
env_info["is_flux"] = False
|
||||
env_info["is_auraflow"] = False
|
||||
wc_wildcards_folders = getattr(opts, "ppp_wil_wildcardsfolders", "")
|
||||
if wc_wildcards_folders == "":
|
||||
wc_wildcards_folders = os.getenv("WILDCARD_DIR", PPPWildcards.DEFAULT_WILDCARDS_FOLDER)
|
||||
wildcards_folders = [
|
||||
(f if os.path.isabs(f) else os.path.abspath(os.path.join(models_path, f)))
|
||||
for f in wc_wildcards_folders.split(",")
|
||||
if f.strip() != ""
|
||||
]
|
||||
options = {
|
||||
"debug_level": getattr(opts, "ppp_gen_debug_level", DEBUG_LEVEL.none.value),
|
||||
"pony_substrings": getattr(opts, "ppp_gen_ponysubstrings", PromptPostProcessor.DEFAULT_PONY_SUBSTRINGS),
|
||||
"process_wildcards": getattr(opts, "ppp_wil_processwildcards", True),
|
||||
"if_wildcards": getattr(opts, "ppp_wil_ifwildcards", PromptPostProcessor.IFWILDCARDS_CHOICES.ignore.value),
|
||||
"choice_separator": getattr(opts, "ppp_wil_choice_separator", PromptPostProcessor.DEFAULT_CHOICE_SEPARATOR),
|
||||
"keep_choices_order": getattr(opts, "ppp_wil_keep_choices_order", False),
|
||||
"stn_separator": getattr(opts, "ppp_stn_separator", PromptPostProcessor.DEFAULT_STN_SEPARATOR),
|
||||
"stn_ignore_repeats": getattr(opts, "ppp_stn_ignorerepeats", True),
|
||||
"cleanup_extra_spaces": getattr(opts, "ppp_cup_extraspaces", True),
|
||||
"cleanup_empty_constructs": getattr(opts, "ppp_cup_emptyconstructs", True),
|
||||
"cleanup_extra_separators": getattr(opts, "ppp_cup_extraseparators", True),
|
||||
"cleanup_extra_separators2": getattr(opts, "ppp_cup_extraseparators2", True),
|
||||
"cleanup_breaks": getattr(opts, "ppp_cup_breaks", True),
|
||||
"cleanup_breaks_eol": getattr(opts, "ppp_cup_breaks_eol", False),
|
||||
"cleanup_ands": getattr(opts, "ppp_cup_ands", True),
|
||||
"cleanup_ands_eol": getattr(opts, "ppp_cup_ands_eol", False),
|
||||
"cleanup_extranetwork_tags": getattr(opts, "ppp_cup_extranetworktags", False),
|
||||
"cleanup_merge_attention": getattr(opts, "ppp_cup_mergeattention", True),
|
||||
"remove_extranetwork_tags": getattr(opts, "ppp_rem_removeextranetworktags", False),
|
||||
}
|
||||
self.wildcards_obj.refresh_wildcards(
|
||||
self.ppp_debug_level, wildcards_folders if options["process_wildcards"] else None
|
||||
)
|
||||
ppp = PromptPostProcessor(
|
||||
self.ppp_logger, self.ppp_interrupt, env_info, options, self.grammar_content, self.wildcards_obj
|
||||
)
|
||||
prompts_list = []
|
||||
|
||||
if input_force_equal_seeds:
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info("Forcing equal seeds")
|
||||
seeds = getattr(p, "all_seeds", [])
|
||||
subseeds = getattr(p, "all_subseeds", [])
|
||||
p.all_seeds = [seeds[0] for _ in seeds]
|
||||
p.all_subseeds = [subseeds[0] for _ in subseeds]
|
||||
|
||||
if input_unlink_seed:
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info("Using unlinked seed")
|
||||
num_seeds = len(getattr(p, "all_seeds", []))
|
||||
if input_seed == -1:
|
||||
calculated_seeds = np.random.randint(0, 2**32, size=num_seeds, dtype=np.int64)
|
||||
elif input_variable_seed:
|
||||
calculated_seeds = [input_seed + i for i in range(num_seeds)]
|
||||
else:
|
||||
calculated_seeds = [input_seed for _ in range(num_seeds)]
|
||||
else:
|
||||
seeds = getattr(p, "all_seeds", [])
|
||||
subseeds = getattr(p, "all_subseeds", [])
|
||||
subseed_strength = getattr(p, "subseed_strength", 0.0)
|
||||
if subseed_strength > 0:
|
||||
calculated_seeds = [
|
||||
int(subseed * subseed_strength + seed * (1 - subseed_strength))
|
||||
for seed, subseed in zip(seeds, subseeds)
|
||||
]
|
||||
# if len(set(calculated_seeds)) < len(calculated_seeds):
|
||||
# self.ppp_logger.info("Adjusting seeds because some are equal.")
|
||||
# calculated_seeds = [seed + i for i, seed in enumerate(calculated_seeds)]
|
||||
else:
|
||||
calculated_seeds = seeds
|
||||
|
||||
# adds regular prompts
|
||||
rpr = getattr(p, "all_prompts", None)
|
||||
rnr = getattr(p, "all_negative_prompts", None)
|
||||
if rpr is not None and rnr is not None:
|
||||
prompts_list += [
|
||||
("regular", seed, prompt, negative_prompt)
|
||||
for seed, prompt, negative_prompt in zip(calculated_seeds, rpr, rnr)
|
||||
if (seed, prompt, negative_prompt) not in prompts_list
|
||||
]
|
||||
# make it compatible with A1111 hires fix
|
||||
if (
|
||||
hasattr(p, "all_hr_prompts")
|
||||
and p.all_hr_prompts is not None
|
||||
and hasattr(p, "all_hr_negative_prompts")
|
||||
and p.all_hr_negative_prompts is not None
|
||||
):
|
||||
for i, (hr_prompt, hr_negative_prompt) in enumerate(zip(p.all_hr_prompts, p.all_hr_negative_prompts)):
|
||||
p.all_hr_prompts[i], p.all_hr_negative_prompts[i] = ppp.process_prompt(hr_prompt, hr_negative_prompt)
|
||||
rph = getattr(p, "all_hr_prompts", None)
|
||||
rnh = getattr(p, "all_hr_negative_prompts", None)
|
||||
if rph is not None and rnh is not None:
|
||||
prompts_list += [
|
||||
("hiresfix", seed, prompt, negative_prompt)
|
||||
for seed, prompt, negative_prompt in zip(calculated_seeds, rph, rnh)
|
||||
if (seed, prompt, negative_prompt) not in prompts_list
|
||||
]
|
||||
|
||||
# processes prompts
|
||||
for i, (prompttype, seed, prompt, negative_prompt) in enumerate(prompts_list):
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info(f"processing prompts[{i+1}] ({prompttype})")
|
||||
if self.lru_cache.get((seed, hash(self.wildcards_obj), prompt, negative_prompt)) is None:
|
||||
posp, negp = ppp.process_prompt(prompt, negative_prompt, seed)
|
||||
self.lru_cache.put((seed, hash(self.wildcards_obj), prompt, negative_prompt), (posp, negp))
|
||||
# adds also the result so i2i doesn't process it unnecessarily
|
||||
self.lru_cache.put((seed, hash(self.wildcards_obj), posp, negp), (posp, negp))
|
||||
elif self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info("result already in cache")
|
||||
|
||||
# updates the prompts
|
||||
if rpr is not None and rnr is not None:
|
||||
for i, (seed, prompt, negative_prompt) in enumerate(zip(calculated_seeds, rpr, rnr)):
|
||||
found = self.lru_cache.get((seed, hash(self.wildcards_obj), prompt, negative_prompt))
|
||||
if found is not None:
|
||||
rpr[i] = found[0]
|
||||
rnr[i] = found[1]
|
||||
if rph is not None and rnh is not None:
|
||||
for i, (seed, prompt, negative_prompt) in enumerate(zip(calculated_seeds, rph, rnh)):
|
||||
found = self.lru_cache.get((seed, hash(self.wildcards_obj), prompt, negative_prompt))
|
||||
if found is not None:
|
||||
rph[i] = found[0]
|
||||
rnh[i] = found[1]
|
||||
|
||||
t2 = time.time()
|
||||
if self.ppp_debug_level != DEBUG_LEVEL.none:
|
||||
self.ppp_logger.info(f"process time: {t2 - t1:.3f} seconds")
|
||||
|
||||
def ppp_interrupt(self):
|
||||
"""
|
||||
@@ -114,171 +320,266 @@ class PromptPostProcessorScript(scripts.Script):
|
||||
"""
|
||||
shared.state.interrupted = True
|
||||
|
||||
def __on_ui_settings(self):
|
||||
"""
|
||||
Callback function for UI settings.
|
||||
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
# general settings
|
||||
section = ("prompt-post-processor", PromptPostProcessor.NAME)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_sep", info=shared.OptionInfo("<h2>General settings</h2>", "", gr.HTML, section=section)
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_debug",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Debug",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_ifwildcards",
|
||||
info=shared.OptionInfo(
|
||||
default=PromptPostProcessor.IFWILDCARDS_CHOICES["ignore"],
|
||||
label="What to do with remaining wildcards?",
|
||||
component=gr.Radio,
|
||||
component_args={"choices": PromptPostProcessor.IFWILDCARDS_CHOICES.values()},
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
def on_ui_settings():
|
||||
"""
|
||||
Callback function for UI settings.
|
||||
|
||||
# content removal settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_rem_sep", info=shared.OptionInfo("<br/><h2>Content removal settings</h2>", "", gr.HTML, section=section)
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_rem_removeextranetworktags",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Remove extra network tags",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_rem_if", info=shared.OptionInfo("<p style=\"font-style:italic\">* Parsing of the 'if' commands cannot be disabled</p>", "", gr.HTML, section=section)
|
||||
)
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
|
||||
# send to negative settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_sep",
|
||||
info=shared.OptionInfo("<br/><h2>Send to Negative settings</h2>", "", gr.HTML, section=section),
|
||||
section = ("prompt-post-processor", PromptPostProcessor.NAME)
|
||||
|
||||
def import_old_settings(names, default):
|
||||
for name in names:
|
||||
if hasattr(opts, name):
|
||||
return getattr(opts, name)
|
||||
return default
|
||||
|
||||
def import_bool_to_any(name, value_false, value_true, default):
|
||||
if hasattr(opts, name):
|
||||
return value_true if getattr(opts, name) else value_false
|
||||
return default
|
||||
|
||||
def new_html_title(title):
|
||||
info = shared.OptionInfo(
|
||||
title,
|
||||
"",
|
||||
gr.HTML,
|
||||
section=section,
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_doi2i",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Apply in img2img (this includes any pass that contains an initial image, like refiner, hires fix, adetailer)",
|
||||
section=section,
|
||||
info.do_not_save = True
|
||||
return info
|
||||
|
||||
# general settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_sep",
|
||||
info=new_html_title("<h2>General settings</h2>"),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_debug_level",
|
||||
info=shared.OptionInfo(
|
||||
default=import_bool_to_any(
|
||||
"ppp_gen_debug",
|
||||
DEBUG_LEVEL.minimal.value,
|
||||
DEBUG_LEVEL.full.value,
|
||||
DEBUG_LEVEL.minimal.value,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_separator",
|
||||
info=shared.OptionInfo(
|
||||
PromptPostProcessor.DEFAULT_STN_SEPARATOR,
|
||||
label="Separator used when adding to the negative prompt",
|
||||
section=section,
|
||||
label="Debug level",
|
||||
component=gr.Radio,
|
||||
component_args={
|
||||
"choices": (
|
||||
("None", DEBUG_LEVEL.none.value),
|
||||
("Minimal", DEBUG_LEVEL.minimal.value),
|
||||
("Full", DEBUG_LEVEL.full.value),
|
||||
),
|
||||
},
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_ponysubstrings",
|
||||
info=shared.OptionInfo(
|
||||
PromptPostProcessor.DEFAULT_PONY_SUBSTRINGS,
|
||||
label="Comma separated list of substrings to look for in the model full filename to flag it as Pony (case insensitive)",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_gen_doi2i",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Apply in img2img",
|
||||
comment_after='<span class="info">(this includes any pass that contains an initial image, like adetailer)</span>',
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
|
||||
# wildcard settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_sep",
|
||||
info=new_html_title("<br><h2>Wildcard settings</h2>"),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_processwildcards",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Process wildcards",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_wildcardsfolders",
|
||||
info=shared.OptionInfo(
|
||||
PPPWildcards.DEFAULT_WILDCARDS_FOLDER,
|
||||
label="Wildcards folders",
|
||||
comment_after='<span class="info">(absolute or relative to the models folder)</span>',
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_ifwildcards",
|
||||
info=shared.OptionInfo(
|
||||
default=import_old_settings(
|
||||
["ppp_gen_ifwildcards", "ppp_ifwildcards"],
|
||||
PromptPostProcessor.IFWILDCARDS_CHOICES.ignore.value,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_ignorerepeats",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Ignore repeated content",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_joinattention",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Join attention modifiers (weights) when possible",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
# clean-up settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_sep", info=shared.OptionInfo("<br/><h2>Clean-up settings</h2>", "", gr.HTML, section=section)
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_doi2i",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Apply in img2img (this includes any pass that contains an initial image, like refiner, hires fix, adetailer)",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_emptyconstructs",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove empty constructs (attention, alternation, scheduling)",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraseparators",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove extra separators",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraseparators2",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove additional extra separators",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_breaks",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Clean up around BREAKs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_breaks_eol",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Use EOL instead of Space before BREAKs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_ands",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Clean up around ANDs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_ands_eol",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Use EOL instead of Space before ANDs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extranetworktags",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Clean up around extra network tags",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraspaces",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove extra spaces",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
label="What to do with remaining/invalid wildcards?",
|
||||
component=gr.Radio,
|
||||
component_args={
|
||||
"choices": (
|
||||
("Ignore", PromptPostProcessor.IFWILDCARDS_CHOICES.ignore.value),
|
||||
("Remove", PromptPostProcessor.IFWILDCARDS_CHOICES.remove.value),
|
||||
("Add visible warning", PromptPostProcessor.IFWILDCARDS_CHOICES.warn.value),
|
||||
("Stop the generation", PromptPostProcessor.IFWILDCARDS_CHOICES.stop.value),
|
||||
)
|
||||
},
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_choice_separator",
|
||||
info=shared.OptionInfo(
|
||||
PromptPostProcessor.DEFAULT_CHOICE_SEPARATOR,
|
||||
label="Default separator used when adding multiple choices",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_wil_keep_choices_order",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Keep the order of selected choices",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
|
||||
# content removal settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_rem_sep",
|
||||
info=new_html_title("<br><h2>Content removal settings</h2>"),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_rem_removeextranetworktags",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Remove extra network tags",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
|
||||
# send to negative settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_sep",
|
||||
info=new_html_title("<br><h2>Send to Negative settings</h2>"),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_separator",
|
||||
info=shared.OptionInfo(
|
||||
PromptPostProcessor.DEFAULT_STN_SEPARATOR,
|
||||
label="Separator used when adding to the negative prompt",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_stn_ignorerepeats",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Ignore repeated content",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
# clean-up settings
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_sep",
|
||||
info=new_html_title("<br><h2>Clean-up settings</h2>"),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_emptyconstructs",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove empty constructs (attention, alternation, scheduling)",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraseparators",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove extra separators",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraseparators2",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove additional extra separators",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_breaks",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Clean up around BREAKs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_breaks_eol",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Use EOL instead of Space before BREAKs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_ands",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Clean up around ANDs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_ands_eol",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Use EOL instead of Space before ANDs",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extranetworktags",
|
||||
info=shared.OptionInfo(
|
||||
False,
|
||||
label="Clean up around extra network tags",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_extraspaces",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Remove extra spaces",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
shared.opts.add_option(
|
||||
key="ppp_cup_mergeattention",
|
||||
info=shared.OptionInfo(
|
||||
True,
|
||||
label="Merge attention modifiers (weights) when possible",
|
||||
section=section,
|
||||
),
|
||||
)
|
||||
|
||||
# Remove old settings
|
||||
# for name in ["ppp_gen_ifwildcards", "ppp_ifwildcards", "ppp_gen_debug", "ppp_stn_doi2i", "ppp_cup_doi2i"]:
|
||||
# if hasattr(opts, name):
|
||||
# delattr(opts, name)
|
||||
|
||||
|
||||
script_callbacks.on_ui_settings(on_ui_settings)
|
||||
|
||||
+779
-281
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"json": {
|
||||
"wildcard1": [
|
||||
"choice1",
|
||||
"choice2",
|
||||
"choice3"
|
||||
],
|
||||
"wildcard2": [
|
||||
"r2-3$$-",
|
||||
"4::choice1",
|
||||
"3:: choice2 ",
|
||||
"2::choice3",
|
||||
"5 if _is_sd1::choice4"
|
||||
],
|
||||
"wildcard3": [
|
||||
"__2$$,$$json/wildcard2__"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
yaml:
|
||||
wildcard1:
|
||||
- choice1
|
||||
- choice2
|
||||
- choice3
|
||||
|
||||
wildcard2:
|
||||
- ~r2-3$$-
|
||||
- "'label1,label2'4::choice1"
|
||||
- "3:: choice2 "
|
||||
- { labels: ["label1", "label3"], weight: 2, content: choice3 }
|
||||
- 5 if _is_sd1::choice4
|
||||
|
||||
wildcard2bis:
|
||||
- __1$$yaml/wildcard2'^yaml/wildcard2bis'__bis
|
||||
|
||||
wildcard2bisbis:
|
||||
- __1$$yaml/wildcard2bis'#^yaml/wildcard2bisbis'__bis
|
||||
|
||||
wildcard3:
|
||||
- __2$$,$$yaml/wildcard2__
|
||||
|
||||
wildcard4: inline text
|
||||
|
||||
wildcard5: inline ${var:default}
|
||||
|
||||
wildcard6:
|
||||
- { weight: 2, text: choice1 }
|
||||
- { weight: 3, content: choice2 }
|
||||
- { text: choice3 }
|
||||
- { weight: 4, if: _is_ssd, text: choice4 }
|
||||
|
||||
wildcard7:
|
||||
- <lora:test1:1>
|
||||
- <lora:test2:1>
|
||||
- <lora:test3:1>
|
||||
|
||||
wildcardPS:
|
||||
- {
|
||||
sampler: "~",
|
||||
repeating: false,
|
||||
count: 2,
|
||||
prefix: "prefix-",
|
||||
suffix: "-suffix",
|
||||
separator: "/",
|
||||
}
|
||||
- { weight: 3, text: choice1 }
|
||||
- { weight: 2, text: choice2 }
|
||||
- { weight: 1, text: choice3 }
|
||||
|
||||
more_nested:
|
||||
even_more_nested: # this would be __yaml/more_nested/even_more_nested__
|
||||
- one
|
||||
- two
|
||||
|
||||
anonwildcards:
|
||||
- one
|
||||
- two
|
||||
- # choice without options and anonymous wildcard
|
||||
- three
|
||||
- four
|
||||
- 3 if _is_sdxl: # choice with options and anonymous wildcard
|
||||
- five
|
||||
- six
|
||||
- { weight: 1, text: [seven, eight] } # anonymous wildcard used in a choice in object format
|
||||
- # choice without options and anonymous wildcard with parameters
|
||||
- { count: 2, prefix: "#" }
|
||||
- nine
|
||||
- ten
|
||||
@@ -0,0 +1,3 @@
|
||||
- one
|
||||
- 2
|
||||
- three
|
||||
@@ -0,0 +1 @@
|
||||
one choice
|
||||
@@ -0,0 +1,4 @@
|
||||
# wildcard1
|
||||
choice1
|
||||
choice2
|
||||
choice3
|
||||
@@ -0,0 +1,6 @@
|
||||
# wildcard2
|
||||
r2-3$$-
|
||||
4::choice1
|
||||
3:: choice2
|
||||
2::choice3
|
||||
5 if _is_sd1::choice4
|
||||
@@ -0,0 +1,2 @@
|
||||
# wildcard3
|
||||
__2$$,$$text/wildcard2__
|
||||
Reference in New Issue
Block a user