Commit Graph

308 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 8866f0dea0 Removed reference to missing wildcard 2023-01-08 20:37:00 +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 394a687c50 Removed reference to dynamicprompts constants.py 2023-01-08 18:08:03 +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 03e5bad2b6 Removed unnecessary dependencies 2023-01-07 23:09:27 +02:00
Adi Eyal ed99c160e5
Update README.md 2023-01-07 23:05:34 +02:00
Adi Eyal e9c4f5f61d
Update README.md 2023-01-07 23:03:31 +02:00
Adi Eyal 9d068088c4
Update bug_report.md 2023-01-07 22:51:57 +02:00
Adi Eyal 2efdbdfae2 Fixed typo 2023-01-07 19:25:04 +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 9127329108 Added link to the devilkkw collection 2023-01-07 18:33:07 +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 5cb0633b21 Merge branch 'chore/migrate-to-dynamicprompts' 2023-01-06 21:43:01 +02:00
Adi Eyal 3ad4e0276a Merge branch 'chore/dependency-update' into chore/migrate-to-dynamicprompts 2023-01-06 13:18:09 +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 f53a375edc removed unused tests 2023-01-05 20:14:28 +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 f53389774e
Update SYNTAX.md 2023-01-03 22:48:08 +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 e657365f53 Removed cast(list[Command) which was causing issues with older python
It's effectively a noop at runtime so it doesn't change functionality
2023-01-02 12:02:14 +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 8d06ee799b Squash whitespace 2023-01-01 22:30:09 +02:00
Adi Eyal 87c5bf5998 Merge branch 'main' of github.com:adieyal/sd-dynamic-prompting 2023-01-01 22:28:48 +02:00
Adi Eyal 6b6bf03fe5 Fixed variants with missing values 2023-01-01 22:27:47 +02:00
Adi Eyal 6601295fc9
Update SYNTAX.md 2023-01-01 21:55:40 +02:00
Adi Eyal e75e1a5ade moved docs into a separate folder 2023-01-01 21:54:01 +02:00
Adi Eyal 21bb881846
Update SYNTAX.md 2023-01-01 21:48:28 +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 2e2ffe9bce Merge branch 'main' of github.com:adieyal/sd-dynamic-prompting 2023-01-01 10:41:19 +02:00
Adi Eyal 0244810aa2 Added passthru support for prompt editing 2023-01-01 10:40:52 +02:00
Adi Eyal 1b224c2fc0
Update README.md 2022-12-31 23:37:05 +02:00
Adi Eyal 73de9bae18
Add files via upload
minor tweak
2022-12-31 23:36:13 +02:00
Adi Eyal 64d9bdf423
Update README.md
Added links to changelog and syntax
2022-12-31 23:32:43 +02:00
Adi Eyal e499972764
Add files via upload
minor cleanup
2022-12-31 23:31:26 +02:00