web server: update image_progress callback for diffusers data

Author: keturn

backend/invoke_ai_web_server.py

@@ -15,6 +15,7 @@
 from threading import Event
 
 from ldm.invoke.args import Args, APP_ID, APP_VERSION, calculate_init_img_hash
+from ldm.invoke.generator.diffusers_pipeline import PipelineIntermediateState
 from ldm.invoke.pngwriter import PngWriter, retrieve_metadata
 from ldm.invoke.prompt_parser import split_weighted_subprompts
 
@@ -602,7 +603,9 @@ def generate_images(
             self.socketio.emit("progressUpdate", progress.to_formatted_dict())
             eventlet.sleep(0)
 
-            def image_progress(sample, step):
+            def image_progress(progress_state: PipelineIntermediateState):
+                step = progress_state.step
+                sample = progress_state.latents
                 if self.canceled.is_set():
                     raise CanceledException
 

ldm/invoke/generator/diffusers_pipeline.py

@@ -188,7 +188,7 @@ def image_from_embeddings(self, latents: torch.Tensor, num_inference_steps: int,
         result = None
         for result in self.generate_from_embeddings(
                 latents, text_embeddings, guidance_scale, run_id, **extra_step_kwargs):
-            if callback is not None:
+            if callback is not None and isinstance(result, PipelineIntermediateState):
                 callback(result)
         if result is None:
             raise AssertionError("why was that an empty generator?")