Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions invokeai/app/services/session_queue/session_queue_common.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime
import json
from itertools import chain, product
from typing import Generator, Literal, Optional, TypeAlias, Union, cast
from typing import Generator, Literal, Optional, TypeAlias, Union

from pydantic import (
AliasChoices,
Expand All @@ -15,7 +15,6 @@
)
from pydantic_core import to_jsonable_python

from invokeai.app.invocations.baseinvocation import BaseInvocation
from invokeai.app.invocations.fields import ImageField
from invokeai.app.services.shared.graph import Graph, GraphExecutionState, NodeNotFoundError
from invokeai.app.services.workflow_records.workflow_records_common import (
Expand Down Expand Up @@ -137,20 +136,18 @@ def validate_unique_field_mappings(cls, v: Optional[BatchDataCollection]):
return v

@model_validator(mode="after")
def validate_batch_nodes_and_edges(cls, values):
batch_data_collection = cast(Optional[BatchDataCollection], values.data)
if batch_data_collection is None:
return values
graph = cast(Graph, values.graph)
for batch_data_list in batch_data_collection:
def validate_batch_nodes_and_edges(self):
if self.data is None:
return self
for batch_data_list in self.data:
for batch_data in batch_data_list:
try:
node = cast(BaseInvocation, graph.get_node(batch_data.node_path))
node = self.graph.get_node(batch_data.node_path)
except NodeNotFoundError:
raise NodeNotFoundError(f"Node {batch_data.node_path} not found in graph")
if batch_data.field_name not in type(node).model_fields:
raise NodeNotFoundError(f"Field {batch_data.field_name} not found in node {batch_data.node_path}")
return values
return self

@field_validator("graph")
def validate_graph(cls, v: Graph):
Expand Down
2 changes: 1 addition & 1 deletion invokeai/version/invokeai_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "6.8.0rc1"
__version__ = "6.8.0rc2"