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
commit b67041dd29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 2 deletions

View File

@ -154,7 +154,7 @@ class ModelInstall(object):
models = set() models = set()
for key, value in self.datasets.items(): for key, value in self.datasets.items():
name,base,model_type = ModelManager.parse_key(key) 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) models.add(key)
return models return models

View File

@ -416,7 +416,14 @@ class PipelineFolderProbe(FolderProbeBase):
class VaeFolderProbe(FolderProbeBase): class VaeFolderProbe(FolderProbeBase):
def get_base_type(self)->BaseModelType: 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): class TextualInversionFolderProbe(FolderProbeBase):
def get_format(self)->str: def get_format(self)->str:

View File

@ -24,6 +24,14 @@ sdxl-refiner/main/stable-diffusion-xl-refiner-1-0:
description: Stable Diffusion XL refiner model (12 GB) description: Stable Diffusion XL refiner model (12 GB)
repo_id: stabilityai/stable-diffusion-xl-refiner-1.0 repo_id: stabilityai/stable-diffusion-xl-refiner-1.0
recommended: False recommended: False
sdxl-refiner/main/stable-diffusion-xl-refiner-1-0:
description: Stable Diffusion XL refiner model (12 GB)
repo_id: stabilityai/stable-diffusion-xl-refiner-1.0
recommended: false
sdxl/vae/sdxl-1-0-vae-fix:
description: Fine tuned version of the SDXL-1.0 VAE
repo_id: madebyollin/sdxl-vae-fp16-fix
recommended: true
sd-1/main/Analog-Diffusion: sd-1/main/Analog-Diffusion:
description: An SD-1.5 model trained on diverse analog photographs (2.13 GB) description: An SD-1.5 model trained on diverse analog photographs (2.13 GB)
repo_id: wavymulder/Analog-Diffusion repo_id: wavymulder/Analog-Diffusion

11
scripts/probe-model.py Executable file
View File

@ -0,0 +1,11 @@
#!/bin/env python
import sys
from pathlib import Path
from invokeai.backend.model_management.model_probe import ModelProbe
info = ModelProbe().probe(Path(sys.argv[1]))
print(info)