1919!emphasized: "(" prompt ")"
2020 | "(" prompt ":" prompt ")"
2121 | "[" prompt "]"
22- scheduled: "[" [prompt ":"] prompt ":" [WHITESPACE] NUMBER "]"
22+ scheduled: "[" [prompt ":"] prompt ":" [WHITESPACE] NUMBER [WHITESPACE] "]"
2323alternate: "[" prompt ("|" prompt)+ "]"
2424WHITESPACE: /\s+/
2525plain: /([^\\\[\]():|]|\\.)+/
@@ -60,11 +60,11 @@ def collect_steps(steps, tree):
6060
6161 class CollectSteps (lark .Visitor ):
6262 def scheduled (self , tree ):
63- tree .children [- 1 ] = float (tree .children [- 1 ])
64- if tree .children [- 1 ] < 1 :
65- tree .children [- 1 ] *= steps
66- tree .children [- 1 ] = min (steps , int (tree .children [- 1 ]))
67- res .append (tree .children [- 1 ])
63+ tree .children [- 2 ] = float (tree .children [- 2 ])
64+ if tree .children [- 2 ] < 1 :
65+ tree .children [- 2 ] *= steps
66+ tree .children [- 2 ] = min (steps , int (tree .children [- 2 ]))
67+ res .append (tree .children [- 2 ])
6868
6969 def alternate (self , tree ):
7070 res .extend (range (1 , steps + 1 ))
@@ -75,7 +75,7 @@ def alternate(self, tree):
7575 def at_step (step , tree ):
7676 class AtStep (lark .Transformer ):
7777 def scheduled (self , args ):
78- before , after , _ , when = args
78+ before , after , _ , when , _ = args
7979 yield before or () if step <= when else after
8080 def alternate (self , args ):
8181 yield next (args [(step - 1 )% len (args )])
@@ -333,7 +333,7 @@ def reconstruct_multicond_batch(c: MulticondLearnedConditioning, current_step):
333333\\|
334334\(|
335335\[|
336- :([+-]?[.\d]+)\)|
336+ :\s* ([+-]?[.\d]+)\s* \)|
337337\)|
338338]|
339339[^\\()\[\]:]+|
0 commit comments