Merge branch 'main' into refactor/model-manager-3

This commit is contained in:
Lincoln Stein
2023-11-22 22:28:31 -05:00
81 changed files with 2813 additions and 1212 deletions

View File

@ -1,12 +1,13 @@
# ruff: noqa: I001, F401
"""
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 .model_manager import AddModelResult, ModelInfo, ModelManager, SchedulerPredictionType
from .lora import ModelPatcher, ONNXModelPatcher
from .model_cache import ModelCache
from .lora import ModelPatcher, ONNXModelPatcher # noqa: F401
from .model_cache import ModelCache # noqa: F401
from .models import ( # noqa: F401
from .models import (
BaseModelType,
DuplicateModelException,
ModelNotFoundException,
@ -16,4 +17,4 @@ from .models import ( # noqa: F401
)
# This import must be last
from .model_merge import ModelMerger, MergeInterpolationMethod # noqa: F401 isort: split
from .model_merge import MergeInterpolationMethod, ModelMerger