Commit Graph

642 Commits (main)

Author SHA1 Message Date
TheAwesomeGoat e20cf0d164 fixed '/' in wildcard 2022-10-26 17:33:28 +02:00
TheAwesomeGoat 27f62dcf33 changes 2022-10-26 14:48:47 +02:00
TheAwesomeGoat 101ba66cc3 UI Changes 2022-10-26 11:49:13 +02:00
Adi Eyal e12dcdf16b Added wildcard globbing
Originally introduced here: https://github.com/adieyal/sd-dynamic-prompting/pull/15
2022-10-25 23:15:32 +02:00
TheAwesomeGoat e62d161bec fixed where it couldnt find a file 2022-10-25 18:09:43 +02:00
TheAwesomeGoat cb37a11217 ui changes 2022-10-25 16:03:03 +02:00
TheAwesomeGoat 7a6654ee63 ui changes 2022-10-25 16:01:49 +02:00
TheAwesomeGoat 9b3731819d folders for organization 2022-10-25 12:42:18 +02:00
TheAwesomeGoat 69ae030292 folders for organization 2022-10-25 12:41:11 +02:00
Adi Eyal 0f23134549 Updated changelog 2022-10-24 21:05:54 +02:00
Adi Eyal 21ab2c5fdd Merge branch 'evanjs-extended-glob' 2022-10-24 20:52:11 +02:00
Adi Eyal 7c43ebbff5 Incorporating recursive globbing and wildcard file comments
Also bumped the version to 0.5.0
Removed path globbing and danbooru tag compatibility pending further discussion
2022-10-24 20:50:16 +02:00
Evan Stoll 7e9f7d1edc Add `replace_underscore` checkbox from Vetchems/sd-danbooru-tags
Source: 07eb0d0de1/scripts/dynamic_prompting.py
2022-10-22 13:01:29 -04:00
Evan Stoll 686acf0521 Show full path relative to `WILDCARD_DIR` for each wildcard entry 2022-10-22 13:01:11 -04:00
Evan Stoll d0401a86c7 Scan for shown wildcards recursively and display results in scrollbox
* In the text element for the dynamic prompting script, ensure the wildcard directory is scanned recursively to ensure all wildcard files are listed
* Enable scrollbar for dynamic prompting text element to prevent uncontrollable growth of body height
2022-10-22 13:01:11 -04:00
Evan Stoll 4196e78be1 Add note to README regarding "fuzzy wildcard patterns" 2022-10-22 13:01:11 -04:00
Evan Stoll 484b190b0a dynamic_prompting.py: use "extended"/fuzzy matching for wildcards
* Supports fuzzy matches against full path:
 * `buildings` -> `settings/outdoors/buildings.txt`, `settings/indoors/buildings.txt`
 * `settings*natural` -> `settings/outdoors/natural.txt`
2022-10-22 13:01:11 -04:00
Adi Eyal 7f6428f0d5 Re-enabled grid generation 2022-10-22 11:43:36 +02:00
Adi Eyal 07f424539f Fixed bug where num_batches was being interpreted as num_images
https://github.com/adieyal/sd-dynamic-prompting/issues/10
2022-10-22 11:38:42 +02:00
Adi Eyal 415d02391f logging the generated prompt at logging.INFO level 2022-10-21 17:05:56 +02:00
Adi Eyal e3cc390aad Ignoring unknown characters in non-utf8 encoded files
hopefully fixes this [issue](https://github.com/adieyal/sd-dynamic-prompting/issues/2)
2022-10-19 17:09:00 +02:00
Adi Eyal 0304499b7e Merge branch 'main' of github.com:adieyal/sd-dynamic-prompting 2022-10-19 16:48:14 +02:00
Adi Eyal 26cb8e8d8a Fixed wildcard regular expression
Previous regex didn't allow underscores in wildcard filenames
2022-10-19 16:47:25 +02:00
Adi Eyal 849b497492
Fixed formatting in README 2022-10-19 16:11:30 +03:00
Adi Eyal 100b43bf94 Added recursive prompt resolultion
See this issue for a use case: https://github.com/adieyal/sd-dynamic-prompting/issues/3
2022-10-18 22:53:12 +02:00
Adi Eyal 5e0b006005 Updated changelog with combination intervals 2022-10-18 22:10:12 +02:00
Adi Eyal c3c383f17c Minor clean-up
Removed inline documentation - better to keep it in README
Minor change in exception handling
2022-10-18 22:04:46 +02:00
Shane Galvin 57f8be9132
quantity range order agnostic
1-3$$ and 3-1$$ are now both valid
2022-10-18 12:08:05 -04:00
Shane Galvin 852335d23a
increment version 2022-10-18 11:51:37 -04:00
Shane Galvin 9597eeae21
update inline documentation 2022-10-18 10:50:28 -04:00
Shane Galvin ffd8be3bf8
readme: combination range 2022-10-18 10:25:34 -04:00
Shane Galvin 678be757fe
add quantity range support for $$
Now can use syntax like {1-3$$a|b|c|d} to select a random quantity of options from a provided range of numbers
2022-10-18 10:21:36 -04:00
Adi Eyal be36e41d37 Merge branch 'main' of github.com:adieyal/sd-dynamic-prompting 2022-10-15 20:13:11 +02:00
Adi Eyal 653c835b32 Fixed batch img2img
Previously the same prompt was used for every image in the batch, this fixes that so that the prompt is re-generated every time.
2022-10-15 20:09:50 +02:00
Adi Eyal 2cfde30b37
Update README.md 2022-10-12 10:31:18 +02:00
Adi Eyal 50776257e9 Minor bug fix 2022-10-11 23:07:34 +02:00
Adi Eyal ea9d018fa1 Minor README change 2022-10-11 12:08:53 +02:00
Adi Eyal a2bc581261 Changed [] to {} due to conflicts
https://github.com/adieyal/sd-dynamic-prompting/issues/1
2022-10-11 12:07:13 +02:00
Adi Eyal 2668b6868a Added inline documentation 2022-10-09 00:49:14 +02:00
Adi Eyal ba7e9e503e Added wildcard functionality
Wildcards are now possible in a similar to https://github.com/jtkelm2/stable-diffusion-webui-1/blob/master/scripts/wildcards.py
2022-10-08 22:04:17 +02:00
Adi Eyal 7e6548e656 initial commit 2022-10-08 20:15:21 +02:00
Adi Eyal 7d2b598b64
Initial commit 2022-10-08 19:58:23 +02:00