feat: chat in explore support agent (#647)

Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
2023-07-27 13:27:34 +08:00
parent 4fdb37771a
commit 23e3413655
121 changed files with 4081 additions and 527 deletions
--- a/web/app/components/share/chat/hooks/use-conversation.ts
+++ b/web/app/components/share/chat/hooks/use-conversation.ts
@@ -1,5 +1,6 @@
 import { useState } from 'react'
 import produce from 'immer'
+import { useGetState } from 'ahooks'
 import type { ConversationItem } from '@/models/share'

 const storageConversationIdKey = 'conversationIdInfo'
@@ -8,7 +9,7 @@ type ConversationInfoType = Omit<ConversationItem, 'inputs' | 'id'>
 function useConversation() {
  const [conversationList, setConversationList] = useState<ConversationItem[]>([])
  const [pinnedConversationList, setPinnedConversationList] = useState<ConversationItem[]>([])
-  const [currConversationId, doSetCurrConversationId] = useState<string>('-1')
+  const [currConversationId, doSetCurrConversationId, getCurrConversationId] = useGetState<string>('-1')
  // when set conversation id, we do not have set appId
  const setCurrConversationId = (id: string, appId: string, isSetToLocalStroge = true, newConversationName = '') => {
    doSetCurrConversationId(id)
@@ -53,6 +54,7 @@ function useConversation() {
    pinnedConversationList,
    setPinnedConversationList,
    currConversationId,
+    getCurrConversationId,
    setCurrConversationId,
    getConversationIdFromStorage,
    isNewConversation,
--- a/web/app/components/share/chat/index.tsx
+++ b/web/app/components/share/chat/index.tsx
@@ -43,6 +43,8 @@ import Confirm from '@/app/components/base/confirm'
 export type IMainProps = {
  isInstalledApp?: boolean
  installedAppInfo?: InstalledApp
+  isSupportPlugin?: boolean
+  isUniversalChat?: boolean
 }

 const Main: FC<IMainProps> = ({
@@ -88,6 +90,7 @@ const Main: FC<IMainProps> = ({
    pinnedConversationList,
    setPinnedConversationList,
    currConversationId,
+    getCurrConversationId,
    setCurrConversationId,
    getConversationIdFromStorage,
    isNewConversation,
@@ -212,7 +215,7 @@ const Main: FC<IMainProps> = ({
    }

    // update chat list of current conversation
-    if (!isNewConversation && !conversationIdChangeBecauseOfNew && !isResponsing) {
+    if (!isNewConversation && !conversationIdChangeBecauseOfNew) {
      fetchChatList(currConversationId, isInstalledApp, installedAppInfo?.id).then((res: any) => {
        const { data } = res
        const newChatList: IChatItem[] = generateNewChatListWithOpenstatement(notSyncToStateIntroduction, notSyncToStateInputs)
@@ -421,6 +424,7 @@ const Main: FC<IMainProps> = ({
  const [suggestQuestions, setSuggestQuestions] = useState<string[]>([])
  const [messageTaskId, setMessageTaskId] = useState('')
  const [hasStopResponded, setHasStopResponded, getHasStopResponded] = useGetState(false)
+  const [isResponsingConIsCurrCon, setIsResponsingConCurrCon, getIsResponsingConIsCurrCon] = useGetState(true)

  const handleSend = async (message: string) => {
    if (isResponsing) {
@@ -457,12 +461,13 @@ const Main: FC<IMainProps> = ({
      content: '',
      isAnswer: true,
    }
-
-    let tempNewConversationId = ''
+    const prevTempNewConversationId = getCurrConversationId() || '-1'
+    let tempNewConversationId = prevTempNewConversationId

    setHasStopResponded(false)
    setResponsingTrue()
    setIsShowSuggestion(false)
+    setIsResponsingConCurrCon(true)
    sendChatMessage(data, {
      getAbortController: (abortController) => {
        setAbortController(abortController)
@@ -474,6 +479,11 @@ const Main: FC<IMainProps> = ({
          tempNewConversationId = newConversationId

        setMessageTaskId(taskId)
+        // has switched to other conversation
+        if (prevTempNewConversationId !== getCurrConversationId()) {
+          setIsResponsingConCurrCon(false)
+          return
+        }
        // closesure new list is outdated.
        const newListWithAnswer = produce(
          getChatList().filter(item => item.id !== responseItem.id && item.id !== placeholderAnswerId),
@@ -499,7 +509,7 @@ const Main: FC<IMainProps> = ({
        resetNewConversationInputs()
        setChatNotStarted()
        setCurrConversationId(tempNewConversationId, appId, true)
-        if (suggestedQuestionsAfterAnswerConfig?.enabled && !getHasStopResponded()) {
+        if (getIsResponsingConIsCurrCon() && suggestedQuestionsAfterAnswerConfig?.enabled && !getHasStopResponded()) {
          const { data }: any = await fetchSuggestedQuestions(responseItem.id, isInstalledApp, installedAppInfo?.id)
          setSuggestQuestions(data)
          setIsShowSuggestion(true)
@@ -628,7 +638,7 @@ const Main: FC<IMainProps> = ({
                    isHideFeedbackEdit
                    onFeedback={handleFeedback}
                    isResponsing={isResponsing}
-                    canStopResponsing={!!messageTaskId}
+                    canStopResponsing={!!messageTaskId && isResponsingConIsCurrCon}
                    abortResponsing={async () => {
                      await stopChatMessageResponding(appId, messageTaskId, isInstalledApp, installedAppInfo?.id)
                      setHasStopResponded(true)
--- a/web/app/components/share/chat/sidebar/index.tsx
+++ b/web/app/components/share/chat/sidebar/index.tsx
@@ -11,6 +11,7 @@ import AppInfo from '@/app/components/share/chat/sidebar/app-info'
 // import Card from './card'
 import type { ConversationItem, SiteInfo } from '@/models/share'
 import { fetchConversations } from '@/service/share'
+import { fetchConversations as fetchUniversalConversations } from '@/service/universal-chat'

 export type ISidebarProps = {
  copyRight: string
@@ -22,6 +23,7 @@ export type ISidebarProps = {
  isClearPinnedConversationList: boolean
  isInstalledApp: boolean
  installedAppId?: string
+  isUniversalChat?: boolean
  siteInfo: SiteInfo
  onMoreLoaded: (res: { data: ConversationItem[]; has_more: boolean }) => void
  onPinnedMoreLoaded: (res: { data: ConversationItem[]; has_more: boolean }) => void
@@ -43,6 +45,7 @@ const Sidebar: FC<ISidebarProps> = ({
  isClearPinnedConversationList,
  isInstalledApp,
  installedAppId,
+  isUniversalChat,
  siteInfo,
  onMoreLoaded,
  onPinnedMoreLoaded,
@@ -57,8 +60,14 @@ const Sidebar: FC<ISidebarProps> = ({
  const [hasPinned, setHasPinned] = useState(false)

  const checkHasPinned = async () => {
-    const { data }: any = await fetchConversations(isInstalledApp, installedAppId, undefined, true)
-    setHasPinned(data.length > 0)
+    let res: any
+    if (isUniversalChat)
+      res = await fetchUniversalConversations(undefined, true)
+
+    else
+      res = await fetchConversations(isInstalledApp, installedAppId, undefined, true)
+
+    setHasPinned(res.data.length > 0)
  }

  useEffect(() => {
@@ -70,13 +79,13 @@ const Sidebar: FC<ISidebarProps> = ({
      checkHasPinned()
  }, [controlUpdateList])

-  const maxListHeight = isInstalledApp ? 'max-h-[30vh]' : 'max-h-[40vh]'
+  const maxListHeight = (isInstalledApp || isUniversalChat) ? 'max-h-[30vh]' : 'max-h-[40vh]'

  return (
    <div
      className={
        cn(
-          isInstalledApp ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]',
+          (isInstalledApp || isUniversalChat) ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]',
          'shrink-0 flex flex-col bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px]  border-r border-gray-200 mobile:h-screen',
        )
      }
@@ -109,6 +118,7 @@ const Sidebar: FC<ISidebarProps> = ({
              isClearConversationList={isClearPinnedConversationList}
              isInstalledApp={isInstalledApp}
              installedAppId={installedAppId}
+              isUniversalChat={isUniversalChat}
              onMoreLoaded={onPinnedMoreLoaded}
              isNoMore={isPinnedNoMore}
              isPinned={true}
@@ -119,18 +129,19 @@ const Sidebar: FC<ISidebarProps> = ({
          </div>
        )}
        {/* unpinned list */}
-        <div className={cn('mt-4 px-4', !hasPinned && 'flex flex-col flex-grow')}>
+        <div className={cn('grow flex flex-col mt-4 px-4', !hasPinned && 'flex flex-col flex-grow')}>
          {(hasPinned && list.length > 0) && (
            <div className='mb-1.5 leading-[18px] text-xs text-gray-500 font-medium uppercase'>{t('share.chat.unpinnedTitle')}</div>
          )}
          <List
-            className={cn(hasPinned ? maxListHeight : 'flex-grow')}
+            className={cn('flex-grow h-0')}
            currentId={currentId}
            onCurrentIdChange={onCurrentIdChange}
            list={list}
            isClearConversationList={isClearConversationList}
            isInstalledApp={isInstalledApp}
            installedAppId={installedAppId}
+            isUniversalChat={isUniversalChat}
            onMoreLoaded={onMoreLoaded}
            isNoMore={isNoMore}
            isPinned={false}
@@ -141,9 +152,11 @@ const Sidebar: FC<ISidebarProps> = ({
        </div>

      </div>
-      <div className="flex flex-shrink-0 pr-4 pb-4 pl-4">
-        <div className="text-gray-400 font-normal text-xs">© {copyRight} {(new Date()).getFullYear()}</div>
-      </div>
+      {!isUniversalChat && (
+        <div className="flex flex-shrink-0 pr-4 pb-4 pl-4">
+          <div className="text-gray-400 font-normal text-xs">© {copyRight} {(new Date()).getFullYear()}</div>
+        </div>
+      )}
    </div>
  )
 }
--- a/web/app/components/share/chat/sidebar/list/index.tsx
+++ b/web/app/components/share/chat/sidebar/list/index.tsx
@@ -10,6 +10,7 @@ import cn from 'classnames'
 import s from './style.module.css'
 import type { ConversationItem } from '@/models/share'
 import { fetchConversations } from '@/service/share'
+import { fetchConversations as fetchUniversalConversations } from '@/service/universal-chat'
 import ItemOperation from '@/app/components/explore/item-operation'

 export type IListProps = {
@@ -19,6 +20,7 @@ export type IListProps = {
  list: ConversationItem[]
  isClearConversationList: boolean
  isInstalledApp: boolean
+  isUniversalChat?: boolean
  installedAppId?: string
  onMoreLoaded: (res: { data: ConversationItem[]; has_more: boolean }) => void
  isNoMore: boolean
@@ -35,6 +37,7 @@ const List: FC<IListProps> = ({
  list,
  isClearConversationList,
  isInstalledApp,
+  isUniversalChat,
  installedAppId,
  onMoreLoaded,
  isNoMore,
@@ -51,8 +54,12 @@ const List: FC<IListProps> = ({
        let lastId = !isClearConversationList ? list[list.length - 1]?.id : undefined
        if (lastId === '-1')
          lastId = undefined
-
-        const { data: conversations, has_more }: any = await fetchConversations(isInstalledApp, installedAppId, lastId, isPinned)
+        let res: any
+        if (isUniversalChat)
+          res = await fetchUniversalConversations(lastId, isPinned)
+        else
+          res = await fetchConversations(isInstalledApp, installedAppId, lastId, isPinned)
+        const { data: conversations, has_more }: any = res
        onMoreLoaded({ data: conversations, has_more })
      }
      return { list: [] }
@@ -68,7 +75,7 @@ const List: FC<IListProps> = ({
  return (
    <nav
      ref={listRef}
-      className={cn(className, 'shrink-0 space-y-1 bg-white pb-[85px] overflow-y-auto')}
+      className={cn(className, 'shrink-0 space-y-1 bg-white overflow-y-auto overflow-x-hidden')}
    >
      {list.map((item) => {
        const isCurrent = item.id === currentId
--- a/web/app/components/share/chat/welcome/index.tsx
+++ b/web/app/components/share/chat/welcome/index.tsx
@@ -25,7 +25,7 @@ export type IWelcomeProps = {
  canEidtInpus: boolean
  savedInputs: Record<string, any>
  onInputsChange: (inputs: Record<string, any>) => void
-  plan: string
+  plan?: string
 }

 const Welcome: FC<IWelcomeProps> = ({
--- a/web/app/components/share/chatbot/sidebar/list/index.tsx
+++ b/web/app/components/share/chatbot/sidebar/list/index.tsx
@@ -65,7 +65,7 @@ const List: FC<IListProps> = ({
  return (
    <nav
      ref={listRef}
-      className={cn(className, 'shrink-0 space-y-1 bg-white pb-[85px] overflow-y-auto')}
+      className={cn(className, 'shrink-0 space-y-1 bg-white overflow-y-auto')}
    >
      {list.map((item) => {
        const isCurrent = item.id === currentId