diff --git a/scripts/probe-model.py b/scripts/probe-model.py index 2a5c36cfeb..14af866634 100755 --- a/scripts/probe-model.py +++ b/scripts/probe-model.py @@ -5,11 +5,8 @@ import argparse import sys from pathlib import Path -from invokeai.backend.model_manager import ( - ModelProbe, - SchedulerPredictionType, - InvalidModelException, -) + +from invokeai.backend.model_manager import InvalidModelException, ModelProbe, SchedulerPredictionType def helper(model_path: Path): diff --git a/tests/test_model_config2.py b/tests/test_model_config2.py index 606deaf74b..661cb78c03 100644 --- a/tests/test_model_config2.py +++ b/tests/test_model_config2.py @@ -3,14 +3,14 @@ Test the refactored model config classes. """ from invokeai.backend.model_manager.config import ( - ModelConfigFactory, InvalidModelConfigException, + LoRAConfig, MainCheckpointConfig, MainDiffusersConfig, - LoRAConfig, - TextualInversionConfig, + ModelConfigFactory, ONNXSD1Config, ONNXSD2Config, + TextualInversionConfig, ValidationError, ) diff --git a/tests/test_model_download.py b/tests/test_model_download.py index 400408b945..295f57660a 100644 --- a/tests/test_model_download.py +++ b/tests/test_model_download.py @@ -2,18 +2,19 @@ import tempfile import time -import requests -from requests_testadapter import TestAdapter -from requests import HTTPError from pathlib import Path +import requests +from requests import HTTPError +from requests_testadapter import TestAdapter + +import invokeai.backend.model_manager.download.queue as download_queue from invokeai.backend.model_manager.download import ( + DownloadJobBase, DownloadJobStatus, DownloadQueue, - DownloadJobBase, UnknownJobIDException, ) -import invokeai.backend.model_manager.download.queue as download_queue # Allow for at least one chunk to be fetched during the pause/unpause test. # Otherwise pause test doesn't work because whole file contents are read diff --git a/tests/test_model_manager.py b/tests/test_model_manager.py index 3d143a0abb..9402f81c5f 100644 --- a/tests/test_model_manager.py +++ b/tests/test_model_manager.py @@ -3,7 +3,7 @@ from pathlib import Path import pytest from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.backend import ModelConfigStore, BaseModelType, ModelType, SubModelType +from invokeai.backend import BaseModelType, ModelConfigStore, ModelType, SubModelType from invokeai.backend.model_manager import ModelLoader BASIC_MODEL_NAME = "sdxl-base-1-0" diff --git a/tests/test_model_storage_file.py b/tests/test_model_storage_file.py index 5f96ff7c48..96bff4af17 100644 --- a/tests/test_model_storage_file.py +++ b/tests/test_model_storage_file.py @@ -2,21 +2,13 @@ Test the refactored model config classes. """ +from hashlib import sha256 + import pytest -from hashlib import sha256 from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.backend.model_manager.storage import ( - ModelConfigStoreYAML, - ModelConfigStore, - UnknownModelException, -) -from invokeai.backend.model_manager.config import ( - ModelType, - TextualInversionConfig, - DiffusersConfig, - VaeDiffusersConfig, -) +from invokeai.backend.model_manager.config import DiffusersConfig, ModelType, TextualInversionConfig, VaeDiffusersConfig +from invokeai.backend.model_manager.storage import ModelConfigStore, ModelConfigStoreYAML, UnknownModelException @pytest.fixture diff --git a/tests/test_model_storage_sql.py b/tests/test_model_storage_sql.py index f4652a9fe5..255e4bf473 100644 --- a/tests/test_model_storage_sql.py +++ b/tests/test_model_storage_sql.py @@ -2,22 +2,14 @@ Test the refactored model config classes. """ -import pytest import sys - from hashlib import sha256 + +import pytest + from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.backend.model_manager.storage import ( - ModelConfigStoreSQL, - ModelConfigStore, - UnknownModelException, -) -from invokeai.backend.model_manager.config import ( - ModelType, - TextualInversionConfig, - DiffusersConfig, - VaeDiffusersConfig, -) +from invokeai.backend.model_manager.config import DiffusersConfig, ModelType, TextualInversionConfig, VaeDiffusersConfig +from invokeai.backend.model_manager.storage import ModelConfigStore, ModelConfigStoreSQL, UnknownModelException @pytest.fixture