Upload 6 files

README.md

@@ -4,7 +4,7 @@ emoji: 🎨➡️🧨
 colorFrom: indigo
 colorTo: purple
 sdk: gradio
-sdk_version: 4.38.1
+sdk_version: 4.42.0
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -61,6 +61,7 @@ It saves you the trouble of typing them in.<br>
         hf_token = gr.Textbox(label="Your HF write token", placeholder="hf_...", value="", max_lines=1)
         civitai_key = gr.Textbox(label="Your Civitai API Key (Optional)", info="If you download model from Civitai...", placeholder="", value="", max_lines=1)
         is_upload_sf = gr.Checkbox(label="Upload single safetensors file into new repo", value=False)
+        is_private = gr.Checkbox(label="Create private repo", value=True)
         presets = gr.Radio(label="Presets", choices=list(preset_dict.keys()), value="Default")
         with gr.Accordion("Advanced settings", open=False):
             is_half = gr.Checkbox(label="Half precision", value=True)
@@ -87,7 +88,7 @@ It saves you the trouble of typing them in.<br>
     gr.on(
         triggers=[run_button.click],
         fn=convert_url_to_diffusers_repo_sd,
-        inputs=[dl_url, hf_user, hf_repo, hf_token, civitai_key, is_upload_sf, repo_urls, is_half, vae, scheduler,
+        inputs=[dl_url, hf_user, hf_repo, hf_token, civitai_key, is_private, is_upload_sf, repo_urls, is_half, vae, scheduler,
                  lora1, lora1s, lora2, lora2s, lora3, lora3s, lora4, lora4s, lora5, lora5s,
                  model_type, sample_size, ema],
         outputs=[repo_urls, output_md],

convert_url_to_diffusers_sd.py

@@ -12,7 +12,7 @@ def list_sub(a, b):
 
 def is_repo_name(s):
     import re
-    return re.fullmatch(r'^[^/,\s]+?/[^/,\s]+?$', s)
+    return re.fullmatch(r'^[^/,\s\"\']+/[^/,\s\"\']+$', s)
 
 
 def download_thing(directory, url, civitai_api_key=""):

convert_url_to_diffusers_sd_gr.py

@@ -13,7 +13,7 @@ def list_sub(a, b):
 
 def is_repo_name(s):
     import re
-    return re.fullmatch(r'^[^/,\s]+?/[^/,\s]+?$', s)
+    return re.fullmatch(r'^[^/,\s\"\']+/[^/,\s\"\']+$', s)
 
 
 def download_thing(directory, url, civitai_api_key="", progress=gr.Progress(track_tqdm=True)):
@@ -216,7 +216,7 @@ def fuse_loras(pipe, lora_dict={}, temp_dir=".", civitai_key=""):
 
 
 def convert_url_to_diffusers_sd(url, civitai_key="", is_upload_sf=False, half=True, vae=None, scheduler="Euler", lora_dict={},
-                                  model_type="v1", sample_size=768, ema="ema", progress=gr.Progress(track_tqdm=True)):
+                                  model_type="v1", sample_size=768, ema="ema", is_local=True, progress=gr.Progress(track_tqdm=True)):
     progress(0, desc="Start converting...")
     temp_dir = "."
     new_file = get_download_file(temp_dir, url, civitai_key)
@@ -277,6 +277,7 @@ def convert_url_to_diffusers_sd(url, civitai_key="", is_upload_sf=False, half=Tr
     if not is_repo_name(new_file) and is_upload_sf:
         import shutil
         shutil.move(str(Path(new_file).resolve()), str(Path(new_repo_name, Path(new_file).name).resolve()))
+    elif not is_local: os.remove(new_file)
 
     progress(1, desc="Converted.")
     return new_repo_name
@@ -293,14 +294,14 @@ def is_repo_exists(repo_id):
         return True # for safe
 
 
-def create_diffusers_repo(new_repo_id, diffusers_folder, progress=gr.Progress(track_tqdm=True)):
+def create_diffusers_repo(new_repo_id, diffusers_folder, is_private, progress=gr.Progress(track_tqdm=True)):
     from huggingface_hub import HfApi
     import os
     hf_token = os.environ.get("HF_TOKEN")
     api = HfApi()
     try:
         progress(0, desc="Start uploading...")
-        api.create_repo(repo_id=new_repo_id, token=hf_token)
+        api.create_repo(repo_id=new_repo_id, token=hf_token, private=is_private)
         for path in Path(diffusers_folder).glob("*"):
             if path.is_dir():
                 api.upload_folder(repo_id=new_repo_id, folder_path=str(path), path_in_repo=path.name, token=hf_token)
@@ -315,10 +316,11 @@ def create_diffusers_repo(new_repo_id, diffusers_folder, progress=gr.Progress(tr
     return url
 
 
-def convert_url_to_diffusers_repo_sd(dl_url, hf_user, hf_repo, hf_token, civitai_key="", is_upload_sf=False, repo_urls=[], half=True, vae=None,
+def convert_url_to_diffusers_repo_sd(dl_url, hf_user, hf_repo, hf_token, civitai_key="", is_private=True, is_upload_sf=False, repo_urls=[], half=True, vae=None,
                                   scheduler="Euler", lora1=None, lora1s=1.0, lora2=None, lora2s=1.0, lora3=None, lora3s=1.0,
                                   lora4=None, lora4s=1.0, lora5=None, lora5s=1.0,
                                   model_type="v1", sample_size=768, ema="ema", progress=gr.Progress(track_tqdm=True)):
+    import shutil
     if not hf_user:
         print(f"Invalid user name: {hf_user}")
         progress(1, desc=f"Invalid user name: {hf_user}")
@@ -327,7 +329,7 @@ def convert_url_to_diffusers_repo_sd(dl_url, hf_user, hf_repo, hf_token, civitai
     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}
     new_path = convert_url_to_diffusers_sd(dl_url, civitai_key, is_upload_sf, half, vae, scheduler, lora_dict,
-                                            model_type, sample_size, ema)
+                                            model_type, sample_size, ema, False)
     if not new_path: return gr.update(value=repo_urls, choices=repo_urls), gr.update(value="")
     new_repo_id = f"{hf_user}/{Path(new_path).stem}"
     if hf_repo != "": new_repo_id = f"{hf_user}/{hf_repo}"
@@ -339,7 +341,8 @@ def convert_url_to_diffusers_repo_sd(dl_url, hf_user, hf_repo, hf_token, civitai
         print(f"Repo already exists: {new_repo_id}")
         progress(1, desc=f"Repo already exists: {new_repo_id}")
         return gr.update(value=repo_urls, choices=repo_urls), gr.update(value="")
-    repo_url = create_diffusers_repo(new_repo_id, new_path)
+    repo_url = create_diffusers_repo(new_repo_id, new_path, is_private)
+    shutil.rmtree(new_path)
     if not repo_urls: repo_urls = []
     repo_urls.append(repo_url)
     md = "Your new repo:<br>"
@@ -381,4 +384,4 @@ if __name__ == "__main__":
             lora_dict[str(p)] = 1.0
 
     convert_url_to_diffusers_sd(args.url, args.civitai_key, args.half, args.vae, args.scheduler, lora_dict,
-                                 args.model_type, args.sample_size, args.ema)
+                                 args.model_type, args.sample_size, args.ema, True)

local/convert_url_to_diffusers_sd.py

@@ -12,7 +12,7 @@ def list_sub(a, b):
 
 def is_repo_name(s):
     import re
-    return re.fullmatch(r'^[^/,\s]+?/[^/,\s]+?$', s)
+    return re.fullmatch(r'^[^/,\s\"\']+/[^/,\s\"\']+$', s)
 
 
 def download_thing(directory, url, civitai_api_key=""):