@lobehub/chat 1.64.1 → 1.64.3

package/src/store/chat/slices/builtinTool/{action.ts → actions/searXNG.ts}

@@ -1,35 +1,18 @@
-import { produce } from 'immer';
-import pMap from 'p-map';
-import { SWRResponse } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
-import { useClientDataSWR } from '@/libs/swr';
-import { fileService } from '@/services/file';
 import { searchService } from '@/services/search';
-import { imageGenerationService } from '@/services/textToImage';
-import { uploadService } from '@/services/upload';
 import { chatSelectors } from '@/store/chat/selectors';
 import { ChatStore } from '@/store/chat/store';
-import { useFileStore } from '@/store/file';
 import { CreateMessageParams } from '@/types/message';
-import { DallEImageItem } from '@/types/tool/dalle';
 import {
   SEARCH_SEARXNG_NOT_CONFIG,
   SearchContent,
   SearchQuery,
   SearchResponse,
 } from '@/types/tool/search';
-import { setNamespace } from '@/utils/storeDebug';
 import { nanoid } from '@/utils/uuid';
 
-const n = setNamespace('tool');
-
-const SWR_FETCH_KEY = 'FetchImageItem';
-/**
- * builtin tool action
- */
-export interface ChatBuiltinToolAction {
-  generateImageFromPrompts: (items: DallEImageItem[], id: string) => Promise<void>;
+export interface SearchAction {
   /**
    * 重新发起搜索
    * @description 会更新插件的 arguments 参数，然后再次搜索
@@ -45,69 +28,15 @@ export interface ChatBuiltinToolAction {
     data: SearchQuery,
     aiSummary?: boolean,
   ) => Promise<void | boolean>;
-  text2image: (id: string, data: DallEImageItem[]) => Promise<void>;
-
-  toggleDallEImageLoading: (key: string, value: boolean) => void;
   toggleSearchLoading: (id: string, loading: boolean) => void;
-  updateImageItem: (id: string, updater: (data: DallEImageItem[]) => void) => Promise<void>;
-  useFetchDalleImageItem: (id: string) => SWRResponse;
 }
 
-export const chatToolSlice: StateCreator<
+export const searchSlice: StateCreator<
   ChatStore,
   [['zustand/devtools', never]],
   [],
-  ChatBuiltinToolAction
+  SearchAction
 > = (set, get) => ({
-  generateImageFromPrompts: async (items, messageId) => {
-    const { toggleDallEImageLoading, updateImageItem } = get();
-    // eslint-disable-next-line unicorn/consistent-function-scoping
-    const getMessageById = (id: string) => chatSelectors.getMessageById(id)(get());
-
-    const message = getMessageById(messageId);
-    if (!message) return;
-
-    const parent = getMessageById(message!.parentId!);
-    const originPrompt = parent?.content;
-    let errorArray: any[] = [];
-
-    await pMap(items, async (params, index) => {
-      toggleDallEImageLoading(messageId + params.prompt, true);
-
-      let url = '';
-      try {
-        url = await imageGenerationService.generateImage(params);
-      } catch (e) {
-        toggleDallEImageLoading(messageId + params.prompt, false);
-        errorArray[index] = e;
-
-        await get().updatePluginState(messageId, { error: errorArray });
-      }
-
-      if (!url) return;
-
-      await updateImageItem(messageId, (draft) => {
-        draft[index].previewUrl = url;
-      });
-
-      toggleDallEImageLoading(messageId + params.prompt, false);
-      const imageFile = await uploadService.getImageFileByUrlWithCORS(
-        url,
-        `${originPrompt || params.prompt}_${index}.png`,
-      );
-
-      const data = await useFileStore.getState().uploadWithProgress({
-        file: imageFile,
-      });
-
-      if (!data) return;
-
-      await updateImageItem(messageId, (draft) => {
-        draft[index].imageId = data.id;
-        draft[index].previewUrl = undefined;
-      });
-    });
-  },
   reSearchWithSearXNG: async (id, data, options) => {
     get().toggleSearchLoading(id, true);
     await get().updatePluginArguments(id, data);
@@ -158,6 +87,13 @@ export const chatToolSlice: StateCreator<
     let data: SearchResponse | undefined;
     try {
       data = await searchService.search(params.query, params.searchEngines);
+
+      // 如果没有搜索到结果，那么尝试使用默认的搜索引擎再搜一次
+      if (data?.results.length === 0 && params.searchEngines && params.searchEngines?.length > 0) {
+        data = await searchService.search(params.query);
+        get().updatePluginArguments(id, { ...params, searchEngines: undefined });
+      }
+
       await get().updatePluginState(id, data);
     } catch (e) {
       if ((e as Error).message === SEARCH_SEARXNG_NOT_CONFIG) {
@@ -181,8 +117,8 @@ export const chatToolSlice: StateCreator<
 
     if (!data) return;
 
-    // 只取前 5 个结果作为上下文
-    const searchContent: SearchContent[] = data.results.slice(0, 5).map((item) => ({
+    // add 15 search results to message content
+    const searchContent: SearchContent[] = data.results.slice(0, 15).map((item) => ({
       content: item.content,
       title: item.title,
       url: item.url,
@@ -196,49 +132,12 @@ export const chatToolSlice: StateCreator<
     // 如果 aiSummary 为 true，则会自动触发总结
     return aiSummary;
   },
-  text2image: async (id, data) => {
-    // const isAutoGen = settingsSelectors.isDalleAutoGenerating(useGlobalStore.getState());
-    // if (!isAutoGen) return;
-
-    await get().generateImageFromPrompts(data, id);
-  },
 
-  toggleDallEImageLoading: (key, value) => {
+  toggleSearchLoading: (id, loading) => {
     set(
-      { dalleImageLoading: { ...get().dalleImageLoading, [key]: value } },
+      { searchLoading: { ...get().searchLoading, [id]: loading } },
       false,
-      n('toggleDallEImageLoading'),
+      `toggleSearchLoading/${loading ? 'start' : 'end'}`,
     );
   },
-
-  toggleSearchLoading: (id, loading) => {
-    set({ searchLoading: { ...get().searchLoading, [id]: loading } }, false, 'toggleSearchLoading');
-  },
-
-  updateImageItem: async (id, updater) => {
-    const message = chatSelectors.getMessageById(id)(get());
-    if (!message) return;
-
-    const data: DallEImageItem[] = JSON.parse(message.content);
-
-    const nextContent = produce(data, updater);
-    await get().internal_updateMessageContent(id, JSON.stringify(nextContent));
-  },
-
-  useFetchDalleImageItem: (id) =>
-    useClientDataSWR([SWR_FETCH_KEY, id], async () => {
-      const item = await fileService.getFile(id);
-
-      set(
-        produce((draft) => {
-          if (draft.dalleImageMap[id]) return;
-
-          draft.dalleImageMap[id] = item;
-        }),
-        false,
-        n('useFetchFile'),
-      );
-
-      return item;
-    }),
 });

package/src/store/chat/slices/message/action.ts

@@ -380,7 +380,7 @@ export const chatMessage: StateCreator<
         messageLoadingIds: toggleBooleanList(get().messageLoadingIds, id, loading),
       },
       false,
-      'internal_toggleMessageLoading',
+      `internal_toggleMessageLoading/${loading ? 'start' : 'end'}`,
     );
   },
   internal_toggleLoadingArrays: (key, loading, id, action) => {

package/src/store/chat/store.ts

@@ -6,7 +6,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { createDevtools } from '../middleware/createDevtools';
 import { ChatStoreState, initialState } from './initialState';
-import { ChatBuiltinToolAction, chatToolSlice } from './slices/builtinTool/action';
+import { ChatBuiltinToolAction, chatToolSlice } from './slices/builtinTool/actions';
 import { ChatPortalAction, chatPortalSlice } from './slices/portal/action';
 import { ChatTranslateAction, chatTranslate } from './slices/translate/action';
 import { ChatMessageAction, chatMessage } from './slices/message/action';

package/src/tools/web-browsing/Portal/ResultList/SearchItem/TitleExtra.tsx

@@ -4,19 +4,23 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
+import { EngineAvatarGroup } from '@/tools/web-browsing/components/EngineAvatar';
+
 import CategoryAvatar from './CategoryAvatar';
 
 interface TitleExtraProps {
   category: string;
+  engines: string[];
   highlight?: boolean;
   score: number;
 }
 
-const TitleExtra = memo<TitleExtraProps>(({ category, score, highlight }) => {
+const TitleExtra = memo<TitleExtraProps>(({ category, score, highlight, engines }) => {
   const { t } = useTranslation('tool');
 
   return (
     <Flexbox align={'center'} gap={4} horizontal>
+      <EngineAvatarGroup engines={engines} />
       <Tooltip title={t(highlight ? 'search.includedTooltip' : 'search.scoreTooltip')}>
         {highlight ? (
           <Tag bordered={false} color={'blue'} style={{ marginInlineEnd: 0 }}>

package/src/tools/web-browsing/Portal/ResultList/SearchItem/Video.tsx

@@ -113,7 +113,12 @@ const VideoItem = memo<SearchResultProps>(
                   </AntAvatar.Group>
                   <Flexbox className={styles.title}>{title}</Flexbox>
                 </Flexbox>
-                <TitleExtra category={category} highlight={highlight} score={score} />
+                <TitleExtra
+                  category={category}
+                  engines={engines}
+                  highlight={highlight}
+                  score={score}
+                />
               </Flexbox>
               <Typography.Text className={styles.url} type={'secondary'}>
                 {url}

package/src/tools/web-browsing/Portal/ResultList/SearchItem/index.tsx

@@ -3,9 +3,9 @@ import { createStyles } from 'antd-style';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import WebFavicon from '@/components/WebFavicon';
 import { SearchResult } from '@/types/tool/search';
 
-import { EngineAvatarGroup } from '../../../components/EngineAvatar';
 import TitleExtra from './TitleExtra';
 import Video from './Video';
 
@@ -73,10 +73,15 @@ const SearchItem = memo<SearchResultProps>((props) => {
         <Flexbox gap={8}>
           <Flexbox align={'center'} distribution={'space-between'} horizontal>
             <Flexbox align={'center'} gap={8} horizontal>
-              <EngineAvatarGroup engines={engines} />
+              <WebFavicon title={title} url={url} />
               <Flexbox className={styles.title}>{title}</Flexbox>
             </Flexbox>
-            <TitleExtra category={category} highlight={props.highlight} score={score} />
+            <TitleExtra
+              category={category}
+              engines={engines}
+              highlight={props.highlight}
+              score={score}
+            />
           </Flexbox>
           <Typography.Text className={styles.url} type={'secondary'}>
             {url}

package/src/tools/web-browsing/Render/SearchQuery/index.tsx

@@ -33,8 +33,8 @@ const SearchQueryView = memo<SearchQueryViewProps>(
 
     return !pluginState ? (
       <Flexbox align={'center'} distribution={'space-between'} height={32} horizontal>
-        <Skeleton.Button active style={{ borderRadius: 8, height: 32, width: 180 }} />
-        <Skeleton.Button active style={{ borderRadius: 8, height: 32, width: 220 }} />
+        <Skeleton.Button active style={{ borderRadius: 4, height: 32, width: 180 }} />
+        <Skeleton.Button active style={{ borderRadius: 4, height: 32, width: 220 }} />
       </Flexbox>
     ) : editing ? (
       <SearchBar

package/src/tools/web-browsing/Render/SearchResult/SearchResultItem.tsx

@@ -1,10 +1,10 @@
 import { Typography } from 'antd';
 import { createStyles } from 'antd-style';
-import Image from 'next/image';
 import Link from 'next/link';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import WebFavicon from '@/components/WebFavicon';
 import { SearchResult } from '@/types/tool/search';
 
 const useStyles = createStyles(({ css, token }) => ({
@@ -52,14 +52,7 @@ const SearchResultItem = memo<SearchResult>(({ url, title }) => {
       <Flexbox className={styles.container} gap={2} justify={'space-between'} key={url}>
         <div className={styles.title}>{title}</div>
         <Flexbox align={'center'} gap={4} horizontal>
-          <Image
-            alt={title || url}
-            height={14}
-            src={`https://icons.duckduckgo.com/ip3/${host}.ico`}
-            style={{ borderRadius: 4 }}
-            unoptimized
-            width={14}
-          />
+          <WebFavicon size={14} title={title} url={url} />
           <Typography.Text className={styles.url} type={'secondary'}>
             {host.replace('www.', '')}
           </Typography.Text>

package/src/tools/web-browsing/Render/index.tsx

@@ -34,7 +34,7 @@ const WebBrowsing = memo<BuiltinRenderProps<SearchContent[], SearchQuery, Search
     }
 
     return (
-      <Flexbox gap={16}>
+      <Flexbox gap={8}>
         <SearchQueryView
           args={args}
           editing={editing}

package/src/tools/web-browsing/const.ts

@@ -1,11 +1,12 @@
 export const ENGINE_ICON_MAP: Record<string, string> = {
-  arxiv: 'https://arxiv.org/static/browse/0.3.4/images/icons/favicon-32x32.png',
-  bilibili: 'https://www.bilibili.com/favicon.ico',
-  bing: 'https://www.bing.com/favicon.ico',
-  brave: 'https://brave.com/static-assets/images/brave-favicon.png',
-  duckduckgo: 'https://www.duckduckgo.com/favicon.ico',
-  google: 'https://www.google.com/favicon.ico',
-  npm: 'https://static-production.npmjs.com/da3ab40fb0861d15c83854c29f5f2962.png',
-  qwant: 'https://www.qwant.com/favicon.ico',
-  youtube: 'https://www.youtube.com/favicon.ico',
+  'arxiv': 'https://icons.duckduckgo.com/ip3/arxiv.org.ico',
+  'bilibili': 'https://icons.duckduckgo.com/ip3/bilibili.com.ico',
+  'bing': 'https://icons.duckduckgo.com/ip3/www.bing.com.ico',
+  'brave': 'https://icons.duckduckgo.com/ip3/brave.com.ico',
+  'duckduckgo': 'https://icons.duckduckgo.com/ip3/www.duckduckgo.com.ico',
+  'google': 'https://icons.duckduckgo.com/ip3/google.com.ico',
+  'google scholar': 'https://icons.duckduckgo.com/ip3/scholar.google.com.ico',
+  'npm': 'https://icons.duckduckgo.com/ip3/npmjs.com.ico',
+  'qwant': 'https://icons.duckduckgo.com/ip3/www.qwant.com.ico',
+  'youtube': 'https://icons.duckduckgo.com/ip3/youtube.com.ico',
 };