From cc6c59b27ac022a4624ed8f9473f2d000730f4ec Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Fri, 5 Dec 2025 09:39:39 +0800
Subject: [PATCH] fix: fix db session already begin (#29160)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/core/app/apps/message_based_app_generator.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/core/app/apps/message_based_app_generator.py b/api/core/app/apps/message_based_app_generator.py
index 246ec7d786..57617d8863 100644
--- a/api/core/app/apps/message_based_app_generator.py
+++ b/api/core/app/apps/message_based_app_generator.py
@@ -156,7 +156,7 @@ class MessageBasedAppGenerator(BaseAppGenerator):
         query = application_generate_entity.query or "New conversation"
         conversation_name = (query[:20] + "…") if len(query) > 20 else query
 
-        with db.session.begin():
+        try:
             if not conversation:
                 conversation = Conversation(
                     app_id=app_config.app_id,
@@ -232,7 +232,10 @@ class MessageBasedAppGenerator(BaseAppGenerator):
                 db.session.add_all(message_files)
 
             db.session.commit()
-        return conversation, message
+            return conversation, message
+        except Exception:
+            db.session.rollback()
+            raise
 
     def _get_conversation_introduction(self, application_generate_entity: AppGenerateEntity) -> str:
         """