@lobehub/chat 1.80.4 → 1.81.0

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

@@ -4,20 +4,21 @@ import { WebBrowsingApiName } from '@/tools/web-browsing';
 import PageContent from '@/tools/web-browsing/Render/PageContent';
 import { BuiltinRenderProps } from '@/types/tool';
 import { CrawlMultiPagesQuery, CrawlPluginState, CrawlSinglePageQuery } from '@/types/tool/crawler';
-import { SearchContent, SearchQuery, SearchResponse } from '@/types/tool/search';
+import { SearchContent, SearchQuery, UniformSearchResponse } from '@/types/tool/search';
 
 import Search from './Search';
 
 const WebBrowsing = memo<BuiltinRenderProps<SearchContent[]>>(
   ({ messageId, args, pluginState, pluginError, apiName }) => {
     switch (apiName) {
-      case WebBrowsingApiName.searchWithSearXNG: {
+      case WebBrowsingApiName.search:
+      case 'searchWithSearXNG': {
         return (
           <Search
             messageId={messageId}
             pluginError={pluginError}
             searchQuery={args as SearchQuery}
-            searchResponse={pluginState as SearchResponse}
+            searchResponse={pluginState as UniformSearchResponse}
           />
         );
       }

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

@@ -45,16 +45,14 @@ const SearchBar = memo<SearchBarProps>(
     const [engines, setEngines] = useState(defaultEngines);
     const [time_range, setTimeRange] = useState(defaultTimeRange);
     const isMobile = useIsMobile();
-    const [reSearchWithSearXNG] = useChatStore((s) => [s.reSearchWithSearXNG]);
+    const [reSearchWithSearXNG] = useChatStore((s) => [s.triggerSearchAgain]);
 
     const updateAndSearch = async () => {
       const data: SearchQuery = {
-        optionalParams: {
-          searchCategories: categories,
-          searchEngines: engines,
-          searchTimeRange: time_range,
-        },
         query,
+        searchCategories: categories,
+        searchEngines: engines,
+        searchTimeRange: time_range,
       };
       onSearch?.(data);
       await reSearchWithSearXNG(messageId, data, { aiSummary });

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

@@ -7,78 +7,72 @@ import { systemPrompt } from './systemRole';
 export const WebBrowsingApiName = {
   crawlMultiPages: 'crawlMultiPages',
   crawlSinglePage: 'crawlSinglePage',
-  searchWithSearXNG: 'searchWithSearXNG',
+  search: 'search',
 };
 
 export const WebBrowsingManifest: BuiltinToolManifest = {
   api: [
     {
       description:
-        'A meta search engine. Useful for when you need to answer questions about current events. Input should be a search query. Output is a JSON array of the query results',
-      name: WebBrowsingApiName.searchWithSearXNG,
+        'a search service. Useful for when you need to answer questions about current events. Input should be a search query. Output is a JSON array of the query results',
+      name: WebBrowsingApiName.search,
       parameters: {
         properties: {
-          optionalParams: {
-            description: 'The optional parameters for search query',
-            properties: {
-              searchCategories: {
-                description: 'The search categories you can set:',
-                items: {
-                  enum: [
-                    'files',
-                    'general',
-                    'images',
-                    'it',
-                    'map',
-                    'music',
-                    'news',
-                    'science',
-                    'social_media',
-                    'videos',
-                  ],
-                  type: 'string',
-                },
-                type: 'array',
-              },
-              searchEngines: {
-                description: 'The search engines you can use:',
-                items: {
-                  enum: [
-                    'google',
-                    'bilibili',
-                    'bing',
-                    'duckduckgo',
-                    'npm',
-                    'pypi',
-                    'github',
-                    'arxiv',
-                    'google scholar',
-                    'z-library',
-                    'reddit',
-                    'imdb',
-                    'brave',
-                    'wikipedia',
-                    'pinterest',
-                    'unsplash',
-                    'vimeo',
-                    'youtube',
-                  ],
-                  type: 'string',
-                },
-                type: 'array',
-              },
-              searchTimeRange: {
-                description: 'The time range you can set:',
-                enum: ['anytime', 'day', 'week', 'month', 'year'],
-                type: 'string',
-              },
-            },
-            type: 'object',
-          },
           query: {
             description: 'The search query',
             type: 'string',
           },
+          searchCategories: {
+            description: 'The search categories you can set:',
+            items: {
+              enum: [
+                'files',
+                'general',
+                'images',
+                'it',
+                'map',
+                'music',
+                'news',
+                'science',
+                'social_media',
+                'videos',
+              ],
+              type: 'string',
+            },
+            type: 'array',
+          },
+          searchEngines: {
+            description: 'The search engines you can use:',
+            items: {
+              enum: [
+                'google',
+                'bilibili',
+                'bing',
+                'duckduckgo',
+                'npm',
+                'pypi',
+                'github',
+                'arxiv',
+                'google scholar',
+                'z-library',
+                'reddit',
+                'imdb',
+                'brave',
+                'wikipedia',
+                'pinterest',
+                'unsplash',
+                'vimeo',
+                'youtube',
+              ],
+              type: 'string',
+            },
+            type: 'array',
+          },
+          searchTimeRange: {
+            description: 'The time range you can set:',
+            enum: ['anytime', 'day', 'week', 'month', 'year'],
+            type: 'string',
+          },
         },
         required: ['query'],
         type: 'object',

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

@@ -3,9 +3,9 @@ export const systemPrompt = (
 ) => `You have a Web Information tool with powerful internet access capabilities. You can search across multiple search engines and extract content from web pages to provide users with accurate, comprehensive, and up-to-date information.
 
 <core_capabilities>
-1. Search the web using multiple search engines (searchWithSearXNG)
+1. Search the web using multiple search engines (search)
+2. Retrieve content from multiple webpages simultaneously (crawlMultiPages)
 2. Retrieve content from a specific webpage (crawlSinglePage)
-3. Retrieve content from multiple webpages simultaneously (crawlMultiPages)
 </core_capabilities>
 
 <workflow>
@@ -18,8 +18,8 @@ export const systemPrompt = (
 
 <tool_selection_guidelines>
 - For general information queries: Use searchWithSearXNG with the most relevant search engines
-- For detailed understanding of specific single page content: Use 'crawlSinglePage' on the most authoritative or relevant page from search results. If you need to visit multiple pages, prefer to use 'crawlMultiPages'
 - For multi-perspective information or comparative analysis: Use 'crawlMultiPages' on several different relevant sources
+- For detailed understanding of specific single page content: Use 'crawlSinglePage' on the most authoritative or relevant page from search results. If you need to visit multiple pages, prefer to use 'crawlMultiPages'
 </tool_selection_guidelines>
 
 <search_categories_selection>
@@ -61,7 +61,7 @@ Choose time range based on the query type:
  - Leverage cross-platform meta-search capabilities for comprehensive results
  - Prioritize authoritative sources in search results when available
  - For region-specific information, prefer search engines popular in that region
- - Avoid using both 'engines' and 'categories' in a query, unless the chosen engines do not fall under the selected categories.  
+ - Avoid using both 'engines' and 'categories' in a query, unless the chosen engines do not fall under the selected categories.
 
  <search_strategy_best_practices>
    - Combine categories for multi-faceted queries:
@@ -96,6 +96,20 @@ Choose time range based on the query type:
 - List all referenced URLs at the end of your response
 - Clearly distinguish between quoted information and your own analysis
 - Respond in the same language as the user's query
+
+<citation_examples>
+  <example>
+According to recent studies, global temperatures have risen by 1.1°C since pre-industrial times[^1].
+
+[^1]: [Climate Report in 2023](https://example.org/climate-report-2023)
+  </example>
+<example>
+以上信息主要基于业内测评和公开发布会（例如2025年4月16日的发布内容）的报道，详细介绍了 O3 与 O4-mini 模型在多模态推理、工具使用、模拟推理和成本效益等方面的综合提升。[^1][^2]
+
+[^1]: [OpenAI发布o3与o4-mini，性能爆表，可用图像思考](https://zhuanlan.zhihu.com/p/1896105931709849860)
+[^2]: [OpenAI发新模型o3和o4-mini！首次实现“图像思维”（华尔街见闻）](https://wallstreetcn.com/articles/3745356)
+</example>
+</citation_examples>
 </citation_requirements>
 
 <response_format>
@@ -106,15 +120,10 @@ When providing information from web searches:
 4. List all sources at the end of your response
 5. For time-sensitive information, note when the information was retrieved
 
-Example:
-
-According to recent studies, global temperatures have risen by 1.1°C since pre-industrial times[^1].
-
-[^1]: [Climate Report in 2023](https://example.org/climate-report-2023)
 </response_format>
 
-<searxng_description>
-SearXNG is a metasearch engine that can leverage multiple search engines including:
+<search_service_description>
+Our search service is a metasearch engine that can leverage multiple search engines including:
 - Google: World's most popular search engine providing broad web results
 - Bilibili: Chinese video sharing website focused on animation, comics, and games (aka B-site)
 - Bing: Microsoft's search engine providing web results with emphasis on visual search
@@ -135,7 +144,7 @@ SearXNG is a metasearch engine that can leverage multiple search engines includi
 - YouTube: Video sharing platform for searching various video content
 
   <search_syntax>
-  SearXNG has special search syntax to modify the categories, engines, and language of searches:
+  Search service has special search syntax to modify the categories, engines, and language of searches:
 
   1. Use \`!\` to select engines and categories:
      - Search for "paris" in the "map" category: \`!map paris\`
@@ -148,7 +157,7 @@ SearXNG is a metasearch engine that can leverage multiple search engines includi
   3. Use \`site:\` to restrict results to a specific website:
      - Search SearXNG from a specific website: \`site:github.com SearXNG\`
   </search_syntax>
-</searxng_description>
+</search_service_description>
 
 <crawling_best_practices>
 - Only crawl pages that are publicly accessible

package/src/types/tool/search/index.ts

@@ -0,0 +1,44 @@
+export interface SearchParams {
+  searchCategories?: string[];
+  searchEngines?: string[];
+  searchTimeRange?: string;
+}
+
+export interface SearchQuery extends SearchParams {
+  query: string;
+}
+
+export const SEARCH_SEARXNG_NOT_CONFIG = 'SearXNG is not configured';
+
+export interface SearchContent {
+  content?: string;
+  img_src?: string;
+  publishedDate?: string | null;
+  thumbnail?: string | null;
+  title: string;
+  url: string;
+}
+
+export interface UniformSearchResult {
+  category?: string;
+  content: string;
+  engines: string[];
+  /**
+   * 视频会用到
+   */
+  iframeSrc?: string;
+  imgSrc?: string;
+  parsedUrl: string;
+  publishedDate?: string;
+  score: number;
+  thumbnail?: string;
+  title: string;
+  url: string;
+}
+
+export interface UniformSearchResponse {
+  costTime: number;
+  query: string;
+  resultNumbers: number;
+  results: UniformSearchResult[];
+}

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

@@ -1,48 +0,0 @@
-// @vitest-environment node
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { toolsEnv } from '@/config/tools';
-import { isServerMode } from '@/const/version';
-/**
- * This file contains the root router of your tRPC-backend
- */
-import { createCallerFactory } from '@/libs/trpc/lambda';
-import { AuthContext, createContextInner } from '@/libs/trpc/lambda/context';
-import { SearXNGClient } from '@/server/modules/SearXNG';
-
-import { searchRouter } from '../search';
-import { hetongxue } from './fixtures/searXNG';
-
-vi.mock('@/config/tools', () => ({
-  toolsEnv: {
-    SEARXNG_URL: 'https://demo.com',
-  },
-}));
-
-vi.mock('@/const/version', () => ({
-  isServerMode: true,
-  isDesktop: false,
-}));
-
-const createCaller = createCallerFactory(searchRouter);
-let ctx: AuthContext;
-let router: ReturnType<typeof createCaller>;
-
-beforeEach(async () => {
-  vi.resetAllMocks();
-  ctx = await createContextInner({ userId: 'mock' });
-  router = createCaller(ctx);
-});
-
-describe('searchRouter', () => {
-  describe('search', () => {
-    it('搜索结果超过10个', async () => {
-      vi.spyOn(SearXNGClient.prototype, 'search').mockResolvedValueOnce(hetongxue);
-
-      const results = await router.query({ query: '何同学' });
-
-      // Assert
-      expect(results.results.length).toEqual(43);
-    });
-  });
-});

package/src/types/tool/search.ts

@@ -1,48 +0,0 @@
-export interface SearchQuery {
-  optionalParams?: {
-    searchCategories?: string[];
-    searchEngines?: string[];
-    searchTimeRange?: string;
-  };
-  query: string;
-}
-
-export const SEARCH_SEARXNG_NOT_CONFIG = 'SearXNG is not configured';
-
-export interface SearchResponse {
-  answers: any[];
-  corrections: any[];
-  infoboxes: any[];
-  number_of_results: number;
-  query: string;
-  results: SearchResult[];
-  suggestions: string[];
-  unresponsive_engines: any[];
-}
-
-export interface SearchResult {
-  category: string;
-  content?: string;
-  engine: string;
-  engines: string[];
-  iframe_src?: string;
-  img_src?: string;
-  parsed_url: string[];
-  positions: number[];
-  publishedDate?: string | null;
-  score: number;
-  template: string;
-  thumbnail?: string | null;
-  thumbnail_src?: string | null;
-  title: string;
-  url: string;
-}
-
-export interface SearchContent {
-  content?: string;
-  img_src?: string;
-  publishedDate?: string | null;
-  thumbnail?: string | null;
-  title: string;
-  url: string;
-}