Compare commits

..
Author SHA1 Message Date
asagi4 ff111a9f7c v3.0.0-beta.1
Not a complete apocalypse this time
2026-02-18 18:00:11 +02:00
asagi4 ab1cf5949e Make new parser the default 2026-02-04 16:39:50 +02:00
asagi4 105562a5bb Remove requirements.txt, not needed with new parser 2026-02-04 16:39:50 +02:00
asagi4 e337ecc019 tests: COUPLE mask shortcut 2026-02-04 16:39:50 +02:00
asagi4 b2bb7b9960 Tests for step count 2026-02-04 16:39:50 +02:00
asagi4 f1ade19345 test: Verify that basic paren escapes don't get stripped 2026-02-04 16:39:50 +02:00
asagi4 15c115c7f3 Fix type complaint 2026-02-04 16:39:50 +02:00
asagi4 97f050c264 test only new parser 2026-02-04 16:39:50 +02:00
asagi4 ca5848a8aa Test multiple averages 2026-02-04 16:39:50 +02:00
asagi4 24240aac2d Make github tests work again 2026-02-04 16:39:50 +02:00
asagi4 883ea6a96d Disable method override complaint 2026-02-04 16:39:50 +02:00
asagi4 49b761ae5b Working importing for v3 nodes 2026-02-04 16:39:50 +02:00
asagi4 bd0dd00d8c v3: nodes_lazy.py 2026-02-04 16:39:50 +02:00
asagi4 3f303cb33a v3: nodes_tools 2026-02-04 16:39:50 +02:00
asagi4 d009bb782b v3: nodes_hooks.py 2026-02-04 16:39:50 +02:00
asagi4 eaf5fa20c4 v3: nodes_base.py 2026-02-04 16:39:50 +02:00
asagi4 2becb5cdc6 Initial v3 migration 2026-02-04 16:39:50 +02:00
asagi4 e1b12acbdf handle setting steps 2026-02-04 16:39:50 +02:00
asagi4 3ea605fbe0 parsy ruff fixes 2026-02-04 16:39:50 +02:00
asagi4 f4d5477d4c parsy loractl 2026-02-04 16:39:50 +02:00
asagi4 5cb18ab5a9 simplify LoRA weight parsing 2026-02-04 16:39:50 +02:00
asagi4 fc5c0a1857 Rewrite parser to use parsy 2026-02-04 16:39:50 +02:00
asagi4 f9769fe90c Remove broken expand_graph.py 2026-02-04 16:39:50 +02:00
asagi4 09438a35f4 Split cutoff parser to its own file 2026-02-04 16:39:50 +02:00
asagi4 d0d34f8b2f split macros out of parser 2026-02-04 16:39:50 +02:00
asagi4 dcc9379d40 Fix NOISE doing nothing 2026-02-04 16:39:50 +02:00
asagi4 9231ec4936 Fix github workflows 2026-02-04 16:39:50 +02:00
asagi4 0473d90446 Remove old tests 2026-02-04 16:39:50 +02:00
asagi4 138df090a6 Fix LazyLoraLoader tests 2026-02-04 16:39:50 +02:00
asagi4 c89dcb135d Test for discovered corner case behaviour 2026-02-04 16:39:50 +02:00
asagi4 c53717101c Add a graph test for alternating 2026-02-04 16:39:50 +02:00
asagi4 d185c72a16 Refactor tests for new parser 2026-02-04 16:39:50 +02:00
asagi4 805ffbf463 Use pytest tests 2026-02-04 16:39:50 +02:00
asagi4 d14f5b789a Convert tests to pytest
Not 100% sure these fully work yet
2026-02-04 16:39:50 +02:00
asagi4 deba0a0642 Ruff fixes etc. 2026-02-04 16:39:50 +02:00
asagi4 f98bf25a83 Typing fixes etc 2026-02-04 16:39:50 +02:00
asagi4 2c8727a75a Remove cache hack, it's broken anyway 2026-02-04 16:39:50 +02:00
asagi4 86ec30c028 Add ruff and ty 2026-02-04 16:39:50 +02:00
asagi4 e0efac1ebc Add pyright 2026-02-04 16:39:50 +02:00
asagi4 68766215f2 v2.1.3 2026-02-04 16:32:26 +02:00
4 changed files with 11 additions and 14 deletions
+8 -9
View File
@@ -6,6 +6,12 @@ Prompt Control comes with `PCTextEncode`, which provides advanced text encoding
A `Basic Text to Image` template is included with the extension, and can be loaded from ComfyUI's template library.
> [!NOTE]
> v3.0.0 is backwards compatible with existing workflows, but requires at least ComfyUI v0.8.0
> The parser was rewritten using parsy. It is intended to have the same behaviour as the old parser, but is **significantly** faster.
> Please report any bugs or incompatibilities you find.
## What can it do?
You can use text prompts to control the following:
@@ -34,16 +40,9 @@ If you encounter issues as a user or if you're a node developer and Prompt Contr
## Requirements
For LoRA scheduling to work, you'll need at least version 0.3.7 of ComfyUI (0.3.36 of ComfyUI desktop).
The v3 node schema uses features that require at least ComfyUI v0.8.0
You need to have `lark` installed in your Python environment for parsing to work (If you reuse A1111's venv, it'll already be there).
If you use the portable version of ComfyUI on Windows with its embedded Python, you must open a terminal in the ComfyUI installation directory and run the command:
```
.\python_embeded\python.exe -m pip install lark
```
Then restart ComfyUI afterwards.
If you run into problems, update ComfyUI first.
# Core nodes
+2 -2
View File
@@ -12,8 +12,8 @@ from comfy_execution.graph_utils import GraphBuilder
from .utils import consolidate_schedule, find_nonscheduled_loras, get_function
log = logging.getLogger("comfyui-prompt-control")
if os.environ.get("PC_USE_NEW_PARSER", "0") == "1":
log.info("Using new parsy parser")
if os.environ.get("PC_USE_OLD_PARSER", "0") != "0":
log.info("Using new parser implementation. Set PC_USE_OLD_PARSER=1 to use old parser instead")
from .parser_parsy import parse_prompt_schedules as parse_prompt_schedules
else:
from .parser import parse_prompt_schedules
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-prompt-control"
description = "Provides nodes for prompt editing and LoRA scheduling, advanced regional prompting (including attention masking) and more, all controlled through your text prompt"
version = "2.1.2"
version = "3.0.0-beta.1"
license = { file = "LICENSE" }
# some lark versions older than 1.1.9 apparently have a bug that breaks things, see https://github.com/asagi4/comfyui-prompt-control/issues/35
dependencies = ["lark >= 1.1.9"]
-2
View File
@@ -1,2 +0,0 @@
# some lark versions older than 1.1.9 apparently have a bug that breaks things, see https://github.com/asagi4/comfyui-prompt-control/issues/35
lark >= 1.1.9