Merge branch 'main' into bugfix/merge-script-display-correct-model-bases

lstein · web-flow · commit d946cb78e6e0 · 2023-10-24T17:20:36.000-04:00
diff --git a/invokeai/app/services/model_manager/__init__.py b/invokeai/app/services/model_manager/__init__.py
@@ -0,0 +1 @@
+from .model_manager_default import ModelManagerService
diff --git a/invokeai/backend/training/textual_inversion_training.py b/invokeai/backend/training/textual_inversion_training.py
@@ -41,7 +41,7 @@
 
 # invokeai stuff
 from invokeai.app.services.config import InvokeAIAppConfig, PagingArgumentParser
-from invokeai.app.services.model_manager_service import ModelManagerService
+from invokeai.app.services.model_manager import ModelManagerService
 from invokeai.backend.model_management.models import SubModelType
 
 if version.parse(version.parse(PIL.__version__).base_version) >= version.parse("9.1.0"):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from .model_manager_default import ModelManagerService`