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

Updated to fix Annotated pydantic errors on modelInfo

Browse Source
This commit is contained in:
Kent Keirsey
2023-03-28 10:39:20 -04:00
parent 7bef16f6f2
commit e282d2ee7a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
invokeai/app/api/routers/models.py
View File

@ -34,19 +34,17 @@ class DiffusersModelInfo(ModelInfo):
repo_id: Optional[str] = Field(description="The repo ID to use for this model") repo_id: Optional[str] = Field(description="The repo ID to use for this model")
path: Optional[str] = Field(description="The path to the model") path: Optional[str] = Field(description="The path to the model")
class modelInfo(ModelInfo):
info: Annotated[Union[CkptModelInfo,DiffusersModelInfo], Field(discriminator="format")]
class CreateModelRequest (BaseModel): class CreateModelRequest (BaseModel):
name: str = Field(description="The name of the model") name: str = Field(description="The name of the model")
info: Union[CkptModelInfo, DiffusersModelInfo] = Field(..., discriminator="format", description="The model details and configuration")
class CreateModelResponse (BaseModel):
name: str = Field(description="The name of the new model")
info: Union[CkptModelInfo, DiffusersModelInfo] = Field(..., discriminator="format", description="The model details and configuration")
status: str = Field(description="The status of the API response")
class CreateModelResponse (BaseModel):
name: str = Field(description="The name of the new model")
info: Annotated[Union[(CkptModelInfo,DiffusersModelInfo)], Field(discriminator="format")] = Field(description="The model info") info: Annotated[Union[(CkptModelInfo,DiffusersModelInfo)], Field(discriminator="format")] = Field(description="The model info")
class CreateModelResponse (BaseModel):
name: str = Field(description="The name of the new model")
info: modelInfo = Field(description="The model details and configuration")
status: str = Field(description="The status of the API response")
class ModelsList(BaseModel): class ModelsList(BaseModel):
models: dict[str, Annotated[Union[(CkptModelInfo,DiffusersModelInfo)], Field(discriminator="format")]] models: dict[str, Annotated[Union[(CkptModelInfo,DiffusersModelInfo)], Field(discriminator="format")]]
@ -95,7 +93,7 @@ async def update_model(
model_attributes=model_request["info"], model_attributes=model_request["info"],
clobber=True, clobber=True,
) )
model_response = CreateModelResponse(status="success") model_response = CreateModelResponse(name=model_request.name, info=model_request.info, status="success")
except Exception as e: except Exception as e:
# Handle any exceptions thrown during the execution of the method # Handle any exceptions thrown during the execution of the method