Commit Graph

78 Commits (defdf8a9273fc1cd7c5a4be738d3e888bb452e1c)

Author SHA1 Message Date
Adi Eyal 394a687c50 Removed reference to dynamicprompts constants.py 2023-01-08 18:08:03 +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 a43eb74dae Initegrated jinja2 from dynamicprompts
Removed old jinja2 code
2023-01-06 23:43:52 +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 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 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 6b6bf03fe5 Fixed variants with missing values 2023-01-01 22:27:47 +02:00
Adi Eyal e6e4b22d2d Parser now correctly ignores [low emphasis] square brackets 2023-01-01 20:35:41 +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 927f939269 Fixed wildcard in random generator
previously embedded prompts were not processed
2022-12-31 19:54:10 +02:00
Adi Eyal 1097693e66 regex to match literals instread of unicode printables
THe former is muchg faster than the latter
2022-12-31 19:35:42 +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 3016fd6f0e Using Iterable from tying instead of collections.abc
This cause an error in older versions of python
2022-12-31 17:55:43 +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 cd96cc7ee2 Fixed #131 2022-12-24 13:14:12 +02:00
Adi Eyal b60b883d31 fixed #117 2022-12-22 09:14:54 +02:00
Adi Eyal 9ad7001c7a Changed weights parameter in CombinationSelector to be optional 2022-12-22 04:15:34 +02:00
shoffing 96fa8fb049 add support for weighted variants 2022-12-21 16:54:46 -05:00
Adi Eyal 8d7b3e562c Added ability to copy collections to wildcards folder 2022-12-12 13:54:32 +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
Adi Eyal 5ef54e00b4 Wildcards hierarchy is now sorted 2022-12-04 07:51:16 +02:00
Adi Eyal 04932107aa Added a rudimentary wildcards manager tab 2022-12-03 23:30:42 +02:00
Adi Eyal d038c3ec76 addresses https://github.com/adieyal/sd-dynamic-prompts/issues/90 2022-12-03 15:46:12 +02:00
Adi Eyal d62b8686df Fixes https://github.com/adieyal/sd-dynamic-prompts/issues/88 2022-12-02 10:20:00 +02:00
Adi Eyal 98528f4acb Addresses https://github.com/adieyal/sd-dynamic-prompts/issues/85 2022-11-30 17:06:29 +02:00
Adi Eyal 3327751afe fixes https://github.com/adieyal/sd-dynamic-prompts/issues/80 2022-11-29 13:48:49 +02:00
Adi Eyal 21f75e5110 Fixes https://github.com/adieyal/sd-dynamic-prompts/issues/79 2022-11-29 12:26:57 +02:00
Adi Eyal 2e79b55926 Fixes https://github.com/adieyal/sd-dynamic-prompts/issues/78 2022-11-29 08:43:25 +02:00
Adi Eyal 43ac2ba399 Fixes https://github.com/adieyal/sd-dynamic-prompts/issues/54 2022-11-28 09:02:34 +02:00
Adi Eyal 8bf5c1c59b Minor syntax change 2022-11-20 14:29:47 +02:00
Adi Eyal c7434e7822 Changed attention grabber to use noun phrases instead of entities 2022-11-17 06:29:53 +02:00
Adi Eyal 9b923a9d64 Added attention grabber
adds attention to random keyword in the prompt
2022-11-17 00:37:33 +02:00
Brendan Byrd a7b3046ae1 Only clean up the MP-generated prompt, not the original one 2022-11-16 14:19:03 -05:00
Adi Eyal bde776ceb7 Added checkbox to disable negative prompt
Useful for I'm feeling lucky and Magic prompt
2022-11-15 21:46:56 +02:00
Adi Eyal 47cc387fbc Fixes #59 2022-11-15 18:12:44 +02:00
Adi Eyal 34dd5f1501 Added shuffle to combinatorial generation
Simulates randomness if only a subset of all prompts is generated
2022-11-14 17:46:28 +02:00
Adi Eyal 77c14d16f1 Minor fix to weighted choices jinja2 extension 2022-11-14 17:23:40 +02:00
Adi Eyal 8ebcfc4a46 re-wrote combinatorial generation using queues instead of recursion
This should provide better control for limited the number of prompts generated
2022-11-14 15:14:19 +02:00
Adi Eyal 471b1f36e8 I'm feeling lucky now uses the prompt as a search string in the lexica.art API 2022-11-14 11:34:29 +02:00
Adi Eyal 5b950fd698 Fixed a combinatorial explosion bug
Fixed a bug that didn't limit the number of prompts when using combinatorial generation and large wildcard files
2022-11-14 11:18:14 +02:00
Adi Eyal dbf2a54bf2 Added missing generator file 2022-11-14 10:50:03 +02:00