@lobehub/chat 1.77.17 → 1.78.0

package/locales/pt-BR/tool.json

@@ -19,8 +19,28 @@
       "placeholder": "Palavras-chave",
       "tooltip": "Isso irá recuperar os resultados da pesquisa novamente e criar uma nova mensagem de resumo"
     },
-    "searchEngine": "Motor de busca:",
+    "searchCategory": {
+      "placeholder": "Pesquisar categoria",
+      "title": "Categoria de pesquisa:",
+      "value": {
+        "files": "Arquivos",
+        "general": "Geral",
+        "images": "Imagens",
+        "it": "Tecnologia da Informação",
+        "map": "Mapa",
+        "music": "Música",
+        "news": "Notícias",
+        "science": "Ciência",
+        "social_media": "Mídias sociais",
+        "videos": "Vídeos"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "Motor de busca",
+      "title": "Motor de busca:"
+    },
     "searchResult": "Número de pesquisas:",
+    "searchTimeRange": "Intervalo de tempo:",
     "summary": "Resumo",
     "summaryTooltip": "Resumir o conteúdo atual",
     "viewMoreResults": "Ver mais {{results}} resultados"

package/locales/ru-RU/tool.json

@@ -19,8 +19,28 @@
       "placeholder": "Ключевые слова",
       "tooltip": "Будет повторно получен результат поиска и создано новое резюме сообщения"
     },
-    "searchEngine": "Поисковая система:",
+    "searchCategory": {
+      "placeholder": "Поиск категории",
+      "title": "Категория поиска:",
+      "value": {
+        "files": "Файлы",
+        "general": "Общее",
+        "images": "Изображения",
+        "it": "Информационные технологии",
+        "map": "Карта",
+        "music": "Музыка",
+        "news": "Новости",
+        "science": "Наука",
+        "social_media": "Социальные медиа",
+        "videos": "Видео"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "Поисковая система",
+      "title": "Поисковая система:"
+    },
     "searchResult": "Количество результатов:",
+    "searchTimeRange": "Временной диапазон:",
     "summary": "Резюме",
     "summaryTooltip": "Суммировать текущее содержимое",
     "viewMoreResults": "Посмотреть еще {{results}} результатов"

package/locales/tr-TR/tool.json

@@ -19,8 +19,28 @@
       "placeholder": "Anahtar kelime",
       "tooltip": "Arama sonuçları yeniden alınacak ve yeni bir özet mesajı oluşturulacaktır"
     },
-    "searchEngine": "Arama motoru:",
+    "searchCategory": {
+      "placeholder": "Kategori Ara",
+      "title": "Kategori Ara:",
+      "value": {
+        "files": "Dosyalar",
+        "general": "Genel",
+        "images": "Görüntüler",
+        "it": "Bilgi Teknolojisi",
+        "map": "Harita",
+        "music": "Müzik",
+        "news": "Haberler",
+        "science": "Bilim",
+        "social_media": "Sosyal Medya",
+        "videos": "Videolar"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "Arama Motoru",
+      "title": "Arama Motoru:"
+    },
     "searchResult": "Arama sayısı:",
+    "searchTimeRange": "Zaman aralığı:",
     "summary": "Özet",
     "summaryTooltip": "Mevcut içeriği özetle",
     "viewMoreResults": "Daha fazla {{results}} sonuç görüntüle"

package/locales/vi-VN/tool.json

@@ -19,8 +19,28 @@
       "placeholder": "Từ khóa",
       "tooltip": "Sẽ lấy lại kết quả tìm kiếm và tạo một tin nhắn tóm tắt mới"
     },
-    "searchEngine": "Công cụ tìm kiếm:",
+    "searchCategory": {
+      "placeholder": "Tìm kiếm danh mục",
+      "title": "Danh mục tìm kiếm:",
+      "value": {
+        "files": "Tài liệu",
+        "general": "Chung",
+        "images": "Hình ảnh",
+        "it": "Công nghệ thông tin",
+        "map": "Bản đồ",
+        "music": "Âm nhạc",
+        "news": "Tin tức",
+        "science": "Khoa học",
+        "social_media": "Mạng xã hội",
+        "videos": "Video"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "Công cụ tìm kiếm",
+      "title": "Công cụ tìm kiếm:"
+    },
     "searchResult": "Số lượng tìm kiếm:",
+    "searchTimeRange": "Khoảng thời gian:",
     "summary": "Tóm tắt",
     "summaryTooltip": "Tóm tắt nội dung hiện tại",
     "viewMoreResults": "Xem thêm {{results}} kết quả"

package/locales/zh-CN/tool.json

@@ -19,8 +19,37 @@
       "placeholder": "关键词",
       "tooltip": "将会重新获取搜索结果，并创建一条新的总结消息"
     },
-    "searchEngine": "搜索引擎：",
+    "searchCategory": {
+      "placeholder": "搜索类别",
+      "title": "搜索类别：",
+      "value": {
+        "files": "文件",
+        "general": "通用",
+        "images": "图片",
+        "it": "信息技术",
+        "map": "地图",
+        "music": "音乐",
+        "news": "新闻",
+        "science": "科学",
+        "social_media": "社交媒体",
+        "videos": "视频"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "搜索引擎",
+      "title": "搜索引擎："
+    },
     "searchResult": "搜索数量：",
+    "searchTimeRange": {
+      "title": "时间范围：",
+      "value": {
+        "anytime": "时间不限",
+        "day": "一天内",
+        "month": "一月内",
+        "week": "一周内",
+        "year": "一年内"
+      }
+    },
     "summary": "总结",
     "summaryTooltip": "总结当前内容",
     "viewMoreResults": "查看更多 {{results}} 个结果"

package/locales/zh-TW/tool.json

@@ -19,8 +19,28 @@
       "placeholder": "關鍵字",
       "tooltip": "將會重新獲取搜尋結果，並建立一條新的總結消息"
     },
-    "searchEngine": "搜尋引擎：",
+    "searchCategory": {
+      "placeholder": "搜尋類別",
+      "title": "搜尋類別：",
+      "value": {
+        "files": "文件",
+        "general": "通用",
+        "images": "圖片",
+        "it": "資訊科技",
+        "map": "地圖",
+        "music": "音樂",
+        "news": "新聞",
+        "science": "科學",
+        "social_media": "社交媒體",
+        "videos": "影片"
+      }
+    },
+    "searchEngine": {
+      "placeholder": "搜尋引擎",
+      "title": "搜尋引擎："
+    },
     "searchResult": "搜尋數量：",
+    "searchTimeRange": "時間範圍：",
     "summary": "總結",
     "summaryTooltip": "總結當前內容",
     "viewMoreResults": "查看更多 {{results}} 個結果"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.77.17",
+  "version": "1.78.0",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/libs/next-auth/sso-providers/index.ts

@@ -6,6 +6,7 @@ import Casdoor from './casdoor';
 import CloudflareZeroTrust from './cloudflare-zero-trust';
 import GenericOIDC from './generic-oidc';
 import Github from './github';
+import Keycloak from './keycloak';
 import Logto from './logto';
 import MicrosoftEntraID from './microsoft-entra-id';
 import WeChat from './wechat';
@@ -24,4 +25,5 @@ export const ssoProviders = [
   Casdoor,
   MicrosoftEntraID,
   WeChat,
+  Keycloak,
 ];

package/src/libs/next-auth/sso-providers/keycloak.ts

@@ -0,0 +1,25 @@
+import Keycloak from 'next-auth/providers/keycloak';
+
+import { CommonProviderConfig } from './sso.config';
+
+const provider = {
+  id: 'keycloak',
+  provider: Keycloak({
+    ...CommonProviderConfig,
+    // Specify auth scope, at least include 'openid email'
+    authorization: { params: { scope: 'openid email profile' } },
+    clientId: process.env.AUTH_KEYCLOAK_ID,
+    clientSecret: process.env.AUTH_KEYCLOAK_SECRET,
+    issuer: process.env.AUTH_KEYCLOAK_ISSUER,
+    profile(profile) {
+      return {
+        email: profile.email,
+        id: profile.sub,
+        name: profile.name,
+        providerAccountId: profile.sub,
+      };
+    },
+  }),
+};
+
+export default provider;

package/src/locales/default/tool.ts

@@ -19,8 +19,37 @@ export default {
       placeholder: '关键词',
       tooltip: '将会重新获取搜索结果，并创建一条新的总结消息',
     },
-    searchEngine: '搜索引擎：',
+    searchCategory: {
+      placeholder: '搜索类别',
+      title: '搜索类别：',
+      value: {
+        'files': '文件',
+        'general': '通用',
+        'images': '图片',
+        'it': '信息技术',
+        'map': '地图',
+        'music': '音乐',
+        'news': '新闻',
+        'science': '科学',
+        'social_media': '社交媒体',
+        'videos': '视频',
+      },
+    },
+    searchEngine: {
+      placeholder: '搜索引擎',
+      title: '搜索引擎：',
+    },
     searchResult: '搜索数量：',
+    searchTimeRange: {
+      title: '时间范围：',
+      value: {
+        anytime: '时间不限',
+        day: '一天内',
+        month: '一月内',
+        week: '一周内',
+        year: '一年内',
+      },
+    },
     summary: '总结',
     summaryTooltip: '总结当前内容',
     viewMoreResults: '查看更多 {{results}} 个结果',

package/src/server/modules/SearXNG.ts

@@ -10,10 +10,18 @@ export class SearXNGClient {
     this.baseUrl = baseUrl;
   }
 
-  async search(query: string, engines?: string[]): Promise<SearchResponse> {
+  async search(query: string, optionalParams: Record<string, any> = {}): Promise<SearchResponse> {
     try {
+      const { time_range, ...otherParams } = optionalParams;
+
+      const processedParams = Object.entries(otherParams).reduce<Record<string, any>>((acc, [key, value]) => {
+        acc[key] = Array.isArray(value) ? value.join(',') : value;
+        return acc;
+      }, {});
+
       const searchParams = qs.stringify({
-        engines: engines?.join(','),
+        ...processedParams,
+        ...(time_range !== 'anytime' && { time_range }),
         format: 'json',
         q: query,
       });

package/src/server/routers/tools/__test__/search.test.ts

@@ -98,8 +98,10 @@ describe('searchRouter', () => {
       const caller = searchRouter.createCaller(mockContext as any);
 
       const result = await caller.query({
+        optionalParams: {
+          searchEngines: ['google'],
+        },
         query: 'test query',
-        searchEngine: ['google'],
       });
 
       expect(result).toEqual(mockSearchResult);

package/src/server/routers/tools/search.ts

@@ -43,8 +43,12 @@ export const searchRouter = router({
   query: searchProcedure
     .input(
       z.object({
+        optionalParams: z.object({
+          searchCategories: z.array(z.string()).optional(),
+          searchEngines: z.array(z.string()).optional(),
+          searchTimeRange: z.string().optional(),
+        }).optional(),
         query: z.string(),
-        searchEngine: z.array(z.string()).optional(),
       }),
     )
     .query(async ({ input }) => {
@@ -55,7 +59,11 @@ export const searchRouter = router({
       const client = new SearXNGClient(toolsEnv.SEARXNG_URL);
 
       try {
-        return await client.search(input.query, input.searchEngine);
+        return await client.search(input.query, {
+          categories: input.optionalParams?.searchCategories,
+          engines: input.optionalParams?.searchEngines,
+          time_range: input.optionalParams?.searchTimeRange,
+        });
       } catch (e) {
         console.error(e);
 

package/src/services/search.ts

@@ -1,8 +1,8 @@
 import { toolsClient } from '@/libs/trpc/client';
 
 class SearchService {
-  search(query: string, searchEngine?: string[]) {
-    return toolsClient.search.query.query({ query, searchEngine });
+  search(query: string, optionalParams?: object) {
+    return toolsClient.search.query.query({ optionalParams, query});
   }
 
   crawlPage(url: string) {

package/src/store/chat/slices/builtinTool/actions/searXNG.test.ts

@@ -72,8 +72,10 @@ describe('searXNG actions', () => {
 
       const messageId = 'test-message-id';
       const query: SearchQuery = {
+        optionalParams: {
+          searchEngines: ['google'],
+        },
         query: 'test query',
-        searchEngines: ['google'],
       };
 
       await act(async () => {
@@ -82,13 +84,15 @@ describe('searXNG actions', () => {
 
       const expectedContent: SearchContent[] = [
         {
-          content: 'Test Content',
           title: 'Test Result',
           url: 'https://test.com',
+          content: 'Test Content',
         },
       ];
 
-      expect(searchService.search).toHaveBeenCalledWith('test query', ['google']);
+      expect( searchService.search ).toHaveBeenCalledWith('test query', {
+        searchEngines: [ 'google' ]
+      });
       expect(result.current.searchLoading[messageId]).toBe(false);
       expect(result.current.internal_updateMessageContent).toHaveBeenCalledWith(
         messageId,
@@ -133,6 +137,7 @@ describe('searXNG actions', () => {
       };
 
       (searchService.search as Mock)
+        .mockResolvedValueOnce(emptyResponse)
         .mockResolvedValueOnce(emptyResponse)
         .mockResolvedValueOnce(retryResponse);
 
@@ -141,20 +146,35 @@ describe('searXNG actions', () => {
 
       const messageId = 'test-message-id';
       const query: SearchQuery = {
+        optionalParams: {
+          searchEngines: ['custom-engine'],
+          searchTimeRange: 'year',
+        },
         query: 'test query',
-        searchEngines: ['custom-engine'],
       };
 
       await act(async () => {
         await searchWithSearXNG(messageId, query);
       });
 
-      expect(searchService.search).toHaveBeenCalledTimes(2);
-      expect(searchService.search).toHaveBeenNthCalledWith(1, 'test query', ['custom-engine']);
-      expect(searchService.search).toHaveBeenNthCalledWith(2, 'test query');
+      expect(searchService.search).toHaveBeenCalledTimes(3);
+      expect(searchService.search).toHaveBeenNthCalledWith(1, "test query", {
+          "searchEngines": [ "custom-engine" ],
+          "searchTimeRange": "year",
+      });
+      expect(searchService.search).toHaveBeenNthCalledWith(2, "test query", {
+          "searchTimeRange": "year",
+      });
+      expect(result.current.updatePluginArguments).toHaveBeenCalledWith(messageId, {
+        optionalParams: {
+          "searchTimeRange": "year",
+        },
+        query: 'test query',
+      });
+      expect(searchService.search).toHaveBeenNthCalledWith(3, "test query");
       expect(result.current.updatePluginArguments).toHaveBeenCalledWith(messageId, {
+        optionalParams: undefined,
         query: 'test query',
-        searchEngines: undefined,
       });
     });
 

package/src/store/chat/slices/builtinTool/actions/searXNG.ts

@@ -142,12 +142,26 @@ export const searchSlice: StateCreator<
     get().toggleSearchLoading(id, true);
     let data: SearchResponse | undefined;
     try {
-      data = await searchService.search(params.query, params.searchEngines);
+      // 首次查询
+      data = await searchService.search(params.query, params.optionalParams);
+
+      // 如果没有搜索到结果，则执行第一次重试（移除搜索引擎限制）
+      if (data?.results.length === 0 && params.optionalParams?.searchEngines && params.optionalParams?.searchEngines?.length > 0) {
+        const paramsExcludeSearchEngines = {
+          ...params,
+          optionalParams: {
+            ...params.optionalParams,
+            searchEngines: undefined
+          }
+        };
+        data = await searchService.search(params.query, paramsExcludeSearchEngines.optionalParams);
+        get().updatePluginArguments(id, paramsExcludeSearchEngines);
+      }
 
-      // 如果没有搜索到结果，那么尝试使用默认的搜索引擎再搜一次
-      if (data?.results.length === 0 && params.searchEngines && params.searchEngines?.length > 0) {
+      // 如果仍然没有搜索到结果，则执行第二次重试（移除所有限制）
+      if (data?.results.length === 0) {
         data = await searchService.search(params.query);
-        get().updatePluginArguments(id, { ...params, searchEngines: undefined });
+        get().updatePluginArguments(id, { ...params, optionalParams: undefined });
       }
 
       await get().updatePluginState(id, data);
@@ -175,9 +189,12 @@ export const searchSlice: StateCreator<
 
     // 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,
+      ...(item.content && { content: item.content }),
+      ...(item.publishedDate && { publishedDate: item.publishedDate }),
+      ...(item.img_src && { img_src: item.img_src }),
+      ...(item.thumbnail && { thumbnail: item.thumbnail }),
     }));
 
     await get().internal_updateMessageContent(id, JSON.stringify(searchContent));

package/src/tools/web-browsing/Portal/Search/index.tsx

@@ -19,7 +19,7 @@ interface InspectorUIProps {
 
 const Inspector = memo<InspectorUIProps>(({ query: args, messageId, response }) => {
   const engines = uniq((response.results || []).map((result) => result.engine));
-  const defaultEngines = engines.length > 0 ? engines : args.searchEngines || [];
+  const defaultEngines = engines.length > 0 ? engines : args.optionalParams?.searchEngines || [];
   const loading = useChatStore(chatToolSelectors.isSearXNGSearching(messageId));
 
   if (loading) {

package/src/tools/web-browsing/Render/Search/SearchQuery/SearchView.tsx

@@ -66,7 +66,7 @@ const SearchBar = memo<SearchBarProps>(
         </Flexbox>
 
         <Flexbox align={'center'} horizontal>
-          <div className={styles.font}>{t('search.searchEngine')}</div>
+          <div className={styles.font}>{t('search.searchEngine.title')}</div>
           {searching ? (
             <Skeleton.Button active size={'small'} />
           ) : (

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

@@ -29,7 +29,7 @@ const SearchQueryView = memo<SearchQueryViewProps>(
     const { t } = useTranslation('common');
 
     const engines = uniq(searchResults.map((result) => result.engine));
-    const defaultEngines = engines.length > 0 ? engines : args.searchEngines || [];
+    const defaultEngines = engines.length > 0 ? engines : args.optionalParams?.searchEngines || [];
 
     return !pluginState ? (
       <Flexbox align={'center'} distribution={'space-between'} height={32} horizontal>

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

@@ -32,7 +32,7 @@ const SearchResult = memo<SearchResultProps>(
     const { t } = useTranslation(['tool', 'common']);
 
     const engines = uniq(searchResults.map((result) => result.engine));
-    const defaultEngines = engines.length > 0 ? engines : args.searchEngines || [];
+    const defaultEngines = engines.length > 0 ? engines : args.optionalParams?.searchEngines || [];
     const isMobile = useIsMobile();
 
     if (loading || !pluginState)

package/src/tools/web-browsing/components/CategoryAvatar.tsx

@@ -0,0 +1,27 @@
+import { Avatar } from 'antd';
+import { useTheme } from 'antd-style';
+import { memo } from 'react';
+
+import { CATEGORY_ICON_MAP } from '../const';
+
+interface CategoryAvatarProps {
+  category: string;
+}
+
+export const CategoryAvatar = memo<CategoryAvatarProps>(({ category }) => {
+  const theme = useTheme();
+  const IconComponent = CATEGORY_ICON_MAP[category];
+
+  return (
+    <Avatar
+      alt={category}
+      icon={<IconComponent />}
+      style={{
+        backgroundColor: 'transparent',
+        color: theme.colorTextSecondary,
+        height: 16,
+        width: 16
+      }}
+    />
+  );
+});