mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
402cf9b0ee
Refactor services folder/module structure.
**Motivation**
While working on our services I've repeatedly encountered circular imports and a general lack of clarity regarding where to put things. The structure introduced goes a long way towards resolving those issues, setting us up for a clean structure going forward.
**Services**
Services are now in their own folder with a few files:
- `services/{service_name}/__init__.py`: init as needed, mostly empty now
- `services/{service_name}/{service_name}_base.py`: the base class for the service
- `services/{service_name}/{service_name}_{impl_type}.py`: the default concrete implementation of the service - typically one of `sqlite`, `default`, or `memory`
- `services/{service_name}/{service_name}_common.py`: any common items - models, exceptions, utilities, etc
Though it's a bit verbose to have the service name both as the folder name and the prefix for files, I found it is _extremely_ confusing to have all of the base classes just be named `base.py`. So, at the cost of some verbosity when importing things, I've included the service name in the filename.
There are some minor logic changes. For example, in `InvocationProcessor`, instead of assigning the model manager service to a variable to be used later in the file, the service is used directly via the `Invoker`.
**Shared**
Things that are used across disparate services are in `services/shared/`:
- `default_graphs.py`: previously in `services/`
- `graphs.py`: previously in `services/`
- `paginatation`: generic pagination models used in a few services
- `sqlite`: the `SqliteDatabase` class, other sqlite-specific things
93 lines
3.8 KiB
Python
93 lines
3.8 KiB
Python
from invokeai.app.services.item_storage.item_storage_base import ItemStorageABC
|
|
|
|
from ...invocations.compel import CompelInvocation
|
|
from ...invocations.image import ImageNSFWBlurInvocation
|
|
from ...invocations.latent import DenoiseLatentsInvocation, LatentsToImageInvocation
|
|
from ...invocations.noise import NoiseInvocation
|
|
from ...invocations.primitives import IntegerInvocation
|
|
from .graph import Edge, EdgeConnection, ExposedNodeInput, ExposedNodeOutput, Graph, LibraryGraph
|
|
|
|
default_text_to_image_graph_id = "539b2af5-2b4d-4d8c-8071-e54a3255fc74"
|
|
|
|
|
|
def create_text_to_image() -> LibraryGraph:
|
|
graph = Graph(
|
|
nodes={
|
|
"width": IntegerInvocation(id="width", value=512),
|
|
"height": IntegerInvocation(id="height", value=512),
|
|
"seed": IntegerInvocation(id="seed", value=-1),
|
|
"3": NoiseInvocation(id="3"),
|
|
"4": CompelInvocation(id="4"),
|
|
"5": CompelInvocation(id="5"),
|
|
"6": DenoiseLatentsInvocation(id="6"),
|
|
"7": LatentsToImageInvocation(id="7"),
|
|
"8": ImageNSFWBlurInvocation(id="8"),
|
|
},
|
|
edges=[
|
|
Edge(
|
|
source=EdgeConnection(node_id="width", field="value"),
|
|
destination=EdgeConnection(node_id="3", field="width"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="height", field="value"),
|
|
destination=EdgeConnection(node_id="3", field="height"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="seed", field="value"),
|
|
destination=EdgeConnection(node_id="3", field="seed"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="3", field="noise"),
|
|
destination=EdgeConnection(node_id="6", field="noise"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="6", field="latents"),
|
|
destination=EdgeConnection(node_id="7", field="latents"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="4", field="conditioning"),
|
|
destination=EdgeConnection(node_id="6", field="positive_conditioning"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="5", field="conditioning"),
|
|
destination=EdgeConnection(node_id="6", field="negative_conditioning"),
|
|
),
|
|
Edge(
|
|
source=EdgeConnection(node_id="7", field="image"),
|
|
destination=EdgeConnection(node_id="8", field="image"),
|
|
),
|
|
],
|
|
)
|
|
return LibraryGraph(
|
|
id=default_text_to_image_graph_id,
|
|
name="t2i",
|
|
description="Converts text to an image",
|
|
graph=graph,
|
|
exposed_inputs=[
|
|
ExposedNodeInput(node_path="4", field="prompt", alias="positive_prompt"),
|
|
ExposedNodeInput(node_path="5", field="prompt", alias="negative_prompt"),
|
|
ExposedNodeInput(node_path="width", field="value", alias="width"),
|
|
ExposedNodeInput(node_path="height", field="value", alias="height"),
|
|
ExposedNodeInput(node_path="seed", field="value", alias="seed"),
|
|
],
|
|
exposed_outputs=[ExposedNodeOutput(node_path="8", field="image", alias="image")],
|
|
)
|
|
|
|
|
|
def create_system_graphs(graph_library: ItemStorageABC[LibraryGraph]) -> list[LibraryGraph]:
|
|
"""Creates the default system graphs, or adds new versions if the old ones don't match"""
|
|
|
|
# TODO: Uncomment this when we are ready to fix this up to prevent breaking changes
|
|
graphs: list[LibraryGraph] = list()
|
|
|
|
# text_to_image = graph_library.get(default_text_to_image_graph_id)
|
|
|
|
# # TODO: Check if the graph is the same as the default one, and if not, update it
|
|
# #if text_to_image is None:
|
|
text_to_image = create_text_to_image()
|
|
graph_library.set(text_to_image)
|
|
|
|
graphs.append(text_to_image)
|
|
|
|
return graphs
|