Skip to content

Commit 29087af

Browse files
feat(mm): consistent naming for all model config classes
1 parent 17c5ad2 commit 29087af

File tree

5 files changed

+130
-137
lines changed

5 files changed

+130
-137
lines changed

invokeai/app/api/routers/model_manager.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
from invokeai.backend.model_manager import BaseModelType, ModelFormat, ModelType
3232
from invokeai.backend.model_manager.config import (
3333
AnyModelConfig,
34-
Main_SD1_Checkpoint_Config,
35-
Main_SD2_Checkpoint_Config,
36-
Main_SDXL_Checkpoint_Config,
37-
Main_SDXLRefiner_Checkpoint_Config,
34+
Main_Checkpoint_SD1_Config,
35+
Main_Checkpoint_SD2_Config,
36+
Main_Checkpoint_SDXL_Config,
37+
Main_Checkpoint_SDXLRefiner_Config,
3838
)
3939
from invokeai.backend.model_manager.load.model_cache.cache_stats import CacheStats
4040
from invokeai.backend.model_manager.metadata.fetch.huggingface import HuggingFaceMetadataFetch
@@ -747,10 +747,10 @@ async def convert_model(
747747
if isinstance(
748748
model_config,
749749
(
750-
Main_SD1_Checkpoint_Config,
751-
Main_SD2_Checkpoint_Config,
752-
Main_SDXL_Checkpoint_Config,
753-
Main_SDXLRefiner_Checkpoint_Config,
750+
Main_Checkpoint_SD1_Config,
751+
Main_Checkpoint_SD2_Config,
752+
Main_Checkpoint_SDXL_Config,
753+
Main_Checkpoint_SDXLRefiner_Config,
754754
),
755755
):
756756
msg = f"The model with key {key} is not a main SD 1/2/XL checkpoint model."

invokeai/app/invocations/flux_ip_adapter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from invokeai.app.invocations.util import validate_begin_end_step, validate_weights
1818
from invokeai.app.services.shared.invocation_context import InvocationContext
1919
from invokeai.backend.model_manager.config import (
20-
IPAdapter_FLUX_Checkpoint_Config,
20+
IPAdapter_Checkpoint_FLUX_Config,
2121
)
2222
from invokeai.backend.model_manager.taxonomy import BaseModelType, ModelType
2323

@@ -67,7 +67,7 @@ def validate_begin_end_step_percent(self) -> Self:
6767
def invoke(self, context: InvocationContext) -> IPAdapterOutput:
6868
# Lookup the CLIP Vision encoder that is intended to be used with the IP-Adapter model.
6969
ip_adapter_info = context.models.get_config(self.ip_adapter_model.key)
70-
assert isinstance(ip_adapter_info, IPAdapter_FLUX_Checkpoint_Config)
70+
assert isinstance(ip_adapter_info, IPAdapter_Checkpoint_FLUX_Config)
7171

7272
# Note: There is a IPAdapterInvokeAIConfig.image_encoder_model_id field, but it isn't trustworthy.
7373
image_encoder_starter_model = CLIP_VISION_MODEL_MAP[self.clip_vision_model]

0 commit comments

Comments
 (0)