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
56 lines
1.5 KiB
Python
56 lines
1.5 KiB
Python
import json
|
|
from typing import Optional
|
|
|
|
from pydantic import ValidationError
|
|
|
|
from invokeai.app.services.shared.graph import Edge
|
|
|
|
|
|
def get_metadata_graph_from_raw_session(session_raw: str) -> Optional[dict]:
|
|
"""
|
|
Parses raw session string, returning a dict of the graph.
|
|
|
|
Only the general graph shape is validated; none of the fields are validated.
|
|
|
|
Any `metadata_accumulator` nodes and edges are removed.
|
|
|
|
Any validation failure will return None.
|
|
"""
|
|
|
|
graph = json.loads(session_raw).get("graph", None)
|
|
|
|
# sanity check make sure the graph is at least reasonably shaped
|
|
if (
|
|
type(graph) is not dict
|
|
or "nodes" not in graph
|
|
or type(graph["nodes"]) is not dict
|
|
or "edges" not in graph
|
|
or type(graph["edges"]) is not list
|
|
):
|
|
# something has gone terribly awry, return an empty dict
|
|
return None
|
|
|
|
try:
|
|
# delete the `metadata_accumulator` node
|
|
del graph["nodes"]["metadata_accumulator"]
|
|
except KeyError:
|
|
# no accumulator node, all good
|
|
pass
|
|
|
|
# delete any edges to or from it
|
|
for i, edge in enumerate(graph["edges"]):
|
|
try:
|
|
# try to parse the edge
|
|
Edge(**edge)
|
|
except ValidationError:
|
|
# something has gone terribly awry, return an empty dict
|
|
return None
|
|
|
|
if (
|
|
edge["source"]["node_id"] == "metadata_accumulator"
|
|
or edge["destination"]["node_id"] == "metadata_accumulator"
|
|
):
|
|
del graph["edges"][i]
|
|
|
|
return graph
|