Upload 6 files

README.md

@@ -1,10 +1,10 @@
 ---
-title: CivitAI to HF Downloader Alpha
+title: CivitAI to HF🤗 Downloader & Uploader with Search
 emoji: 🤗
 colorFrom: yellow
 colorTo: blue
 sdk: gradio
-sdk_version: 4.44.0
+sdk_version: 5.0.1
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -2,15 +2,16 @@ import gradio as gr
 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; }
+.title { font-size: 3em; align-items: center; text-align: center; }
+.block.result { margin: 1em 0; padding: 1em; box-shadow: 0 0 3px 3px #664422, 0 0 3px 2px #664422 inset; border-radius: 6px; background: #665544; }
 """
 
 with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_cache=(60, 3600)) as demo:
     with gr.Column():
-        gr.Markdown("# Civitai to HF Downloader Alpha", elem_classes="title")
+        gr.Markdown("# CivitAI to HF🤗 Downloader & Uploader", elem_classes="title")
         with gr.Accordion("Search Civitai", open=False):
             with gr.Row():
-                search_civitai_type = gr.CheckboxGroup(label="Type", choices=CIVITAI_TYPE, value=[])
+                search_civitai_type = gr.CheckboxGroup(label="Type", choices=CIVITAI_TYPE, value=["Checkpoint", "LORA"])
                 search_civitai_basemodel = gr.CheckboxGroup(label="Base model", choices=CIVITAI_BASEMODEL, value=[])
             with gr.Row():
                 search_civitai_sort = gr.Radio(label="Sort", choices=CIVITAI_SORT, value=CIVITAI_SORT[0])
@@ -35,7 +36,7 @@ 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)
         uploaded_urls = gr.CheckboxGroup(visible=False, choices=[], value=None) # hidden
         run_button = gr.Button(value="Download and Upload")
-        urls_md = gr.Markdown()
+        urls_md = gr.Markdown("<br><br>", elem_classes="result")
     gr.DuplicateButton(value="Duplicate Space")
 
     gr.on(

civitai_to_hf.py

@@ -7,10 +7,16 @@ import requests
 from requests.adapters import HTTPAdapter
 from urllib3.util import Retry
 from utils import get_token, set_token, is_repo_exists, get_user_agent, get_download_file
+import re
 
 
 def parse_urls(s):
-    return [x.strip() for x in s.split() if s and "http" in s]
+    url_pattern = "https?://[\\w/:%#\\$&\\?\\(\\)~\\.=\\+\\-]+"
+    try:
+        urls = re.findall(url_pattern, s)
+        return list(urls)
+    except Exception:
+        return []
 
 
 def upload_safetensors_to_repo(filename, repo_id, repo_type, is_private, progress=gr.Progress(track_tqdm=True)):
@@ -40,8 +46,9 @@ def download_file(dl_url, civitai_key, progress=gr.Progress(track_tqdm=True)):
 def download_civitai(dl_url, civitai_key, hf_token, urls, 
                      newrepo_id, repo_type="model", is_private=True, progress=gr.Progress(track_tqdm=True)):
     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")
+    else: set_token(os.environ.get("HF_TOKEN")) # default huggingface write token
+    if not civitai_key: civitai_key = os.environ.get("CIVITAI_API_KEY") # default Civitai API key
+    if not newrepo_id: newrepo_id = os.environ.get("HF_REPO") # default repo to upload
     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 = []
@@ -52,9 +59,9 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
         if url: urls.append(url)
         Path(file).unlink()
     progress(1, desc="Processing...")
-    md = ""
+    md = f'### Your repo: [{newrepo_id}]({"https://huggingface.co/datasets/" if repo_type == "dataset" else "https://huggingface.co/"}{newrepo_id})\n'
     for u in urls:
-        md += f"[Uploaded {str(u)}]({str(u)})<br>"
+        md += f"- Uploaded [{str(u)}]({str(u)})\n"
     gc.collect()
     return gr.update(value=urls, choices=urls), gr.update(value=md)
 
@@ -67,7 +74,6 @@ CIVITAI_PERIOD = ["AllTime", "Year", "Month", "Week", "Day"]
 
 def search_on_civitai(query: str, types: list[str], allow_model: list[str] = [], limit: int = 100,
                            sort: str = "Highest Rated", period: str = "AllTime", tag: str = ""):
-
     user_agent = get_user_agent()
     headers = {'User-Agent': user_agent, 'content-type': 'application/json'}
     base_url = 'https://civitai.com/api/v1/models'

requirements.txt

@@ -1,2 +1,2 @@
 huggingface-hub
-gdown
+gdown