From 86ef57f6c3cfb10f614e56418b8ec16e4ae8a475 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Sat, 27 Sep 2025 04:33:00 -0500 Subject: [PATCH] refac --- backend/open_webui/models/messages.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/open_webui/models/messages.py b/backend/open_webui/models/messages.py index 2e70b8a4d7..0066154cd9 100644 --- a/backend/open_webui/models/messages.py +++ b/backend/open_webui/models/messages.py @@ -135,7 +135,7 @@ class MessageTable: db.refresh(result) return MessageModel.model_validate(result) if result else None - def get_message_by_id(self, id: str) -> Optional[MessageReplyToResponse]: + def get_message_by_id(self, id: str) -> Optional[MessageResponse]: with get_db() as db: message = db.get(Message, id) if not message: @@ -146,20 +146,22 @@ class MessageTable: if message.reply_to_id else None ) + reactions = self.get_reactions_by_message_id(id) - replies = self.get_thread_replies_by_message_id(id) + thread_replies = self.get_thread_replies_by_message_id(id) user = Users.get_user_by_id(message.user_id) - - return MessageReplyToResponse.model_validate( + return MessageResponse.model_validate( { **MessageModel.model_validate(message).model_dump(), "user": user.model_dump() if user else None, "reply_to_message": ( reply_to_message.model_dump() if reply_to_message else None ), - "latest_reply_at": replies[0].created_at if replies else None, - "reply_count": len(replies), + "latest_reply_at": ( + thread_replies[0].created_at if thread_replies else None + ), + "reply_count": len(thread_replies), "reactions": reactions, } )