Merge branch 'main' into taxonomy

Author: Billy

invokeai/app/run_app.py

@@ -49,8 +49,6 @@ def run_app() -> None:
     # Miscellaneous startup tasks.
     apply_monkeypatches()
     register_mime_types()
-    if app_config.dev_reload:
-        enable_dev_reload()
     check_cudnn(logger)
 
     # Initialize the app and event loop.
@@ -61,6 +59,11 @@ def run_app() -> None:
     # core nodes have been imported so that we can catch when a custom node clobbers a core node.
     load_custom_nodes(custom_nodes_path=app_config.custom_nodes_path, logger=logger)
 
+    if app_config.dev_reload:
+        # load_custom_nodes seems to bypass jurrigged's import sniffer, so be sure to call it *after* they're already
+        # imported.
+        enable_dev_reload(custom_nodes_path=app_config.custom_nodes_path)
+
     # Start the server.
     config = uvicorn.Config(
         app=app,

invokeai/app/util/startup_utils.py

@@ -1,6 +1,7 @@
 import logging
 import mimetypes
 import socket
+from pathlib import Path
 
 import torch
 
@@ -33,8 +34,9 @@ def check_cudnn(logger: logging.Logger) -> None:
             )
 
 
-def enable_dev_reload() -> None:
+def enable_dev_reload(custom_nodes_path=None) -> None:
     """Enable hot reloading on python file changes during development."""
+    import invokeai
     from invokeai.backend.util.logging import InvokeAILogger
 
     try:
@@ -44,7 +46,10 @@ def enable_dev_reload() -> None:
             'Can\'t start `--dev_reload` because jurigged is not found; `pip install -e ".[dev]"` to include development dependencies.'
         ) from e
     else:
-        jurigged.watch(logger=InvokeAILogger.get_logger(name="jurigged").info)
+        paths = [str(Path(invokeai.__file__).with_name("*.py"))]
+        if custom_nodes_path:
+            paths.append(str(custom_nodes_path / "*.py"))
+        jurigged.watch(pattern=paths, logger=InvokeAILogger.get_logger(name="jurigged").info)
 
 
 def apply_monkeypatches() -> None:

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "5.9.0rc1"
+__version__ = "5.9.0rc2"

tests/test_imports.py

@@ -0,0 +1,35 @@
+import importlib
+import pkgutil
+
+import invokeai
+
+KNOWN_IMPORT_ERRORS = {
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.setup",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.validate",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.caffe2_benchmark",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.caffe2_validate",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.onnx_optimize",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.onnx_validate",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.onnx_to_caffe",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.geffnet",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.onnx_export",
+    "invokeai.backend.model_manager.load.model_cache.torch_module_autocast.custom_modules.custom_invoke_linear_nf4",
+    "invokeai.backend.model_manager.load.model_cache.torch_module_autocast.custom_modules.custom_invoke_linear_8_bit_lt",
+    "invokeai.backend.image_util.normal_bae.nets.submodules.efficientnet_repo.hubconf",
+    "invokeai.backend.quantization.bnb_nf4",
+    "invokeai.backend.quantization.bnb_llm_int8",
+}
+
+
+def test_invokeai_imports():
+    modules = {name for _, name, _ in pkgutil.walk_packages(invokeai.__path__, invokeai.__name__ + ".")}
+    failed_to_import = set()
+
+    for mod in modules:
+        try:
+            importlib.import_module(mod)
+        except Exception:
+            if mod not in KNOWN_IMPORT_ERRORS:
+                failed_to_import.add(mod)
+
+    assert not failed_to_import, f"Modules failed to import: {failed_to_import}"