2022-12-01 05:33:20 +00:00
|
|
|
from .test_invoker import create_edge
|
|
|
|
from .test_nodes import ImageTestInvocation, ListPassThroughInvocation, PromptTestInvocation, PromptCollectionTestInvocation
|
2023-03-03 05:02:15 +00:00
|
|
|
from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext
|
2023-04-06 04:06:05 +00:00
|
|
|
from invokeai.app.invocations.collections import RangeInvocation
|
|
|
|
from invokeai.app.invocations.math import AddInvocation, MultiplyInvocation
|
2023-03-03 05:02:15 +00:00
|
|
|
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
|
2023-04-14 06:41:06 +00:00
|
|
|
from invokeai.app.services.graph import Graph, GraphInvocation, InvalidEdgeError, LibraryGraph, NodeAlreadyInGraphError, NodeNotFoundError, are_connections_compatible, EdgeConnection, CollectInvocation, IterateInvocation, GraphExecutionState
|
2022-12-01 05:33:20 +00:00
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
def simple_graph():
|
|
|
|
g = Graph()
|
|
|
|
g.add_node(PromptTestInvocation(id = "1", prompt = "Banana sushi"))
|
|
|
|
g.add_node(ImageTestInvocation(id = "2"))
|
|
|
|
g.add_edge(create_edge("1", "prompt", "2", "prompt"))
|
|
|
|
return g
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
def mock_services():
|
|
|
|
# NOTE: none of these are actually called by the test invocations
|
2023-02-25 04:11:28 +00:00
|
|
|
return InvocationServices(
|
2023-04-06 04:06:05 +00:00
|
|
|
model_manager = None, # type: ignore
|
|
|
|
events = None, # type: ignore
|
|
|
|
images = None, # type: ignore
|
|
|
|
latents = None, # type: ignore
|
Partial migration of UI to nodes API (#3195)
* feat(ui): add axios client generator and simple example
* fix(ui): update client & nodes test code w/ new Edge type
* chore(ui): organize generated files
* chore(ui): update .eslintignore, .prettierignore
* chore(ui): update openapi.json
* feat(backend): fixes for nodes/generator
* feat(ui): generate object args for api client
* feat(ui): more nodes api prototyping
* feat(ui): nodes cancel
* chore(ui): regenerate api client
* fix(ui): disable OG web server socket connection
* fix(ui): fix scrollbar styles typing and prop
just noticed the typo, and made the types stronger.
* feat(ui): add socketio types
* feat(ui): wip nodes
- extract api client method arg types instead of manually declaring them
- update example to display images
- general tidy up
* start building out node translations from frontend state and add notes about missing features
* use reference to sampler_name
* use reference to sampler_name
* add optional apiUrl prop
* feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation
* feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node
* feat(ui): img2img implementation
* feat(ui): get intermediate images working but types are stubbed out
* chore(ui): add support for package mode
* feat(ui): add nodes mode script
* feat(ui): handle random seeds
* fix(ui): fix middleware types
* feat(ui): add rtk action type guard
* feat(ui): disable NodeAPITest
This was polluting the network/socket logs.
* feat(ui): fix parameters panel border color
This commit should be elsewhere but I don't want to break my flow
* feat(ui): make thunk types more consistent
* feat(ui): add type guards for outputs
* feat(ui): load images on socket connect
Rudimentary
* chore(ui): bump redux-toolkit
* docs(ui): update readme
* chore(ui): regenerate api client
* chore(ui): add typescript as dev dependency
I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue.
* feat(ui): begin migrating gallery to nodes
Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way.
* feat(ui): clean up & comment results slice
* fix(ui): separate thunk for initial gallery load so it properly gets index 0
* feat(ui): POST upload working
* fix(ui): restore removed type
* feat(ui): patch api generation for headers access
* chore(ui): regenerate api
* feat(ui): wip gallery migration
* feat(ui): wip gallery migration
* chore(ui): regenerate api
* feat(ui): wip refactor socket events
* feat(ui): disable panels based on app props
* feat(ui): invert logic to be disabled
* disable panels when app mounts
* feat(ui): add support to disableTabs
* docs(ui): organise and update docs
* lang(ui): add toast strings
* feat(ui): wip events, comments, and general refactoring
* feat(ui): add optional token for auth
* feat(ui): export StatusIndicator and ModelSelect for header use
* feat(ui) working on making socket URL dynamic
* feat(ui): dynamic middleware loading
* feat(ui): prep for socket jwt
* feat(ui): migrate cancelation
also updated action names to be event-like instead of declaration-like
sorry, i was scattered and this commit has a lot of unrelated stuff in it.
* fix(ui): fix img2img type
* chore(ui): regenerate api client
* feat(ui): improve InvocationCompleteEvent types
* feat(ui): increase StatusIndicator font size
* fix(ui): fix middleware order for multi-node graphs
* feat(ui): add exampleGraphs object w/ iterations example
* feat(ui): generate iterations graph
* feat(ui): update ModelSelect for nodes API
* feat(ui): add hi-res functionality for txt2img generations
* feat(ui): "subscribe" to particular nodes
feels like a dirty hack but oh well it works
* feat(ui): first steps to node editor ui
* fix(ui): disable event subscription
it is not fully baked just yet
* feat(ui): wip node editor
* feat(ui): remove extraneous field types
* feat(ui): nodes before deleting stuff
* feat(ui): cleanup nodes ui stuff
* feat(ui): hook up nodes to redux
* fix(ui): fix handle
* fix(ui): add basic node edges & connection validation
* feat(ui): add connection validation styling
* feat(ui): increase edge width
* feat(ui): it blends
* feat(ui): wip model handling and graph topology validation
* feat(ui): validation connections w/ graphlib
* docs(ui): update nodes doc
* feat(ui): wip node editor
* chore(ui): rebuild api, update types
* add redux-dynamic-middlewares as a dependency
* feat(ui): add url host transformation
* feat(ui): handle already-connected fields
* feat(ui): rewrite SqliteItemStore in sqlalchemy
* fix(ui): fix sqlalchemy dynamic model instantiation
* feat(ui, nodes): metadata wip
* feat(ui, nodes): models
* feat(ui, nodes): more metadata wip
* feat(ui): wip range/iterate
* fix(nodes): fix sqlite typing
* feat(ui): export new type for invoke component
* tests(nodes): fix test instantiation of ImageField
* feat(nodes): fix LoadImageInvocation
* feat(nodes): add `title` ui hint
* feat(nodes): make ImageField attrs optional
* feat(ui): wip nodes etc
* feat(nodes): roll back sqlalchemy
* fix(nodes): partially address feedback
* fix(backend): roll back changes to pngwriter
* feat(nodes): wip address metadata feedback
* feat(nodes): add seeded rng to RandomRange
* feat(nodes): address feedback
* feat(nodes): move GET images error handling to DiskImageStorage
* feat(nodes): move GET images error handling to DiskImageStorage
* fix(nodes): fix image output schema customization
* feat(ui): img2img/txt2img -> linear
- remove txt2img and img2img tabs
- add linear tab
- add initial image selection to linear parameters accordion
* feat(ui): tidy graph builders
* feat(ui): tidy misc
* feat(ui): improve invocation union types
* feat(ui): wip metadata viewer recall
* feat(ui): move fonts to normal deps
* feat(nodes): fix broken upload
* feat(nodes): add metadata module + tests, thumbnails
- `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service`
- Handles loading/parsing/building metadata, and creating png info objects
- added tests for MetadataModule
- Lifted thumbnail stuff to util
* fix(nodes): revert change to RandomRangeInvocation
* feat(nodes): address feedback
- make metadata a service
- rip out pydantic validation, implement metadata parsing as simple functions
- update tests
- address other minor feedback items
* fix(nodes): fix other tests
* fix(nodes): add metadata service to cli
* fix(nodes): fix latents/image field parsing
* feat(nodes): customise LatentsField schema
* feat(nodes): move metadata parsing to frontend
* fix(nodes): fix metadata test
---------
Co-authored-by: maryhipp <maryhipp@gmail.com>
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-04-22 03:10:20 +00:00
|
|
|
metadata = None, # type: ignore
|
2023-02-25 04:11:28 +00:00
|
|
|
queue = MemoryInvocationQueue(),
|
2023-04-14 06:41:06 +00:00
|
|
|
graph_library=SqliteItemStorage[LibraryGraph](
|
|
|
|
filename=sqlite_memory, table_name="graphs"
|
|
|
|
),
|
2023-02-25 04:11:28 +00:00
|
|
|
graph_execution_manager = SqliteItemStorage[GraphExecutionState](filename = sqlite_memory, table_name = 'graph_executions'),
|
2023-03-11 22:00:00 +00:00
|
|
|
processor = DefaultInvocationProcessor(),
|
2023-04-06 04:06:05 +00:00
|
|
|
restoration = None, # type: ignore
|
2023-02-25 04:11:28 +00:00
|
|
|
)
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
def invoke_next(g: GraphExecutionState, services: InvocationServices) -> tuple[BaseInvocation, BaseInvocationOutput]:
|
|
|
|
n = g.next()
|
|
|
|
if n is None:
|
|
|
|
return (None, None)
|
|
|
|
|
|
|
|
print(f'invoking {n.id}: {type(n)}')
|
|
|
|
o = n.invoke(InvocationContext(services, "1"))
|
|
|
|
g.complete(n.id, o)
|
|
|
|
|
|
|
|
return (n, o)
|
|
|
|
|
|
|
|
def test_graph_state_executes_in_order(simple_graph, mock_services):
|
|
|
|
g = GraphExecutionState(graph = simple_graph)
|
|
|
|
|
|
|
|
n1 = invoke_next(g, mock_services)
|
|
|
|
n2 = invoke_next(g, mock_services)
|
|
|
|
n3 = g.next()
|
|
|
|
|
|
|
|
assert g.prepared_source_mapping[n1[0].id] == "1"
|
|
|
|
assert g.prepared_source_mapping[n2[0].id] == "2"
|
|
|
|
assert n3 is None
|
|
|
|
assert g.results[n1[0].id].prompt == n1[0].prompt
|
|
|
|
assert n2[0].prompt == n1[0].prompt
|
|
|
|
|
|
|
|
def test_graph_is_complete(simple_graph, mock_services):
|
|
|
|
g = GraphExecutionState(graph = simple_graph)
|
|
|
|
n1 = invoke_next(g, mock_services)
|
|
|
|
n2 = invoke_next(g, mock_services)
|
|
|
|
n3 = g.next()
|
|
|
|
|
|
|
|
assert g.is_complete()
|
|
|
|
|
|
|
|
def test_graph_is_not_complete(simple_graph, mock_services):
|
|
|
|
g = GraphExecutionState(graph = simple_graph)
|
|
|
|
n1 = invoke_next(g, mock_services)
|
|
|
|
n2 = g.next()
|
|
|
|
|
|
|
|
assert not g.is_complete()
|
|
|
|
|
|
|
|
# TODO: test completion with iterators/subgraphs
|
|
|
|
|
|
|
|
def test_graph_state_expands_iterator(mock_services):
|
|
|
|
graph = Graph()
|
2023-04-06 04:06:05 +00:00
|
|
|
graph.add_node(RangeInvocation(id = "0", start = 0, stop = 3, step = 1))
|
|
|
|
graph.add_node(IterateInvocation(id = "1"))
|
|
|
|
graph.add_node(MultiplyInvocation(id = "2", b = 10))
|
|
|
|
graph.add_node(AddInvocation(id = "3", b = 1))
|
|
|
|
graph.add_edge(create_edge("0", "collection", "1", "collection"))
|
|
|
|
graph.add_edge(create_edge("1", "item", "2", "a"))
|
|
|
|
graph.add_edge(create_edge("2", "a", "3", "a"))
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
g = GraphExecutionState(graph = graph)
|
2023-04-06 04:06:05 +00:00
|
|
|
while not g.is_complete():
|
|
|
|
invoke_next(g, mock_services)
|
|
|
|
|
|
|
|
prepared_add_nodes = g.source_prepared_mapping['3']
|
|
|
|
results = set([g.results[n].a for n in prepared_add_nodes])
|
|
|
|
expected = set([1, 11, 21])
|
|
|
|
assert results == expected
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
|
|
|
|
def test_graph_state_collects(mock_services):
|
|
|
|
graph = Graph()
|
|
|
|
test_prompts = ["Banana sushi", "Cat sushi"]
|
|
|
|
graph.add_node(PromptCollectionTestInvocation(id = "1", collection = list(test_prompts)))
|
|
|
|
graph.add_node(IterateInvocation(id = "2"))
|
|
|
|
graph.add_node(PromptTestInvocation(id = "3"))
|
|
|
|
graph.add_node(CollectInvocation(id = "4"))
|
|
|
|
graph.add_edge(create_edge("1", "collection", "2", "collection"))
|
|
|
|
graph.add_edge(create_edge("2", "item", "3", "prompt"))
|
|
|
|
graph.add_edge(create_edge("3", "prompt", "4", "item"))
|
|
|
|
|
|
|
|
g = GraphExecutionState(graph = graph)
|
|
|
|
n1 = invoke_next(g, mock_services)
|
|
|
|
n2 = invoke_next(g, mock_services)
|
|
|
|
n3 = invoke_next(g, mock_services)
|
|
|
|
n4 = invoke_next(g, mock_services)
|
|
|
|
n5 = invoke_next(g, mock_services)
|
|
|
|
n6 = invoke_next(g, mock_services)
|
|
|
|
|
|
|
|
assert isinstance(n6[0], CollectInvocation)
|
|
|
|
|
|
|
|
assert sorted(g.results[n6[0].id].collection) == sorted(test_prompts)
|