Skip to content

Updated fork - #39

Open
uorufu wants to merge 59 commits into
AUTOMATIC1111:masterfrom
uorufu:master
Open

Updated fork#39
uorufu wants to merge 59 commits into
AUTOMATIC1111:masterfrom
uorufu:master

Conversation

@uorufu

@uorufu uorufu commented Apr 5, 2024

Copy link
Copy Markdown

Check out my fork.
It works great with adetailer and has some added functionality.

Ps: I started programming a couple of days ago when I decided to make something work for what I needed. Someone more experienced might want to look over the code. I am sure it is a mess.

It works great though.

uorufu and others added 17 commits April 1, 2024 16:30
Personal fork to work better with Adetailer.
bugfixes / cleaning code
Updated random method to be way better. Increased wildcard tiers to 20 ( `` `__0_textfile__  --->  __19_textfile__` ``
Brought back seed locking option in settings, working with adetailer now.
Keep same seed option had a bug where turning the setting off wouldn't work until a full reload.
Massive update.
Added iterative wildcards
Fixed some issues
Also added the ability to use wildcards the old way.
(Although I recommend using tiered wildcards.)
Also added the settings into txt2img menu.
uorufu added 12 commits April 5, 2024 06:48
Optimizations, fixes
Added functionality to lock the wildcard to a specific line between 1 and 99

For example:

normal wildcard (wildcard.txt) getting random line number: __1_wildcard__
locked wildcard getting line number between 1-99, in example the fourth line in the wildcard: __1_wildcard_4__

This allows you to lock certain wildcards to a specific line for testing/batching.
small oopsy, fixed
uorufu added 30 commits October 9, 2024 17:25
Code cleanup as it was a mess and added locking lines. (ie. __0_wildcard_14__ will lock to the 14th line in the wildcard.txt file)
Good thing I am not a professional. 
Small bug fixed.
Added negative prompt wildcards. 
Pretty much done with this extension for now.


Only known bug:

If you use lora's inside wildcards, it doesn't work when using "Batch Size".
It still works fine with "Batch Count" however.

This has to do with automatic1111/forge handling prompts outside of the extension. I suspect when you use "Batch Size", the prompt lora's are loaded once for all iterations. Whereas with "Batch Count" it reloads the lora's newly for each iteration.

# TLDR: Don't use "Batch Size", or don't use lora's inside of wildcards.
Negative and Hires prompts functioning properly as well.

Some changes/fixes.

Note: I can't seem to fix the infotext of hires prompt. 

It does apply the correct prompt for image generation, but in a batch all images have the hires prompt of the first image in their infotext.
Final update for now. 

So new features added the past couple of days:

- negative and hires prompt support.
- line locking support added. ( `__1_wildcard_12__` locks to 12th line of wildcard.txt )
- Made the script a bit easier to read? (It's still a bit of a mess, and there are plenty of efficiency improvements to be had, but it works and is pretty robust as it is now.)

Basically, it's working as I originally wanted it to now. So probably done with it.
Added nested wildcards.

For example using Prompt:  `__0_wildcard_2__`  from

wildcard.txt
```
line 1
line 2: __0_wildcard_3__
line 3
```
Will have `line 2: line 3` as a prompt result.
Okay, completely rewrote and reworked it. 
Code looks.... A bit better now.

Works quite nicely.
better error handling
Locking an Iterative wildcard will now start a batch and iterate from that line. (`__$_wildcard_12__` will start to iterate from the 12th line instead of simply locking that file to line 12.)
When using the seed locking functionality added the following two options:
- Lock all tiers except specified tiers (example: Unlock -> 1,3 = Unlocks only wildcards that use tier 1 and 3. Locks all others.)
- Lock only specified tiers (example: Lock -> 4,5 = Locks only wildcards that use tier 4 and 5. Unlocks all others.)

Also made improvements on global var cleaning. Interrupting batches, etc, should no longer mess up the handling of global vars. Now, every time you begin generating a new image or batch, it should clean up properly.
removed unnecessary leftover prints
Removed 'Automatic1111' from the title and updated formatting.
gradio update for reforge gradio version
Minor change to gradio elements for improved clarity
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant