From f0fb38fed43c3327f1296101554d26d5e0381063 Mon Sep 17 00:00:00 2001
From: Qun <51054082+QunBB@users.noreply.github.com>
Date: Tue, 4 Mar 2025 09:09:32 +0800
Subject: [PATCH] unify moderation and annotation's response behavior in
 message log of chatflow app with other types of app (#14800)

---
 .../app/apps/advanced_chat/generate_task_pipeline.py     | 9 +++++++++
 1 file changed, 9 insertions(+)

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 3d6ba5ce37..5dd3ba11c8 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -582,6 +582,15 @@ class AdvancedChatAppGenerateTaskPipeline:
                         session.commit()
 
                     yield workflow_finish_resp
+                elif event.stopped_by in (
+                    QueueStopEvent.StopBy.INPUT_MODERATION,
+                    QueueStopEvent.StopBy.ANNOTATION_REPLY,
+                ):
+                    # When hitting input-moderation or annotation-reply, the workflow will not start
+                    with Session(db.engine, expire_on_commit=False) as session:
+                        # Save message
+                        self._save_message(session=session)
+                        session.commit()
 
                 yield self._message_end_to_stream_response()
                 break