tidy(mm): rename ckpy "config" -> "config_path"

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

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
)

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")

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(

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")

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"],