From d051c0868e1ee9a470e273205cde6b11230f6eca Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 17 Sep 2023 17:13:56 -0400 Subject: [PATCH] attempt to fix flake8 lint errors --- invokeai/app/invocations/latent.py | 1 - invokeai/app/services/events.py | 2 +- invokeai/app/services/invocation_services.py | 2 +- invokeai/backend/model_manager/__init__.py | 2 +- invokeai/backend/model_manager/loader.py | 1 - invokeai/backend/model_manager/merge.py | 1 - invokeai/backend/model_manager/models/sdxl.py | 7 ++----- invokeai/backend/model_manager/models/stable_diffusion.py | 2 +- invokeai/backend/model_manager/probe.py | 1 - scripts/convert_models_config_to_3.2.py | 1 - tests/test_model_manager.py | 2 +- 11 files changed, 7 insertions(+), 15 deletions(-) diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index 9527453f6f..a5f31ec9ad 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -34,7 +34,6 @@ from invokeai.app.util.step_callback import stable_diffusion_step_callback from invokeai.backend.model_manager import BaseModelType, ModelType, SilenceWarnings from ...backend.model_manager.lora import ModelPatcher -from ...backend.model_manager.models import BaseModelType from ...backend.model_manager.seamless import set_seamless from ...backend.stable_diffusion import PipelineIntermediateState from ...backend.stable_diffusion.diffusers_pipeline import ( diff --git a/invokeai/app/services/events.py b/invokeai/app/services/events.py index bab91179fa..2380dfac6a 100644 --- a/invokeai/app/services/events.py +++ b/invokeai/app/services/events.py @@ -3,7 +3,7 @@ from typing import Any, Optional from invokeai.app.models.image import ProgressImage -from invokeai.app.services.model_manager_service import BaseModelType, ModelInfo, ModelType, SubModelType +from invokeai.app.services.model_manager_service import ModelInfo, SubModelType from invokeai.app.util.misc import get_timestamp from invokeai.backend.model_manager.download import DownloadJobBase from invokeai.backend.util.logging import InvokeAILogger diff --git a/invokeai/app/services/invocation_services.py b/invokeai/app/services/invocation_services.py index 2bdf406870..a4ec3573f5 100644 --- a/invokeai/app/services/invocation_services.py +++ b/invokeai/app/services/invocation_services.py @@ -1,7 +1,7 @@ # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654) and the InvokeAI Team from __future__ import annotations -from typing import TYPE_CHECKING, Optional +from typing import TYPE_CHECKING if TYPE_CHECKING: from logging import Logger diff --git a/invokeai/backend/model_manager/__init__.py b/invokeai/backend/model_manager/__init__.py index a40402453e..de8e67a740 100644 --- a/invokeai/backend/model_manager/__init__.py +++ b/invokeai/backend/model_manager/__init__.py @@ -15,7 +15,7 @@ from .config import ( # noqa F401 ) from .install import ModelInstall, ModelInstallJob # noqa F401 from .loader import ModelInfo, ModelLoad # noqa F401 -from .lora import ModelPatcher, ONNXModelPatcher +from .lora import ModelPatcher, ONNXModelPatcher # noqa F401 from .models import OPENAPI_MODEL_CONFIGS, read_checkpoint_meta # noqa F401 from .probe import InvalidModelException, ModelProbe, ModelProbeInfo # noqa F401 from .search import ModelSearch # noqa F401 diff --git a/invokeai/backend/model_manager/loader.py b/invokeai/backend/model_manager/loader.py index 0275c989e5..e5d67e34ea 100644 --- a/invokeai/backend/model_manager/loader.py +++ b/invokeai/backend/model_manager/loader.py @@ -226,7 +226,6 @@ class ModelLoad(ModelLoadBase): model_path, is_submodel_override = self._get_model_path(model_config, submodel_type) if is_submodel_override: - model_type = submodel_type submodel_type = None model_class = self._get_implementation(model_config.base_model, model_config.model_type) diff --git a/invokeai/backend/model_manager/merge.py b/invokeai/backend/model_manager/merge.py index 11274d9e70..3b17f5a2ca 100644 --- a/invokeai/backend/model_manager/merge.py +++ b/invokeai/backend/model_manager/merge.py @@ -18,7 +18,6 @@ import invokeai.backend.util.logging as logger from invokeai.app.services.config import InvokeAIAppConfig from . import ModelConfigBase, ModelConfigStore, ModelInstall, ModelType -from .probe import ModelProbe, ModelProbeInfo class MergeInterpolationMethod(str, Enum): diff --git a/invokeai/backend/model_manager/models/sdxl.py b/invokeai/backend/model_manager/models/sdxl.py index 221d9bd359..97ff3e0d32 100644 --- a/invokeai/backend/model_manager/models/sdxl.py +++ b/invokeai/backend/model_manager/models/sdxl.py @@ -1,16 +1,13 @@ import json import os from enum import Enum -from pathlib import Path -from typing import Literal, Optional, Union +from typing import Literal from omegaconf import OmegaConf -from pydantic import Field -from ..config import CheckpointConfig, MainCheckpointConfig, MainDiffusersConfig +from ..config import MainDiffusersConfig from .base import ( BaseModelType, - DiffusersModel, InvalidModelException, ModelConfigBase, ModelType, diff --git a/invokeai/backend/model_manager/models/stable_diffusion.py b/invokeai/backend/model_manager/models/stable_diffusion.py index 5d05c78ff4..2a14bddcee 100644 --- a/invokeai/backend/model_manager/models/stable_diffusion.py +++ b/invokeai/backend/model_manager/models/stable_diffusion.py @@ -2,7 +2,7 @@ import json import os from enum import Enum from pathlib import Path -from typing import Literal, Optional, Union +from typing import Literal, Optional from diffusers import StableDiffusionInpaintPipeline, StableDiffusionPipeline from omegaconf import OmegaConf diff --git a/invokeai/backend/model_manager/probe.py b/invokeai/backend/model_manager/probe.py index 730a340ab8..7d9aeebef9 100644 --- a/invokeai/backend/model_manager/probe.py +++ b/invokeai/backend/model_manager/probe.py @@ -8,7 +8,6 @@ its base type, model type, format and variant. import json from abc import ABC, abstractmethod -from dataclasses import dataclass from pathlib import Path from typing import Callable, Optional diff --git a/scripts/convert_models_config_to_3.2.py b/scripts/convert_models_config_to_3.2.py index fb75631fb3..203f09c804 100644 --- a/scripts/convert_models_config_to_3.2.py +++ b/scripts/convert_models_config_to_3.2.py @@ -12,7 +12,6 @@ These will mostly be empty after conversion, but will be populated when new models are downloaded from HuggingFace or Civitae. """ import argparse -import sys from pathlib import Path from omegaconf import OmegaConf diff --git a/tests/test_model_manager.py b/tests/test_model_manager.py index ceed1abe7d..ea5f445ef8 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 BaseModelType, ModelConfigStore, ModelType, SubModelType +from invokeai.backend import SubModelType from invokeai.backend.model_manager import ModelLoad BASIC_MODEL_NAME = "sdxl-base-1-0"