v3.0.0-beta.8

See: #150

prompt_control/nodes_lazy.py

@@ -200,6 +200,8 @@ def build_scheduled_prompts(graph, schedules, clip):
         p, classnames = get_function(p, "NODE", defaults=None)
         realargs = ["PCTextEncode", "text", ""]
         if classnames:
+            # Need to explicitly expand segs for custom node
+            p = expand_segs(p)
             args = classnames[0].args[0]
             if not args.strip():
                 raise ValueError("NODE can't be empty!")

prompt_control/parser_parsy.py

@@ -370,7 +370,17 @@ ctlweight = seq(number, (string("@") >> number).optional(0)).sep_by(comma, min=1
 loractl = (string("<loractl:") >> filename * 1 + lora_weights(ctlweight) << string(">")).combine(LoRACTL)
 emb = (string("<emb:") >> filename << string(">")).map(lambda f: Text(f"embedding:{f}"))
 
-expr = escape | comment | non_special | bracketed | emphasis.combine(combine_prompt) | lora | loractl | emb
+expr = (
+    escape
+    | comment
+    | non_special
+    | bracketed
+    | emphasis.combine(combine_prompt)
+    | lora
+    | loractl
+    | emb
+    | char_from("<>").map(Text)
+)
 prompt_ = expr.at_least(1).combine(combine_prompt)
 prompt.become(prompt_)
 # Treat any character that isn't valid prompt syntax as just text

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-prompt-control"
 description = "Nodes for prompt editing and LoRA scheduling, advanced regional prompting (including attention masking) and advanced prompt encoding, all controlled through your text prompt. Feature keywords: comfyui-prompt-control, schedule, macros, attention couple, loractl, A1111"
-version = "3.0.0-beta.7"
+version = "3.0.0-beta.8"
 license = { file = "LICENSE" }
 
 requires-python = ">= 3.10"

tests/test_graph.py

@@ -461,7 +461,7 @@ def test_textencode_lora_with_schedule():
 
 
 def test_textencode_custom():
-    r = te("NODE(CLIPTextEncode)simple [test:0.1,0.5] prompt")
+    r = te("NODE(CLIPTextEncode)simple [test:0.1,0.5] $p SEG(p) prompt")
     assert r == {
         "result": (["UID.0.0.8", 0],),
         "expand": {
@@ -538,12 +538,7 @@ def test_textencode_custom_extra():
             },
             "UID.0.0.5": {
                 "class_type": "CustomTextEncode",
-                "inputs": {
-                    "clip": [0, 0],
-                    "prompt": "simple  prompt",
-                    "image": ["1", 0],
-                    "option": "test"
-                },
+                "inputs": {"clip": [0, 0], "prompt": "simple  prompt", "image": ["1", 0], "option": "test"},
             },
             "UID.0.0.6": {
                 "class_type": "ConditioningSetTimestepRange",

tests/test_parser.py

@@ -342,6 +342,12 @@ def test_cornercase_corrected(parse):
     assert p.parsed_prompt[1:] == p2.parsed_prompt
 
 
+def test_ltgt_in_schedule(parse):
+    p = parse("This should [<parse> correctly:be <Picture 1>:0.1]<lora:test:1>")
+    assert_prompt(p, 0.1, 0.1, "This should <parse> correctly", ("test", 1.0, 1.0))
+    assert_prompt(p, 0.15, 1.0, "This should be <Picture 1>", ("test", 1.0, 1.0))
+
+
 def test_floats(parse):
     p = parse("[a:b:0.5] [c:d:e:0.2,0.7] <lora:test:-0.3>")
     p2 = parse("[a:b:.5] [c:d:e:.2,.7] <lora:test:-.3>")