From 7db71ed42ef8426fc95e11b539f581351091851d Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 14 Aug 2023 20:55:30 -0400 Subject: [PATCH] rename modules --- invokeai/backend/model_manager/__init__.py | 15 +++++++++++++++ .../model_config.py => model_manager/config.py} | 2 +- .../backend/model_manager/storage/__init__.py | 6 ++++++ .../storage/base.py | 2 +- .../storage/sql.py | 4 ++-- .../storage/yaml.py | 2 +- tests/test_model_config2.py | 2 +- tests/test_model_storage_file.py | 4 ++-- tests/test_model_storage_sql.py | 4 ++-- 9 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 invokeai/backend/model_manager/__init__.py rename invokeai/backend/{model_management2/model_config.py => model_manager/config.py} (99%) create mode 100644 invokeai/backend/model_manager/storage/__init__.py rename invokeai/backend/{model_management2 => model_manager}/storage/base.py (97%) rename invokeai/backend/{model_management2 => model_manager}/storage/sql.py (99%) rename invokeai/backend/{model_management2 => model_manager}/storage/yaml.py (99%) diff --git a/invokeai/backend/model_manager/__init__.py b/invokeai/backend/model_manager/__init__.py new file mode 100644 index 0000000000..7700a112d9 --- /dev/null +++ b/invokeai/backend/model_manager/__init__.py @@ -0,0 +1,15 @@ +""" +Initialization file for invokeai.backend.model_manager.config +""" +from invokeai.backend.model_manager.config import ( + ModelConfigFactory, + ModelConfigBase, + InvalidModelConfigException, + BaseModelType, + ModelType, + SubModelType, + ModelVariantType, + ModelFormat, + SchedulerPredictionType, +) + diff --git a/invokeai/backend/model_management2/model_config.py b/invokeai/backend/model_manager/config.py similarity index 99% rename from invokeai/backend/model_management2/model_config.py rename to invokeai/backend/model_manager/config.py index 48220b5a1a..9f0c305bc9 100644 --- a/invokeai/backend/model_management2/model_config.py +++ b/invokeai/backend/model_manager/config.py @@ -4,7 +4,7 @@ Configuration definitions for image generation models. Typical usage: - from invokeai.backend.model_management2.model_config import ModelConfigFactory + from invokeai.backend.model_manager import ModelConfigFactory raw = dict(path='models/sd-1/main/foo.ckpt', name='foo', base_model='sd-1', diff --git a/invokeai/backend/model_manager/storage/__init__.py b/invokeai/backend/model_manager/storage/__init__.py new file mode 100644 index 0000000000..3d75ec5627 --- /dev/null +++ b/invokeai/backend/model_manager/storage/__init__.py @@ -0,0 +1,6 @@ +""" +Initialization file for invokeai.backend.model_manager.storage +""" +from .base import ModelConfigStore, UnknownModelException +from .yaml import ModelConfigStoreYAML +from .sql import ModelConfigStoreSQL diff --git a/invokeai/backend/model_management2/storage/base.py b/invokeai/backend/model_manager/storage/base.py similarity index 97% rename from invokeai/backend/model_management2/storage/base.py rename to invokeai/backend/model_manager/storage/base.py index 9e4d7b2fa5..12fb764529 100644 --- a/invokeai/backend/model_management2/storage/base.py +++ b/invokeai/backend/model_manager/storage/base.py @@ -7,7 +7,7 @@ Abstract base class for storing and retrieving model configuration records. from abc import ABC, abstractmethod from typing import Union, Set, List, Optional -from ..model_config import ModelConfigBase, BaseModelType, ModelType +from ..config import ModelConfigBase, BaseModelType, ModelType class DuplicateModelException(Exception): diff --git a/invokeai/backend/model_management2/storage/sql.py b/invokeai/backend/model_manager/storage/sql.py similarity index 99% rename from invokeai/backend/model_management2/storage/sql.py rename to invokeai/backend/model_manager/storage/sql.py index 7cadf4de2f..403b6c30d6 100644 --- a/invokeai/backend/model_management2/storage/sql.py +++ b/invokeai/backend/model_manager/storage/sql.py @@ -4,7 +4,7 @@ Implementation of ModelConfigStore using a SQLite3 database Typical usage: - from invokeai.backend.model_management2.storage.yaml import ModelConfigStoreSQL + from invokeai.backend.model_manager import ModelConfigStoreSQL store = ModelConfigStoreYAML("./configs/models.yaml") config = dict( path='/tmp/pokemon.bin', @@ -47,7 +47,7 @@ from pathlib import Path from typing import Union, List, Optional, Set -from ..model_config import ( +from ..config import ( ModelConfigBase, ModelConfigFactory, BaseModelType, diff --git a/invokeai/backend/model_management2/storage/yaml.py b/invokeai/backend/model_manager/storage/yaml.py similarity index 99% rename from invokeai/backend/model_management2/storage/yaml.py rename to invokeai/backend/model_manager/storage/yaml.py index e276658d9e..802a1b5297 100644 --- a/invokeai/backend/model_management2/storage/yaml.py +++ b/invokeai/backend/model_manager/storage/yaml.py @@ -47,7 +47,7 @@ from typing import Union, Set, List, Optional from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig -from ..model_config import ( +from ..config import ( ModelConfigBase, ModelConfigFactory, BaseModelType, diff --git a/tests/test_model_config2.py b/tests/test_model_config2.py index c06ad9299d..ecd394a187 100644 --- a/tests/test_model_config2.py +++ b/tests/test_model_config2.py @@ -4,7 +4,7 @@ Test the refactored model config classes. from pathlib import Path -from invokeai.backend.model_management2.model_config import ( +from invokeai.backend.model_manager.config import ( ModelConfigFactory, InvalidModelConfigException, MainCheckpointConfig, diff --git a/tests/test_model_storage_file.py b/tests/test_model_storage_file.py index 65913b70a0..73773487df 100644 --- a/tests/test_model_storage_file.py +++ b/tests/test_model_storage_file.py @@ -6,12 +6,12 @@ import pytest from hashlib import sha256 from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.backend.model_management2.storage.yaml import ( +from invokeai.backend.model_manager.storage import ( ModelConfigStoreYAML, ModelConfigStore, UnknownModelException, ) -from invokeai.backend.model_management2.model_config import ( +from invokeai.backend.model_manager.config import ( TextualInversionConfig, DiffusersConfig, VaeDiffusersConfig, diff --git a/tests/test_model_storage_sql.py b/tests/test_model_storage_sql.py index b946a8f2b7..321f14f84a 100644 --- a/tests/test_model_storage_sql.py +++ b/tests/test_model_storage_sql.py @@ -6,12 +6,12 @@ import pytest from hashlib import sha256 from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.backend.model_management2.storage.sql import ( +from invokeai.backend.model_manager.storage import ( ModelConfigStoreSQL, ModelConfigStore, UnknownModelException, ) -from invokeai.backend.model_management2.model_config import ( +from invokeai.backend.model_manager.config import ( TextualInversionConfig, DiffusersConfig, VaeDiffusersConfig,