From 2209934b94bfd755ef39d67d98c6517d4f00308f Mon Sep 17 00:00:00 2001 From: Saifeddine ALOUI Date: Sun, 24 Mar 2024 03:41:45 +0100 Subject: [PATCH] enhanced binding --- lollms/binding.py | 1 + lollms/server/endpoints/lollms_binding_infos.py | 1 + lollms/server/endpoints/lollms_configuration_infos.py | 4 +++- lollms/services/comfyui/lollms_comfyui.py | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lollms/binding.py b/lollms/binding.py index 2a2a915..9f06bc6 100644 --- a/lollms/binding.py +++ b/lollms/binding.py @@ -421,6 +421,7 @@ class LLMBinding: def add_default_configurations(self, binding_config:TypedConfig): binding_config.addConfigs([ + {"name":"model_name","type":"str","value":'', "help":"Last known model for fast model recovery"}, {"name":"clip_model_name","type":"str","value":'ViT-L-14/openai','options':["ViT-L-14/openai","ViT-H-14/laion2b_s32b_b79k"], "help":"Clip model to be used for images understanding"}, {"name":"caption_model_name","type":"str","value":'blip-large','options':['blip-base', 'git-large-coco', 'blip-large','blip2-2.7b', 'blip2-flan-t5-xl'], "help":"Clip model to be used for images understanding"}, {"name":"vqa_model_name","type":"str","value":'Salesforce/blip-vqa-capfilt-large','options':['Salesforce/blip-vqa-capfilt-large', 'Salesforce/blip-vqa-base', 'Salesforce/blip-image-captioning-large','Salesforce/blip2-opt-2.7b', 'Salesforce/blip2-flan-t5-xxl'], "help":"Salesforce question/answer model"}, diff --git a/lollms/server/endpoints/lollms_binding_infos.py b/lollms/server/endpoints/lollms_binding_infos.py index 0af5881..8ef411d 100644 --- a/lollms/server/endpoints/lollms_binding_infos.py +++ b/lollms/server/endpoints/lollms_binding_infos.py @@ -49,6 +49,7 @@ def list_bindings(): if card.exists(): try: bnd = load_config(card) + bnd["name"]=f.stem bnd["folder"]=f.stem installed = (lollmsElfServer.lollms_paths.personal_configuration_path/"bindings"/f.stem/f"config.yaml").exists() bnd["installed"]=installed diff --git a/lollms/server/endpoints/lollms_configuration_infos.py b/lollms/server/endpoints/lollms_configuration_infos.py index 8f7b3f4..c37dcdf 100644 --- a/lollms/server/endpoints/lollms_configuration_infos.py +++ b/lollms/server/endpoints/lollms_configuration_infos.py @@ -76,7 +76,8 @@ async def update_setting(request: Request): per.model = None gc.collect() lollmsElfServer.binding = BindingBuilder().build_binding(lollmsElfServer.config, lollmsElfServer.lollms_paths, InstallOption.INSTALL_IF_NECESSARY, lollmsCom=lollmsElfServer) - lollmsElfServer.model = None + lollmsElfServer.config.model_name = lollmsElfServer.binding.binding_config.model_name + lollmsElfServer.model = lollmsElfServer.binding.build_model() lollmsElfServer.config.save_config() ASCIIColors.green("Binding loaded successfully") except Exception as ex: @@ -98,6 +99,7 @@ async def update_setting(request: Request): for per in lollmsElfServer.mounted_personalities: if per is not None: per.model = None + lollmsElfServer.binding.binding_config.model_name = lollmsElfServer.config.model_name lollmsElfServer.model = lollmsElfServer.binding.build_model() if lollmsElfServer.model is not None: ASCIIColors.yellow("New model OK") diff --git a/lollms/services/comfyui/lollms_comfyui.py b/lollms/services/comfyui/lollms_comfyui.py index 54e846d..f9ac6ef 100644 --- a/lollms/services/comfyui/lollms_comfyui.py +++ b/lollms/services/comfyui/lollms_comfyui.py @@ -88,7 +88,8 @@ def install_comfyui(lollms_app:LollmsApplication): download_file("https://huggingface.co/stabilityai/stable-video-diffusion-img2vid-xt/blob/main/svd_xt.safetensors", comfyui_folder/"models/checkpoints","svd_xt.safetensors") if show_yes_no_dialog("warning!","Do you want to install all control net models?"): - (comfyui_folder/"models/controlnet").mkdir(parents=True, exist_ok=True) + (comfyui_folder/"models/controlnet").mkdir(parents=True, exist_ok=True) + download_file("https://huggingface.co/thibaud/controlnet-openpose-sdxl-1.0/resolve/main/OpenPoseXL2.safetensors", comfyui_folder/"models/controlnet","OpenPoseXL2.safetensors") download_file("https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/kohya_controllllite_xl_openpose_anime.safetensors", comfyui_folder/"models/controlnet","kohya_controllllite_xl_openpose_anime.safetensors") download_file("https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/kohya_controllllite_xl_canny.safetensors", comfyui_folder/"models/controlnet","kohya_controllllite_xl_canny.safetensors") download_file("https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/kohya_controllllite_xl_depth.safetensors", comfyui_folder/"models/controlnet","kohya_controllllite_xl_depth.safetensors")