Upload 5 files

app.py

@@ -1,5 +1,5 @@
 import gradio as gr
-from civitai_to_hf import search_civitai, download_civitai, select_civitai_item, CIVITAI_TYPE, CIVITAI_BASEMODEL, CIVITAI_SORT, CIVITAI_PERIOD
+from civitai_to_hf import search_civitai, download_civitai, select_civitai_item, add_civitai_item, CIVITAI_TYPE, CIVITAI_BASEMODEL, CIVITAI_SORT, CIVITAI_PERIOD
 
 css = """
 .title { text-align: center; !important; }
@@ -23,7 +23,8 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
                 search_civitai_json = gr.JSON(value={}, visible=False)
                 search_civitai_desc = gr.Markdown(value="", visible=False)
             search_civitai_result = gr.Dropdown(label="Search Results", choices=[("", "")], value="", allow_custom_value=True, visible=False)
-        dl_url = gr.Textbox(label="Download URL", placeholder="https://civitai.com/api/download/models/28907", value="", lines=1)
+            search_civitai_add = gr.Button("Add to download URLs")
+        dl_url = gr.Textbox(label="Download URL(s)", placeholder="https://civitai.com/api/download/models/28907\n...", value="", lines=2, max_lines=255)
         civitai_key = gr.Textbox(label="Your Civitai Key", value="", max_lines=1)
         with gr.Row():
             hf_token = gr.Textbox(label="Your HF write token", placeholder="hf_...", value="", max_lines=1)
@@ -51,7 +52,8 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
         queue=True,
         show_api=False,
     )
-    search_civitai_result.change(select_civitai_item, [search_civitai_result], [dl_url, search_civitai_desc], queue=False, show_api=False)
+    search_civitai_result.change(select_civitai_item, [search_civitai_result], [search_civitai_desc], queue=False, show_api=False)
+    search_civitai_add.click(add_civitai_item, [search_civitai_result, dl_url], [dl_url], queue=False, show_api=False)
 
 demo.queue()
 demo.launch()

civitai_to_hf.py

@@ -9,13 +9,17 @@ from urllib3.util import Retry
 from utils import get_token, set_token, is_repo_exists, get_user_agent, get_download_file
 
 
+def parse_urls(s):
+    return [x.strip() for x in s.split() if s and "http" in s]
+
+
 def upload_safetensors_to_repo(filename, repo_id, repo_type, is_private, progress=gr.Progress(track_tqdm=True)):
     output_filename = Path(filename).name
     hf_token = get_token()
     api = HfApi(token=hf_token)
     try:
         if not is_repo_exists(repo_id, repo_type): api.create_repo(repo_id=repo_id, repo_type=repo_type, token=hf_token, private=is_private)
-        progress(0, desc="Start uploading...")
+        progress(0, desc=f"Start uploading... {filename} to {repo_id}")
         api.upload_file(path_or_fileobj=filename, path_in_repo=output_filename, repo_type=repo_type, revision="main", token=hf_token, repo_id=repo_id)
         progress(1, desc="Uploaded.")
         url = hf_hub_url(repo_id=repo_id, repo_type=repo_type, filename=output_filename)
@@ -28,7 +32,7 @@ def upload_safetensors_to_repo(filename, repo_id, repo_type, is_private, progres
 
 def download_file(dl_url, civitai_key, progress=gr.Progress(track_tqdm=True)):
     download_dir = "."
-    progress(0, desc="Start downloading...")
+    progress(0, desc=f"Start downloading... {dl_url}")
     output_filename = get_download_file(download_dir, dl_url, civitai_key)
     return output_filename
 
@@ -38,13 +42,16 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
     if hf_token: set_token(hf_token)
     else: set_token(os.environ.get("HF_TOKEN"))
     if not civitai_key: civitai_key = os.environ.get("CIVITAI_API_KEY")
-    if not hf_token or not civitai_key: raise gr.Error("HF write token and Civitai API key is required.")
-    file = download_file(dl_url, civitai_key)
+    if not get_token() or not civitai_key: raise gr.Error("HF write token and Civitai API key is required.")
+    dl_urls = parse_urls(dl_url)
     if not urls: urls = []
-    url = upload_safetensors_to_repo(file, newrepo_id, repo_type, is_private)
+    for u in dl_urls:
+        file = download_file(u, civitai_key)
+        if not Path(file).exists() or not Path(file).is_file(): continue
+        url = upload_safetensors_to_repo(file, newrepo_id, repo_type, is_private)
+        if url: urls.append(url)
+        Path(file).unlink()
     progress(1, desc="Processing...")
-    if url: urls.append(url)
-    Path(file).unlink()
     md = ""
     for u in urls:
         md += f"[Uploaded {str(u)}]({str(u)})<br>"
@@ -123,7 +130,13 @@ def search_civitai(query, types, base_model=[], sort=CIVITAI_SORT[0], period=CIV
 
 
 def select_civitai_item(search_result):
-    if not "http" in search_result: return gr.update(value=""), gr.update(value="None", visible=True)
+    if not "http" in search_result: return gr.update(value="None", visible=True)
     result = civitai_last_results.get(search_result, "None")
     md = result['md'] if result else ""
-    return gr.update(value=search_result), gr.update(value=md, visible=True)
+    return gr.update(value=md, visible=True)
+
+
+def add_civitai_item(search_result, dl_url):
+    if not "http" in search_result: return gr.update(value=dl_url)
+    new_url = f"{dl_url}\n{search_result}" if dl_url else search_result
+    return gr.update(value=new_url)