Commit Graph

154 Commits (4e41203d970d1ec04dc51031089ef4e7c3a1cd31)

Author SHA1 Message Date
Aarni Koskela 0320a42f6e Refactor into single package 2023-01-29 13:18:40 +02:00
Adi Eyal 6f2c357c60 Upgraded dynamicprompts to v0.4.1
Fixes #211
2023-01-28 20:35:18 +02:00
Adi Eyal d355174496 Bumped version to v2.5.1 2023-01-27 07:17:34 +02:00
Adi Eyal eb35768b8c Merge branch 'blacken' of https://github.com/akx/sd-dynamic-prompts into akx-blacken 2023-01-26 21:15:10 +02:00
Adi Eyal 7bb40296e2 Bumped version to v2.5.0 2023-01-26 21:12:59 +02:00
Aarni Koskela 3be423bf41 Reformat code with black 2023-01-26 21:11:42 +02:00
Aarni Koskela d9587881fe Fix trailing whitespaces & end-of-files too 2023-01-26 21:10:58 +02:00
Aarni Koskela 1f4f6e4013 Add support for magic prompt blocklisting 2023-01-26 20:36:38 +02:00
Aarni Koskela 0d50208256 Move list of magic models to `prompts.consts` 2023-01-26 20:36:38 +02:00
Aarni Koskela 0401f3d397 Use wildcard_manager.path now that it's a thing
Refs https://github.com/adieyal/dynamicprompts/pull/7
2023-01-24 12:34:59 +02:00
Adi Eyal 61c85807b4 Upgraded dynamicprompts to v0.3.2 2023-01-24 12:28:14 +02:00
Aarni Koskela 6b49db53a5 Clean up unused local variables 2023-01-24 11:35:58 +02:00
Adi Eyal 217774ddff Added a script to import noodle prompts - thanks to @akx 2023-01-23 18:51:07 +02:00
Adi Eyal 35828110d6 Merge branch 'cleanup' of https://github.com/akx/sd-dynamic-prompts into akx-cleanup 2023-01-23 17:03:24 +02:00
Aarni Koskela 9624ce46e8 Apply fixes by Ruff 2023-01-23 16:51:29 +02:00
Adi Eyal 7879f57caf Merge branch 'cleanup' of https://github.com/akx/sd-dynamic-prompts into akx-cleanup 2023-01-23 16:49:26 +02:00
Aarni Koskela 9afce27b2c Apply fixes by Ruff 2023-01-23 15:55:23 +02:00
Adi Eyal 559945bd2b Fixed a minor but annoying bug when copying collections
Previously collection folders were copied directly into the root of the wildcards folder instead of their collection folder.
2023-01-23 15:33:25 +02:00
Adi Eyal 3a6b6ec62b Magic Prompt can now choose between a number of models 2023-01-22 01:34:41 +02:00
Adi Eyal 408db435f1 Fixed a bug introduced in the previous version
Max generations was being using in both combinatorial and random mode
2023-01-21 21:51:41 +02:00
Adi Eyal 401682b06e Added max-generations slider 2023-01-21 19:01:07 +02:00
Adi Eyal 5a4c554c95 Bumped version 2023-01-21 16:49:29 +02:00
Adi Eyal e870a3e05c Fixed installation of spacy 2023-01-15 20:02:32 +02:00
Adi Eyal 2ac2787690 minor code refactor 2023-01-14 22:10:30 +02:00
Adi Eyal de78d63910 minor refactor 2023-01-14 21:59:52 +02:00
Adi Eyal 68620cc532 Don't apply to negative prompts now only applies to prompt magic 2023-01-14 19:28:14 +02:00
Adi Eyal 2bad5db176 Added devilkkw collection 2023-01-12 08:00:42 +02:00
Adi Eyal 57095a5b87 Bumped version to 2.3.2 2023-01-12 07:49:01 +02:00
Adi Eyal 20000a9f95 Added accordion to the prompt magic section
Fixes https://github.com/adieyal/sd-dynamic-prompts/issues/174
2023-01-12 07:47:24 +02:00
Adi Eyal bf60af9296 Added help links and version 2023-01-12 07:33:15 +02:00
Adi Eyal 70e434dfb2 Fixed annoying unnecessary reinstall of dependenices
Also bumped dynamicprompts to v0.2.6 which includes wildcard caching for
a performance boost
2023-01-10 09:07:03 +02:00
Adi Eyal 88c511ad3e Moved a few settings to the settings tab 2023-01-09 11:46:37 +02:00
Adi Eyal a00e02d5b8 Fixed decimal weights in variants
e.g. {0.2::red|0.5::blue|0.3::yellow}. Fixes #165
2023-01-08 21:36:09 +02:00
Adi Eyal defdf8a927 Fixed disable negative prompts
Fixes #167
2023-01-08 20:59:37 +02:00
Adi Eyal e590253fcd Removed 2.0 warning 2023-01-08 18:13:56 +02:00
Adi Eyal dc4ad65bc3 Fixed missing whitespace between wildcards 2023-01-08 18:08:51 +02:00
Adi Eyal 348e5bafd4 Fixed unlink seed from prompt bug. Fixes #150 2023-01-08 16:56:31 +02:00
Adi Eyal 1b4d0b9751 Added option to save the raw prompt into the image metadata 2023-01-08 15:02:21 +02:00
Adi Eyal 69d7b2a68b Fixes #151 - Updated the dynamicprompts library to v0.2.1 2023-01-07 19:23:42 +02:00
Adi Eyal 3f93c92856 Whitespace in prompts is being honours by default 2023-01-07 18:15:00 +02:00
Adi Eyal 6a7689abe9 Extracted generator_builder into a separate class 2023-01-07 00:46:38 +02:00
Adi Eyal 07e127ed08 Bumped version to 2.0.4 2023-01-06 23:46:09 +02:00
Adi Eyal a43eb74dae Initegrated jinja2 from dynamicprompts
Removed old jinja2 code
2023-01-06 23:43:52 +02:00
Adi Eyal 72715dae36 Added warning about updated version 2023-01-06 21:50:02 +02:00
Adi Eyal b8a7bdd53e Updated dependencies
dynamicprompts is now always upgraded if a new version is available. This means that a new version of the extension does not need to be released every time dynamicprompts updates.
The new version 0.1.18 of dynamicprompts removes an explicit dependency on pytorch and relies on the version that is installed with the webui. This avoids an unpleasant 1.8GB download.
Unpinned requests so that it uses the same version as Automatic1111.
2023-01-06 13:17:27 +02:00
Adi Eyal 9570dbfb7e Upgraded to dynamicprompts 0.1.17 which fixes the alternated words syntax
Previously [cat|dog] didn't work due to | being a reserved character. It is now only reserved inside variants {a|b|c}
2023-01-05 20:08:58 +02:00
Adi Eyal 51de80497e Using classes from the typing package for python 3.7 compatibility 2023-01-04 22:33:55 +02:00
Adi Eyal be23398c5b bumped version 2023-01-04 19:43:55 +02:00
Adi Eyal 78a49fd5a5 Migrated to using the dynamicprompts library 2023-01-04 19:42:43 +02:00
Adi Eyal 89053f0dcf Better handling of missing wildcard files
now the original __wildcard__ is returned instead of throwing an error
2023-01-03 14:56:24 +02:00