From cbb90cbdbbde52f0d932e221ea30357989c871ed Mon Sep 17 00:00:00 2001 From: camenduru <54370274+camenduru@users.noreply.github.com> Date: Mon, 24 Jul 2023 10:59:59 +0300 Subject: [PATCH 1/2] Download all model types. --- invokeai/backend/install/model_install_backend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/invokeai/backend/install/model_install_backend.py b/invokeai/backend/install/model_install_backend.py index 0537d6069a..e4a24c76b4 100644 --- a/invokeai/backend/install/model_install_backend.py +++ b/invokeai/backend/install/model_install_backend.py @@ -145,8 +145,7 @@ class ModelInstall(object): models = set() for key, value in self.datasets.items(): name,base,model_type = ModelManager.parse_key(key) - if model_type==ModelType.Main: - models.add(key) + models.add(key) return models def recommended_models(self)->Set[str]: From dbc3d42afc2013df9dd9e586eedb9cdc5d4d85fd Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Tue, 25 Jul 2023 22:24:03 -0400 Subject: [PATCH 2/2] install all recommended models with --yes; don't alter starter model screen --- invokeai/backend/install/invokeai_configure.py | 9 ++++----- invokeai/backend/install/model_install_backend.py | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/invokeai/backend/install/invokeai_configure.py b/invokeai/backend/install/invokeai_configure.py index 1f0e39961b..5a84109217 100755 --- a/invokeai/backend/install/invokeai_configure.py +++ b/invokeai/backend/install/invokeai_configure.py @@ -588,7 +588,7 @@ def default_user_selections(program_opts: Namespace) -> InstallSelections: # ------------------------------------- def initialize_rootdir(root: Path, yes_to_all: bool = False): - logger.info("** INITIALIZING INVOKEAI RUNTIME DIRECTORY **") + logger.info("Initializing InvokeAI runtime directory") for name in ( "models", "databases", @@ -819,15 +819,14 @@ def main(): sys.exit(0) if opt.skip_support_models: - logger.info("SKIPPING SUPPORT MODEL DOWNLOADS PER USER REQUEST") + logger.info("Skipping support models at user's request") else: - logger.info("CHECKING/UPDATING SUPPORT MODELS") + logger.info("Installing support models") download_support_models() if opt.skip_sd_weights: - logger.warning("SKIPPING DIFFUSION WEIGHTS DOWNLOAD PER USER REQUEST") + logger.warning("Skipping diffusion weights download per user request") elif models_to_download: - logger.info("DOWNLOADING DIFFUSION WEIGHTS") process_and_execute(opt, models_to_download) postscript(errors=errors) diff --git a/invokeai/backend/install/model_install_backend.py b/invokeai/backend/install/model_install_backend.py index e4a24c76b4..f4dfc8fdd2 100644 --- a/invokeai/backend/install/model_install_backend.py +++ b/invokeai/backend/install/model_install_backend.py @@ -141,15 +141,17 @@ class ModelInstall(object): for i in installed: print(f"{i['model_name']}\t{i['base_model']}\t{i['path']}") - def starter_models(self)->Set[str]: + # logic here a little reversed to maintain backward compatibility + def starter_models(self, all_models: bool=False)->Set[str]: models = set() for key, value in self.datasets.items(): name,base,model_type = ModelManager.parse_key(key) - models.add(key) + if all_models or model_type==ModelType.Main: + models.add(key) return models def recommended_models(self)->Set[str]: - starters = self.starter_models() + starters = self.starter_models(all_models=True) return set([x for x in starters if self.datasets[x].get('recommended',False)]) def default_model(self)->str: