github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(mm): use ValueError for model id sanity checks

Browse Source
This commit is contained in:
psychedelicious
2025-10-10 12:02:33 +11:00
parent db2a8306c2
commit d81a55401a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
invokeai/backend/model_manager/configs/base.py
View File

@@ -155,21 +155,21 @@ class Config_Base(ABC, BaseModel):
if isinstance(type_, Enum):
type_ = str(type_.value)
elif not isinstance(type_, str):
raise TypeError("Model config dict 'type' field must be a string or Enum")
raise ValueError("Model config dict 'type' field must be a string or Enum")
tag_strings.append(type_)
if format_ := v.get("format"):
if isinstance(format_, Enum):
format_ = str(format_.value)
elif not isinstance(format_, str):
raise TypeError("Model config dict 'format' field must be a string or Enum")
raise ValueError("Model config dict 'format' field must be a string or Enum")
tag_strings.append(format_)
if base_ := v.get("base"):
if isinstance(base_, Enum):
base_ = str(base_.value)
elif not isinstance(base_, str):
raise TypeError("Model config dict 'base' field must be a string or Enum")
raise ValueError("Model config dict 'base' field must be a string or Enum")
tag_strings.append(base_)
# Special case: CLIP Embed models also need the variant to distinguish them.
@@ -182,14 +182,16 @@ class Config_Base(ABC, BaseModel):
if isinstance(variant_, Enum):
variant_ = variant_.value
elif not isinstance(variant_, str):
raise TypeError("Model config dict 'variant' field must be a string or Enum")
raise ValueError("Model config dict 'variant' field must be a string or Enum")
tag_strings.append(variant_)
else:
raise ValueError("CLIP Embed model config dict must include a 'variant' field")
return ".".join(tag_strings)
else:
raise TypeError("Model config discriminator value must be computed from a dict or ModelConfigBase instance")
raise ValueError(
"Model config discriminator value must be computed from a dict or ModelConfigBase instance"
)
@classmethod
@abstractmethod