all files migrated; tweaks needed

tests/nodes/test_graph_execution_state.py

@@ -1,11 +1,11 @@
 from .test_invoker import create_edge
 from .test_nodes import ImageTestInvocation, ListPassThroughInvocation, PromptTestInvocation, PromptCollectionTestInvocation
-from ldm.invoke.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
-from ldm.invoke.app.services.processor import DefaultInvocationProcessor
-from ldm.invoke.app.services.sqlite import SqliteItemStorage, sqlite_memory
-from ldm.invoke.app.services.invocation_queue import MemoryInvocationQueue
-from ldm.invoke.app.services.invocation_services import InvocationServices
-from ldm.invoke.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation, GraphExecutionState
+from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
+from invokeai.app.services.processor import DefaultInvocationProcessor
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
+from invokeai.app.services.invocation_queue import MemoryInvocationQueue
+from invokeai.app.services.invocation_services import InvocationServices
+from invokeai.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation, GraphExecutionState
 import pytest
 
 

tests/nodes/test_invoker.py

@@ -1,11 +1,11 @@
 from .test_nodes import ErrorInvocation, ImageTestInvocation, ListPassThroughInvocation, PromptTestInvocation, PromptCollectionTestInvocation, TestEventService, create_edge, wait_until
-from ldm.invoke.app.services.processor import DefaultInvocationProcessor
-from ldm.invoke.app.services.sqlite import SqliteItemStorage, sqlite_memory
-from ldm.invoke.app.services.invocation_queue import MemoryInvocationQueue
-from ldm.invoke.app.services.invoker import Invoker
-from ldm.invoke.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
-from ldm.invoke.app.services.invocation_services import InvocationServices
-from ldm.invoke.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation, GraphExecutionState
+from invokeai.app.services.processor import DefaultInvocationProcessor
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
+from invokeai.app.services.invocation_queue import MemoryInvocationQueue
+from invokeai.app.services.invoker import Invoker
+from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
+from invokeai.app.services.invocation_services import InvocationServices
+from invokeai.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation, GraphExecutionState
 import pytest
 
 

tests/nodes/test_node_graph.py

@@ -1,9 +1,9 @@
-from ldm.invoke.app.invocations.image import *
+from invokeai.app.invocations.image import *
 
 from .test_nodes import ListPassThroughInvocation, PromptTestInvocation
-from ldm.invoke.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation
-from ldm.invoke.app.invocations.generate import ImageToImageInvocation, TextToImageInvocation
-from ldm.invoke.app.invocations.upscale import UpscaleInvocation
+from invokeai.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation
+from invokeai.app.invocations.generate import ImageToImageInvocation, TextToImageInvocation
+from invokeai.app.invocations.upscale import UpscaleInvocation
 import pytest
 
 

tests/nodes/test_nodes.py

@@ -1,7 +1,7 @@
 from typing import Any, Callable, Literal
-from ldm.invoke.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
-from ldm.invoke.app.invocations.image import ImageField
-from ldm.invoke.app.services.invocation_services import InvocationServices
+from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
+from invokeai.app.invocations.image import ImageField
+from invokeai.app.services.invocation_services import InvocationServices
 from pydantic import Field
 import pytest
 
@@ -63,8 +63,8 @@ class PromptCollectionTestInvocation(BaseInvocation):
         return PromptCollectionTestInvocationOutput(collection=self.collection.copy())
 
 
-from ldm.invoke.app.services.events import EventServiceBase
-from ldm.invoke.app.services.graph import EdgeConnection
+from invokeai.app.services.events import EventServiceBase
+from invokeai.app.services.graph import EdgeConnection
 
 def create_edge(from_id: str, from_field: str, to_id: str, to_field: str) -> tuple[EdgeConnection, EdgeConnection]:
     return (EdgeConnection(node_id = from_id, field = from_field), EdgeConnection(node_id = to_id, field = to_field))
@@ -95,4 +95,4 @@ def wait_until(condition: Callable[[], bool], timeout: int = 10, interval: float
         if condition():
             return
         time.sleep(interval)
-    raise TimeoutError("Condition not met")
+    raise TimeoutError("Condition not met")

tests/nodes/test_sqlite.py

@@ -1,4 +1,4 @@
-from ldm.invoke.app.services.sqlite import SqliteItemStorage, sqlite_memory
+from invokeai.app.services.sqlite import SqliteItemStorage, sqlite_memory
 from pydantic import BaseModel, Field
 
 

tests/test_path.py

@@ -7,11 +7,10 @@ import pathlib
 from os import path as osp
 from PIL import Image
 
-import invokeai.frontend.dist as frontend
+import invokeai.frontend.web.dist as frontend
 import invokeai.configs as configs
 import invokeai.assets.web as assets_web
 
-
 class ConfigsTestCase(unittest.TestCase):
     """Test the configuration related imports and objects"""
 
@@ -32,7 +31,7 @@ class ConfigsTestCase(unittest.TestCase):
     def test_frontend_path(self):
         """Test that the frontend path is correct"""
         FRONTEND_PATH = str(self.get_frontend_path())
-        assert FRONTEND_PATH.endswith(osp.join("invokeai", "frontend", "dist"))
+        assert FRONTEND_PATH.endswith(osp.join("invokeai", "frontend", "web", "dist"))
 
     def test_caution_img(self):
         """Verify the caution image"""