Upload 2 files

app.py

@@ -79,7 +79,7 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", fill_width=True, css=css, delete_ca
         fn=search_civitai,
         inputs=[search_civitai_query, search_civitai_type, search_civitai_basemodel, search_civitai_sort,
                 search_civitai_period, search_civitai_tag, search_civitai_user, search_civitai_limit,
-                search_civitai_page, search_civitai_filetype, search_civitai_gallery, state],
+                search_civitai_page, search_civitai_filetype, civitai_key, search_civitai_gallery, state],
         outputs=[search_civitai_result, search_civitai_desc, search_civitai_submit, search_civitai_query, search_civitai_gallery,
                  search_civitai_result_checkbox, search_civitai_result_info, state],
         queue=False,

civitai_to_hf.py

@@ -108,8 +108,8 @@ def download_file(dl_url, civitai_key, progress=gr.Progress(track_tqdm=True)):
     return output_filename
 
 
-def save_civitai_info(dl_url, filename, progress=gr.Progress(track_tqdm=True)):
-    json_str, html_str, image_path = get_civitai_json(dl_url, True, filename)
+def save_civitai_info(dl_url, filename, civitai_key="", progress=gr.Progress(track_tqdm=True)):
+    json_str, html_str, image_path = get_civitai_json(dl_url, True, filename, civitai_key)
     if not json_str: return  "", "", ""
     json_path = str(Path(TEMP_DIR, Path(filename).stem + ".json"))
     html_path = str(Path(TEMP_DIR, Path(filename).stem + ".html"))
@@ -124,7 +124,7 @@ def save_civitai_info(dl_url, filename, progress=gr.Progress(track_tqdm=True)):
         return "", "", ""
 
 
-def upload_info_to_repo(dl_url, filename, repo_id, repo_type, is_private, progress=gr.Progress(track_tqdm=True)):
+def upload_info_to_repo(dl_url, filename, repo_id, repo_type, is_private, civitai_key="", progress=gr.Progress(track_tqdm=True)):
     def upload_file(api, filename, repo_id, repo_type, hf_token):
         if not Path(filename).exists(): return
         api.upload_file(path_or_fileobj=filename, path_in_repo=Path(filename).name, repo_type=repo_type, revision="main", token=hf_token, repo_id=repo_id)
@@ -135,7 +135,7 @@ def upload_info_to_repo(dl_url, filename, repo_id, repo_type, is_private, progre
     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=f"Downloading info... {filename}")
-        json_path, html_path, image_path = save_civitai_info(dl_url, filename)
+        json_path, html_path, image_path = save_civitai_info(dl_url, filename, civitai_key)
         progress(0, desc=f"Start uploading info... {filename} to {repo_id}")
         if not json_path: return
         else: upload_file(api, json_path, repo_id, repo_type, hf_token)
@@ -167,7 +167,7 @@ def download_civitai(dl_url, civitai_key, hf_token, urls,
             if is_rename: file = get_safe_filename(file, newrepo_id, repo_type)
             url = upload_safetensors_to_repo(file, newrepo_id, repo_type, is_private)
             if url:
-                if is_info: upload_info_to_repo(u, file, newrepo_id, repo_type, is_private)
+                if is_info: upload_info_to_repo(u, file, newrepo_id, repo_type, is_private, civitai_key)
                 urls.append(url)
                 remain_urls.remove(u)
                 md += f"- Uploaded [{str(u)}]({str(u)})\n"
@@ -187,15 +187,17 @@ CIVITAI_TYPE = ["Checkpoint", "TextualInversion", "Hypernetwork", "AestheticGrad
                 "Controlnet", "Upscaler", "MotionModule", "VAE", "Poses", "Wildcards", "Workflows", "Other"]
 CIVITAI_FILETYPE = ["Model", "VAE", "Config", "Training Data"]
 CIVITAI_BASEMODEL = ["Pony", "Illustrious", "SDXL 1.0", "SD 1.5", "Flux.1 D", "Flux.1 S", "SD 3.5"]
-CIVITAI_SORT = ["Highest Rated", "Most Downloaded", "Newest"]
+#CIVITAI_SORT = ["Highest Rated", "Most Downloaded", "Newest"]
+CIVITAI_SORT = ["Highest Rated", "Most Downloaded", "Most Liked", "Most Discussed", "Most Collected", "Most Buzz", "Newest"]
 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: str = "", page: int = 1,
-                      filetype: list[str] = [], progress=gr.Progress(track_tqdm=True)):
+                      filetype: list[str] = [], api_key: str = "", progress=gr.Progress(track_tqdm=True)):
     user_agent = get_user_agent()
     headers = {'User-Agent': user_agent, 'content-type': 'application/json'}
+    if api_key: headers['Authorization'] = f'Bearer {{{api_key}}}'
     base_url = 'https://civitai.com/api/v1/models'
     params = {'sort': sort, 'period': period, 'limit': int(limit), 'nsfw': 'true'}
     if len(types) != 0: params["types"] = types
@@ -271,13 +273,13 @@ def search_on_civitai(query: str, types: list[str], allow_model: list[str] = [],
 
 
 def search_civitai(query, types, base_model=[], sort=CIVITAI_SORT[0], period=CIVITAI_PERIOD[0], tag="", user="", limit=100, page=1,
-                   filetype=[], gallery=[], state={}, progress=gr.Progress(track_tqdm=True)):
+                   filetype=[], api_key="", gallery=[], state={}, progress=gr.Progress(track_tqdm=True)):
     civitai_last_results = {}
     set_state(state, "civitai_last_choices", [("", "")])
     set_state(state, "civitai_last_gallery", [])
     set_state(state, "civitai_last_results", civitai_last_results)
     results_info = "No item found."
-    items = search_on_civitai(query, types, base_model, int(limit), sort, period, tag, user, int(page), filetype)
+    items = search_on_civitai(query, types, base_model, int(limit), sort, period, tag, user, int(page), filetype, api_key)
     if not items: return gr.update(choices=[("", "")], value=[], visible=True),\
           gr.update(value="", visible=False), gr.update(), gr.update(), gr.update(), gr.update(), results_info, state
     choices = []
@@ -299,12 +301,13 @@ def search_civitai(query, types, base_model=[], sort=CIVITAI_SORT[0], period=CIV
           gr.update(), gr.update(), gr.update(value=gallery), gr.update(choices=choices, value=[]), results_info, state
 
 
-def get_civitai_json(dl_url: str, is_html: bool=False, image_baseurl: str=""):
+def get_civitai_json(dl_url: str, is_html: bool=False, image_baseurl: str="", api_key=""):
     if not image_baseurl: image_baseurl = dl_url
     default = ("", "", "") if is_html else ""
     if "https://civitai.com/api/download/models/" not in dl_url: return default
     user_agent = get_user_agent()
     headers = {'User-Agent': user_agent, 'content-type': 'application/json'}
+    if api_key: headers['Authorization'] = f'Bearer {{{api_key}}}'
     base_url = 'https://civitai.com/api/v1/model-versions/'
     params = {}
     session = requests.Session()