hw6

infer.py

@@ -179,9 +179,10 @@ def infer(
     width,
     height,
     guidance_scale,
+    lora_scale,
     num_inference_steps,
     use_controlnet,
-    controlnet_strength,
+    control_strength,
     controlnet_mode,
     controlnet_image,
     use_ip_adapter,
@@ -202,6 +203,7 @@ def infer(
             prompt=prompt,
             negative_prompt=negative_prompt,
             guidance_scale=guidance_scale,
+            cross_attention_kwargs={"scale": lora_scale},
             num_inference_steps=num_inference_steps,
             width=width,
             height=height,
@@ -217,9 +219,13 @@ def infer(
         image = pipe(
             prompt,
             cn_image,
+            controlnet_conditioning_scale=control_strength,
             negative_prompt=negative_prompt,
-            num_inference_steps = num_inference_steps,
-            controlnet_conditioning_scale=controlnet_strength,
+            guidance_scale=guidance_scale,
+            cross_attention_kwargs={"scale": lora_scale},
+            num_inference_steps=num_inference_steps,
+            width=width,
+            height=height,
             generator=generator
         ).images[0]
 
@@ -231,9 +237,13 @@ def infer(
 
         image = pipe(
             prompt,
-            num_inference_steps=num_inference_steps,
-            guidance_scale=guidance_scale,
             ip_adapter_image=ip_adapter_image,
+            negative_prompt=negative_prompt,
+            guidance_scale=guidance_scale,
+            cross_attention_kwargs={"scale": lora_scale},
+            num_inference_steps=num_inference_steps,
+            width=width,
+            height=height,
             generator=generator
         ).images[0]
 
@@ -248,13 +258,15 @@ def infer(
         image = pipe(
             prompt,
             cn_image,
-            num_inference_steps=num_inference_steps,
+            controlnet_conditioning_scale=control_strength,
+            ip_adapter_image=ip_adapter_image,
+            negative_prompt=negative_prompt,
             guidance_scale=guidance_scale,
-            height=height,
+            cross_attention_kwargs={"scale": lora_scale},
+            num_inference_steps=num_inference_steps,
             width=width,
-            controlnet_conditioning_scale=controlnet_strength,
-            ip_adapter_image=ip_adapter_image,
-            generator=generator,
+            height=height,
+            generator=generator
         ).images[0]
 
     return image, seed