Merge branch 'main' into space-txt2img

app_init.py

@@ -121,17 +121,14 @@ def init_app(app: FastAPI, user_data: UserData, args: Args, pipeline):
                     last_params = params
                     image = pipeline.predict(params)
                     if image is None:
+                        await websocket.send_json({"status": "send_frame"})
                         continue
                     frame = pil_to_frame(image)
                     yield frame
                     # https://bugs.chromium.org/p/chromium/issues/detail?id=1250396
                     if not is_firefox(request.headers["user-agent"]):
                         yield frame
-                    await websocket.send_json(
-                        {
-                            "status": "send_frame",
-                        }
-                    )
+                    await websocket.send_json({"status": "send_frame"})
 
             return StreamingResponse(
                 generate(),

pipelines/controlnetLoraSD15.py

@@ -172,7 +172,7 @@ class Pipeline:
             pipe.set_progress_bar_config(disable=True)
             pipe.to(device=device, dtype=torch_dtype).to(device)
             if device.type != "mps":
-                self.pipe.unet.to(memory_format=torch.channels_last)
+                pipe.unet.to(memory_format=torch.channels_last)
 
             if psutil.virtual_memory().total < 64 * 1024**3:
                 pipe.enable_attention_slicing()