@lobehub/lobehub 2.0.0-next.2 → 2.0.0-next.20

package/src/server/services/search/impls/firecrawl/index.ts

@@ -26,7 +26,7 @@ export class FirecrawlImpl implements SearchServiceImpl {
 
   private get baseUrl(): string {
     // Assuming the base URL is consistent with the crawl endpoint
-    return process.env.FIRECRAWL_URL || 'https://api.firecrawl.dev/v1';
+    return process.env.FIRECRAWL_URL || 'https://api.firecrawl.dev/v2';
   }
 
   async query(query: string, params: SearchParams = {}): Promise<UniformSearchResponse> {
@@ -34,13 +34,14 @@ export class FirecrawlImpl implements SearchServiceImpl {
     const endpoint = urlJoin(this.baseUrl, '/search');
 
     const defaultQueryParams: FirecrawlSearchParameters = {
-      limit: 15,
+      limit: 20,
       query,
       /*
       scrapeOptions: {
         formats: ["markdown"]
       },
       */
+      sources: [{ type: 'web' }, { type: 'news' }],
     };
 
     let body: FirecrawlSearchParameters = {
@@ -95,25 +96,64 @@ export class FirecrawlImpl implements SearchServiceImpl {
 
       log('Parsed Firecrawl response: %o', firecrawlResponse);
 
-      const mappedResults = (firecrawlResponse.data || []).map(
+      // V2 API returns data as object with web/images/news arrays
+      const webResults = firecrawlResponse.data.web || [];
+      const imageResults = firecrawlResponse.data.images || [];
+      const newsResults = firecrawlResponse.data.news || [];
+
+      // Map web results
+      const mappedWebResults = webResults.map(
+        (result): UniformSearchResult => ({
+          category: 'general',
+          content: result.description || result.markdown || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
+          title: result.title || '',
+          url: result.url,
+        }),
+      );
+
+      // Map news results
+      const mappedNewsResults = newsResults.map(
         (result): UniformSearchResult => ({
-          category: 'general', // Default category
-          content: result.description || '', // Prioritize content, fallback to snippet
-          engines: ['firecrawl'], // Use 'firecrawl' as the engine name
-          parsedUrl: result.url ? new URL(result.url).hostname : '', // Basic URL parsing
-          score: 1, // Default score to 1
+          category: 'news',
+          content: result.snippet || result.markdown || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
           title: result.title || '',
           url: result.url,
         }),
       );
 
-      log('Mapped %d results to SearchResult format', mappedResults.length);
+      // Map image results
+      const mappedImageResults = imageResults.map(
+        (result): UniformSearchResult => ({
+          category: 'images',
+          content: result.title || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
+          title: result.title || '',
+          url: result.imageUrl, // Use imageUrl for images
+        }),
+      );
+
+      // Combine all results
+      const allResults = [...mappedWebResults, ...mappedNewsResults, ...mappedImageResults];
+
+      log('Mapped %d results to SearchResult format', allResults.length);
+
+      if (firecrawlResponse.warning) {
+        log.extend('warn')('Firecrawl warning: %s', firecrawlResponse.warning);
+      }
 
       return {
         costTime,
         query: query,
-        resultNumbers: mappedResults.length,
-        results: mappedResults,
+        resultNumbers: allResults.length,
+        results: allResults,
       };
     } catch (error) {
       log.extend('error')('Error parsing Firecrawl response: %o', error);

package/src/server/services/search/impls/firecrawl/type.ts

@@ -1,35 +1,86 @@
+// V2 API Types
 interface FirecrawlScrapeOptions {
-  formats: string[];
+  blockAds?: boolean;
+  formats?: string[];
+  maxAge?: number;
+  onlyMainContent?: boolean;
+  removeBase64Images?: boolean;
 }
 
+type FirecrawlSource =
+  | { location?: string; tbs?: string; type: 'web' }
+  | { type: 'images' }
+  | { type: 'news' };
+
+type FirecrawlCategory = { type: 'github' } | { type: 'research' } | { type: 'pdf' };
+
 export interface FirecrawlSearchParameters {
+  categories?: FirecrawlCategory[];
   country?: string;
-  lang?: string;
+  ignoreInvalidURLs?: boolean;
   limit?: number;
+  location?: string;
   query: string;
   scrapeOptions?: FirecrawlScrapeOptions;
+  sources?: FirecrawlSource[];
   tbs?: string;
   timeout?: number;
 }
 
 interface FirecrawlMetadata {
   description?: string;
+  error?: string | null;
   sourceURL?: string;
   statusCode?: number;
+  title?: string;
+}
+
+// Web search result
+interface FirecrawlWebResult {
+  description: string;
+  html?: string | null;
+  links?: string[];
+  markdown?: string | null;
+  metadata?: FirecrawlMetadata;
+  rawHtml?: string | null;
+  screenshot?: string | null;
   title: string;
+  url: string;
 }
 
-interface FirecrawlData {
-  description?: string;
-  html?: string;
+// Image search result
+interface FirecrawlImageResult {
+  imageHeight: number;
+  imageUrl: string;
+  imageWidth: number;
+  position: number;
+  title: string;
+  url: string;
+}
+
+// News search result
+interface FirecrawlNewsResult {
+  date: string;
+  html?: string | null;
+  imageUrl?: string;
   links?: string[];
-  markdown?: string;
+  markdown?: string | null;
   metadata?: FirecrawlMetadata;
-  title?: string;
+  position: number;
+  rawHtml?: string | null;
+  screenshot?: string | null;
+  snippet: string;
+  title: string;
   url: string;
 }
 
+// V2 Response structure
 export interface FirecrawlResponse {
-  data: FirecrawlData[];
-  success?: boolean;
+  data: {
+    images?: FirecrawlImageResult[];
+    news?: FirecrawlNewsResult[];
+    web?: FirecrawlWebResult[];
+  };
+  success: boolean;
+  warning?: string | null;
 }

package/src/services/__tests__/tool.test.ts

@@ -1,8 +1,5 @@
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { edgeClient } from '@/libs/trpc/client';
-import { globalHelpers } from '@/store/global/helpers';
-
 import { toolService } from '../tool';
 import openAPIV3 from './openai/OpenAPI_V3.json';
 import OpenAIPlugin from './openai/plugin.json';

package/src/services/aiModel/index.test.ts

@@ -1,10 +1,7 @@
 import { testService } from '~test-utils';
 
-import { ClientService } from './client';
 import { ServerService } from './server';
 
 describe('aiModelService', () => {
   testService(ServerService);
-
-  testService(ClientService);
 });

package/src/services/aiModel/index.ts

@@ -1,9 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const aiModelService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : new ClientService();
+export const aiModelService = new ServerService();

package/src/services/aiProvider/index.test.ts

@@ -1,10 +1,7 @@
 import { testService } from '~test-utils';
 
-import { ClientService } from './client';
 import { ServerService } from './server';
 
 describe('aiProviderService', () => {
   testService(ServerService);
-
-  testService(ClientService);
 });

package/src/services/aiProvider/index.ts

@@ -1,9 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const aiProviderService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : new ClientService();
+export const aiProviderService = new ServerService();

package/src/services/chat/chat.test.ts

@@ -8,18 +8,12 @@ import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vite
 
 import { DEFAULT_USER_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
-import * as isCanUseFCModule from '@/helpers/isCanUseFC';
 import * as toolEngineeringModule from '@/helpers/toolEngineering';
-import { agentChatConfigSelectors, agentSelectors } from '@/store/agent/selectors';
+import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import { aiModelSelectors } from '@/store/aiInfra';
 import { useToolStore } from '@/store/tool';
-import { toolSelectors } from '@/store/tool/selectors';
-import { modelProviderSelectors } from '@/store/user/selectors';
-import { DalleManifest } from '@/tools/dalle';
 import { WebBrowsingManifest } from '@/tools/web-browsing';
 
-import { API_ENDPOINTS } from '../_url';
-import * as helpers from './helper';
 import { chatService } from './index';
 
 // Mocking external dependencies
@@ -290,6 +284,9 @@ describe('ChatService', () => {
         vi.mocked(parseDataUri).mockReturnValue({ type: 'url', base64: null, mimeType: null });
         vi.mocked(isDesktopLocalStaticServerUrl).mockReturnValue(false); // Not a local URL
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Hello',
@@ -375,6 +372,9 @@ describe('ChatService', () => {
           mimeType: 'image/png',
         });
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Hello',
@@ -447,6 +447,9 @@ describe('ChatService', () => {
         vi.mocked(isDesktopLocalStaticServerUrl).mockReturnValue(false); // This is NOT a local URL
         vi.mocked(imageUrlToBase64).mockClear(); // Clear to ensure it's not called
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Hello',
@@ -524,6 +527,9 @@ describe('ChatService', () => {
           mimeType: 'image/jpeg',
         });
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Multiple images',
@@ -831,39 +837,6 @@ describe('ChatService', () => {
           undefined,
         );
       });
-
-      it('work with dalle3', async () => {
-        const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
-        const messages = [
-          {
-            role: 'user',
-            content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n',
-            sessionId: 'inbox',
-            createdAt: 1702723964330,
-            id: 'vyQvEw6V',
-            updatedAt: 1702723964330,
-            extra: {},
-            meta: {
-              avatar: DEFAULT_USER_AVATAR,
-            },
-          },
-        ] as UIChatMessage[];
-
-        await chatService.createAssistantMessage({
-          messages,
-          model: 'gpt-3.5-turbo-1106',
-          top_p: 1,
-          plugins: [DalleManifest.identifier],
-        });
-
-        // Assert that getChatCompletionSpy was called with the expected arguments
-        expect(getChatCompletionSpy).toHaveBeenCalled();
-
-        const calls = getChatCompletionSpy.mock.lastCall;
-        // Take a snapshot of the first call's first argument
-        expect(calls![0]).toMatchSnapshot();
-        expect(calls![1]).toBeUndefined();
-      });
     });
 
     describe('search functionality', () => {

package/src/services/chat/contextEngineering.test.ts

@@ -248,36 +248,6 @@ describe('contextEngineering', () => {
     ]);
   });
 
-  it('should inject INBOX_GUIDE_SYSTEM_ROLE for welcome questions in inbox session', async () => {
-    // Don't mock INBOX_GUIDE_SYSTEMROLE, use the real one
-    const messages: UIChatMessage[] = [
-      {
-        role: 'user',
-        content: 'Hello, this is my first question',
-        createdAt: Date.now(),
-        id: 'test-welcome',
-        meta: {},
-        updatedAt: Date.now(),
-      },
-    ];
-
-    const result = await contextEngineering({
-      messages,
-      model: 'gpt-4',
-      provider: 'openai',
-      isWelcomeQuestion: true,
-      sessionId: 'inbox',
-    });
-
-    // Should have system message with inbox guide content
-    const systemMessage = result.find((msg) => msg.role === 'system');
-    expect(systemMessage).toBeDefined();
-    // Check for characteristic content of the actual INBOX_GUIDE_SYSTEMROLE
-    expect(systemMessage!.content).toContain('LobeChat Support Assistant');
-    expect(systemMessage!.content).toContain('LobeHub');
-    expect(Object.keys(systemMessage!).length).toEqual(2);
-  });
-
   it('should inject historySummary into system message when provided', async () => {
     const historySummary = 'Previous conversation summary: User discussed AI topics.';
 

package/src/services/chat/contextEngineering.ts

@@ -1,9 +1,8 @@
-import { INBOX_GUIDE_SYSTEMROLE, INBOX_SESSION_ID, isDesktop, isServerMode } from '@lobechat/const';
+import { isDesktop, isServerMode } from '@lobechat/const';
 import {
   ContextEngine,
   HistorySummaryProvider,
   HistoryTruncateProcessor,
-  InboxGuideProvider,
   InputTemplateProcessor,
   MessageCleanupProcessor,
   MessageContentProcessor,
@@ -48,8 +47,6 @@ export const contextEngineering = async ({
   enableHistoryCount,
   historyCount,
   historySummary,
-  sessionId,
-  isWelcomeQuestion,
 }: ContextEngineeringContext): Promise<OpenAIChatMessage[]> => {
   const toolNameResolver = new ToolNameResolver();
 
@@ -63,14 +60,6 @@ export const contextEngineering = async ({
       // 2. System role injection (agent's system role)
       new SystemRoleInjector({ systemRole }),
 
-      // 3. Inbox guide system role injection
-      new InboxGuideProvider({
-        inboxGuideSystemRole: INBOX_GUIDE_SYSTEMROLE,
-        inboxSessionId: INBOX_SESSION_ID,
-        isWelcomeQuestion: isWelcomeQuestion,
-        sessionId: sessionId,
-      }),
-
       // 4. Tool system role injection
       new ToolSystemRoleProvider({
         getToolSystemRoles: (tools) => toolSelectors.enabledSystemRoles(tools)(getToolStoreState()),

package/src/services/chat/helper.ts

@@ -1,16 +1,9 @@
-import { isDeprecatedEdition } from '@lobechat/const';
 import { ModelProvider } from 'model-bank';
 
 import { getAiInfraStoreState } from '@/store/aiInfra';
 import { aiModelSelectors, aiProviderSelectors } from '@/store/aiInfra/selectors';
-import { getUserStoreState, useUserStore } from '@/store/user';
-import { modelConfigSelectors, modelProviderSelectors } from '@/store/user/selectors';
 
 export const isCanUseVision = (model: string, provider: string): boolean => {
-  // TODO: remove isDeprecatedEdition condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelProviderSelectors.isModelEnabledVision(model)(getUserStoreState());
-  }
   return aiModelSelectors.isModelSupportVision(model, provider)(getAiInfraStoreState());
 };
 
@@ -24,40 +17,23 @@ export const isCanUseVideo = (model: string, provider: string): boolean => {
 export const findDeploymentName = (model: string, provider: string) => {
   let deploymentId = model;
 
-  // TODO: remove isDeprecatedEdition condition in V2.0
-  if (isDeprecatedEdition) {
-    const chatModelCards = modelProviderSelectors.getModelCardsById(ModelProvider.Azure)(
-      useUserStore.getState(),
-    );
-
-    const deploymentName = chatModelCards.find((i) => i.id === model)?.deploymentName;
-    if (deploymentName) deploymentId = deploymentName;
-  } else {
-    // find the model by id
-    const modelItem = getAiInfraStoreState().enabledAiModels?.find(
-      (i) => i.id === model && i.providerId === provider,
-    );
+  // find the model by id
+  const modelItem = getAiInfraStoreState().enabledAiModels?.find(
+    (i) => i.id === model && i.providerId === provider,
+  );
 
-    if (modelItem && modelItem.config?.deploymentName) {
-      deploymentId = modelItem.config?.deploymentName;
-    }
+  if (modelItem && modelItem.config?.deploymentName) {
+    deploymentId = modelItem.config?.deploymentName;
   }
 
   return deploymentId;
 };
 
 export const isEnableFetchOnClient = (provider: string) => {
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelConfigSelectors.isProviderFetchOnClient(provider)(useUserStore.getState());
-  } else {
-    return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
-  }
+  return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
 };
 
 export const resolveRuntimeProvider = (provider: string) => {
-  if (isDeprecatedEdition) return provider;
-
   const isBuiltin = Object.values(ModelProvider).includes(provider as any);
   if (isBuiltin) return provider;
 

package/src/services/chat/index.ts

@@ -66,7 +66,6 @@ interface FetchAITaskResultParams extends FetchSSEOptions {
 interface CreateAssistantMessageStream extends FetchSSEOptions {
   abortController?: AbortController;
   historySummary?: string;
-  isWelcomeQuestion?: boolean;
   params: GetChatCompletionPayload;
   trace?: TracePayload;
 }
@@ -113,9 +112,7 @@ class ChatService {
       enableHistoryCount: agentChatConfigSelectors.enableHistoryCount(agentStoreState),
       // include user messages
       historyCount: agentChatConfigSelectors.historyCount(agentStoreState) + 2,
-      historySummary: options?.historySummary,
       inputTemplate: chatConfig.inputTemplate,
-      isWelcomeQuestion: options?.isWelcomeQuestion,
       messages,
       model: payload.model,
       provider: payload.provider!,
@@ -217,12 +214,10 @@ class ChatService {
     onErrorHandle,
     onFinish,
     trace,
-    isWelcomeQuestion,
     historySummary,
   }: CreateAssistantMessageStream) => {
     await this.createAssistantMessage(params, {
       historySummary,
-      isWelcomeQuestion,
       onAbort,
       onErrorHandle,
       onFinish,
@@ -404,7 +399,7 @@ class ChatService {
     onLoadingChange?.(true);
 
     try {
-      const oaiMessages = await contextEngineering({
+      const llmMessages = await contextEngineering({
         messages: params.messages as any,
         model: params.model!,
         provider: params.provider!,
@@ -421,7 +416,7 @@ class ChatService {
       // remove plugins
       delete params.plugins;
       await this.getChatCompletion(
-        { ...params, messages: oaiMessages, tools },
+        { ...params, messages: llmMessages, tools },
         {
           onErrorHandle: (error) => {
             errorHandle(new Error(error.message), error);

package/src/services/chat/types.ts

@@ -1,9 +1,9 @@
 import { TracePayload } from '@lobechat/types';
+
 import { FetchSSEOptions } from '@/utils/fetch';
 
 export interface FetchOptions extends FetchSSEOptions {
   historySummary?: string;
-  isWelcomeQuestion?: boolean;
   signal?: AbortSignal | undefined;
   trace?: TracePayload;
 }

package/src/services/chatGroup/index.ts

@@ -1,12 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new ServerService();
-
-export const chatGroupService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const chatGroupService = new ServerService();

package/src/services/config.ts

@@ -1,23 +1,13 @@
-import { BRANDING_NAME, isDeprecatedEdition, isServerMode } from '@lobechat/const';
+import { BRANDING_NAME, isServerMode } from '@lobechat/const';
 import { downloadFile, exportJSONFile } from '@lobechat/utils/client';
 import dayjs from 'dayjs';
 
-import { CURRENT_CONFIG_VERSION } from '@/migrations';
 import { ImportPgDataStructure } from '@/types/export';
 
 import { exportService } from './export';
-import { configService as deprecatedExportService } from './export/_deprecated';
 
 class ConfigService {
   exportAll = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportAll();
-      const filename = `${BRANDING_NAME}-config-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-
     const { data, url } = await exportService.exportData();
     const filename = `${dayjs().format('YYYY-MM-DD-hh-mm')}_${BRANDING_NAME}-data.json`;
 
@@ -34,60 +24,6 @@ class ConfigService {
     exportJSONFile(result, filename);
   };
 
-  exportAgents = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportAgents();
-      const filename = `${BRANDING_NAME}-agents-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSingleAgent = async (agentId: string) => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const result = await deprecatedExportService.exportSingleAgent(agentId);
-      if (!result) return;
-
-      const filename = `${BRANDING_NAME}-${result.title}-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(result.config, filename);
-      return;
-    }
-  };
-
-  exportSessions = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportSessions();
-      const filename = `${BRANDING_NAME}-sessions-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSettings = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportSessions();
-      const filename = `${BRANDING_NAME}-settings-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSingleSession = async (sessionId: string) => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const data = await deprecatedExportService.exportSingleSession(sessionId);
-      if (!data) return;
-
-      const filename = `${BRANDING_NAME}-${data.title}-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(data.config, filename);
-      return;
-    }
-  };
-
   private createDataStructure = async (
     data: any,
     mode: 'pglite' | 'postgres',

package/src/services/export/index.ts

@@ -1,6 +1,3 @@
-import { isServerMode } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const exportService = isServerMode ? new ServerService() : new ClientService();
+export const exportService = new ServerService();

package/src/services/file/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const fileService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const fileService = new ServerService();