Remove star imports

invokeai/backend/image_util/normal_bae/nets/submodules/efficientnet_repo/geffnet/conv2d_layers.py

@@ -16,7 +16,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from .config import *
+from .config import is_exportable, is_scriptable
 
 
 # From PyTorch internals

invokeai/backend/image_util/normal_bae/nets/submodules/efficientnet_repo/geffnet/efficientnet_builder.py

@@ -5,8 +5,8 @@ Copyright 2020 Ross Wightman
 import re
 from copy import deepcopy
 
-from .conv2d_layers import *
-from geffnet.activations import *
+from .conv2d_layers import CondConv2d, get_condconv_initializer, math, partial, select_conv2d
+from geffnet.activations import F, get_act_layer, nn, sigmoid, torch
 
 __all__ = ['get_bn_args_tf', 'resolve_bn_args', 'resolve_se_args', 'resolve_act_layer', 'make_divisible',
            'round_channels', 'drop_connect', 'SqueezeExcite', 'ConvBnAct', 'DepthwiseSeparableConv',

invokeai/backend/image_util/normal_bae/nets/submodules/efficientnet_repo/geffnet/gen_efficientnet.py

@@ -32,7 +32,9 @@ import torch.nn.functional as F
 from .config import layer_config_kwargs, is_scriptable
 from .conv2d_layers import select_conv2d
 from .helpers import load_pretrained
-from .efficientnet_builder import *
+from .efficientnet_builder import (BN_EPS_TF_DEFAULT, EfficientNetBuilder, decode_arch_def,
+                                   initialize_weight_default, initialize_weight_goog,
+                                   resolve_act_layer, resolve_bn_args, round_channels)
 
 __all__ = ['GenEfficientNet', 'mnasnet_050', 'mnasnet_075', 'mnasnet_100', 'mnasnet_b1', 'mnasnet_140',
            'semnasnet_050', 'semnasnet_075', 'semnasnet_100', 'mnasnet_a1', 'semnasnet_140', 'mnasnet_small',

invokeai/backend/image_util/normal_bae/nets/submodules/efficientnet_repo/geffnet/mobilenetv3.py

@@ -13,7 +13,9 @@ from .activations import get_act_fn, get_act_layer, HardSwish
 from .config import layer_config_kwargs
 from .conv2d_layers import select_conv2d
 from .helpers import load_pretrained
-from .efficientnet_builder import *
+from .efficientnet_builder import (BN_EPS_TF_DEFAULT, EfficientNetBuilder, decode_arch_def,
+                                   initialize_weight_default, initialize_weight_goog,
+                                   resolve_act_layer, resolve_bn_args, round_channels)
 
 __all__ = ['mobilenetv3_rw', 'mobilenetv3_large_075', 'mobilenetv3_large_100', 'mobilenetv3_large_minimal_100',
            'mobilenetv3_small_075', 'mobilenetv3_small_100', 'mobilenetv3_small_minimal_100',

invokeai/backend/image_util/normal_bae/nets/submodules/efficientnet_repo/geffnet/model_factory.py

@@ -1,8 +1,6 @@
 from .config import set_layer_config
 from .helpers import load_checkpoint
 
-from .gen_efficientnet import *
-from .mobilenetv3 import *
 
 
 def create_model(

invokeai/backend/model_manager/config.py

@@ -49,6 +49,11 @@ from invokeai.backend.util.silence_warnings import SilenceWarnings
 
 logger = logging.getLogger(__name__)
 
+class InvalidModelConfigException(Exception):
+    """Exception for when config parser doesn't recognize this combination of model type and format."""
+    pass
+
+
 # ModelMixin is the base class for all diffusers and transformers models
 # RawModel is the InvokeAI wrapper class for ip_adapters, loras, textual_inversion and onnx runtime
 AnyModel = Union[
@@ -56,9 +61,6 @@ AnyModel = Union[
 ]
 
 
-class InvalidModelConfigException(Exception):
-    """Exception for when config parser doesn't recognize this combination of model type and format."""
-
 
 class BaseModelType(str, Enum):
     """Base model type."""

tests/app/services/download/test_download_queue.py

@@ -22,7 +22,6 @@ from invokeai.app.services.events.events_common import (
     DownloadStartedEvent,
 )
 from invokeai.backend.model_manager.metadata import HuggingFaceMetadataFetch, ModelMetadataWithFiles, RemoteModelFile
-from tests.backend.model_manager.model_manager_fixtures import *  # noqa F403
 from tests.test_nodes import TestEventService
 
 # Prevent pytest deprecation warnings

tests/app/services/model_install/test_model_install.py

@@ -39,7 +39,7 @@ from invokeai.backend.model_manager.config import (
     ModelRepoVariant,
     ModelType,
 )
-from tests.backend.model_manager.model_manager_fixtures import *  # noqa F403
+
 from tests.test_nodes import TestEventService
 
 OS = platform.uname().system

tests/app/services/model_load/test_load_api.py

@@ -12,7 +12,7 @@ from invokeai.app.services.shared.invocation_context import (
     build_invocation_context,
 )
 from invokeai.backend.model_manager.load.load_base import LoadedModelWithoutConfig
-from tests.backend.model_manager.model_manager_fixtures import *  # noqa F403
+
 
 
 @pytest.fixture()

tests/app/services/model_records/test_model_records_sql.py

@@ -28,7 +28,6 @@ from invokeai.backend.model_manager.config import (
     VAEDiffusersConfig,
 )
 from invokeai.backend.util.logging import InvokeAILogger
-from tests.backend.model_manager.model_manager_fixtures import *  # noqa F403
 from tests.fixtures.sqlite_database import create_mock_sqlite_database
 
 

tests/backend/model_manager/model_loading/test_model_load.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from invokeai.app.services.model_manager import ModelManagerServiceBase
 from invokeai.backend.textual_inversion import TextualInversionModelRaw
-from tests.backend.model_manager.model_manager_fixtures import *  # noqa F403
+
 
 
 def test_loading(mm2_model_manager: ModelManagerServiceBase, embedding_file: Path):