Commit Graph

1242 Commits

Author SHA1 Message Date
Barry Downes
9efdda21a8 Combine the comments and choices into a single function to ease
integration into various nodes.
2023-08-06 08:47:19 +10:00
Barry Downes
6e881cfd4f Rename DynamicPrompt output from STRING -> text. 2023-08-05 18:40:19 +10:00
Barry Downes
57ae0987db Move comment support out of comfy.choices and into comfy.comments module. 2023-08-05 17:09:33 +10:00
Barry Downes
dcb4bdfb9b Move ParseLogicError into comfy.parse.
Don't catch ParseError in comfy.choices.
2023-08-05 16:20:26 +10:00
Barry Downes
5a673ee930 Add non-strict parsing and the "strict" argument. 2023-08-05 15:54:12 +10:00
Barry Downes
277e75f66f Add the reescape option. 2023-08-05 15:54:12 +10:00
Barry Downes
84360083c8 Rename get_seed -> get_random_seed. 2023-08-05 15:54:12 +10:00
Barry Downes
a11ee34ebf Tweak the documentation a little. 2023-08-05 15:54:12 +10:00
Barry Downes
be039885a0 Improve dynamic prompt example. 2023-08-05 15:54:12 +10:00
Barry Downes
9aa915045a Slightly rework the choices module interface. 2023-08-05 15:54:12 +10:00
Barry Downes
9bc8b5ce44 Rename parse_choice.py -> choices.py. 2023-08-05 15:54:12 +10:00
Barry Downes
92bca860f8 Remove node changes except for DynamicPrompt. 2023-08-05 15:54:12 +10:00
Barry Downes
6995bb435c Fix: text -> self.text in clone method. 2023-08-05 15:54:12 +10:00
David Peterson
222718035f - Added built-in translation on all "multiline" nodes
- Added a "DynamicPrompt" node which has its own text/seed.
2023-08-03 11:10:23 +10:00
Barry Downes
631d19ca09 Operate randomly when no seed is provided. 2023-08-01 03:15:44 +10:00
Barry Downes
6a01513d09 Add C-style comment support for the dynamic prompt. 2023-08-01 03:15:44 +10:00
Barry Downes
d91544b83c Reimplement dynamic prompts in the CLIPTextEncode node.
To achieve repeatability, a random seed input is added.

By this method, the original prompt text remains intact when
serializing and deserializing from a PNG or history.

But the random seed ensures the same choices will be made
when re-translating the "choices" in the original prompt
text, thus ensuring repeatability.

Also, choices can now be nested.
2023-08-01 03:15:44 +10:00
Barry Downes
2bfe6886c8 Remove dynamicPrompts web extension, as it would interfere with the
reimplementation.
2023-08-01 03:15:44 +10:00
comfyanonymous
4a77fcd6ab Only shift text encoder to vram when CPU cores are under 8. 2023-07-31 00:08:54 -04:00
comfyanonymous
3cd31d0e24 Lower CPU thread check for running the text encoder on the CPU vs GPU. 2023-07-30 17:18:24 -04:00
comfyanonymous
2b13939044 Remove some useless code. 2023-07-30 14:13:33 -04:00
comfyanonymous
95d796fc85 Faster VAE loading. 2023-07-29 16:28:30 -04:00
comfyanonymous
4b957a0010 Initialize the unet directly on the target device. 2023-07-29 14:51:56 -04:00
comfyanonymous
ad5866b02b Fix ROCm nightly install command. 2023-07-29 14:48:29 -04:00
comfyanonymous
c910b4a01c Remove unused code and torchdiffeq dependency. 2023-07-28 21:32:27 -04:00
comfyanonymous
1141029a4a Add --disable-metadata argument to disable saving metadata in files. 2023-07-28 12:31:41 -04:00
comfyanonymous
fbf5c51c1c Merge branch 'fix_batch_timesteps' of https://github.com/asagi4/ComfyUI 2023-07-27 16:13:48 -04:00
comfyanonymous
68be24eead Remove some prints. 2023-07-27 16:12:43 -04:00
asagi4
1ea4d84691 Fix timestep ranges when batch_size > 1 2023-07-27 21:14:09 +03:00
comfyanonymous
4ab75d9cb8 Update colab notebook with SDXL links. 2023-07-26 21:50:44 -04:00
comfyanonymous
5379051d16 Fix diffusers VAE loading. 2023-07-26 18:26:39 -04:00
comfyanonymous
00da9b3268 Merge branch 'fix/types' of https://github.com/melMass/ComfyUI 2023-07-26 01:55:55 -04:00
comfyanonymous
5e3ac1928a Implement modelspec metadata in CheckpointSave for SDXL and refiner. 2023-07-25 22:02:34 -04:00
comfyanonymous
727588d076 Fix some new loras. 2023-07-25 16:39:15 -04:00
comfyanonymous
315ba30c81 Update nightly ROCm pytorch command in readme to 5.6 2023-07-25 15:48:26 -04:00
comfyanonymous
4f9b6f39d1 Fix potential issue with Save Checkpoint. 2023-07-25 00:45:20 -04:00
comfyanonymous
7c0a5a3e0e Disable cuda malloc on a bunch of quadro cards. 2023-07-25 00:09:01 -04:00
comfyanonymous
a51f33ee49 Use bigger tiles when upscaling with model and fallback on OOM. 2023-07-24 19:47:32 -04:00
comfyanonymous
5f75d784a1 Start is now 0.0 and end is now 1.0 for the timestep ranges. 2023-07-24 18:38:17 -04:00
comfyanonymous
7ff14b62f8 ControlNetApplyAdvanced can now define when controlnet gets applied. 2023-07-24 17:50:49 -04:00
comfyanonymous
d191c4f9ed Add a ControlNetApplyAdvanced node.
The controlnet can be applied to the positive or negative prompt only by
connecting it correctly.
2023-07-24 13:35:20 -04:00
comfyanonymous
0240946ecf Add a way to set which range of timesteps the cond gets applied to. 2023-07-24 09:25:02 -04:00
comfyanonymous
30de083dd0 Disable cuda malloc on all the 9xx series. 2023-07-23 13:29:14 -04:00
comfyanonymous
22f29d66ca Try to fix memory issue with lora. 2023-07-22 21:38:56 -04:00
comfyanonymous
67be7eb81d Nodes can now patch the unet function. 2023-07-22 17:01:12 -04:00
comfyanonymous
12a6e93171 Del the right object when applying lora. 2023-07-22 11:25:49 -04:00
comfyanonymous
85a8900a14 Disable cuda malloc on regular GTX 960. 2023-07-22 11:05:33 -04:00
comfyanonymous
78e7958d17 Support controlnet in diffusers format. 2023-07-21 22:58:16 -04:00
comfyanonymous
09386a3697 Fix issue with lora in some cases when combined with model merging. 2023-07-21 21:27:27 -04:00
comfyanonymous
58b2364f58 Properly support SDXL diffusers unet with UNETLoader node. 2023-07-21 14:38:56 -04:00