Upload 3 files

README.md

@@ -4,7 +4,7 @@ emoji: 🤗
 colorFrom: yellow
 colorTo: blue
 sdk: gradio
-sdk_version: 5.47.2
+sdk_version: 5.48.0
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -62,19 +62,23 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
                 is_private = gr.Checkbox(label="Create private repo", value=True)
                 is_info = gr.Checkbox(label="Upload Civitai information files", value=False)
                 is_rename = gr.Checkbox(label="Auto rename", value=True)
-        run_button = gr.Button(value="Download and Upload", variant="primary")
+        with gr.Row():
+            run_button = gr.Button(value="Download and Upload", variant="primary")
+            stop_button = gr.Button(value="Cancel", variant="stop")
         uploaded_urls = gr.CheckboxGroup(visible=False, choices=[], value=None) # hidden
         urls_md = gr.Markdown("<br><br>", elem_classes="result")
-        urls_remain = gr.Textbox("Remaining URLs", value="", show_copy_button=True, visible=False)
+        urls_remain = gr.Textbox(label="Remaining URLs", value="", show_copy_button=True, visible=False)
     gr.DuplicateButton(value="Duplicate Space")
 
-    gr.on(
+    download_evt = gr.on(
         triggers=[run_button.click],
         fn=download_civitai,
         inputs=[dl_url, civitai_key, hf_token, uploaded_urls, newrepo_id, newrepo_type, is_private, is_info, is_rename],
         outputs=[uploaded_urls, urls_md, urls_remain],
         queue=True,
     )
+    stop_button.click(fn=None, cancels=[download_evt], queue=False, show_api=False)
+    stop_button.click(fn=lambda: gr.update(visible=True), inputs=None, outputs=[urls_remain], queue=False, show_api=False)
     gr.on(
         triggers=[search_civitai_submit.click, search_civitai_query.submit, search_civitai_user.submit],
         fn=search_civitai,

civitai_to_hf.py

@@ -214,11 +214,13 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
     hashes = set(get_repo_hashes(newrepo_id, repo_type))
     try:
         md = f'### Your repo: [{newrepo_id}]({"https://huggingface.co/datasets/" if repo_type == "dataset" else "https://huggingface.co/"}{newrepo_id})\n'
+        yield gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls))
         for u in dl_urls:
             if get_civitai_sha256(u, civitai_key) in hashes:
                 print(f"{u} is already exitsts. skipping.")
                 remain_urls.remove(u)
                 md += f"- Skipped [{str(u)}]({str(u)})\n"
+                yield gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls))
                 continue
             file = download_file(u, civitai_key)
             if not Path(file).exists() or not Path(file).is_file(): continue
@@ -229,14 +231,15 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
                 urls.append(url)
                 remain_urls.remove(u)
                 md += f"- Uploaded [{str(u)}]({str(u)})\n"
+            yield gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls))
         dp_repos = parse_repos(dl_url)
         for r in dp_repos:
             url = duplicate_hf_repo(r, newrepo_id, "model", repo_type, is_private, HF_SUBFOLDER_NAME[1])
             if url: urls.append(url)
-        return gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls), visible=False)
+        yield gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls), visible=False)
     except Exception as e:
         gr.Info(f"Error occured: {e}")
-        return gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls), visible=True)
+        yield gr.update(value=urls, choices=urls), gr.update(value=md), gr.update(value="\n".join(remain_urls), visible=True)
     finally:
         gc.collect()