Update z-sd-webui-neutral-prompt-workYEAH3/lib_neutral_prompt/cfg_denoiser_hijack.py

z-sd-webui-neutral-prompt-workYEAH3/lib_neutral_prompt/cfg_denoiser_hijack.py

@@ -36,14 +36,11 @@ def combine_denoised_hijack(
     if not global_state.prompt_exprs and batch_cond_indices:
         global_state.prompt_exprs = convert_to_prompt_expr_from_multicond(batch_cond_indices, [])
 
-    # Получить расписания для всех промптов
     prompt_schedules = prompt_parser.get_learned_conditioning_prompt_schedules(
-        [expr.accept(WebuiPromptVisitor()) for expr in global_state.prompt_exprs],
+        getattr(global_state, "raw_prompts", [expr.accept(WebuiPromptVisitor()) for expr in global_state.prompt_exprs]),
         shared.state.sampling_steps
     )
-    active_prompts = [get_active_prompt(schedule, shared.state.sampling_step) for schedule in prompt_schedules]
-    
-    # Перепарсить активные промпты в PromptExpr
+    active_prompts = [get_active_prompt(s, shared.state.sampling_step) for s in prompt_schedules]
     global_state.prompt_exprs = [neutral_prompt_parser.parse_root(p) for p in active_prompts]
 
     denoised = get_webui_denoised(x_out, batch_cond_indices, text_uncond, cond_scale, original_function)
@@ -105,28 +102,35 @@ def gather_webui_conds(
     sliced_x_out = []
     sliced_cond_indices = []
 
-    if isinstance(prompt, neutral_prompt_parser.LeafPrompt) and prompt.conciliation is None:
+    # 1) Любой лист -> резервируем индекс (убрали проверку conciliation is None)
+    if isinstance(prompt, neutral_prompt_parser.LeafPrompt):
         child_x_out = args.x_out[args.cond_indices[index_in][0]]
         index_offset = index_out + len(sliced_x_out)
         sliced_x_out.append(child_x_out)
         sliced_cond_indices.append((index_offset, prompt.weight))
         return sliced_x_out, sliced_cond_indices
 
+    # 2) Для композита — для каждого ребёнка тоже резервируем индекс,
+    #    а не только когда child.conciliation is None
     if isinstance(prompt, neutral_prompt_parser.CompositePrompt):
         for child in prompt.children:
-            if child.conciliation is None:
-                if isinstance(child, neutral_prompt_parser.LeafPrompt):
-                    child_x_out = args.x_out[args.cond_indices[index_in][0]]
-                else:
-                    child_x_out = child.accept(CondDeltaVisitor(), args, index_in)
-                    child_x_out += child.accept(AuxCondDeltaVisitor(), args, child_x_out, index_in)
-                    child_x_out += args.uncond
-                index_offset = index_out + len(sliced_x_out)
-                sliced_x_out.append(child_x_out)
-                sliced_cond_indices.append((index_offset, child.weight))
+            if isinstance(child, neutral_prompt_parser.LeafPrompt):
+                child_x_out = args.x_out[args.cond_indices[index_in][0]]
+            else:
+                child_x_out = child.accept(CondDeltaVisitor(), args, index_in)
+                child_x_out += child.accept(AuxCondDeltaVisitor(), args, child_x_out, index_in)
+                child_x_out += args.uncond
+
+            index_offset = index_out + len(sliced_x_out)
+            sliced_x_out.append(child_x_out)
+            sliced_cond_indices.append((index_offset, child.weight))
+
+            # важно: шагать по плоскому размеру ребёнка
             index_in += child.accept(neutral_prompt_parser.FlatSizeVisitor())
+
     return sliced_x_out, sliced_cond_indices
 
+
 class CondDeltaVisitor:
     def visit_leaf_prompt(
         self,