Upload 3 files

app.py

@@ -172,8 +172,11 @@ os.makedirs(directory_vaes, exist_ok=True)
 from modutils import (
     download_private_repo,
     get_private_lora_model_lists,
+    get_local_model_list,
     get_model_id_list,
+    escape_lora_basename,
     list_uniq,
+    list_sub,
     get_tupled_embed_list,
     update_lora_dict,
     HF_LORA_ESSENTIAL_PRIVATE_REPO,
@@ -285,10 +288,19 @@ def get_embed_list(pipeline_name):
     return get_tupled_embed_list(embed_sdxl_list if pipeline_name == "StableDiffusionXLPipeline" else embed_list)
 
 def get_my_lora(link_url):
+    from pathlib import Path
+    before = get_local_model_list(directory_loras)
     for url in [url.strip() for url in link_url.split(',')]:
-        if not os.path.exists(f"./loras/{url.split('/')[-1]}"):
+        if not Path(f"./loras/{url.split('/')[-1]}").exists():
             download_things(directory_loras, url, hf_token, CIVITAI_API_KEY)
-            update_lora_dict(f"./loras/{url.split('/')[-1]}")
+    after = get_local_model_list(directory_loras)
+    new_files = list_sub(after, before)
+    for file in new_files:
+        path = Path(file)
+        if path.exists():
+            new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
+            path.resolve().rename(new_path.resolve())
+            update_lora_dict(str(new_path))
     new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
     new_lora_model_list.insert(0, "None")
     

modutils.py

@@ -37,17 +37,14 @@ def change_interface_mode(mode: str):
         gr.update(visible=True), gr.update(value="Standard")
 
 
-def get_model_list(directory_path):
+def get_local_model_list(dir_path):
+    from pathlib import Path
     model_list = []
-    valid_extensions = {'.ckpt', '.pt', '.pth', '.safetensors', '.bin'}
-
-    for filename in os.listdir(directory_path):
-        if os.path.splitext(filename)[1] in valid_extensions:
-            name_without_extension = os.path.splitext(filename)[0]
-            file_path = os.path.join(directory_path, filename)
-            # model_list.append((name_without_extension, file_path))
+    valid_extensions = ('.ckpt', '.pt', '.pth', '.safetensors', '.bin')
+    for file in Path(dir_path).glob("*"):
+        if file.suffix in valid_extensions:
+            file_path = str(Path(f"{dir_path}/{file.name}"))
             model_list.append(file_path)
-#            print('\033[34mFILE: ' + file_path + '\033[0m')
     return model_list
 
 
@@ -382,7 +379,7 @@ def get_lora_tupled_list(lora_model_list):
     from pathlib import Path
     if not lora_model_list: return []
     tupled_list = []
-    local_models = set(get_model_list(directory_loras))
+    local_models = set(get_local_model_list(directory_loras))
     for model in lora_model_list:
         if not model: continue
         basename = Path(model).stem
@@ -411,7 +408,7 @@ def set_lora_trigger(lora_gui: str):
           gr.update(value="", visible=False), gr.update(value="None", visible=True)
     path = Path(lora_gui)
     new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
-    if not new_path.stem in lora_trigger_dict.keys() and not str(path) in set(get_private_lora_model_lists() + get_model_list(directory_loras)):
+    if not new_path.stem in lora_trigger_dict.keys() and not str(path) in set(get_private_lora_model_lists() + get_local_model_list(directory_loras)):
         return gr.update(value="", visible=False), gr.update(visible=False),\
               gr.update(value="", visible=False), gr.update(value="", visible=True)
     if not new_path.exists():
@@ -438,7 +435,7 @@ def set_lora_trigger(lora_gui: str):
         elif items[3]:
             md = f'[LoRA Model URL]({items[3]})'
     if tag and flag:
-        new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
+        new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
         return gr.update(value=tag, label=label, visible=True), gr.update(visible=True),\
               gr.update(value=md, visible=True), gr.update(value=str(new_path), choices=get_lora_tupled_list(new_lora_model_list))
     elif tag:
@@ -477,7 +474,7 @@ def move_file_lora(filepaths):
         path.resolve().rename(newpath.resolve())
         update_lora_dict(str(newpath))
 
-    new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
+    new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
     new_lora_model_list.insert(0, "None")
     
     return gr.update(