Commit Graph

121 Commits (defdf8a9273fc1cd7c5a4be738d3e888bb452e1c)

Author SHA1 Message Date
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
Adi Eyal 93477b95a9 Fixed parser issue caused by literals adjacent to wildcards
e.g. (__colours__) or ,__colours__
2023-01-02 11:55:47 +02:00
Adi Eyal 7811b04657 Reverted prompt editing parsing 2023-01-02 01:31:13 +02:00
Adi Eyal acba16c23d Fixed parsing of emphasis with weights
e.g. (a term:1.2)
2023-01-02 00:31:17 +02:00
Adi Eyal 6b6bf03fe5 Fixed variants with missing values 2023-01-01 22:27:47 +02:00
Adi Eyal efe24266bb Removed old comments checkbox
Comments are now enabled by default
2023-01-01 21:30:06 +02:00
Adi Eyal 4ecd503271 Added a list of occupations to the jumbo collection 2023-01-01 20:48:59 +02:00
Adi Eyal e6e4b22d2d Parser now correctly ignores [low emphasis] square brackets 2023-01-01 20:35:41 +02:00
Adi Eyal 20ee2eda6b Fixed broken attention grabber sliders 2023-01-01 19:07:40 +02:00
Adi Eyal 82189b34a3 Prompt editing and alternating words can next prompts
See https://github.com/adieyal/sd-dynamic-prompts/blob/main/SYNTAX.md
for more details
2023-01-01 18:36:00 +02:00
Adi Eyal 0244810aa2 Added passthru support for prompt editing 2023-01-01 10:40:52 +02:00
Adi Eyal 621a75c7b9 Bumped version 2022-12-31 20:18:16 +02:00
Adi Eyal d6984db7e2 Bumped version 2022-12-31 19:56:12 +02:00
Adi Eyal 74976c7663 Included latin1 characters in printables
pyparsing by default only accepts ascii characters when using printables
2022-12-31 19:11:25 +02:00
Adi Eyal 18302d5569 Bumped version to 1.5.3 2022-12-31 17:58:08 +02:00
Adi Eyal a098e2e1a6 bumped version to 1.5.2 2022-12-31 17:14:01 +02:00
Adi Eyal f91e11bd67 Configurable sliders for attention strength 2022-12-31 17:00:52 +02:00
Adi Eyal a122279157 Using pyparsing instead of regular expressions
Prompts are now more flexible allowing for arbitrary nesting of clauses,
c-style and python-style comments, and Auto1111's prompt editing. Ranges
are now also available in combinatorial mode.
2022-12-31 16:26:10 +02:00
Adi Eyal 601871bbdd Added confirmation prompt when deleting wildcards
Also deletion moves files to Trash using the send2trash library
2022-12-24 19:35:52 +02:00
Adi Eyal bb0c425789 Added animal wildcards 2022-12-24 15:19:51 +02:00
Adi Eyal cd96cc7ee2 Fixed #131 2022-12-24 13:14:12 +02:00
Adi Eyal a7528f4d78 bumped version 2022-12-22 09:15:59 +02:00
Adi Eyal adfbcc0944 Added images to README and bumped version 2022-12-22 04:36:36 +02:00
Adi Eyal 3d36275565 removed junk file 2022-12-15 11:31:04 +02:00
Adi Eyal dec66dea07 Bumped version to 1.3.2 2022-12-15 10:37:27 +02:00
Ruin0x11 25e030db26 Merge remote-tracking branch 'origin/main' into feature/comments 2022-12-13 21:54:23 -08:00
Ruin0x11 0011d935e3 Ability to comment out portions of a prompt 2022-12-13 21:47:19 -08:00
Adi Eyal e8b0171dac fixed wildcard relative paths 2022-12-13 00:51:09 +02:00
Adi Eyal 8d7b3e562c Added ability to copy collections to wildcards folder 2022-12-12 13:54:32 +02:00
Adi Eyal 7d030ed492 Bunped version 2022-12-11 10:22:02 +02:00
Adi Eyal 494c51ab69 Explicitly stringifying json before sending to backend
Previously, single quotes needed to be explicity replaced with double quotes to ensure valid json
2022-12-11 06:52:15 +02:00
Adi Eyal b78ffed91e Stripping whitespace when saving wildcards
Also removed whitespace from the colours wildcard files
2022-12-11 06:19:06 +02:00
Adi Eyal cd158b031f See https://github.com/adieyal/sd-dynamic-prompts/issues/94 2022-12-05 18:08:48 +02:00
Adi Eyal 19f6106fda Updated write prompts to file
Now outputting a csv file with positive and negative prompts, as well as the raw prompts
2022-12-05 08:37:08 +02:00