Merge branch 'main' into bugfix/convert-sdxl-models

This commit is contained in:
Lincoln Stein
2023-07-27 00:24:37 -04:00
committed by GitHub
4 changed files with 28 additions and 2 deletions

View File

@ -154,7 +154,7 @@ class ModelInstall(object):
models = set()
for key, value in self.datasets.items():
name,base,model_type = ModelManager.parse_key(key)
if all_models or model_type==ModelType.Main:
if all_models or model_type in [ModelType.Main, ModelType.Vae]:
models.add(key)
return models

View File

@ -416,7 +416,14 @@ class PipelineFolderProbe(FolderProbeBase):
class VaeFolderProbe(FolderProbeBase):
def get_base_type(self)->BaseModelType:
return BaseModelType.StableDiffusion1
config_file = self.folder_path / 'config.json'
if not config_file.exists():
raise InvalidModelException(f"Cannot determine base type for {self.folder_path}")
with open(config_file,'r') as file:
config = json.load(file)
return BaseModelType.StableDiffusionXL \
if config.get('scaling_factor',0)==0.13025 and config.get('sample_size') in [512, 1024] \
else BaseModelType.StableDiffusion1
class TextualInversionFolderProbe(FolderProbeBase):
def get_format(self)->str: