" + part = part + f'
New Version: {new_version_name}'
+ part = part + '
'
# description
if description:
- part = part + description
+ part = part + ''+ description + '
' # preview image if img_url: - part = part + f"
" + part = part + f"
" + output = output + part @@ -165,3 +174,233 @@ def check_models_new_version_to_md(model_types:list) -> str: return output +# 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) + + # parse model id + model_id = civitai.get_model_id_from_url(model_url_or_id) + if not model_id: + util.printD("failed to parse model id from url or id") + return + + model_info = civitai.get_model_info_by_id(model_id) + 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) + return + + model_type = civitai.model_type_dict[civitai_model_type] + + # get model type + if "name" not in model_info.keys(): + util.printD("model name is not in model_info") + return + + model_name = model_info["name"] + if not model_name: + util.printD("model name is Empty") + model_name = "" + + # get version list + 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) + + # get folder by model type + folder = model.folders[model_type] + # get subfolders + subfolders = util.get_subfolders(folder) + if not subfolders: + subfolders = [] + + # add default root folder + subfolders.append("/") + + util.printD("Get following info for downloading:") + util.printD(f"model_name:{model_name}") + util.printD(f"model_type:{model_type}") + util.printD(f"subfolders:{subfolders}") + util.printD(f"version_strs:{version_strs}") + + return (model_info, model_name, model_type, subfolders, version_strs) + + +# get download url from model info by version string +# return - (version_id, download_url) +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") + return + + modelVersions = model_info["modelVersions"] + if not modelVersions: + util.printD("modelVersions is Empty") + return + + # find version by version_str + version = None + for ver in modelVersions: + # version name can not be used as id + # version id is not readable + # so , we use name_id as version string + ver_str = ver["name"]+"_"+str(ver["id"]) + if ver_str == version_str: + # find version + version = ver + + if not version: + util.printD("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") + return + + # get download url + 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) + + return (version_id, downloadUrl) + + +# download model from civitai by input +# output to markdown log +def dl_model_by_input(model_info:dict, model_type:str, subfolder_str:str, version_str:str, max_size_preview:bool, skip_nsfw_preview:bool) -> str: + + output = "" + + if not model_info: + 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 + util.printD(output) + return output + + model_root_folder = model.folders[model_type] + + + # get subfolder + subfolder = "" + if subfolder_str == "/" or subfolder_str == "\\": + subfolder = "" + elif subfolder_str[:1] == "/" or subfolder_str[:1] == "\\": + subfolder = subfolder_str[1:] + else: + subfolder = subfolder_str + + # 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 + util.printD(output) + return output + + # get download url + r = get_id_and_dl_url_by_version_str(version_str, model_info) + if not r: + output = "Fail to get download url, check console log for detail" + util.printD(output) + return output + + version_id, url = r + if not version_id: + output = "Fail to get version id, check console log for detail" + util.printD(output) + return output + + if not url: + 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: + output = "Downloading failed, check console log for detail" + 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: " + filepath + util.printD(output) + return output + + # write version info to file + base, ext = os.path.splitext(filepath) + info_file = base + civitai.suffix + model.info_ext + model.write_model_info(info_file, version_info) + + # then, get preview image + civitai.get_preview_image_by_model_path(filepath, max_size_preview, skip_nsfw_preview) + + output = "Done. Model downloaded to: " + filepath + util.printD(output) + return output diff --git a/scripts/lib/msg_handler.py b/scripts/lib/msg_handler.py index 79a6e54..1132d77 100644 --- a/scripts/lib/msg_handler.py +++ b/scripts/lib/msg_handler.py @@ -4,63 +4,37 @@ import json from . import util # action list -js_actions = ("open_url", "add_trigger_words", "use_preview_prompt") -py_actions = ("open_url", "scan_log", "model_new_version") +js_actions = ("open_url", "add_trigger_words", "use_preview_prompt", "dl_model_new_version") +py_actions = ("open_url") # handle request from javascript # parameter: msg - msg from js as string in a hidden textbox -# return: (action, model_type, search_term, prompt, neg_prompt) +# return: dict for result def parse_js_msg(msg): util.printD("Start parse js msg") msg_dict = json.loads(msg) + # in case client side run JSON.stringify twice + if (type(msg_dict) == str): + msg_dict = json.loads(msg_dict) + if "action" not in msg_dict.keys(): util.printD("Can not find action from js request") return - - if "model_type" not in msg_dict.keys(): - util.printD("Can not find model type from js request") - return - - if "search_term" not in msg_dict.keys(): - util.printD("Can not find search_term from js request") - return - - if "prompt" not in msg_dict.keys(): - util.printD("Can not find prompt from js request") - return - - if "neg_prompt" not in msg_dict.keys(): - util.printD("Can not find neg_prompt from js request") - return - - action = msg_dict["action"] - model_type = msg_dict["model_type"] - search_term = msg_dict["search_term"] - prompt = msg_dict["prompt"] - neg_prompt = msg_dict["neg_prompt"] + action = msg_dict["action"] if not action: util.printD("Action from js request is None") return - if not model_type: - util.printD("model_type from js request is None") - return - - if not search_term: - util.printD("search_term from js request is None") - return - - if action not in js_actions: util.printD("Unknow action: " + action) return util.printD("End parse js msg") - return (action, model_type, search_term, prompt, neg_prompt) + return msg_dict # build python side msg for sending to js diff --git a/scripts/lib/util.py b/scripts/lib/util.py index 5a5998c..6861eff 100644 --- a/scripts/lib/util.py +++ b/scripts/lib/util.py @@ -1,9 +1,10 @@ # -*- coding: UTF-8 -*- +import os import hashlib import requests import shutil -version = "1.4.3" +version = "1.5.0" # print for debugging def printD(msg): @@ -41,3 +42,26 @@ def download_file(url, path): shutil.copyfileobj(r.raw, f) printD("File downloaded to: " + path) + +# get subfolder list +def get_subfolders(folder:str) -> list: + printD("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): + for dir in dirs: + full_dir_path = os.path.join(root, dir) + # get subfolder path from it + subfolder = full_dir_path[prefix_len:] + subfolders.append(subfolder) + + return subfolders + diff --git a/style.css b/style.css new file mode 100644 index 0000000..91a62ea --- /dev/null +++ b/style.css @@ -0,0 +1,9 @@ +blockquote ul { + list-style:disc; + margin:4px 40px; +} + +blockquote ol { + list-style:decimal; + margin:4px 40px; +}