From 1c94dde35f1f3bb7c72ed95e435c67493f2d4f0c Mon Sep 17 00:00:00 2001 From: zhuqingchao Date: Tue, 15 Jul 2025 21:53:50 +0800 Subject: [PATCH 1/2] filter deleted conversation --- api/controllers/console/app/conversation.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py index 70d6216497..cd6a915f0a 100644 --- a/api/controllers/console/app/conversation.py +++ b/api/controllers/console/app/conversation.py @@ -45,7 +45,11 @@ class CompletionConversationApi(Resource): parser.add_argument("limit", type=int_range(1, 100), default=20, location="args") args = parser.parse_args() - query = db.select(Conversation).where(Conversation.app_id == app_model.id, Conversation.mode == "completion") + query = db.select(Conversation).where( + Conversation.is_deleted == False, + Conversation.app_id == app_model.id, + Conversation.mode == "completion" + ) if args["keyword"]: query = query.join(Message, Message.conversation_id == Conversation.id).filter( @@ -170,7 +174,10 @@ class ChatConversationApi(Resource): .subquery() ) - query = db.select(Conversation).where(Conversation.app_id == app_model.id) + query = db.select(Conversation).where( + Conversation.app_id == app_model.id, + Conversation.is_deleted == False + ) if args["keyword"]: keyword_filter = "%{}%".format(args["keyword"]) From 5129b012abb0b0076a2e538503730ab3695e6416 Mon Sep 17 00:00:00 2001 From: zhuqingchao Date: Tue, 15 Jul 2025 22:08:00 +0800 Subject: [PATCH 2/2] format --- api/controllers/console/app/conversation.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py index cd6a915f0a..bfc9b97cd2 100644 --- a/api/controllers/console/app/conversation.py +++ b/api/controllers/console/app/conversation.py @@ -46,9 +46,7 @@ class CompletionConversationApi(Resource): args = parser.parse_args() query = db.select(Conversation).where( - Conversation.is_deleted == False, - Conversation.app_id == app_model.id, - Conversation.mode == "completion" + Conversation.is_deleted == False, Conversation.app_id == app_model.id, Conversation.mode == "completion" ) if args["keyword"]: @@ -174,10 +172,7 @@ class ChatConversationApi(Resource): .subquery() ) - query = db.select(Conversation).where( - Conversation.app_id == app_model.id, - Conversation.is_deleted == False - ) + query = db.select(Conversation).where(Conversation.app_id == app_model.id, Conversation.is_deleted == False) if args["keyword"]: keyword_filter = "%{}%".format(args["keyword"])