fix: iteration node use the main thread pool

pull/11267/head
Novice Lee 1 year ago
parent c4fad66f2a
commit 286741e139

@ -15,7 +15,7 @@ class ComfyUIProvider(BuiltinToolProviderController):
try: try:
ws.connect(ws_address) ws.connect(ws_address)
except Exception as e: except Exception:
raise ToolProviderCredentialValidationError(f"can not connect to {ws_address}") raise ToolProviderCredentialValidationError(f"can not connect to {ws_address}")
finally: finally:
ws.close() ws.close()

@ -162,7 +162,8 @@ class IterationNode(BaseNode[IterationNodeData]):
if self.node_data.is_parallel: if self.node_data.is_parallel:
futures: list[Future] = [] futures: list[Future] = []
q = Queue() q = Queue()
thread_pool = GraphEngineThreadPool(max_workers=self.node_data.parallel_nums, max_submit_count=100) thread_pool = graph_engine.workflow_thread_pool_mapping[self.thread_pool_id]
thread_pool._max_workers = self.node_data.parallel_nums
for index, item in enumerate(iterator_list_value): for index, item in enumerate(iterator_list_value):
future: Future = thread_pool.submit( future: Future = thread_pool.submit(
self._run_single_iter_parallel, self._run_single_iter_parallel,
@ -235,7 +236,10 @@ class IterationNode(BaseNode[IterationNodeData]):
run_result=NodeRunResult( run_result=NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED, status=WorkflowNodeExecutionStatus.SUCCEEDED,
outputs={"output": jsonable_encoder(outputs)}, outputs={"output": jsonable_encoder(outputs)},
metadata={NodeRunMetadataKey.ITERATION_DURATION_MAP: iter_run_map}, metadata={
NodeRunMetadataKey.ITERATION_DURATION_MAP: iter_run_map,
"total_tokens": graph_engine.graph_runtime_state.total_tokens,
},
) )
) )
except IterationNodeError as e: except IterationNodeError as e:
@ -258,6 +262,7 @@ class IterationNode(BaseNode[IterationNodeData]):
run_result=NodeRunResult( run_result=NodeRunResult(
status=WorkflowNodeExecutionStatus.FAILED, status=WorkflowNodeExecutionStatus.FAILED,
error=str(e), error=str(e),
metadata={"total_tokens": graph_engine.graph_runtime_state.total_tokens},
) )
) )
finally: finally:

Loading…
Cancel
Save