From 50ae66ac51f7a1c022e11eb852be4886348cd659 Mon Sep 17 00:00:00 2001
From: FizzleDorf <1fizzledorf@gmail.com>
Date: Tue, 23 Jan 2024 15:45:08 +0900
Subject: [PATCH] fixed value prompt weight inputs for prompt schedules

---
 .gitignore    |  1 +
 BatchFuncs.py | 38 +++++++++++++++++---------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index c18dd8d..a031648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 __pycache__/
+.idea
\ No newline at end of file
diff --git a/BatchFuncs.py b/BatchFuncs.py
index 05c05d3..0a31ec6 100644
--- a/BatchFuncs.py
+++ b/BatchFuncs.py
@@ -100,6 +100,18 @@ def interpolate_prompt_series(animation_prompts, max_frames, start_frame, pre_te
     current_key = 0
     next_key = 0
 
+    if type(prompt_weight_1) in {int, float}:
+        prompt_weight_1 = tuple([prompt_weight_1] * max_frames)
+
+    if type(prompt_weight_2) in {int, float}:
+        prompt_weight_2 = tuple([prompt_weight_2] * max_frames)
+
+    if type(prompt_weight_3) in {int, float}:
+        prompt_weight_3 = tuple([prompt_weight_3] * max_frames)
+
+    if type(prompt_weight_4) in {int, float}:
+        prompt_weight_4 = tuple([prompt_weight_4] * max_frames)
+
     # For every keyframe prompt except the last
     for i in range(0, len(sorted_prompts) - 1):
         # Get current and next keyframe
@@ -125,8 +137,6 @@ def interpolate_prompt_series(animation_prompts, max_frames, start_frame, pre_te
             current_weight = 1 - next_weight
 
             # add the appropriate prompts and weights to their respective containers.
-            cur_prompt_series[f] = ''
-            nxt_prompt_series[f] = ''
             weight_series[f] = 0.0
             cur_prompt_series[f] = str(current_prompt)
             nxt_prompt_series[f] = str(next_prompt)
@@ -137,27 +147,13 @@ def interpolate_prompt_series(animation_prompts, max_frames, start_frame, pre_te
         next_key = max_frames
         current_weight = 0.0
 
-
-    if type(prompt_weight_1) in {int, float}:
-        prompt_weight_1 = tuple([prompt_weight_1] * max_frames)
-
-    if type(prompt_weight_2) in {int, float}:
-        prompt_weight_2 = tuple([prompt_weight_2] * max_frames)
-
-    if type(prompt_weight_3) in {int, float}:
-        prompt_weight_3 = tuple([prompt_weight_3] * max_frames)
-
-    if type(prompt_weight_4) in {int, float}:
-        prompt_weight_4 = tuple([prompt_weight_4] * max_frames)
-
     index_offset = 0
     # Evaluate the current and next prompt's expressions
-
-    for i in range(start_frame,len(cur_prompt_series)):
-        cur_prompt_series[i] = prepare_batch_prompt(cur_prompt_series[i], max_frames, i, prompt_weight_1[i],
-                                                    prompt_weight_2[i], prompt_weight_3[i], prompt_weight_4[i])
-        nxt_prompt_series[i] = prepare_batch_prompt(nxt_prompt_series[i], max_frames, i, prompt_weight_1[i],
-                                                    prompt_weight_2[i], prompt_weight_3[i], prompt_weight_4[i])
+    for i in range(start_frame, max_frames-1):
+        cur_prompt_series[i] = prepare_batch_prompt(cur_prompt_series[i], max_frames, i, prompt_weight_1,
+                                                    prompt_weight_2, prompt_weight_3, prompt_weight_4)
+        nxt_prompt_series[i] = prepare_batch_prompt(nxt_prompt_series[i], max_frames, i, prompt_weight_1,
+                                                    prompt_weight_2, prompt_weight_3, prompt_weight_4)
         if Is_print == True:
             # Show the to/from prompts with evaluated expressions for transparency.
             print("\n", "Max Frames: ", max_frames, "\n", "frame index: ", (start_frame+i), "\n", "Current Prompt: ",