Merge branch 'main' into sourcery/pull-7

javascript/civitai_helper.js

@@ -559,6 +559,10 @@ onUiLoaded(() => {
                     additional_node = card.querySelector(".actions .additional");
                     //get ul node, which is the parent of all buttons
                     ul_node = card.querySelector(".actions .additional ul");
+                    if (ul_node==null) {
+                        ul_node = document.createElement("ul");   
+                        additional_node.appendChild(ul_node);
+                    }
                     // replace preview text button
                     replace_preview_btn = card.querySelector(".actions .additional a");
 
@@ -594,6 +598,11 @@ onUiLoaded(() => {
                         });
                     }
 
+                    if (replace_preview_btn==null) {
+                        replace_preview_btn = document.createElement("a");   
+                        additional_node.appendChild(replace_preview_btn);
+                    }
+
                     // check thumb mode
                     if (is_thumb_mode) {
                         additional_node.style.display = null;

scripts/ch_lib/civitai.py

@@ -231,15 +231,14 @@ def load_model_info_by_search_term(model_type, search_term):
             break;
 
     if not found:
-        util.printD(f"Can not find model info file: {model_info_filepath}")
+
+    if not os.path.isfile(model_info_filepath):
+         util.printD(f"Can not find model info file: {model_info_filepath}")
         return
 
     return model.load_model_info(model_info_filepath)
 
 
-
-
-
 # get model file names by model type
 # parameter: model_type - string
 # parameter: filter - dict, which kind of model you need
@@ -276,6 +275,31 @@ def get_model_names_by_type_and_filter(model_type:str, filter:dict) -> list:
                 if ext in model.exts:
                     # find a model
 
+    for root, dirs, files in os.walk(model_folder, followlinks=True):
+        for filename in files:
+            item = os.path.join(root, filename)
+            # check extension
+            base, ext = os.path.splitext(item)
+            if ext in model.exts:
+                # find a model
+
+                # check filter
+                if no_info_only:
+                    # check model info file
+                    info_file = base + suffix + model.info_ext
+                    if os.path.isfile(info_file):
+                        continue
+
+                if empty_info_only:
+                    # check model info file
+                    info_file = base + suffix + model.info_ext
+                    if os.path.isfile(info_file):
+                        if model_info := model.load_model_info(info_file):
+                            if "id" in model_info.keys():
+                                # find a non-empty model info file
+                                continue
+
+
                     # check filter
                     if no_info_only:
                         # check model info file
@@ -545,8 +569,6 @@ def check_model_new_version_by_path(model_path:str, delay:float=1) -> tuple:
     return (model_path, model_id, model_name, current_version_id, new_version_name, description, downloadUrl, img_url)
 
 
-
-
 # check model's new version
 # parameter: delay - float, how many seconds to delay between each request to civitai
 # return: new_versions - a list for all new versions, each one is (model_path, model_id, model_name, new_verion_id, new_version_name, description, download_url, img_url)
@@ -613,9 +635,4 @@ def check_models_new_version_by_model_types(model_types:list, delay:float=1) ->
                     new_versions.append(r)
 
 
-
-
     return new_versions
-
-
-

scripts/ch_lib/downloader.py

@@ -12,7 +12,7 @@ requests.packages.urllib3.disable_warnings()
 
 # output is downloaded file path
 def dl(url, folder, filename, filepath):
-    util.printD("Start downloading from: " + url)
+    util.printD(f"Start downloading from: {url}")
     # get file_path
     file_path = ""
     if filepath:
@@ -22,11 +22,11 @@ def dl(url, folder, filename, filepath):
         if not folder:
             util.printD("folder is none")
             return
-        
+
         if not os.path.isdir(folder):
-            util.printD("folder does not exist: "+folder)
+            util.printD(f"folder does not exist: {folder}")
             return
-        
+
         if filename:
             file_path = os.path.join(folder, filename)
 
@@ -40,25 +40,25 @@ def dl(url, folder, filename, filepath):
     # if file_path is empty, need to get file name from download url's header
     if not file_path:
         filename = ""
-        if "Content-Disposition" in rh.headers.keys():
+        if "Content-Disposition" in rh.headers:
             cd = rh.headers["Content-Disposition"]
             # Extract the filename from the header
             # content of a CD: "attachment;filename=FileName.txt"
             # in case "" is in CD filename's start and end, need to strip them out
             filename = cd.split("=")[1].strip('"')
             if not filename:
-                util.printD("Fail to get file name from Content-Disposition: " + cd)
+                util.printD(f"Fail to get file name from Content-Disposition: {cd}")
                 return
-            
+
         if not filename:
             util.printD("Can not get file name from download url's header")
             return
-        
+
         # with folder and filename, now we have the full file path
         file_path = os.path.join(folder, filename)
 
 
-    util.printD("Target file path: " + file_path)
+    util.printD(f"Target file path: {file_path}")
     base, ext = os.path.splitext(file_path)
 
     # check if file is already exist
@@ -67,7 +67,7 @@ def dl(url, folder, filename, filepath):
     while os.path.isfile(file_path):
         util.printD("Target file already exist.")
         # re-name
-        new_base = base + "_" + str(count)
+        new_base = f"{base}_{str(count)}"
         file_path = new_base + ext
         count += 1
 

scripts/ch_lib/js_action_civitai.py

@@ -23,7 +23,7 @@ def open_model_url(msg, open_url_with_js):
     if not result:
         util.printD("Parsing js ms failed")
         return
-    
+
     model_type = result["model_type"]
     search_term = result["search_term"]
 
@@ -50,7 +50,7 @@ def open_model_url(msg, open_url_with_js):
     }
 
     if not open_url_with_js:
-        util.printD("Open Url: " + url)
+        util.printD(f"Open Url: {url}")
         # open url
         webbrowser.open_new_tab(url)
     else:
@@ -73,7 +73,7 @@ def add_trigger_words(msg):
     if not result:
         util.printD("Parsing js ms failed")
         return
-    
+
     model_type = result["model_type"]
     search_term = result["search_term"]
     prompt = result["prompt"]
@@ -83,29 +83,29 @@ def add_trigger_words(msg):
     if not model_info:
         util.printD(f"Failed to get model info for {model_type} {search_term}")
         return [prompt, prompt]
-    
+
     if "trainedWords" not in model_info.keys():
         util.printD(f"Failed to get trainedWords from info file for {model_type} {search_term}")
         return [prompt, prompt]
-    
+
     trainedWords = model_info["trainedWords"]
     if not trainedWords:
         util.printD(f"No trainedWords from info file for {model_type} {search_term}")
         return [prompt, prompt]
-    
+
     if len(trainedWords) == 0:
         util.printD(f"trainedWords from info file for {model_type} {search_term} is empty")
         return [prompt, prompt]
-    
+
     # get ful trigger words
     trigger_words = ""
     for word in trainedWords:
         trigger_words = trigger_words + word + ", "
 
-    new_prompt = prompt + " " + trigger_words
+    new_prompt = f"{prompt} {trigger_words}"
-    util.printD("trigger_words: " + trigger_words)
+    util.printD(f"trigger_words: {trigger_words}")
-    util.printD("prompt: " + prompt)
+    util.printD(f"prompt: {prompt}")
-    util.printD("new_prompt: " + new_prompt)
+    util.printD(f"new_prompt: {new_prompt}")
 
     util.printD("End add_trigger_words")
 
@@ -188,14 +188,14 @@ def dl_model_new_version(msg, max_size_preview, skip_nsfw_preview):
         output = "Parsing js ms failed"
         util.printD(output)
         return output
-    
+
     model_path = result["model_path"]
     version_id = result["version_id"]
     download_url = result["download_url"]
 
-    util.printD("model_path: " + model_path)
+    util.printD(f"model_path: {model_path}")
-    util.printD("version_id: " + str(version_id))
+    util.printD(f"version_id: {str(version_id)}")
-    util.printD("download_url: " + download_url)
+    util.printD(f"download_url: {download_url}")
 
     # check data
     if not model_path:
@@ -207,14 +207,14 @@ def dl_model_new_version(msg, max_size_preview, skip_nsfw_preview):
         output = "version_id is empty"
         util.printD(output)
         return output
-    
+
     if not download_url:
         output = "download_url is empty"
         util.printD(output)
         return output
 
     if not os.path.isfile(model_path):
-        output = "model_path is not a file: "+ model_path
+        output = f"model_path is not a file: {model_path}"
         util.printD(output)
         return output
 
@@ -232,14 +232,14 @@ def dl_model_new_version(msg, max_size_preview, skip_nsfw_preview):
     # download file
     new_model_path = downloader.dl(download_url, model_folder, None, None)
     if not new_model_path:
-        output = "Download failed, check console log for detail. Download url: " + download_url
+        output = f"Download failed, check console log for detail. Download url: {download_url}"
         util.printD(output)
         return output
 
     # get version info
     version_info = civitai.get_version_info_by_version_id(version_id)
     if not version_info:
-        output = "Model downloaded, but failed to get version info, check console log for detail. Model saved to: " + new_model_path
+        output = f"Model downloaded, but failed to get version info, check console log for detail. Model saved to: {new_model_path}"
         util.printD(output)
         return output
 
@@ -250,7 +250,7 @@ def dl_model_new_version(msg, max_size_preview, skip_nsfw_preview):
 
     # then, get preview image
     civitai.get_preview_image_by_model_path(new_model_path, max_size_preview, skip_nsfw_preview)
-    
+
-    output = "Done. Model downloaded to: " + new_model_path
+    output = f"Done. Model downloaded to: {new_model_path}"
     util.printD(output)
     return output

scripts/ch_lib/model.py

@@ -122,7 +122,6 @@ def get_model_path_by_type_and_name(model_type:str, model_name:str) -> str:
     else:
         model_folders = [folders[model_type]]
 
-
     # model could be in subfolder, need to walk.
     model_root = ""
     model_path = ""
@@ -136,6 +135,3 @@ def get_model_path_by_type_and_name(model_type:str, model_name:str) -> str:
                     return (model_root, model_path)
 
     return
-
-
-

scripts/ch_lib/model_action_civitai.py

@@ -19,14 +19,14 @@ def scan_model(scan_model_types, max_size_preview, skip_nsfw_preview):
         output = "Model Types is None, can not scan."
         util.printD(output)
         return output
-    
+
     model_types = []
     # check type if it is a string
     if type(scan_model_types) == str:
         model_types.append(scan_model_types)
     else:
         model_types = scan_model_types
-    
+
     model_count = 0
     image_count = 0
     # scan_log = ""
@@ -34,7 +34,7 @@ def scan_model(scan_model_types, max_size_preview, skip_nsfw_preview):
         if model_type not in model_types:
             continue
 
-        util.printD("Scanning path: " + model_folder)
+        util.printD(f"Scanning path: {model_folder}")
         for root, dirs, files in os.walk(model_folder, followlinks=True):
             for filename in files:
                 # check ext
@@ -45,7 +45,7 @@ def scan_model(scan_model_types, max_size_preview, skip_nsfw_preview):
                     if len(base) > 4:
                         if base[-4:] == model.vae_suffix:
                             # find .vae
-                            util.printD("This is a vae file: " + filename)
+                            util.printD(f"This is a vae file: {filename}")
                             continue
 
                     # find a model
@@ -53,15 +53,15 @@ def scan_model(scan_model_types, max_size_preview, skip_nsfw_preview):
                     info_file = base + civitai.suffix + model.info_ext
                     # check info file
                     if not os.path.isfile(info_file):
-                        util.printD("Creating model info for: " + filename)
+                        util.printD(f"Creating model info for: {filename}")
                         # get model's sha256
                         hash = util.gen_file_sha256(item)
 
                         if not hash:
-                            output = "failed generating SHA256 for model:" + filename
+                            output = f"failed generating SHA256 for model:{filename}"
                             util.printD(output)
                             return output
-                        
+
                         # use this sha256 to get model info from civitai
                         model_info = civitai.get_model_info_by_hash(hash)
                         # delay 1 second for ti
@@ -72,7 +72,7 @@ def scan_model(scan_model_types, max_size_preview, skip_nsfw_preview):
                         if model_info is None:
                             output = "Connect to Civitai API service failed. Wait a while and try again"
                             util.printD(output)
-                            return output+", check console log for detail"
+                            return f"{output}, check console log for detail"
 
                         # write model info to file
                         model.write_model_info(info_file, model_info)
@@ -102,7 +102,7 @@ def get_model_info_by_input(model_type, model_name, model_url_or_id, max_size_pr
     # parse model id
     model_id = civitai.get_model_id_from_url(model_url_or_id)
     if not model_id:
-        output = "failed to parse model id from url: " + model_url_or_id
+        output = f"failed to parse model id from url: {model_url_or_id}"
         util.printD(output)
         return output
 
@@ -113,13 +113,13 @@ def get_model_info_by_input(model_type, model_name, model_url_or_id, max_size_pr
         output = "failed to get model file path"
         util.printD(output)
         return output
-    
+
     model_root, model_path = result
     if not model_path:
         output = "model path is empty"
         util.printD(output)
         return output
-    
+
     # get info file path
     base, ext = os.path.splitext(model_path)
     info_file = base + civitai.suffix + model.info_ext
@@ -129,19 +129,19 @@ def get_model_info_by_input(model_type, model_name, model_url_or_id, max_size_pr
     model_info = civitai.get_version_info_by_model_id(model_id)
 
     if not model_info:
-        output = "failed to get model info from url: " + model_url_or_id
+        output = f"failed to get model info from url: {model_url_or_id}"
         util.printD(output)
         return output
-    
+
     # write model info to file
     model.write_model_info(info_file, model_info)
 
-    util.printD("Saved model info to: "+ info_file)
+    util.printD(f"Saved model info to: {info_file}")
 
     # check preview image
     civitai.get_preview_image_by_model_path(model_path, max_size_preview, skip_nsfw_preview)
 
-    output = "Model Info saved to: " + info_file
+    output = f"Model Info saved to: {info_file}"
     return output
 
 
@@ -166,28 +166,28 @@ def check_models_new_version_to_md(model_types:list) -> str:
             url = civitai.url_dict["modelPage"]+str(model_id)
 
             part = f'<div style="font-size:20px;margin:6px 0px;"><b>Model: <a href="{url}" target="_blank"><u>{model_name}</u></a></b></div>'
-            part = part + f'<div style="font-size:16px">File: {model_path}</div>'
+            part = f'{part}<div style="font-size:16px">File: {model_path}</div>'
             if download_url:
                 # replace "\" to "/" in model_path for windows
                 model_path = model_path.replace('\\', '\\\\')
-                part = part + f'<div style="font-size:16px;margin:6px 0px;">New Version: <u><a href="{download_url}" target="_blank" style="margin:0px 10px;">{new_version_name}</a></u>'
+                part = f'{part}<div style="font-size:16px;margin:6px 0px;">New Version: <u><a href="{download_url}" target="_blank" style="margin:0px 10px;">{new_version_name}</a></u>'
                 # add js function to download new version into SD webui by python
-                part = part + "    "
+                part = f"{part}    "
                 # in embed HTML, onclick= will also follow a ", never a ', so have to write it as following
-                part = part + f"<u><a href='#' style='margin:0px 10px;' onclick=\"ch_dl_model_new_version(event, '{model_path}', '{new_verion_id}', '{download_url}')\">[Download into SD]</a></u>"
+                part = f"""{part}<u><a href='#' style='margin:0px 10px;' onclick=\"ch_dl_model_new_version(event, '{model_path}', '{new_verion_id}', '{download_url}')\">[Download into SD]</a></u>"""
-                
+
             else:
-                part = part + f'<div style="font-size:16px;margin:6px 0px;">New Version: {new_version_name}'
+                part = f'{part}<div style="font-size:16px;margin:6px 0px;">New Version: {new_version_name}'
-            part = part + '</div>'
+            part = f'{part}</div>'
 
             # description
             if description:
-                part = part + '<blockquote style="font-size:16px;margin:6px 0px;">'+ description + '</blockquote><br>'
+                part = f'{part}<blockquote style="font-size:16px;margin:6px 0px;">{description}</blockquote><br>'
 
-            # preview image            
+            # preview image
             if img_url:
-                part = part + f"<img src='{img_url}'><br>"
+                part = f"{part}<img src='{img_url}'><br>"
-                
+                                
 
             output = output + part
 
@@ -198,7 +198,7 @@ def check_models_new_version_to_md(model_types:list) -> str:
 
 # get model info by url
 def get_model_info_by_url(model_url_or_id:str) -> tuple:
-    util.printD("Getting model info by: " + model_url_or_id)
+    util.printD(f"Getting model info by: {model_url_or_id}")
 
     # parse model id
     model_id = civitai.get_model_id_from_url(model_url_or_id)
@@ -210,22 +210,22 @@ def get_model_info_by_url(model_url_or_id:str) -> tuple:
     if model_info is None:
         util.printD("Connect to Civitai API service failed. Wait a while and try again")
         return
-    
+
     if not model_info:
         util.printD("failed to get model info from url or id")
         return
-    
+
     # parse model type, model name, subfolder, version from this model info
     # get model type
     if "type" not in model_info.keys():
         util.printD("model type is not in model_info")
         return
-    
+
     civitai_model_type = model_info["type"]
     if civitai_model_type not in civitai.model_type_dict.keys():
-        util.printD("This model type is not supported:"+civitai_model_type)
+        util.printD(f"This model type is not supported:{civitai_model_type}")
         return
-    
+
     model_type = civitai.model_type_dict[civitai_model_type]
 
     # get model type
@@ -242,20 +242,15 @@ def get_model_info_by_url(model_url_or_id:str) -> tuple:
     if "modelVersions" not in model_info.keys():
         util.printD("modelVersions is not in model_info")
         return
-    
+
     modelVersions = model_info["modelVersions"]
     if not modelVersions:
         util.printD("modelVersions is Empty")
         return
-    
-    version_strs = []
-    for version in modelVersions:
-        # version name can not be used as id
-        # version id is not readable
-        # so , we use name_id as version string
-        version_str = version["name"]+"_"+str(version["id"])
-        version_strs.append(version_str)
 
+    version_strs = [
+        version["name"] + "_" + str(version["id"]) for version in modelVersions
+    ]
     # get folder by model type
     folder = model.folders[model_type]
     # get subfolders
@@ -279,11 +274,11 @@ def get_ver_info_by_ver_str(version_str:str, model_info:dict) -> dict:
     if not version_str:
         util.printD("version_str is empty")
         return
-    
+
     if not model_info:
         util.printD("model_info is None")
         return
-    
+
     # get version list
     if "modelVersions" not in model_info.keys():
         util.printD("modelVersions is not in model_info")
@@ -293,7 +288,7 @@ def get_ver_info_by_ver_str(version_str:str, model_info:dict) -> dict:
     if not modelVersions:
         util.printD("modelVersions is Empty")
         return
-    
+
     # find version by version_str
     version = None
     for ver in modelVersions:
@@ -306,14 +301,14 @@ def get_ver_info_by_ver_str(version_str:str, model_info:dict) -> dict:
             version = ver
 
     if not version:
-        util.printD("can not find version by version string: " + version_str)
+        util.printD(f"can not find version by version string: {version_str}")
         return
-    
+
     # get version id
     if "id" not in version.keys():
         util.printD("this version has no id")
         return
-    
+
     return version
 
 
@@ -323,11 +318,11 @@ def get_id_and_dl_url_by_version_str(version_str:str, model_info:dict) -> tuple:
     if not version_str:
         util.printD("version_str is empty")
         return
-    
+
     if not model_info:
         util.printD("model_info is None")
         return
-    
+
     # get version list
     if "modelVersions" not in model_info.keys():
         util.printD("modelVersions is not in model_info")
@@ -337,7 +332,7 @@ def get_id_and_dl_url_by_version_str(version_str:str, model_info:dict) -> tuple:
     if not modelVersions:
         util.printD("modelVersions is Empty")
         return
-    
+
     # find version by version_str
     version = None
     for ver in modelVersions:
@@ -350,14 +345,14 @@ def get_id_and_dl_url_by_version_str(version_str:str, model_info:dict) -> tuple:
             version = ver
 
     if not version:
-        util.printD("can not find version by version string: " + version_str)
+        util.printD(f"can not find version by version string: {version_str}")
         return
-    
+
     # get version id
     if "id" not in version.keys():
         util.printD("this version has no id")
         return
-    
+
     version_id = version["id"]
     if not version_id:
         util.printD("version id is Empty")
@@ -367,14 +362,14 @@ def get_id_and_dl_url_by_version_str(version_str:str, model_info:dict) -> tuple:
     if "downloadUrl" not in version.keys():
         util.printD("downloadUrl is not in this version")
         return
-    
+
     downloadUrl = version["downloadUrl"]
     if not downloadUrl:
         util.printD("downloadUrl is Empty")
         return
-    
+
-    util.printD("Get Download Url: " + downloadUrl)
+    util.printD(f"Get Download Url: {downloadUrl}")
-    
+
     return (version_id, downloadUrl)
     
 
@@ -388,36 +383,36 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
         output = "model_info is None"
         util.printD(output)
         return output
-    
+
     if not model_type:
         output = "model_type is None"
         util.printD(output)
         return output
-    
+
     if not subfolder_str:
         output = "subfolder string is None"
         util.printD(output)
         return output
-    
+
     if not version_str:
         output = "version_str is None"
         util.printD(output)
         return output
-    
+
     # get model root folder
     if model_type not in model.folders.keys():
-        output = "Unknow model type: "+model_type
+        output = f"Unknow model type: {model_type}"
         util.printD(output)
         return output
-    
+
     model_root_folder = model.folders[model_type]
 
 
     # get subfolder
     subfolder = ""
-    if subfolder_str == "/" or subfolder_str == "\\":
+    if subfolder_str in {"/", "\\"}:
         subfolder = ""
-    elif subfolder_str[:1] == "/" or subfolder_str[:1] == "\\":
+    elif subfolder_str[:1] in ["/", "\\"]:
         subfolder = subfolder_str[1:]
     else:
         subfolder = subfolder_str
@@ -425,17 +420,17 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
     # get model folder for downloading
     model_folder = os.path.join(model_root_folder, subfolder)
     if not os.path.isdir(model_folder):
-        output = "Model folder is not a dir: "+ model_folder
+        output = f"Model folder is not a dir: {model_folder}"
         util.printD(output)
         return output
-    
+
     # get version info
     ver_info = get_ver_info_by_ver_str(version_str, model_info)
     if not ver_info:
         output = "Fail to get version info, check console log for detail"
         util.printD(output)
         return output
-    
+
     version_id = ver_info["id"]
 
 
@@ -444,22 +439,23 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
         # some model versions have multiple files
         download_urls = []
         if "files" in ver_info.keys():
-            for file_info in ver_info["files"]:
+            download_urls.extend(
-                if "downloadUrl" in file_info.keys():
+                file_info["downloadUrl"]
-                    download_urls.append(file_info["downloadUrl"])
+                for file_info in ver_info["files"]
-
+                if "downloadUrl" in file_info.keys()
+            )
         if not len(download_urls):
             if "downloadUrl" in ver_info.keys():
                 download_urls.append(ver_info["downloadUrl"])
 
 
-        # check if this model is already existed
+        if r := civitai.search_local_model_info_by_version_id(
-        r = civitai.search_local_model_info_by_version_id(model_folder, version_id)
+            model_folder, version_id
-        if r:
+        ):
             output = "This model version is already existed"
             util.printD(output)
             return output
-        
+
         # download
         filepath = ""
         for url in download_urls:
@@ -468,7 +464,7 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
                 output = "Downloading failed, check console log for detail"
                 util.printD(output)
                 return output
-            
+
             if url == ver_info["downloadUrl"]:
                 filepath = model_filepath
     else:
@@ -479,7 +475,7 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
             output = "Fail to get download url, check console log for detail"
             util.printD(output)
             return output
-        
+
         # download
         filepath = downloader.dl(url, model_folder, None, None)
         if not filepath:
@@ -490,11 +486,11 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
 
     if not filepath:
         filepath = model_filepath
-    
+
     # get version info
     version_info = civitai.get_version_info_by_version_id(version_id)
     if not version_info:
-        output = "Model downloaded, but failed to get version info, check console log for detail. Model saved to: " + filepath
+        output = f"Model downloaded, but failed to get version info, check console log for detail. Model saved to: {filepath}"
         util.printD(output)
         return output
 
@@ -505,7 +501,7 @@ def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, versio
 
     # then, get preview image
     civitai.get_preview_image_by_model_path(filepath, max_size_preview, skip_nsfw_preview)
-    
+
-    output = "Done. Model downloaded to: " + filepath
+    output = f"Done. Model downloaded to: {filepath}"
     util.printD(output)
     return output

scripts/ch_lib/msg_handler.py

@@ -29,7 +29,7 @@ def parse_js_msg(msg):
         return
 
     if action not in js_actions:
-        util.printD("Unknow action: " + action)
+        util.printD(f"Unknow action: {action}")
         return
 
     util.printD("End parse js msg")
@@ -45,13 +45,13 @@ def build_py_msg(action:str, content:dict):
     if not content:
         util.printD("Content is None")
         return
-    
+
     if not action:
         util.printD("Action is None")
         return
 
     if action not in py_actions:
-        util.printD("Unknow action: " + action)
+        util.printD(f"Unknow action: {action}")
         return
 
     msg = {

scripts/ch_lib/setting.py

@@ -29,7 +29,7 @@ data = {
 # save setting
 # return output msg for log
 def save():
-    print("Saving setting to: " + path)
+    print(f"Saving setting to: {path}")
 
     json_data = json.dumps(data, indent=4)
 
@@ -40,12 +40,12 @@ def save():
         with open(path, 'w') as f:
             f.write(json_data)
     except Exception as e:
-        util.printD("Error when writing file:"+path)
+        util.printD(f"Error when writing file:{path}")
         output = str(e)
         util.printD(str(e))
         return output
 
-    output = "Setting saved to: " + path
+    output = f"Setting saved to: {path}"
     util.printD(output)
 
     return output
@@ -56,7 +56,7 @@ def load():
     # load data into globel data
     global data
 
-    util.printD("Load setting from: " + path)
+    util.printD(f"Load setting from: {path}")
 
     if not os.path.isfile(path):
         util.printD("No setting file, use default")

scripts/ch_lib/util.py

@@ -22,10 +22,10 @@ def printD(msg):
 def read_chunks(file, size=io.DEFAULT_BUFFER_SIZE):
     """Yield pieces of data from a file-like object until EOF."""
     while True:
-        chunk = file.read(size)
+        if chunk := file.read(size):
-        if not chunk:
+            yield chunk
+        else:
             break
-        yield chunk
 
 # Now, hashing use the same way as pip's source code.
 def gen_file_sha256(filname):
@@ -39,40 +39,40 @@ def gen_file_sha256(filname):
             h.update(block)
 
     hash_value =  h.hexdigest()
-    printD("sha256: " + hash_value)
+    printD(f"sha256: {hash_value}")
-    printD("length: " + str(length))
+    printD(f"length: {str(length)}")
     return hash_value
 
 
 
 # get preview image
 def download_file(url, path):
-    printD("Downloading file from: " + url)
+    printD(f"Downloading file from: {url}")
     # get file
     r = requests.get(url, stream=True, headers=def_headers, proxies=proxies)
     if not r.ok:
-        printD("Get error code: " + str(r.status_code))
+        printD(f"Get error code: {r.status_code}")
         printD(r.text)
         return
-    
+
     # write to file
     with open(os.path.realpath(path), 'wb') as f:
         r.raw.decode_content = True
         shutil.copyfileobj(r.raw, f)
 
-    printD("File downloaded to: " + path)
+    printD(f"File downloaded to: {path}")
 
 # get subfolder list
 def get_subfolders(folder:str) -> list:
-    printD("Get subfolder for: " + folder)
+    printD(f"Get subfolder for: {folder}")
     if not folder:
         printD("folder can not be None")
         return
-    
+
     if not os.path.isdir(folder):
         printD("path is not a folder")
         return
-    
+
     prefix_len = len(folder)
     subfolders = []
     for root, dirs, files in os.walk(folder, followlinks=True):
@@ -98,7 +98,7 @@ def get_relative_path(item_path:str, parent_path:str) -> str:
         return item_path
 
     relative = item_path[len(parent_path):]
-    if relative[:1] == "/" or relative[:1] == "\\":
+    if relative[:1] in ["/", "\\"]:
         relative = relative[1:]
 
     # printD("relative:"+relative)