isort wip

tests/nodes/test_graph_execution_state.py

@@ -1,30 +1,24 @@
-from .test_invoker import create_edge
-from .test_nodes import (
+import pytest
+
+# This import must happen before other invoke imports or test in other files(!!) break
+from .test_nodes import (  # isort: split
+    PromptCollectionTestInvocation,
+    PromptTestInvocation,
     TestEventService,
     TextToImageTestInvocation,
-    PromptTestInvocation,
-    PromptCollectionTestInvocation,
-)
-from invokeai.app.services.invocation_queue import MemoryInvocationQueue
-from invokeai.app.services.processor import DefaultInvocationProcessor
-from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
-from invokeai.app.invocations.baseinvocation import (
-    BaseInvocation,
-    BaseInvocationOutput,
-    InvocationContext,
 )
+
+from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
 from invokeai.app.invocations.collections import RangeInvocation
 from invokeai.app.invocations.math import AddInvocation, MultiplyInvocation
+from invokeai.app.services.graph import CollectInvocation, Graph, GraphExecutionState, IterateInvocation, LibraryGraph
+from invokeai.app.services.invocation_queue import MemoryInvocationQueue
 from invokeai.app.services.invocation_services import InvocationServices
 from invokeai.app.services.invocation_stats import InvocationStatsService
-from invokeai.app.services.graph import (
-    Graph,
-    CollectInvocation,
-    IterateInvocation,
-    GraphExecutionState,
-    LibraryGraph,
-)
-import pytest
+from invokeai.app.services.processor import DefaultInvocationProcessor
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
+
+from .test_invoker import create_edge
 
 
 @pytest.fixture

tests/nodes/test_invoker.py

@@ -1,23 +1,21 @@
+import pytest
+
+from invokeai.app.services.graph import Graph, GraphExecutionState, LibraryGraph
+from invokeai.app.services.invocation_queue import MemoryInvocationQueue
+from invokeai.app.services.invocation_services import InvocationServices
+from invokeai.app.services.invocation_stats import InvocationStatsService
+from invokeai.app.services.invoker import Invoker
+from invokeai.app.services.processor import DefaultInvocationProcessor
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
+
 from .test_nodes import (
-    TestEventService,
     ErrorInvocation,
-    TextToImageTestInvocation,
     PromptTestInvocation,
+    TestEventService,
+    TextToImageTestInvocation,
     create_edge,
     wait_until,
 )
-from invokeai.app.services.invocation_queue import MemoryInvocationQueue
-from invokeai.app.services.processor import DefaultInvocationProcessor
-from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
-from invokeai.app.services.invoker import Invoker
-from invokeai.app.services.invocation_services import InvocationServices
-from invokeai.app.services.invocation_stats import InvocationStatsService
-from invokeai.app.services.graph import (
-    Graph,
-    GraphExecutionState,
-    LibraryGraph,
-)
-import pytest
 
 
 @pytest.fixture

tests/nodes/test_node_graph.py

@@ -1,3 +1,4 @@
+import pytest
 from invokeai.app.invocations.baseinvocation import (
     BaseInvocation,
     BaseInvocationOutput,
@@ -29,7 +30,25 @@ from invokeai.app.invocations.image import ShowImageInvocation
 from invokeai.app.invocations.math import AddInvocation, SubtractInvocation
 from invokeai.app.invocations.primitives import FloatInvocation, IntegerInvocation
 from invokeai.app.services.default_graphs import create_text_to_image
-import pytest
+from invokeai.app.services.graph import (
+    CollectInvocation,
+    Edge,
+    EdgeConnection,
+    Graph,
+    GraphInvocation,
+    InvalidEdgeError,
+    IterateInvocation,
+    NodeAlreadyInGraphError,
+    NodeNotFoundError,
+    are_connections_compatible,
+)
+
+from .test_nodes import (
+    ImageToImageTestInvocation,
+    ListPassThroughInvocation,
+    PromptTestInvocation,
+    TextToImageTestInvocation,
+)
 
 
 # Helpers

tests/nodes/test_nodes.py

@@ -78,7 +78,7 @@ class PromptCollectionTestInvocation(BaseInvocation):
         return PromptCollectionTestInvocationOutput(collection=self.collection.copy())
 
 
-# Importing these at the top breaks previous tests
+# Importing these must happen after test invocations are defined or they won't register
 from invokeai.app.services.events import EventServiceBase  # noqa: E402
 from invokeai.app.services.graph import Edge, EdgeConnection  # noqa: E402
 

tests/nodes/test_sqlite.py

@@ -1,6 +1,7 @@
-from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
 from pydantic import BaseModel, Field
 
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
+
 
 class TestModel(BaseModel):
     id: str = Field(description="ID")

tests/test_config.py

@@ -6,8 +6,6 @@ import pytest
 from omegaconf import OmegaConf
 from pydantic import ValidationError
 
-from invokeai.app.services.config import InvokeAIAppConfig
-
 
 @pytest.fixture
 def patch_rootdir(tmp_path: Path, monkeypatch: Any) -> None:
@@ -166,6 +164,7 @@ def test_type_coercion(patch_rootdir):
     """
 )
 def test_deny_nodes(patch_rootdir):
+    from invokeai.app.services.config import InvokeAIAppConfig
     # Allow integer, string and float, but explicitly deny float
     allow_deny_nodes_conf = OmegaConf.create(
         """

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 ModelManager, BaseModelType, ModelType, SubModelType
+from invokeai.backend import BaseModelType, ModelManager, ModelType, SubModelType
 
 BASIC_MODEL_NAME = ("SDXL base", BaseModelType.StableDiffusionXL, ModelType.Main)
 VAE_OVERRIDE_MODEL_NAME = ("SDXL with VAE", BaseModelType.StableDiffusionXL, ModelType.Main)

tests/test_path.py

@@ -2,14 +2,15 @@
 Not really a test, but a way to verify that the paths are existing
 and fail early if they are not.
 """
-import unittest
 import pathlib
+import unittest
 from os import path as osp
+
 from PIL import Image
 
-import invokeai.frontend.web.dist as frontend
-import invokeai.configs as configs
 import invokeai.app.assets.images as image_assets
+import invokeai.configs as configs
+import invokeai.frontend.web.dist as frontend
 
 
 class ConfigsTestCase(unittest.TestCase):