hw6

methods.py

@@ -187,7 +187,6 @@ def infer(
 
         image = pipe(
             prompt,
-            edges,
             ip_adapter_image=image_upload_ip,
             num_inference_steps=num_inference_steps,
             guidance_scale=guidance_scale,
@@ -195,11 +194,17 @@ def infer(
 
     elif use_advanced_ip != False and use_advanced_controlnet != False:
         print("SD 1.5 + Lora + IpAdapter + ControlNet")
+
+        edges = cv.Canny(image_upload_cn, 80, 160)
+        edges = np.repeat(edges[:, :, None], 3, axis=2)
+        edges = Image.fromarray(edges)
+
         pipe = get_lora_sd_pipeline(base_model_name_or_path=model_repo_id,
                                 ip_adapter=True,
                                 controlnet=True,
                                 dtype=dtype).to(device)
         
+        
         pipe.set_ip_adapter_scale(ip_adapter_scale)
         image = pipe(prompt,
             edges,