Skip to content

Commit 385483f

Browse files
authored
Download all model types. (#3944)
2 parents f060e32 + c7f883d commit 385483f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

invokeai/backend/install/invokeai_configure.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ def default_user_selections(program_opts: Namespace) -> InstallSelections:
558558

559559
# -------------------------------------
560560
def initialize_rootdir(root: Path, yes_to_all: bool = False):
561-
logger.info("** INITIALIZING INVOKEAI RUNTIME DIRECTORY **")
561+
logger.info("Initializing InvokeAI runtime directory")
562562
for name in (
563563
"models",
564564
"databases",
@@ -788,15 +788,14 @@ def main():
788788
sys.exit(0)
789789

790790
if opt.skip_support_models:
791-
logger.info("SKIPPING SUPPORT MODEL DOWNLOADS PER USER REQUEST")
791+
logger.info("Skipping support models at user's request")
792792
else:
793-
logger.info("CHECKING/UPDATING SUPPORT MODELS")
793+
logger.info("Installing support models")
794794
download_support_models()
795795

796796
if opt.skip_sd_weights:
797-
logger.warning("SKIPPING DIFFUSION WEIGHTS DOWNLOAD PER USER REQUEST")
797+
logger.warning("Skipping diffusion weights download per user request")
798798
elif models_to_download:
799-
logger.info("DOWNLOADING DIFFUSION WEIGHTS")
800799
process_and_execute(opt, models_to_download)
801800

802801
postscript(errors=errors)

invokeai/backend/install/model_install_backend.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,17 @@ def list_models(self, model_type):
149149
for i in installed:
150150
print(f"{i['model_name']}\t{i['base_model']}\t{i['path']}")
151151

152-
def starter_models(self)->Set[str]:
152+
# logic here a little reversed to maintain backward compatibility
153+
def starter_models(self, all_models: bool=False)->Set[str]:
153154
models = set()
154155
for key, value in self.datasets.items():
155156
name,base,model_type = ModelManager.parse_key(key)
156-
if model_type==ModelType.Main:
157+
if all_models or model_type==ModelType.Main:
157158
models.add(key)
158159
return models
159160

160161
def recommended_models(self)->Set[str]:
161-
starters = self.starter_models()
162+
starters = self.starter_models(all_models=True)
162163
return set([x for x in starters if self.datasets[x].get('recommended',False)])
163164

164165
def default_model(self)->str:

0 commit comments

Comments
 (0)