From cbd1a7263a1c8ca880a7041121211662b8d68d66 Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 14 Apr 2023 00:56:17 -0400 Subject: [PATCH] nodes: fix typing of GraphExecutionState.id --- invokeai/app/services/graph.py | 5 ++--- invokeai/app/services/invocation_queue.py | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/invokeai/app/services/graph.py b/invokeai/app/services/graph.py index 44f6a3d69e..d18329f49d 100644 --- a/invokeai/app/services/graph.py +++ b/invokeai/app/services/graph.py @@ -2,7 +2,6 @@ import copy import itertools -import traceback import uuid from types import NoneType from typing import ( @@ -751,7 +750,7 @@ class GraphExecutionState(BaseModel): """Tracks the state of a graph execution""" id: str = Field( - description="The id of the execution state", default_factory=uuid.uuid4 + description="The id of the execution state", default_factory=lambda: uuid.uuid4().__str__() ) # TODO: Store a reference to the graph instead of the actual graph? @@ -1171,7 +1170,7 @@ class LibraryGraph(BaseModel): if len(v) != len(set(i.alias for i in v)): raise ValueError("Duplicate exposed alias") return v - + @root_validator def validate_exposed_nodes(cls, values): graph = values['graph'] diff --git a/invokeai/app/services/invocation_queue.py b/invokeai/app/services/invocation_queue.py index 008a2e0823..9ffaa5f898 100644 --- a/invokeai/app/services/invocation_queue.py +++ b/invokeai/app/services/invocation_queue.py @@ -2,12 +2,14 @@ import time from abc import ABC, abstractmethod -from pydantic import BaseModel, Field from queue import Queue +from uuid import UUID + +from pydantic import BaseModel, Field class InvocationQueueItem(BaseModel): - graph_execution_state_id: str + graph_execution_state_id: UUID invocation_id: str invoke_all: bool timestamp: float = Field(default_factory=time.time)