Merge branch 'lstein/installer-for-new-model-layout' of github.com:invoke-ai/InvokeAI into lstein/installer-for-new-model-layout

This commit is contained in:
Lincoln Stein
2023-06-20 09:42:21 -04:00
3 changed files with 3 additions and 2 deletions

View File

@ -513,7 +513,6 @@ class ModelManager(object):
named 'model-name', and model_manager.config to get the full OmegaConf
object derived from models.yaml
"""
assert not(model_type is not None and base_model is None), "model_type must be provided with base_model"
models = dict()
for model_key in sorted(self.models, key=str.casefold):

View File

@ -123,6 +123,7 @@ class StableDiffusion2Model(DiffusersModel):
class DiffusersConfig(ModelConfigBase):
format: Literal["diffusers"]
vae: Optional[str] = Field(None)
variant: ModelVariantType
prediction_type: SchedulerPredictionType
upcast_attention: bool
@ -130,6 +131,7 @@ class StableDiffusion2Model(DiffusersModel):
format: Literal["checkpoint"]
vae: Optional[str] = Field(None)
config: Optional[str] = Field(None)
variant: ModelVariantType
prediction_type: SchedulerPredictionType
upcast_attention: bool