From 151ba02022e1722bc822f1b24897a54725d6e477 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 17 Sep 2023 17:22:50 -0400 Subject: [PATCH] fix models.yaml version assertion error in pytests --- invokeai/backend/model_manager/storage/sql.py | 2 +- invokeai/backend/model_manager/storage/yaml.py | 2 +- tests/test_model_manager/configs/relative_sub.models.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/invokeai/backend/model_manager/storage/sql.py b/invokeai/backend/model_manager/storage/sql.py index 1f6b8e6415..71b8332103 100644 --- a/invokeai/backend/model_manager/storage/sql.py +++ b/invokeai/backend/model_manager/storage/sql.py @@ -78,7 +78,7 @@ class ModelConfigStoreSQL(ModelConfigStore): finally: self._lock.release() assert ( - self.version == CONFIG_FILE_VERSION + str(self.version) == CONFIG_FILE_VERSION ), f"Model config version {self.version} does not match expected version {CONFIG_FILE_VERSION}" def _create_tables(self) -> None: diff --git a/invokeai/backend/model_manager/storage/yaml.py b/invokeai/backend/model_manager/storage/yaml.py index ee147cd8f2..1f56a2dbab 100644 --- a/invokeai/backend/model_manager/storage/yaml.py +++ b/invokeai/backend/model_manager/storage/yaml.py @@ -69,7 +69,7 @@ class ModelConfigStoreYAML(ModelConfigStore): self._initialize_yaml() self._config = OmegaConf.load(self._filename) assert ( - self.version == CONFIG_FILE_VERSION + str(self.version) == CONFIG_FILE_VERSION ), f"Model config version {self.version} does not match expected version {CONFIG_FILE_VERSION}" def _initialize_yaml(self): diff --git a/tests/test_model_manager/configs/relative_sub.models.yaml b/tests/test_model_manager/configs/relative_sub.models.yaml index 4f3890aeaa..71b05e9356 100644 --- a/tests/test_model_manager/configs/relative_sub.models.yaml +++ b/tests/test_model_manager/configs/relative_sub.models.yaml @@ -1,5 +1,5 @@ __metadata__: - version: 3.1.1 + version: 3.2 ed799245c762f6d0a9ddfd4e31fdb010: name: sdxl-base-1-0 path: sdxl/main/SDXL base 1_0