feat: Submit Feedback infiniflow#2088 (infiniflow#2134)

### What problem does this PR solve? feat: Submit Feedback infiniflow#2088 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
crazysnowboy · Aug 28, 2024 · 54f7c6e · 54f7c6e
1 parent f843dd0
commit 54f7c6e
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 26 deletions.
diff --git a/web/src/components/message-item/feedback-modal.tsx b/web/src/components/message-item/feedback-modal.tsx
@@ -1,20 +1,34 @@
 import { Form, Input, Modal } from 'antd';
 
 import { IModalProps } from '@/interfaces/common';
+import { IFeedbackRequestBody } from '@/interfaces/request/chat';
+import { useCallback } from 'react';
 
 type FieldType = {
-  username?: string;
+  feedback?: string;
 };
 
-const FeedbackModal = ({ visible, hideModal }: IModalProps<any>) => {
+const FeedbackModal = ({
+  visible,
+  hideModal,
+  onOk,
+  loading,
+}: IModalProps<IFeedbackRequestBody>) => {
   const [form] = Form.useForm();
 
-  const handleOk = async () => {
+  const handleOk = useCallback(async () => {
     const ret = await form.validateFields();
-  };
+    return onOk?.({ thumbup: false, feedback: ret.feedback });
+  }, [onOk, form]);
 
   return (
-    <Modal title="Feedback" open={visible} onOk={handleOk} onCancel={hideModal}>
+    <Modal
+      title="Feedback"
+      open={visible}
+      onOk={handleOk}
+      onCancel={hideModal}
+      confirmLoading={loading}
+    >
       <Form
         name="basic"
         labelCol={{ span: 0 }}
@@ -24,10 +38,10 @@ const FeedbackModal = ({ visible, hideModal }: IModalProps<any>) => {
         form={form}
       >
         <Form.Item<FieldType>
-          name="username"
-          rules={[{ required: true, message: 'Please input your username!' }]}
+          name="feedback"
+          rules={[{ required: true, message: 'Please input your feedback!' }]}
         >
-          <Input.TextArea rows={8} placeholder="Please input your username!" />
+          <Input.TextArea rows={8} placeholder="Please input your feedback!" />
         </Form.Item>
       </Form>
     </Modal>

diff --git a/web/src/components/message-item/group-button.tsx b/web/src/components/message-item/group-button.tsx
@@ -1,5 +1,4 @@
 import CopyToClipboard from '@/components/copy-to-clipboard';
-import { useSetModalState } from '@/hooks/common-hooks';
 import {
   DeleteOutlined,
   DislikeOutlined,
@@ -8,29 +7,46 @@ import {
   SyncOutlined,
 } from '@ant-design/icons';
 import { Radio } from 'antd';
+import { useCallback } from 'react';
 import FeedbackModal from './feedback-modal';
+import { useSendFeedback } from './hooks';
 
-export const AssistantGroupButton = () => {
-  const { visible, hideModal, showModal } = useSetModalState();
+interface IProps {
+  messageId: string;
+  content: string;
+}
+
+export const AssistantGroupButton = ({ messageId, content }: IProps) => {
+  const { visible, hideModal, showModal, onFeedbackOk, loading } =
+    useSendFeedback(messageId);
+
+  const handleLike = useCallback(() => {
+    onFeedbackOk({ thumbup: true });
+  }, [onFeedbackOk]);
 
   return (
     <>
       <Radio.Group size="small">
         <Radio.Button value="a">
-          <CopyToClipboard text="xxx"></CopyToClipboard>
+          <CopyToClipboard text={content}></CopyToClipboard>
         </Radio.Button>
         <Radio.Button value="b">
           <SoundOutlined />
         </Radio.Button>
-        <Radio.Button value="c">
+        <Radio.Button value="c" onClick={handleLike}>
           <LikeOutlined />
         </Radio.Button>
         <Radio.Button value="d" onClick={showModal}>
           <DislikeOutlined />
         </Radio.Button>
       </Radio.Group>
       {visible && (
-        <FeedbackModal visible={visible} hideModal={hideModal}></FeedbackModal>
+        <FeedbackModal
+          visible={visible}
+          hideModal={hideModal}
+          onOk={onFeedbackOk}
+          loading={loading}
+        ></FeedbackModal>
       )}
     </>
   );

diff --git a/web/src/components/message-item/hooks.ts b/web/src/components/message-item/hooks.ts
@@ -0,0 +1,32 @@
+import { useFeedback } from '@/hooks/chat-hooks';
+import { useSetModalState } from '@/hooks/common-hooks';
+import { IFeedbackRequestBody } from '@/interfaces/request/chat';
+import { getMessagePureId } from '@/utils/chat';
+import { useCallback } from 'react';
+
+export const useSendFeedback = (messageId: string) => {
+  const { visible, hideModal, showModal } = useSetModalState();
+  const { feedback, loading } = useFeedback();
+
+  const onFeedbackOk = useCallback(
+    async (params: IFeedbackRequestBody) => {
+      const ret = await feedback({
+        ...params,
+        messageId: getMessagePureId(messageId),
+      });
+
+      if (ret === 0) {
+        hideModal();
+      }
+    },
+    [feedback, hideModal, messageId],
+  );
+
+  return {
+    loading,
+    onFeedbackOk,
+    visible,
+    hideModal,
+    showModal,
+  };
+};
diff --git a/web/src/components/message-item/index.tsx b/web/src/components/message-item/index.tsx
@@ -2,7 +2,7 @@ import { ReactComponent as AssistantIcon } from '@/assets/svg/assistant.svg';
 import { MessageType } from '@/constants/chat';
 import { useSetModalState, useTranslate } from '@/hooks/common-hooks';
 import { useSelectFileThumbnails } from '@/hooks/knowledge-hooks';
-import { IReference, Message } from '@/interfaces/database/chat';
+import { IReference } from '@/interfaces/database/chat';
 import { IChunk } from '@/interfaces/database/knowledge';
 import classNames from 'classnames';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
@@ -11,19 +11,20 @@ import {
   useFetchDocumentInfosByIds,
   useFetchDocumentThumbnailsByIds,
 } from '@/hooks/document-hooks';
+import { IMessage } from '@/pages/chat/interface';
 import MarkdownContent from '@/pages/chat/markdown-content';
 import { getExtension, isImage } from '@/utils/document-util';
 import { Avatar, Button, Flex, List, Space, Typography } from 'antd';
 import FileIcon from '../file-icon';
 import IndentedTreeModal from '../indented-tree/modal';
 import NewDocumentLink from '../new-document-link';
-// import { AssistantGroupButton, UserGroupButton } from './group-button';
+import { AssistantGroupButton, UserGroupButton } from './group-button';
 import styles from './index.less';
 
 const { Text } = Typography;
 
 interface IProps {
-  item: Message;
+  item: IMessage;
   reference: IReference;
   loading?: boolean;
   nickname?: string;
@@ -36,7 +37,6 @@ const MessageItem = ({
   reference,
   loading = false,
   avatar = '',
-  nickname = '',
   clickDocumentButton,
 }: IProps) => {
   const isAssistant = item.role === MessageType.Assistant;
@@ -111,13 +111,16 @@ const MessageItem = ({
           )}
           <Flex vertical gap={8} flex={1}>
             <Space>
-              {/* {isAssistant ? (
-                <AssistantGroupButton></AssistantGroupButton>
+              {isAssistant ? (
+                <AssistantGroupButton
+                  messageId={item.id}
+                  content={item.content}
+                ></AssistantGroupButton>
               ) : (
                 <UserGroupButton></UserGroupButton>
-              )} */}
+              )}
 
-              <b>{isAssistant ? '' : nickname}</b>
+              {/* <b>{isAssistant ? '' : nickname}</b> */}
             </Space>
             <div
               className={

diff --git a/web/src/hooks/chat-hooks.ts b/web/src/hooks/chat-hooks.ts
@@ -6,16 +6,16 @@ import {
   IToken,
   Message,
 } from '@/interfaces/database/chat';
+import { IFeedbackRequestBody } from '@/interfaces/request/chat';
 import i18n from '@/locales/config';
 import { IClientConversation, IMessage } from '@/pages/chat/interface';
 import chatService from '@/services/chat-service';
-import { isConversationIdExist } from '@/utils/chat';
+import { buildMessageUuid, isConversationIdExist } from '@/utils/chat';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { message } from 'antd';
 import dayjs, { Dayjs } from 'dayjs';
 import { useCallback, useMemo, useState } from 'react';
 import { useSearchParams } from 'umi';
-import { v4 as uuid } from 'uuid';
 
 //#region logic
 
@@ -218,7 +218,7 @@ export const useFetchNextConversation = () => {
         const messageList =
           conversation?.message?.map((x: Message | IMessage) => ({
             ...x,
-            id: 'id' in x && x.id ? x.id : uuid(),
+            id: buildMessageUuid(x),
           })) ?? [];
 
         return { ...conversation, message: messageList };
@@ -292,6 +292,56 @@ export const useRemoveNextConversation = () => {
 
   return { data, loading, removeConversation: mutateAsync };
 };
+
+export const useDeleteMessage = () => {
+  // const queryClient = useQueryClient();
+  const { conversationId } = useGetChatSearchParams();
+
+  const {
+    data,
+    isPending: loading,
+    mutateAsync,
+  } = useMutation({
+    mutationKey: ['deleteMessage'],
+    mutationFn: async (messageId: string) => {
+      const { data } = await chatService.deleteMessage({
+        messageId,
+        conversationId,
+      });
+      if (data.retcode === 0) {
+        // queryClient.invalidateQueries({ queryKey: ['fetchConversationList'] });
+      }
+      return data.retcode;
+    },
+  });
+
+  return { data, loading, deleteMessage: mutateAsync };
+};
+
+export const useFeedback = () => {
+  const { conversationId } = useGetChatSearchParams();
+
+  const {
+    data,
+    isPending: loading,
+    mutateAsync,
+  } = useMutation({
+    mutationKey: ['feedback'],
+    mutationFn: async (params: IFeedbackRequestBody) => {
+      const { data } = await chatService.thumbup({
+        ...params,
+        conversationId,
+      });
+      if (data.retcode === 0) {
+        message.success(i18n.t(`message.operated`));
+      }
+      return data.retcode;
+    },
+  });
+
+  return { data, loading, feedback: mutateAsync };
+};
+
 //#endregion
 
 // #region API provided for external calls

diff --git a/web/src/interfaces/request/chat.ts b/web/src/interfaces/request/chat.ts
@@ -0,0 +1,5 @@
+export interface IFeedbackRequestBody {
+  messageId?: string;
+  thumbup?: boolean;
+  feedback?: string;
+}
diff --git a/web/src/pages/chat/hooks.ts b/web/src/pages/chat/hooks.ts
@@ -421,6 +421,7 @@ export const useSendMessage = (
         messages: [
           ...(conversation?.message ?? []).map((x: IMessage) => omit(x, 'id')),
           {
+            id: uuid(),
             role: MessageType.User,
             content: message,
             doc_ids: documentIds,

diff --git a/web/src/services/chat-service.ts b/web/src/services/chat-service.ts
@@ -20,6 +20,9 @@ const {
   getExternalConversation,
   completeExternalConversation,
   uploadAndParseExternal,
+  deleteMessage,
+  thumbup,
+  tts,
 } = api;
 
 const methods = {
@@ -91,6 +94,18 @@ const methods = {
     url: uploadAndParseExternal,
     method: 'post',
   },
+  deleteMessage: {
+    url: deleteMessage,
+    method: 'post',
+  },
+  thumbup: {
+    url: thumbup,
+    method: 'post',
+  },
+  tts: {
+    url: tts,
+    method: 'post',
+  },
 } as const;
 
 const chatService = registerServer<keyof typeof methods>(methods, request);

diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts
@@ -63,6 +63,9 @@ export default {
   listConversation: `${api_host}/conversation/list`,
   removeConversation: `${api_host}/conversation/rm`,
   completeConversation: `${api_host}/conversation/completion`,
+  deleteMessage: `${api_host}/conversation/delete_msg`,
+  thumbup: `${api_host}/conversation/thumbup`,
+  tts: `${api_host}/conversation/tts`,
   // chat for external
   createToken: `${api_host}/api/new_token`,
   listToken: `${api_host}/api/token_list`,

diff --git a/web/src/utils/chat.ts b/web/src/utils/chat.ts
@@ -1,5 +1,25 @@
-import { EmptyConversationId } from '@/constants/chat';
+import { EmptyConversationId, MessageType } from '@/constants/chat';
+import { Message } from '@/interfaces/database/chat';
+import { IMessage } from '@/pages/chat/interface';
+import { v4 as uuid } from 'uuid';
 
 export const isConversationIdExist = (conversationId: string) => {
   return conversationId !== EmptyConversationId && conversationId !== '';
 };
+
+export const buildMessageUuid = (message: Message | IMessage) => {
+  if ('id' in message && message.id) {
+    return message.role === MessageType.User
+      ? `${MessageType.User}_${message.id}`
+      : `${MessageType.Assistant}_${message.id}`;
+  }
+  return uuid();
+};
+
+export const getMessagePureId = (id: string) => {
+  const strings = id.split('_');
+  if (strings.length > 0) {
+    return strings.at(-1);
+  }
+  return id;
+};