mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 12:25:20 +00:00
refac
This commit is contained in:
parent
b4eea78aff
commit
86ef57f6c3
1 changed files with 8 additions and 6 deletions
|
|
@ -135,7 +135,7 @@ class MessageTable:
|
||||||
db.refresh(result)
|
db.refresh(result)
|
||||||
return MessageModel.model_validate(result) if result else None
|
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:
|
with get_db() as db:
|
||||||
message = db.get(Message, id)
|
message = db.get(Message, id)
|
||||||
if not message:
|
if not message:
|
||||||
|
|
@ -146,20 +146,22 @@ class MessageTable:
|
||||||
if message.reply_to_id
|
if message.reply_to_id
|
||||||
else None
|
else None
|
||||||
)
|
)
|
||||||
|
|
||||||
reactions = self.get_reactions_by_message_id(id)
|
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)
|
user = Users.get_user_by_id(message.user_id)
|
||||||
|
return MessageResponse.model_validate(
|
||||||
return MessageReplyToResponse.model_validate(
|
|
||||||
{
|
{
|
||||||
**MessageModel.model_validate(message).model_dump(),
|
**MessageModel.model_validate(message).model_dump(),
|
||||||
"user": user.model_dump() if user else None,
|
"user": user.model_dump() if user else None,
|
||||||
"reply_to_message": (
|
"reply_to_message": (
|
||||||
reply_to_message.model_dump() if reply_to_message else None
|
reply_to_message.model_dump() if reply_to_message else None
|
||||||
),
|
),
|
||||||
"latest_reply_at": replies[0].created_at if replies else None,
|
"latest_reply_at": (
|
||||||
"reply_count": len(replies),
|
thread_replies[0].created_at if thread_replies else None
|
||||||
|
),
|
||||||
|
"reply_count": len(thread_replies),
|
||||||
"reactions": reactions,
|
"reactions": reactions,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue