Merge branch 'dev' into main

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 2023-05-18
+
+- v23.5.15
+- 필요한 것만 임포트하도록 변경 (vae 로딩 오류 없어짐. 로딩 속도 빨라짐)
+
 ### 2023-05-17
 
 - v23.5.14

adetailer/__version__.py

@@ -1 +1 @@
-__version__ = "23.5.14"
+__version__ = "23.5.15"

sd_webui/__init__.py

@@ -1,4 +0,0 @@
-from typing import TYPE_CHECKING
-
-if not TYPE_CHECKING:
-    from modules import *

sd_webui/images.py

@@ -59,4 +59,4 @@ if TYPE_CHECKING:
         """
 
 else:
-    from modules.images import *
+    from modules.images import save_image

sd_webui/paths.py

@@ -11,4 +11,10 @@ if TYPE_CHECKING:
     extensions_dir = os.path.join(os.path.dirname(__file__), "4")
     extensions_builtin_dir = os.path.join(os.path.dirname(__file__), "5")
 else:
-    from modules.paths import *
+    from modules.paths import (
+        data_path,
+        extensions_builtin_dir,
+        extensions_dir,
+        models_path,
+        script_path,
+    )

sd_webui/processing.py

@@ -163,4 +163,10 @@ if TYPE_CHECKING:
         pass
 
 else:
-    from modules.processing import *
+    from modules.processing import (
+        StableDiffusionProcessing,
+        StableDiffusionProcessingImg2Img,
+        StableDiffusionProcessingTxt2Img,
+        create_infotext,
+        process_images,
+    )

sd_webui/safe.py

@@ -7,4 +7,4 @@ if TYPE_CHECKING:
 
     unsafe_torch_load = torch.load
 else:
-    from modules.safe import *
+    from modules.safe import unsafe_torch_load

sd_webui/script_callbacks.py

@@ -10,4 +10,4 @@ if TYPE_CHECKING:
         pass
 
 else:
-    from modules.script_callbacks import *
+    from modules.script_callbacks import on_after_component, on_ui_settings

sd_webui/scripts.py

@@ -78,4 +78,4 @@ if TYPE_CHECKING:
             pass
 
 else:
-    from modules.scripts import *
+    from modules.scripts import AlwaysVisible, PostprocessImageArgs, Script

sd_webui/shared.py

@@ -39,4 +39,4 @@ if TYPE_CHECKING:
     cmd_opts = argparse.Namespace()
 
 else:
-    from modules.shared import *
+    from modules.shared import OptionInfo, cmd_opts, opts