Upload 4 files

convert_url_to_diffusers_sd.py

@@ -198,6 +198,7 @@ def fuse_loras(pipe, civitai_key="", lora_dict={}, temp_dir="."):
     a_list = []
     w_list = []
     for k, v in lora_dict.items():
+        if not k: continue
         new_lora_file = get_download_file(temp_dir, k, civitai_key)
         if not new_lora_file or not Path(new_lora_file).exists():
             print(f"LoRA not found: {k}")
@@ -206,7 +207,8 @@ def fuse_loras(pipe, civitai_key="", lora_dict={}, temp_dir="."):
         a_name = Path(new_lora_file).stem
         pipe.load_lora_weights(new_lora_file, weight_name = w_name, adapter_name = a_name)
         a_list.append(a_name)
-        w_list.append(v) 
+        w_list.append(v)
+    if not a_list: return
     pipe.set_adapters(a_list, adapter_weights=w_list)
     pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
     pipe.unload_lora_weights()
@@ -300,7 +302,6 @@ if __name__ == "__main__":
     assert args.url is not None, "Must provide a URL!"
 
     lora_dict = {args.lora1: args.lora1s, args.lora2: args.lora2s, args.lora3: args.lora3s, args.lora4: args.lora4s, args.lora5: args.lora5s}
-    if None in lora_dict.keys(): del lora_dict[None]
 
     if args.loras and Path(args.loras).exists():
         for p in Path(args.loras).glob('**/*.safetensors'):

convert_url_to_diffusers_sd_gr.py

@@ -199,6 +199,7 @@ def fuse_loras(pipe, lora_dict={}, temp_dir=".", civitai_key=""):
     a_list = []
     w_list = []
     for k, v in lora_dict.items():
+        if not k: continue
         new_lora_file = get_download_file(temp_dir, k, civitai_key)
         if not new_lora_file or not Path(new_lora_file).exists():
             print(f"LoRA not found: {k}")
@@ -207,7 +208,8 @@ def fuse_loras(pipe, lora_dict={}, temp_dir=".", civitai_key=""):
         a_name = Path(new_lora_file).stem
         pipe.load_lora_weights(new_lora_file, weight_name = w_name, adapter_name = a_name)
         a_list.append(a_name)
-        w_list.append(v) 
+        w_list.append(v)
+    if not a_list: return
     pipe.set_adapters(a_list, adapter_weights=w_list)
     pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
     pipe.unload_lora_weights()
@@ -323,7 +325,6 @@ def convert_url_to_diffusers_repo_sd(dl_url, hf_user, hf_repo, hf_token, civitai
     if hf_token and not os.environ.get("HF_TOKEN"): os.environ['HF_TOKEN'] = hf_token
     if not civitai_key and os.environ.get("CIVITAI_API_KEY"): civitai_key = os.environ.get("CIVITAI_API_KEY")
     lora_dict = {lora1: lora1s, lora2: lora2s, lora3: lora3s, lora4: lora4s, lora5: lora5s}
-    if None in lora_dict.keys(): del lora_dict[None]
     new_path = convert_url_to_diffusers_sd(dl_url, civitai_key, is_upload_sf, half, vae, scheduler, lora_dict,
                                             model_type, sample_size, ema)
     if not new_path: return gr.update(value=repo_urls, choices=repo_urls), gr.update(value="")
@@ -373,7 +374,6 @@ if __name__ == "__main__":
     assert args.url is not None, "Must provide a URL!"
 
     lora_dict = {args.lora1: args.lora1s, args.lora2: args.lora2s, args.lora3: args.lora3s, args.lora4: args.lora4s, args.lora5: args.lora5s}
-    if None in lora_dict.keys(): del lora_dict[None]
 
     if args.loras and Path(args.loras).exists():
         for p in Path(args.loras).glob('**/*.safetensors'):

local/convert_url_to_diffusers_sd.py

@@ -198,6 +198,7 @@ def fuse_loras(pipe, civitai_key="", lora_dict={}, temp_dir="."):
     a_list = []
     w_list = []
     for k, v in lora_dict.items():
+        if not k: continue
         new_lora_file = get_download_file(temp_dir, k, civitai_key)
         if not new_lora_file or not Path(new_lora_file).exists():
             print(f"LoRA not found: {k}")
@@ -206,7 +207,8 @@ def fuse_loras(pipe, civitai_key="", lora_dict={}, temp_dir="."):
         a_name = Path(new_lora_file).stem
         pipe.load_lora_weights(new_lora_file, weight_name = w_name, adapter_name = a_name)
         a_list.append(a_name)
-        w_list.append(v) 
+        w_list.append(v)
+    if not a_list: return
     pipe.set_adapters(a_list, adapter_weights=w_list)
     pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
     pipe.unload_lora_weights()
@@ -300,7 +302,6 @@ if __name__ == "__main__":
     assert args.url is not None, "Must provide a URL!"
 
     lora_dict = {args.lora1: args.lora1s, args.lora2: args.lora2s, args.lora3: args.lora3s, args.lora4: args.lora4s, args.lora5: args.lora5s}
-    if None in lora_dict.keys(): del lora_dict[None]
 
     if args.loras and Path(args.loras).exists():
         for p in Path(args.loras).glob('**/*.safetensors'):