@librechat/agents 2.4.83 → 2.4.85

package/src/tools/search/tool.ts

@@ -12,6 +12,7 @@ import {
   newsSchema,
 } from './schema';
 import { createSearchAPI, createSourceProcessor } from './search';
+import { createSerperScraper } from './serper-scraper';
 import { createFirecrawlScraper } from './firecrawl';
 import { expandHighlights } from './highlights';
 import { formatResultsForLLM } from './format';
@@ -328,6 +329,27 @@ Use anchor marker(s) immediately after the statement:
  * Creates a search tool with a schema that dynamically includes the country field
  * only when the searchProvider is 'serper'.
  *
+ * Supports multiple scraper providers:
+ * - Firecrawl (default): Full-featured web scraping with multiple formats
+ * - Serper: Lightweight scraping using Serper's scrape API
+ *
+ * @example
+ * ```typescript
+ * // Using Firecrawl scraper (default)
+ * const searchTool = createSearchTool({
+ *   searchProvider: 'serper',
+ *   scraperProvider: 'firecrawl',
+ *   firecrawlApiKey: 'your-firecrawl-key'
+ * });
+ *
+ * // Using Serper scraper
+ * const searchTool = createSearchTool({
+ *   searchProvider: 'serper',
+ *   scraperProvider: 'serper',
+ *   serperApiKey: 'your-serper-key'
+ * });
+ * ```
+ *
  * @param config - The search tool configuration
  * @returns A DynamicStructuredTool with a schema that depends on the searchProvider
  */
@@ -344,9 +366,12 @@ export const createSearchTool = (
     strategies = ['no_extraction'],
     filterContent = true,
     safeSearch = 1,
+    scraperProvider = 'firecrawl',
     firecrawlApiKey,
     firecrawlApiUrl,
+    firecrawlVersion,
     firecrawlOptions,
+    serperScraperOptions,
     scraperTimeout,
     jinaApiKey,
     jinaApiUrl,
@@ -385,13 +410,27 @@ export const createSearchTool = (
     searxngApiKey,
   });
 
-  const firecrawlScraper = createFirecrawlScraper({
-    ...firecrawlOptions,
-    apiKey: firecrawlApiKey ?? process.env.FIRECRAWL_API_KEY,
-    apiUrl: firecrawlApiUrl,
-    timeout: scraperTimeout ?? firecrawlOptions?.timeout,
-    formats: firecrawlOptions?.formats ?? ['markdown', 'rawHtml'],
-  });
+  /** Create scraper based on scraperProvider */
+  let scraperInstance: t.BaseScraper;
+
+  if (scraperProvider === 'serper') {
+    scraperInstance = createSerperScraper({
+      ...serperScraperOptions,
+      apiKey: serperApiKey,
+      timeout: scraperTimeout ?? serperScraperOptions?.timeout,
+      logger,
+    });
+  } else {
+    scraperInstance = createFirecrawlScraper({
+      ...firecrawlOptions,
+      apiKey: firecrawlApiKey ?? process.env.FIRECRAWL_API_KEY,
+      apiUrl: firecrawlApiUrl,
+      version: firecrawlVersion,
+      timeout: scraperTimeout ?? firecrawlOptions?.timeout,
+      formats: firecrawlOptions?.formats ?? ['markdown', 'rawHtml'],
+      logger,
+    });
+  }
 
   const selectedReranker = createReranker({
     rerankerType,
@@ -413,7 +452,7 @@ export const createSearchTool = (
       filterContent,
       logger,
     },
-    firecrawlScraper
+    scraperInstance
   );
 
   const search = createSearchProcessor({

package/src/tools/search/types.ts

@@ -5,6 +5,7 @@ import type { BaseReranker } from './rerankers';
 import { DATE_RANGE } from './schema';
 
 export type SearchProvider = 'serper' | 'searxng';
+export type ScraperProvider = 'firecrawl' | 'serper';
 export type RerankerType = 'infinity' | 'jina' | 'cohere' | 'none';
 
 export interface Highlight {
@@ -94,9 +95,18 @@ export interface ProcessSourcesConfig {
 export interface FirecrawlConfig {
   firecrawlApiKey?: string;
   firecrawlApiUrl?: string;
+  firecrawlVersion?: string;
   firecrawlOptions?: FirecrawlScraperConfig;
 }
 
+export interface SerperScraperConfig {
+  apiKey?: string;
+  apiUrl?: string;
+  timeout?: number;
+  logger?: Logger;
+  includeMarkdown?: boolean;
+}
+
 export interface ScraperContentResult {
   content: string;
 }
@@ -151,7 +161,9 @@ export interface SearchToolConfig
   jinaApiUrl?: string;
   cohereApiKey?: string;
   rerankerType?: RerankerType;
+  scraperProvider?: ScraperProvider;
   scraperTimeout?: number;
+  serperScraperOptions?: SerperScraperConfig;
   onSearchResults?: (
     results: SearchResult,
     runnableConfig?: RunnableConfig
@@ -170,9 +182,30 @@ export type UsedReferences = {
   reference: MediaReference;
 }[];
 
+/** Base Scraper Interface */
+export interface BaseScraper {
+  scrapeUrl(
+    url: string,
+    options?: unknown
+  ): Promise<[string, FirecrawlScrapeResponse | SerperScrapeResponse]>;
+  extractContent(
+    response: FirecrawlScrapeResponse | SerperScrapeResponse
+  ): [string, undefined | References];
+  extractMetadata(
+    response: FirecrawlScrapeResponse | SerperScrapeResponse
+  ):
+    | ScrapeMetadata
+    | Record<string, string | number | boolean | null | undefined>;
+}
+
 /** Firecrawl */
 export type FirecrawlScrapeOptions = Omit<
   FirecrawlScraperConfig,
+  'apiKey' | 'apiUrl' | 'version' | 'logger'
+>;
+
+export type SerperScrapeOptions = Omit<
+  SerperScraperConfig,
   'apiKey' | 'apiUrl' | 'logger'
 >;
 
@@ -251,9 +284,21 @@ export interface FirecrawlScrapeResponse {
   error?: string;
 }
 
+export interface SerperScrapeResponse {
+  success: boolean;
+  data?: {
+    text?: string;
+    markdown?: string;
+    metadata?: Record<string, string | number | boolean | null | undefined>;
+    credits?: number;
+  };
+  error?: string;
+}
+
 export interface FirecrawlScraperConfig {
   apiKey?: string;
   apiUrl?: string;
+  version?: string;
   formats?: string[];
   timeout?: number;
   logger?: Logger;