diff --git a/invokeai/backend/model_manager/config.py b/invokeai/backend/model_manager/config.py index dfc24cc446..df29b16ee5 100644 --- a/invokeai/backend/model_manager/config.py +++ b/invokeai/backend/model_manager/config.py @@ -21,9 +21,9 @@ Validation errors will raise an InvalidModelConfigException error. """ # pyright: reportIncompatibleVariableOverride=false +import json import logging import time -import json from abc import ABC, abstractmethod from enum import Enum from inspect import isabstract @@ -392,7 +392,6 @@ class ModelConfigBase(ABC, BaseModel): if "source_type" in overrides: overrides["source_type"] = ModelSourceType(overrides["source_type"]) - @classmethod def from_model_on_disk(cls, mod: ModelOnDisk, **overrides): """Creates an instance of this config or raises InvalidModelConfigException.""" @@ -668,6 +667,7 @@ class FluxReduxConfig(LegacyProbeMixin, ModelConfigBase): class LlavaOnevisionConfig(DiffusersConfigBase, ModelConfigBase): """Model config for Llava Onevision models.""" + type: Literal[ModelType.LlavaOnevision] = ModelType.LlavaOnevision format: Literal[ModelFormat.Diffusers] = ModelFormat.Diffusers @@ -684,10 +684,7 @@ class LlavaOnevisionConfig(DiffusersConfigBase, ModelConfigBase): return False architectures = config.get("architectures") - return ( - architectures and - architectures[0] == "LlavaOnevisionForConditionalGeneration" - ) + return architectures and architectures[0] == "LlavaOnevisionForConditionalGeneration" @classmethod def parse(cls, mod: ModelOnDisk) -> dict[str, Any]: diff --git a/tests/test_model_probe.py b/tests/test_model_probe.py index 03644c07e3..d075a8ed4a 100644 --- a/tests/test_model_probe.py +++ b/tests/test_model_probe.py @@ -148,7 +148,7 @@ def test_regression_against_model_probe(datadir: Path, override_model_loading): configs_with_tests = set() model_paths = ModelSearch().search(datadir / "stripped_models") fake_hash = "abcdefgh" # skip hashing to make test quicker - fake_key = "123" # fixed uuid for comparison + fake_key = "123" # fixed uuid for comparison for path in model_paths: legacy_config = new_config = None