fix reorganized module dependencies

invokeai/app/invocations/onnx.py

@@ -17,7 +17,7 @@ from invokeai.app.invocations.primitives import ConditioningField, ConditioningO
 from invokeai.app.util.step_callback import stable_diffusion_step_callback
 from invokeai.backend import BaseModelType, ModelType, SubModelType
 
-from ...backend.model_manager import ONNXModelPatcher
+from ...backend.model_manager.lora import ONNXModelPatcher
 from ...backend.stable_diffusion import PipelineIntermediateState
 from ...backend.util import choose_torch_device
 from ..models.image import ImageCategory, ResourceOrigin

invokeai/app/services/model_manager_service.py

@@ -15,9 +15,6 @@ from invokeai.backend.model_manager import (
     BaseModelType,
     DuplicateModelException,
     ModelConfigBase,
-    ModelInfo,
-    ModelInstallJob,
-    ModelLoad,
     ModelSearch,
     ModelType,
     SubModelType,
@@ -26,6 +23,9 @@ from invokeai.backend.model_manager import (
 from invokeai.backend.model_manager.cache import CacheStats
 from invokeai.backend.model_manager.download import DownloadJobBase
 from invokeai.backend.model_manager.merge import MergeInterpolationMethod, ModelMerger
+from invokeai.backend.model_manager.loader import ModelInfo, ModelLoad
+from invokeai.backend.model_manager.install import ModelInstallJob
+
 
 from .config import InvokeAIAppConfig
 from .events import EventServiceBase

invokeai/backend/model_manager/merge.py

@@ -17,7 +17,8 @@ from diffusers import logging as dlogging
 import invokeai.backend.util.logging as logger
 from invokeai.app.services.config import InvokeAIAppConfig
 
-from . import BaseModelType, ModelConfigBase, ModelConfigStore, ModelInstall, ModelType
+from . import BaseModelType, ModelConfigBase, ModelConfigStore, ModelType
+from .loader import ModelLoad
 from .config import MainConfig
 
 

tests/AC_model_manager/test_model_manager.py

@@ -4,7 +4,7 @@ import pytest
 
 from invokeai.app.services.config import InvokeAIAppConfig
 from invokeai.backend import SubModelType
-from invokeai.backend.model_manager import ModelLoad
+from invokeai.backend.model_manager.loader import ModelLoad
 
 BASIC_MODEL_NAME = "sdxl-base-1-0"
 VAE_OVERRIDE_MODEL_NAME = "sdxl-base-with-custom-vae-1-0"