From 11bd932cbab6c404fdb0698e047cb62a7aff0152 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 22 May 2023 12:46:16 +1000 Subject: [PATCH] feat(nodes): revert invocation_complete url hack --- invokeai/app/services/events.py | 4 ---- invokeai/app/services/processor.py | 20 +------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/invokeai/app/services/events.py b/invokeai/app/services/events.py index dd44bcf73a..a3e7cdd5dc 100644 --- a/invokeai/app/services/events.py +++ b/invokeai/app/services/events.py @@ -50,8 +50,6 @@ class EventServiceBase: result: dict, node: dict, source_node_id: str, - image_url: Optional[str] = None, - thumbnail_url: Optional[str] = None, ) -> None: """Emitted when an invocation has completed""" self.__emit_session_event( @@ -61,8 +59,6 @@ class EventServiceBase: node=node, source_node_id=source_node_id, result=result, - image_url=image_url, - thumbnail_url=thumbnail_url ), ) diff --git a/invokeai/app/services/processor.py b/invokeai/app/services/processor.py index 250d007d06..cdd9db85de 100644 --- a/invokeai/app/services/processor.py +++ b/invokeai/app/services/processor.py @@ -91,30 +91,12 @@ class DefaultInvocationProcessor(InvocationProcessorABC): graph_execution_state ) - def is_image_output(obj: Any) -> TypeGuard[ImageOutput]: - return obj.__class__ == ImageOutput - - outputs_dict = outputs.dict() - - if is_image_output(outputs): - image_url = self.__invoker.services.images_new.get_url( - ImageType.RESULT, outputs.image.image_name - ) - thumbnail_url = self.__invoker.services.images_new.get_url( - ImageType.RESULT, outputs.image.image_name, True - ) - else: - image_url = None - thumbnail_url = None - # Send complete event self.__invoker.services.events.emit_invocation_complete( graph_execution_state_id=graph_execution_state.id, node=invocation.dict(), source_node_id=source_node_id, - result=outputs_dict, - image_url=image_url, - thumbnail_url=thumbnail_url, + result=outputs.dict(), ) except KeyboardInterrupt: