rename modules

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,
+)
+

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',

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

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

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,

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,

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,

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,

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,