diff --git a/invokeai/backend/web/invoke_ai_web_server.py b/invokeai/backend/web/invoke_ai_web_server.py index 80c9618098..a192073b73 100644 --- a/invokeai/backend/web/invoke_ai_web_server.py +++ b/invokeai/backend/web/invoke_ai_web_server.py @@ -26,7 +26,7 @@ from ..args import APP_ID, APP_VERSION, Args, calculate_init_img_hash from ..generator import infill_methods from ..globals import Globals, global_converted_ckpts_dir, global_models_dir from ..image_util import PngWriter, retrieve_metadata -from ..model_management import merge_diffusion_models +from ...frontend.merge.merge_diffusers import merge_diffusion_models from ..prompting import ( get_prompt_structure, get_tokenizer, diff --git a/invokeai/frontend/CLI/CLI.py b/invokeai/frontend/CLI/CLI.py index 39f5c6dc96..17e1c314f7 100644 --- a/invokeai/frontend/CLI/CLI.py +++ b/invokeai/frontend/CLI/CLI.py @@ -1294,13 +1294,15 @@ def run_patches(): # distro after original root directory configuration import invokeai.configs as conf from shutil import copyfile - + root_configs = Path(global_config_dir(), 'stable-diffusion') repo_configs = Path(conf.__path__[0], 'stable-diffusion') + if not root_configs.exists(): + os.makedirs(root_configs, exist_ok=True) for src in repo_configs.iterdir(): dest = root_configs / src.name if not dest.exists(): - copyfile(src,dest) - + copyfile(src, dest) + if __name__ == "__main__": main()