Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix None in model_type

Browse Source
This commit is contained in:
Lincoln Stein 2023-05-16 00:13:44 -04:00
parent 1442f1cb8d
commit cd16857f38
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
invokeai/backend/model_management/model_manager.py
View File

@ -498,7 +498,7 @@ class ModelManager(object):
# don't include VAEs in listing (legacy style) # don't include VAEs in listing (legacy style)
if "config" in stanza and "/VAE/" in stanza["config"]: if "config" in stanza and "/VAE/" in stanza["config"]:
continue continue
if model_key == 'config_file_version': if model_key.startswith('_'):
continue continue
model_name, stanza_type = self.parse_key(model_key) model_name, stanza_type = self.parse_key(model_key)
@ -521,7 +521,7 @@ class ModelManager(object):
description = stanza.get("description", None) description = stanza.get("description", None)
models[stanza_type][model_name].update( models[stanza_type][model_name].update(
model_name=model_name, model_name=model_name,
model_type=model_type, model_type=stanza_type,
format=model_format, format=model_format,
description=description, description=description,
status=status.value, status=status.value,
@ -1209,16 +1209,18 @@ class ModelManager(object):
from older versions of the config file to new ones from older versions of the config file to new ones
as necessary. as necessary.
""" """
current_version = self.config.get("config_file_version","1.0.0") current_version = self.config.get("_version","1.0.0")
if version.parse(current_version) < version.parse(CONFIG_FILE_VERSION): if version.parse(current_version) < version.parse(CONFIG_FILE_VERSION):
self.logger.info(f'models.yaml version {current_version} detected. Updating to {CONFIG_FILE_VERSION}') self.logger.info(f'models.yaml version {current_version} detected. Updating to {CONFIG_FILE_VERSION}')
new_config = OmegaConf.create() new_config = OmegaConf.create()
new_config["config_file_version"] = CONFIG_FILE_VERSION new_config["_version"] = CONFIG_FILE_VERSION
for model_key in self.config: for model_key in self.config:
old_stanza = self.config[model_key] old_stanza = self.config[model_key]
if not isinstance(old_stanza,DictConfig):
continue
# ignore old and ugly way of associating a legacy # ignore old and ugly way of associating a legacy
# vae with a legacy checkpont model # vae with a legacy checkpont model
@ -1237,6 +1239,8 @@ class ModelManager(object):
model_format = 'ckpt' model_format = 'ckpt'
elif old_stanza.get('weights') and Path(old_stanza.get('weights')).suffix == '.safetensors': elif old_stanza.get('weights') and Path(old_stanza.get('weights')).suffix == '.safetensors':
model_format = 'safetensors' model_format = 'safetensors'
else:
model_format = old_stanza.get('format')
# copy fields over manually rather than doing a copy() or deepcopy() # copy fields over manually rather than doing a copy() or deepcopy()
# in order to avoid bringing in unwanted fields. # in order to avoid bringing in unwanted fields.