|
|
|
|
@ -165,7 +165,6 @@ class AdvancedChatAppGenerateTaskPipeline:
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
generator = self._wrapper_process_stream_response(trace_manager=self._application_generate_entity.trace_manager)
|
|
|
|
|
print(f"generator: {generator}=======")
|
|
|
|
|
if self._base_task_pipeline._stream:
|
|
|
|
|
return self._to_stream_response(generator)
|
|
|
|
|
else:
|
|
|
|
|
@ -183,12 +182,13 @@ class AdvancedChatAppGenerateTaskPipeline:
|
|
|
|
|
extras = {}
|
|
|
|
|
if stream_response.metadata:
|
|
|
|
|
extras["metadata"] = stream_response.metadata
|
|
|
|
|
final_outputs = self._task_state.metadata.outputs if self._task_state.metadata and hasattr(self._task_state.metadata, 'outputs') else {}
|
|
|
|
|
return ChatbotAppBlockingResponse(
|
|
|
|
|
task_id=stream_response.task_id,
|
|
|
|
|
data=ChatbotAppBlockingResponse.Data(
|
|
|
|
|
id=self._message_id,
|
|
|
|
|
mode=self._conversation_mode,
|
|
|
|
|
outputs=stream_response.data.outputs,
|
|
|
|
|
outputs=final_outputs,
|
|
|
|
|
conversation_id=self._conversation_id,
|
|
|
|
|
message_id=self._message_id,
|
|
|
|
|
answer=self._task_state.answer,
|
|
|
|
|
@ -505,7 +505,7 @@ class AdvancedChatAppGenerateTaskPipeline:
|
|
|
|
|
task_id=self._application_generate_entity.task_id,
|
|
|
|
|
workflow_execution=workflow_execution,
|
|
|
|
|
)
|
|
|
|
|
self._task_state.metadata.data = workflow_finish_resp.data.outputs.get('outputs', {}).get('outputs')
|
|
|
|
|
self._task_state.metadata.outputs = workflow_finish_resp.data.outputs.get('outputs', {}).get('outputs')
|
|
|
|
|
yield workflow_finish_resp
|
|
|
|
|
self._base_task_pipeline._queue_manager.publish(
|
|
|
|
|
QueueAdvancedChatMessageEndEvent(), PublishFrom.TASK_PIPELINE
|
|
|
|
|
|