diff --git a/invokeai/app/services/model_records/model_records_base.py b/invokeai/app/services/model_records/model_records_base.py index 0b56b7f6c0..1df64709b9 100644 --- a/invokeai/app/services/model_records/model_records_base.py +++ b/invokeai/app/services/model_records/model_records_base.py @@ -18,7 +18,7 @@ from invokeai.backend.model_manager import ( ModelFormat, ModelType, ) -from invokeai.backend.model_manager.config import ModelDefaultSettings, ModelVariantType, SchedulerPredictionType +from invokeai.backend.model_manager.config import MainModelDefaultSettings, ModelVariantType, SchedulerPredictionType class DuplicateModelException(Exception): @@ -68,7 +68,7 @@ class ModelRecordChanges(BaseModelExcludeNull): description: Optional[str] = Field(description="Model description", default=None) base: Optional[BaseModelType] = Field(description="The base model.", default=None) trigger_phrases: Optional[set[str]] = Field(description="Set of trigger phrases for this model", default=None) - default_settings: Optional[ModelDefaultSettings] = Field( + default_settings: Optional[MainModelDefaultSettings] = Field( description="Default settings for this model", default=None ) diff --git a/invokeai/backend/model_manager/config.py b/invokeai/backend/model_manager/config.py index de86b20fb2..78cf5ca19c 100644 --- a/invokeai/backend/model_manager/config.py +++ b/invokeai/backend/model_manager/config.py @@ -131,7 +131,7 @@ class ModelSourceType(str, Enum): HFRepoID = "hf_repo_id" -class ModelDefaultSettings(BaseModel): +class MainModelDefaultSettings(BaseModel): vae: str | None vae_precision: str | None scheduler: SCHEDULER_NAME_VALUES | None @@ -156,9 +156,6 @@ class ModelConfigBase(BaseModel): source_api_response: Optional[str] = Field( description="The original API response from the source, as stringified JSON.", default=None ) - default_settings: Optional[ModelDefaultSettings] = Field( - description="Default settings for this model", default=None - ) cover_image: Optional[str] = Field(description="Url for image to preview model", default=None) @staticmethod @@ -279,6 +276,9 @@ class TextualInversionFolderConfig(ModelConfigBase): class MainConfigBase(ModelConfigBase): type: Literal[ModelType.Main] = ModelType.Main trigger_phrases: Optional[set[str]] = Field(description="Set of trigger phrases for this model", default=None) + default_settings: Optional[MainModelDefaultSettings] = Field( + description="Default settings for this model", default=None + ) class MainCheckpointConfig(CheckpointConfigBase, MainConfigBase):