diff --git a/invokeai/app/services/session_processor/session_processor_default.py b/invokeai/app/services/session_processor/session_processor_default.py index 28591fd7df..028f91fec3 100644 --- a/invokeai/app/services/session_processor/session_processor_default.py +++ b/invokeai/app/services/session_processor/session_processor_default.py @@ -1,7 +1,6 @@ import traceback -from threading import BoundedSemaphore +from threading import BoundedSemaphore, Thread from threading import Event as ThreadEvent -from threading import Thread from typing import Optional from fastapi_events.handlers.local import local_handler diff --git a/invokeai/backend/model_management/__init__.py b/invokeai/backend/model_management/__init__.py index 569428a9e7..0a81bc2108 100644 --- a/invokeai/backend/model_management/__init__.py +++ b/invokeai/backend/model_management/__init__.py @@ -2,10 +2,12 @@ Initialization file for invokeai.backend.model_management """ # This import must be first -from .model_manager import ModelManager, ModelInfo, AddModelResult, SchedulerPredictionType # noqa: F401 isort: split - from .lora import ModelPatcher, ONNXModelPatcher # noqa: F401 from .model_cache import ModelCache # noqa: F401 +from .model_manager import AddModelResult, ModelInfo, ModelManager, SchedulerPredictionType # noqa: F401 isort: split + +# This import must be last +from .model_merge import MergeInterpolationMethod, ModelMerger # noqa: F401 isort: split from .models import ( # noqa: F401 BaseModelType, DuplicateModelException, @@ -14,6 +16,3 @@ from .models import ( # noqa: F401 ModelVariantType, SubModelType, ) - -# This import must be last -from .model_merge import ModelMerger, MergeInterpolationMethod # noqa: F401 isort: split