hw6

methods.py

@@ -124,11 +124,11 @@ def infer(
     guidance_scale=7,
     num_inference_steps=50,
 
-    use_advanced_controlnet=None,
+    use_advanced_controlnet=False,
     control_strength=None,
     image_upload_cn=None,
 
-    use_advanced_ip=None,
+    use_advanced_ip=False,
     ip_adapter_scale=None,
     image_upload_ip=None,
 
@@ -146,7 +146,7 @@ def infer(
     print(use_advanced_controlnet, use_advanced_ip) 
 
 
-    if use_advanced_controlnet == None and use_advanced_ip == None:
+    if use_advanced_controlnet == False and use_advanced_ip == False:
         print("1. SD 1.5 + Lora")
         pipe = get_lora_sd_pipeline(base_model_name_or_path=model_repo_id, 
                                     dtype=dtype).to(device)                   
@@ -159,7 +159,7 @@ def infer(
                 heigth=height,
                 generator=generator).images[0]
 
-    elif use_advanced_controlnet != None and use_advanced_ip == None:
+    elif use_advanced_controlnet != False and use_advanced_ip == False:
         print("SD 1.5 + Lora + Controlnet")
         edges = cv.Canny(np.array(image_upload_cn))
         edges = np.repeat(edges[:, :, None], 3, axis=2)
@@ -177,7 +177,7 @@ def infer(
                 generator=generator).images[0]
  
 
-    elif use_advanced_ip != None and use_advanced_controlnet == None:
+    elif use_advanced_ip != False and use_advanced_controlnet == False:
         print("SD 1.5 + Lora + IpAdapter")
         pipe = get_lora_sd_pipeline(base_model_name_or_path=model_repo_id,
                                     ip_adapter=True,
@@ -192,7 +192,7 @@ def infer(
             guidance_scale=guidance_scale,
             generator=generator).images[0]
 
-    elif use_advanced_ip != None and use_advanced_controlnet != None:
+    elif use_advanced_ip != False and use_advanced_controlnet != False:
         print("SD 1.5 + Lora + IpAdapter + ControlNet")
         pipe = get_lora_sd_pipeline(base_model_name_or_path=model_repo_id,
                                 ip_adapter=True,