Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts; blackify

Browse Source
This commit is contained in:
Lincoln Stein
2023-11-13 18:12:45 -05:00
parent efbdb75568 8929495aeb
commit 38c1436f02
258 changed files with 1794 additions and 4022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
invokeai/backend/model_manager/config.py
View File

@ -114,8 +114,10 @@ class ModelConfigBase(BaseModel):
current_hash: Optional[str] = Field(
description="current fasthash of model contents", default=None
) # if model is converted or otherwise modified, this will hold updated hash
description: Optional[str] = Field(None)
source: Optional[str] = Field(description="Model download source (URL or repo_id)", default=None)
description: Optional[str] = Field(default=None)
source: Optional[str] = Field(
description="Model download source (URL or repo_id)", default=None
)
model_config = ConfigDict(
use_enum_values=False,
@ -249,12 +251,19 @@ class T2IConfig(ModelConfigBase):
format: Literal[ModelFormat.Diffusers]
_ONNXConfig = Annotated[Union[ONNXSD1Config, ONNXSD2Config], Field(discriminator="base")]
_ControlNetConfig = Annotated[
Union[ControlNetDiffusersConfig, ControlNetCheckpointConfig], Field(discriminator="format")
_ONNXConfig = Annotated[
Union[ONNXSD1Config, ONNXSD2Config], Field(discriminator="base")
]
_ControlNetConfig = Annotated[
Union[ControlNetDiffusersConfig, ControlNetCheckpointConfig],
Field(discriminator="format"),
]
_VaeConfig = Annotated[
Union[VaeDiffusersConfig, VaeCheckpointConfig], Field(discriminator="format")
]
_MainModelConfig = Annotated[
Union[MainDiffusersConfig, MainCheckpointConfig], Field(discriminator="format")
]
_VaeConfig = Annotated[Union[VaeDiffusersConfig, VaeCheckpointConfig], Field(discriminator="format")]
_MainModelConfig = Annotated[Union[MainDiffusersConfig, MainCheckpointConfig], Field(discriminator="format")]
AnyModelConfig = Union[
_MainModelConfig,