From 80cd289e878735dd2e40913bef5440f3f9b2953e Mon Sep 17 00:00:00 2001 From: Cocoon-Break <54054995+kuishou68@users.noreply.github.com> Date: Mon, 25 May 2026 15:15:24 +0800 Subject: [PATCH] fix: replace .distinct() with .group_by(Conversation.id) for PostgreSQL JSON compatibility (#36610) Co-authored-by: cocoon Co-authored-by: Asuka Minato Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> (cherry picked from commit e617435d034c2ce955a183cc9af9b938f0d9c5de) --- api/controllers/console/app/conversation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py index c7347933cb..f1b0de1071 100644 --- a/api/controllers/console/app/conversation.py +++ b/api/controllers/console/app/conversation.py @@ -137,7 +137,7 @@ class CompletionConversationApi(Resource): .join( # type: ignore MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id ) - .distinct() + .group_by(Conversation.id) ) elif args.annotation_status == "not_annotated": query = ( @@ -275,7 +275,7 @@ class ChatConversationApi(Resource): .join( # type: ignore MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id ) - .distinct() + .group_by(Conversation.id) ) case "not_annotated": query = (