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

tidy(mm): rename ckpt "last_modified" -> "converted_at"

Browse Source 
Clarify what this timestamp means
This commit is contained in:
psychedelicious 2024-03-01 15:27:41 +11:00
parent 9b40c28144
commit bd4fd9693d
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/app/api/routers/model_manager.py
View File

@ -74,7 +74,7 @@ example_model_config = {
"current_hash": "string", "current_hash": "string",
"description": "string", "description": "string",
"source": "string", "source": "string",
"last_modified": 0, "converted_at": 0,
"variant": "normal", "variant": "normal",
"prediction_type": "epsilon", "prediction_type": "epsilon",
"repo_variant": "fp16", "repo_variant": "fp16",

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

@ -138,9 +138,7 @@ class ModelConfigBase(BaseModel):
@staticmethod @staticmethod
def json_schema_extra(schema: dict[str, Any], model_class: Type[BaseModel]) -> None: def json_schema_extra(schema: dict[str, Any], model_class: Type[BaseModel]) -> None:
schema["required"].extend( schema["required"].extend(["key", "base", "type", "format", "original_hash", "current_hash", "source"])
["key", "base", "type", "format", "original_hash", "current_hash", "source", "last_modified"]
)
model_config = ConfigDict( model_config = ConfigDict(
use_enum_values=False, use_enum_values=False,
@ -159,7 +157,7 @@ class CheckpointConfigBase(ModelConfigBase):
format: Literal[ModelFormat.Checkpoint] = ModelFormat.Checkpoint format: Literal[ModelFormat.Checkpoint] = ModelFormat.Checkpoint
config_path: str = Field(description="path to the checkpoint model config file") config_path: str = Field(description="path to the checkpoint model config file")
last_modified: Optional[float] = Field( converted_at: Optional[float] = Field(
description="When this model was last converted to diffusers", default_factory=time.time description="When this model was last converted to diffusers", default_factory=time.time
) )
@ -380,5 +378,5 @@ class ModelConfigFactory(object):
if key: if key:
model.key = key model.key = key
if isinstance(model, CheckpointConfigBase) and timestamp is not None: if isinstance(model, CheckpointConfigBase) and timestamp is not None:
model.last_modified = timestamp model.converted_at = timestamp
return model # type: ignore return model # type: ignore

2
invokeai/backend/model_manager/load/model_loaders/controlnet.py
View File

@ -29,7 +29,7 @@ class ControlNetLoader(GenericDiffusersLoader):
return False return False
elif ( elif (
dest_path.exists() dest_path.exists()
and (dest_path / "config.json").stat().st_mtime >= (config.last_modified or 0.0) and (dest_path / "config.json").stat().st_mtime >= (config.converted_at or 0.0)
and (dest_path / "config.json").stat().st_mtime >= model_path.stat().st_mtime and (dest_path / "config.json").stat().st_mtime >= model_path.stat().st_mtime
): ):
return False return False

2
invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py
View File

@ -59,7 +59,7 @@ class StableDiffusionDiffusersModel(GenericDiffusersLoader):
return False return False
elif ( elif (
dest_path.exists() dest_path.exists()
and (dest_path / "model_index.json").stat().st_mtime >= (config.last_modified or 0.0) and (dest_path / "model_index.json").stat().st_mtime >= (config.converted_at or 0.0)
and (dest_path / "model_index.json").stat().st_mtime >= model_path.stat().st_mtime and (dest_path / "model_index.json").stat().st_mtime >= model_path.stat().st_mtime
): ):
return False return False

2
invokeai/backend/model_manager/load/model_loaders/vae.py
View File

@ -31,7 +31,7 @@ class VaeLoader(GenericDiffusersLoader):
return False return False
elif ( elif (
dest_path.exists() dest_path.exists()
and (dest_path / "config.json").stat().st_mtime >= (config.last_modified or 0.0) and (dest_path / "config.json").stat().st_mtime >= (config.converted_at or 0.0)
and (dest_path / "config.json").stat().st_mtime >= model_path.stat().st_mtime and (dest_path / "config.json").stat().st_mtime >= model_path.stat().st_mtime
): ):
return False return False