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 ckpy "config" -> "config_path"

Browse Source
This commit is contained in:
psychedelicious 2024-03-01 15:25:21 +11:00
parent 16a5d718bf
commit 9b40c28144
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ example_model_config = {
"base": "sd-1",
"type": "main",
"format": "checkpoint",
"config": "string",
"config_path": "string",
"key": "string",
"original_hash": "string",
"current_hash": "string",
@ -87,7 +87,7 @@ example_model_input = {
"base": "sd-1",
"type": "main",
"format": "checkpoint",
"config": "configs/stable-diffusion/v1-inference.yaml",
"config_path": "configs/stable-diffusion/v1-inference.yaml",
"description": "Model description",
"vae": None,
"variant": "normal",

4
invokeai/app/services/model_install/model_install_default.py
View File

@ -550,8 +550,8 @@ class ModelInstallService(ModelInstallServiceBase):
# add 'main' specific fields
if isinstance(info, CheckpointConfigBase):
# make config relative to our root
legacy_conf = (self.app_config.root_dir / self.app_config.legacy_conf_dir / info.config).resolve()
info.config = legacy_conf.relative_to(self.app_config.root_dir).as_posix()
legacy_conf = (self.app_config.root_dir / self.app_config.legacy_conf_dir / info.config_path).resolve()
info.config_path = legacy_conf.relative_to(self.app_config.root_dir).as_posix()
self.record_store.add_model(info.key, info)
return info.key

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

@ -158,7 +158,7 @@ class CheckpointConfigBase(ModelConfigBase):
"""Model config for checkpoint-style models."""
format: Literal[ModelFormat.Checkpoint] = ModelFormat.Checkpoint
config: 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(
description="When this model was last converted to diffusers", default_factory=time.time
)

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

@ -41,7 +41,7 @@ class ControlNetLoader(GenericDiffusersLoader):
raise Exception(f"ControlNet conversion not supported for model type: {config.base}")
else:
assert isinstance(config, CheckpointConfigBase)
config_file = config.config
config_file = config.config_path
if model_path.suffix == ".safetensors":
checkpoint = safetensors_load_file(model_path, device="cpu")

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

@ -74,7 +74,7 @@ class StableDiffusionDiffusersModel(GenericDiffusersLoader):
StableDiffusionInpaintPipeline if variant == ModelVariantType.Inpaint else StableDiffusionPipeline
)
config_file = config.config
config_file = config.config_path
self._logger.info(f"Converting {model_path} to diffusers format")
convert_ckpt_to_diffusers(

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

@ -44,7 +44,7 @@ class VaeLoader(GenericDiffusersLoader):
raise Exception(f"VAE conversion not supported for model type: {config.base}")
else:
assert isinstance(config, CheckpointConfigBase)
config_file = config.config
config_file = config.config_path
if model_path.suffix == ".safetensors":
checkpoint = safetensors_load_file(model_path, device="cpu")

2
invokeai/backend/model_manager/probe.py
View File

@ -169,7 +169,7 @@ class ModelProbe(object):
# additional fields needed for main and controlnet models
if fields["type"] in [ModelType.Main, ModelType.ControlNet, ModelType.Vae] and fields["format"] == ModelFormat.Checkpoint:
fields["config"] = cls._get_checkpoint_config_path(
fields["config_path"] = cls._get_checkpoint_config_path(
model_path,
model_type=fields["type"],
base_type=fields["base"],

2
tests/app/services/model_records/test_model_records_sql.py
View File

@ -64,7 +64,7 @@ def test_add(store: ModelRecordServiceBase):
"name": "model1",
"base": BaseModelType("sd-1"),
"type": "main",
"config": "/tmp/foo.yaml",
"config_path": "/tmp/foo.yaml",
"variant": "normal",
"format": "checkpoint",
"original_hash": "111222333444",

2
tests/backend/model_manager/model_manager_fixtures.py
View File

@ -177,7 +177,7 @@ def mm2_record_store(mm2_app_config: InvokeAIAppConfig) -> ModelRecordServiceBas
"format": ModelFormat("checkpoint"),
"base": BaseModelType("sd-1"),
"type": "main",
"config": "/tmp/foo.yaml",
"config_path": "/tmp/foo.yaml",
"variant": "normal",
"original_hash": "111222333444",
"source": "https://civitai.com/models/206883/split",