From a05fcedd61ab45ebcd2953caf8245391b3a0e284 Mon Sep 17 00:00:00 2001 From: takatost Date: Thu, 21 Mar 2024 14:04:22 +0800 Subject: [PATCH] fix stop --- api/controllers/console/app/completion.py | 2 +- api/controllers/console/app/workflow.py | 2 +- api/core/app/apps/advanced_chat/generate_task_pipeline.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index 3a8949f960..478ee9dfe7 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -152,7 +152,7 @@ class ChatMessageStopApi(Resource): @setup_required @login_required @account_initialization_required - @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT]) + @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT]) def post(self, app_model, task_id): account = flask_login.current_user diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 8bbadc3164..e57a8f2e54 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -284,7 +284,7 @@ class ConvertToWorkflowApi(Resource): api.add_resource(DraftWorkflowApi, '/apps//workflows/draft') api.add_resource(AdvancedChatDraftWorkflowRunApi, '/apps//advanced-chat/workflows/draft/run') api.add_resource(DraftWorkflowRunApi, '/apps//workflows/draft/run') -api.add_resource(WorkflowTaskStopApi, '/apps//workflows/tasks//stop') +api.add_resource(WorkflowTaskStopApi, '/apps//workflow-runs/tasks//stop') api.add_resource(DraftWorkflowNodeRunApi, '/apps//workflows/draft/nodes//run') api.add_resource(PublishedWorkflowApi, '/apps//workflows/publish') api.add_resource(DefaultBlockConfigsApi, '/apps//workflows/default-workflow-block-configs') diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py index 66bf62771f..5a7adda3e8 100644 --- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py +++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py @@ -228,6 +228,7 @@ class AdvancedChatAppGenerateTaskPipeline(BasedGenerateTaskPipeline, WorkflowCyc self._save_message() yield self._message_end_to_stream_response() + break else: self._queue_manager.publish( QueueAdvancedChatMessageEndEvent(),