Upload modutils.py

modutils.py

@@ -20,6 +20,10 @@ def get_user_agent():
     return 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
 
 
+def to_list(s):
+    return [x.strip() for x in s.split(",") if not s == ""]
+
+
 def list_uniq(l):
         return sorted(set(l), key=l.index)
 
@@ -547,10 +551,13 @@ def get_lora_info(lora_path: str):
     tag = ""
     label = ""
     md = "None"
-    if not lora_path or lora_path == "None": return is_valid, label, tag, md
+    if not lora_path or lora_path == "None":
+        print("LoRA file not found.")
+        return is_valid, label, tag, md
     path = Path(lora_path)
     new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
-    if not to_lora_key(str(new_path)) in loras_dict.keys() and not str(path) in set(all_lora_list):
+    if not to_lora_key(str(new_path)) in loras_dict.keys() and str(path) not in set(get_all_lora_list()):
+        print("LoRA file is not registered.")
         return tag, label, tag, md
     if not new_path.exists():
         download_private_file_from_somewhere(str(path), True)
@@ -729,11 +736,12 @@ def get_civitai_info(path):
     try:
         r = session.get(url, params=params, headers=headers, stream=True, timeout=(3.0, 15))
     except Exception as e:
+        print(e)
         return default
     else:
         if not r.ok: return None
         json = r.json()
-        if not 'baseModel' in json:
+        if 'baseModel' not in json:
             civitai_not_exists_list.append(path)
             return default
         items = []
@@ -762,16 +770,17 @@ def search_lora_on_civitai(query: str, allow_model: list[str] = ["Pony", "SDXL 1
     try:
         r = session.get(base_url, params=params, headers=headers, stream=True, timeout=(3.0, 30))
     except Exception as e:
+        print(e)
         return None
     else:
         if not r.ok: return None
         json = r.json()
-        if not 'items' in json: return None
+        if 'items' not in json: return None
         items = []
         for j in json['items']:
             for model in j['modelVersions']:
                 item = {}
-                if not model['baseModel'] in set(allow_model): continue
+                if model['baseModel'] not in set(allow_model): continue
                 item['name'] = j['name']
                 item['creator'] = j['creator']['username']
                 item['tags'] = j['tags']