fix(chat): fix displaying like/dislike buttons (Issue #2894) (#2895)

epam · Dec 30, 2024 · bb429cf · bb429cf
1 parent 45dba39
commit bb429cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/apps/chat/src/components/Chat/ChatMessage/MessageButtons.tsx b/apps/chat/src/components/Chat/ChatMessage/MessageButtons.tsx
@@ -14,6 +14,8 @@ import { useTranslation } from 'next-i18next';
 
 import classNames from 'classnames';
 
+import { getMessageCustomContent } from '@/src/utils/server/chat';
+
 import { Translation } from '@/src/types/translation';
 
 import { useAppSelector } from '@/src/store/hooks';
@@ -173,8 +175,7 @@ export const MessageAssistantButtons = ({
         ))}
       <div className="flex flex-row gap-2">
         {isLikesEnabled &&
-          (!message.errorMessage ||
-            (message.content.trim() && message.errorMessage)) && (
+          (message.content.trim() || !!getMessageCustomContent(message)) && (
             <>
               {message.like !== LikeState.Disliked && (
                 <Tooltip

diff --git a/apps/chat/src/pages/api/chat.ts b/apps/chat/src/pages/api/chat.ts
@@ -6,7 +6,7 @@ import { validateServerSession } from '@/src/utils/auth/session';
 import { OpenAIStream } from '@/src/utils/server';
 import {
   chatErrorHandler,
-  getMessageCustomContent,
+  getUserMessageCustomContent,
   limitMessagesByTokens,
 } from '@/src/utils/server/chat';
 import { getSortedEntities } from '@/src/utils/server/get-sorted-entities';
@@ -99,7 +99,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     });
 
     messagesToSend = messagesToSend.map((message) => ({
-      ...getMessageCustomContent(message),
+      ...getUserMessageCustomContent(message),
       role: message.role,
       content: message.content,
     }));

diff --git a/apps/chat/src/utils/server/chat.ts b/apps/chat/src/utils/server/chat.ts
@@ -103,9 +103,6 @@ export const hardLimitMessages = (messages: Message[]) => {
 export function getMessageCustomContent(
   message: Message,
 ): Partial<Message> | undefined {
-  if (message.role === Role.Assistant && !message.custom_content?.state) {
-    return;
-  }
   return message.custom_content?.state ||
     message.custom_content?.attachments?.length
     ? {
@@ -121,6 +118,15 @@ export function getMessageCustomContent(
     : undefined;
 }
 
+export function getUserMessageCustomContent(
+  message: Message,
+): Partial<Message> | undefined {
+  if (message.role === Role.Assistant && !message.custom_content?.state) {
+    return;
+  }
+  return getMessageCustomContent(message);
+}
+
 const getResponseBody = (
   fieldName: string,
   displayMessage: string | undefined,