Upload spaghetti_ai_script.py

spaghetti_ai_script.py

@@ -3445,7 +3445,7 @@ def create_image_function (
     #print ("user_id_state_value: ", user_id_state_value)
     #print ("cancel_image_generation_ids_object: ", cancel_image_generation_ids_object)
     #print ("cancel_image_generation_times_object: ", cancel_image_generation_times_object)
-    #print ("-------------------------")
+    print ("-------------------------")
 
     if image_processing_is_canceled(user_id_state_value, image_generation_id_state_value):
 
@@ -3833,13 +3833,13 @@ def create_image_function (
 
         global current_base_model_generation_start_time
 
-        if int(callback_step_index) == 0:
+        if callback_step_number == 1:
 
             current_base_model_generation_start_time = time.time()
 
         seconds_per_step = 0
 
-        if int(callback_step_index) > 0:
+        if callback_step_number > 1:
 
             seconds_per_step = ((time.time() - current_base_model_generation_start_time) / int(callback_step_index))
 
@@ -3867,7 +3867,7 @@ def create_image_function (
 
             latents = callback_kwargs["latents"]
 
-            temporary_extra = str(user_id_state_value) + "_base_model_" + str(callback_step_index)
+            temporary_extra = str(user_id_state_value) + "_base_model_" + str(callback_step_number)
 
             model_to_use = base_model_name_value
 
@@ -3906,7 +3906,7 @@ def create_image_function (
 
             progress(
                 progress = (
-                    callback_step_index,
+                    callback_step_number,
                     current_estimated_total_base_model_steps
                 ),
                 desc = base_model_progress_text,
@@ -3934,19 +3934,21 @@ def create_image_function (
             callback_kwargs
         ):
 
+            callback_step_number = (int(callback_step_index) + 1)
+
             global current_actual_total_refiner_steps
 
             current_actual_total_refiner_steps += 1
 
             global current_refiner_generation_start_time
 
-            if int(callback_step_index) == 0:
+            if callback_step_number == 1:
 
                 current_refiner_generation_start_time = time.time()
 
             seconds_per_step = 0
 
-            if int(callback_step_index) > 0:
+            if callback_step_number > 1:
 
                 seconds_per_step = ((time.time() - current_refiner_generation_start_time) / int(callback_step_index))
 
@@ -3968,7 +3970,7 @@ def create_image_function (
 
                 latents = callback_kwargs["latents"]
 
-                temporary_extra = str(user_id_state_value) + "_refiner_" + str(callback_step_index)
+                temporary_extra = str(user_id_state_value) + "_refiner_" + str(callback_step_number)
 
                 model_to_use = base_model_name_value
 
@@ -3985,11 +3987,11 @@ def create_image_function (
 
                 progress(
                     progress = (
-                        callback_step_index,
+                        callback_step_number,
                         current_estimated_total_refiner_steps
                     ),
                     desc = refiner_progress_text,
-                    unit = "refiner steps"
+                    unit = "est. refiner steps"
                 )
 
             if image_processing_is_canceled(user_id_state_value, image_generation_id_state_value):
@@ -4010,19 +4012,21 @@ def create_image_function (
             callback_latents
         ):
 
+            callback_step_number = (int(callback_step_index) + 1)
+
             global current_actual_total_upscaler_steps
 
             current_actual_total_upscaler_steps += 1
 
             global current_upscaler_generation_start_time
 
-            if int(callback_step_index) == 0:
+            if callback_step_number == 1:
 
                 current_upscaler_generation_start_time = time.time()
 
             seconds_per_step = 0
 
-            if int(callback_step_index) > 0:
+            if callback_step_number > 1:
 
                 seconds_per_step = ((time.time() - current_upscaler_generation_start_time) / int(callback_step_index))
 
@@ -4061,7 +4065,7 @@ def create_image_function (
 
                 progress(
                     progress = (
-                        callback_step_index,
+                        callback_step_number,
                         current_estimated_total_upscaler_steps
                     ),
                     desc = upscaler_progress_text,