@lobehub/chat 1.17.6 → 1.18.0

package/src/store/tool/slices/store/action.test.ts

@@ -15,7 +15,7 @@ vi.mock('@/components/AntdStaticMethods', () => ({
     error: vi.fn(),
   },
 }));
-// Mock the pluginService.getPluginList method
+// Mock the pluginService.getToolList method
 vi.mock('@/services/plugin', () => ({
   pluginService: {
     uninstallPlugin: vi.fn(),
@@ -25,8 +25,8 @@ vi.mock('@/services/plugin', () => ({
 
 vi.mock('@/services/tool', () => ({
   toolService: {
-    getPluginManifest: vi.fn(),
-    getPluginList: vi.fn(),
+    getToolManifest: vi.fn(),
+    getToolList: vi.fn(),
   },
 }));
 
@@ -102,8 +102,8 @@ describe('useToolStore:pluginStore', () => {
   describe('loadPluginStore', () => {
     it('should load plugin list and update state', async () => {
       // Given
-      const pluginListMock = { plugins: [{ identifier: 'plugin1' }, { identifier: 'plugin2' }] };
-      (toolService.getPluginList as Mock).mockResolvedValue(pluginListMock);
+      const pluginListMock = [{ identifier: 'plugin1' }, { identifier: 'plugin2' }];
+      (toolService.getToolList as Mock).mockResolvedValue(pluginListMock);
 
       // When
       let pluginList;
@@ -112,15 +112,15 @@ describe('useToolStore:pluginStore', () => {
       });
 
       // Then
-      expect(toolService.getPluginList).toHaveBeenCalled();
+      expect(toolService.getToolList).toHaveBeenCalled();
       expect(pluginList).toEqual(pluginListMock);
-      expect(useToolStore.getState().pluginStoreList).toEqual(pluginListMock.plugins);
+      expect(useToolStore.getState().pluginStoreList).toEqual(pluginListMock);
     });
 
     it('should handle errors when loading plugin list', async () => {
       // Given
       const error = new Error('Failed to load plugin list');
-      (toolService.getPluginList as Mock).mockRejectedValue(error);
+      (toolService.getToolList as Mock).mockRejectedValue(error);
 
       // When
       let pluginList;
@@ -134,7 +134,7 @@ describe('useToolStore:pluginStore', () => {
       }
 
       // Then
-      expect(toolService.getPluginList).toHaveBeenCalled();
+      expect(toolService.getToolList).toHaveBeenCalled();
       expect(errorOccurred).toBe(true);
       expect(pluginList).toBeUndefined();
       // Ensure the state is not updated with an undefined value
@@ -145,7 +145,7 @@ describe('useToolStore:pluginStore', () => {
   describe('useFetchPluginStore', () => {
     it('should use SWR to fetch plugin store', async () => {
       // Given
-      const pluginListMock = { plugins: [{ identifier: 'plugin1' }, { identifier: 'plugin2' }] };
+      const pluginListMock = [{ identifier: 'plugin1' }, { identifier: 'plugin2' }];
       (useSWR as Mock).mockReturnValue({
         data: pluginListMock,
         error: null,
@@ -157,10 +157,7 @@ describe('useToolStore:pluginStore', () => {
 
       // Then
       expect(useSWR).toHaveBeenCalledWith('loadPluginStore', expect.any(Function), {
-        fallbackData: {
-          plugins: [],
-          schemaVersion: 1,
-        },
+        fallbackData: [],
         revalidateOnFocus: false,
         suspense: true,
       });
@@ -183,10 +180,7 @@ describe('useToolStore:pluginStore', () => {
 
       // Then
       expect(useSWR).toHaveBeenCalledWith('loadPluginStore', expect.any(Function), {
-        fallbackData: {
-          plugins: [],
-          schemaVersion: 1,
-        },
+        fallbackData: [],
         revalidateOnFocus: false,
         suspense: true,
       });
@@ -244,14 +238,14 @@ describe('useToolStore:pluginStore', () => {
         },
         version: '1',
       };
-      (toolService.getPluginManifest as Mock).mockResolvedValue(pluginManifestMock);
+      (toolService.getToolManifest as Mock).mockResolvedValue(pluginManifestMock);
 
       await act(async () => {
         await useToolStore.getState().installPlugin(pluginIdentifier);
       });
 
       // Then
-      expect(toolService.getPluginManifest).toHaveBeenCalled();
+      expect(toolService.getToolManifest).toHaveBeenCalled();
       expect(notification.error).not.toHaveBeenCalled();
       expect(updateInstallLoadingStateMock).toHaveBeenCalledTimes(2);
       expect(pluginService.installPlugin).toHaveBeenCalledWith({
@@ -273,7 +267,7 @@ describe('useToolStore:pluginStore', () => {
       const error = new TypeError('noManifest');
 
       // Mock necessary modules and functions
-      (toolService.getPluginManifest as Mock).mockRejectedValue(error);
+      (toolService.getToolManifest as Mock).mockRejectedValue(error);
 
       useToolStore.setState({
         pluginStoreList: [
@@ -317,7 +311,7 @@ describe('useToolStore:pluginStore', () => {
 
       const plugins = ['plugin1', 'plugin2'];
 
-      (toolService.getPluginManifest as Mock).mockResolvedValue(pluginManifestMock);
+      (toolService.getToolManifest as Mock).mockResolvedValue(pluginManifestMock);
 
       // When
       await act(async () => {

package/src/store/tool/slices/store/action.ts

@@ -1,4 +1,4 @@
-import { LobeChatPluginsMarketIndex } from '@lobehub/chat-plugin-sdk';
+import { LobeChatPluginMeta } from '@lobehub/chat-plugin-sdk';
 import { t } from 'i18next';
 import { produce } from 'immer';
 import useSWR, { SWRResponse, mutate } from 'swr';
@@ -22,13 +22,13 @@ const INSTALLED_PLUGINS = 'loadInstalledPlugins';
 export interface PluginStoreAction {
   installPlugin: (identifier: string, type?: 'plugin' | 'customPlugin') => Promise<void>;
   installPlugins: (plugins: string[]) => Promise<void>;
-  loadPluginStore: () => Promise<LobeChatPluginsMarketIndex>;
+  loadPluginStore: () => Promise<LobeChatPluginMeta[]>;
   refreshPlugins: () => Promise<void>;
   uninstallPlugin: (identifier: string) => Promise<void>;
 
   updateInstallLoadingState: (key: string, value: boolean | undefined) => void;
   useFetchInstalledPlugins: () => SWRResponse<LobeTool[]>;
-  useFetchPluginStore: () => SWRResponse<LobeChatPluginsMarketIndex>;
+  useFetchPluginStore: () => SWRResponse<LobeChatPluginMeta[]>;
 }
 
 export const createPluginStoreSlice: StateCreator<
@@ -44,7 +44,7 @@ export const createPluginStoreSlice: StateCreator<
     const { updateInstallLoadingState, refreshPlugins } = get();
     try {
       updateInstallLoadingState(name, true);
-      const data = await toolService.getPluginManifest(plugin.manifest);
+      const data = await toolService.getToolManifest(plugin.manifest);
 
       // 4. 存储 manifest 信息
       await pluginService.installPlugin({ identifier: plugin.identifier, manifest: data, type });
@@ -68,9 +68,9 @@ export const createPluginStoreSlice: StateCreator<
     await Promise.all(plugins.map((identifier) => installPlugin(identifier)));
   },
   loadPluginStore: async () => {
-    const pluginMarketIndex = await toolService.getPluginList();
+    const pluginMarketIndex = await toolService.getToolList();
 
-    set({ pluginStoreList: pluginMarketIndex.plugins }, false, n('loadPluginList'));
+    set({ pluginStoreList: pluginMarketIndex }, false, n('loadPluginList'));
 
     return pluginMarketIndex;
   },
@@ -104,8 +104,8 @@ export const createPluginStoreSlice: StateCreator<
       suspense: true,
     }),
   useFetchPluginStore: () =>
-    useSWR<LobeChatPluginsMarketIndex>('loadPluginStore', get().loadPluginStore, {
-      fallbackData: { plugins: [], schemaVersion: 1 },
+    useSWR<LobeChatPluginMeta[]>('loadPluginStore', get().loadPluginStore, {
+      fallbackData: [],
       revalidateOnFocus: false,
       suspense: true,
     }),

package/src/types/discover.ts

@@ -0,0 +1,152 @@
+import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
+import { LobeChatPluginMeta, Meta } from '@lobehub/chat-plugin-sdk/lib/types/market';
+
+import { ChatModelCard, ModelProviderCard } from '@/types/llm';
+import { MetaData } from '@/types/meta';
+import { LobeAgentSettings } from '@/types/session';
+
+export enum AssistantCategory {
+  Academic = 'academic',
+  All = 'all',
+  Career = 'career',
+  CopyWriting = 'copywriting',
+  Design = 'design',
+  Education = 'education',
+  Emotions = 'emotions',
+  Entertainment = 'entertainment',
+  Games = 'games',
+  General = 'general',
+  Life = 'life',
+  Marketing = 'marketing',
+  Office = 'office',
+  Programming = 'programming',
+  Translation = 'translation',
+}
+
+export enum PluginCategory {
+  All = 'all',
+  GamingEntertainment = 'gaming-entertainment',
+  LifeStyle = 'lifestyle',
+  MediaGenerate = 'media-generate',
+  ScienceEducation = 'science-education',
+  Social = 'social',
+  StocksFinance = 'stocks-finance',
+  Tools = 'tools',
+  WebSearch = 'web-search',
+}
+
+export enum DiscoverTab {
+  Assistants = 'assistants',
+  Home = 'home',
+  Models = 'models',
+  Plugins = 'plugins',
+  Providers = 'providers',
+}
+
+// TODO 可能需要修改
+export interface ExampleTopic {
+  description: string;
+  id: string;
+  title: string;
+}
+
+// TODO 服务端接口待补充
+export interface DiscoverAssistantItem extends LobeAgentSettings {
+  author: string;
+  createdAt: string;
+  examples?: ExampleTopic[];
+  homepage: string;
+  identifier: string;
+  meta: MetaData & {
+    category?: AssistantCategory;
+  };
+  schemaVersion: 1;
+  socialData: {
+    conversations: number;
+    likes: number;
+    users: number;
+  };
+  suggestions: Omit<DiscoverAssistantItem, 'suggestions' | 'socialData' | 'config'>[];
+}
+
+export interface DiscoverModelItem {
+  createdAt: string;
+  identifier: string;
+  meta: Omit<ChatModelCard, 'displayName' | 'deploymentName'> & {
+    category?: string;
+    title: string;
+  };
+  providers?: string[];
+  socialData: {
+    conversations: number;
+    likes: number;
+    tokens: number;
+  };
+  suggestions: Omit<DiscoverModelItem, 'suggestions' | 'socialData' | 'providers'>[];
+}
+
+export interface DiscoverProviderItem {
+  createdAt: string;
+  identifier: string;
+  meta: Omit<ModelProviderCard, 'chatModels' | 'name'> & {
+    description?: string;
+    title: string;
+  };
+  models: string[];
+  socialData: {
+    conversations: number;
+    likes: number;
+    users: number;
+  };
+  suggestions: Omit<DiscoverProviderItem, 'suggestions' | 'socialData'>[];
+}
+
+// TODO 服务端接口待补充
+export type DiscoverPlugintem = LobeChatPluginMeta & {
+  manifest: LobeChatPluginManifest;
+  meta: Meta & {
+    category?: PluginCategory;
+  };
+  socialData: {
+    called: number;
+    executionTime: number;
+    likes: number;
+    relatedAssistants: number;
+    successRate: number;
+    users: number;
+  };
+  suggestions: Omit<DiscoverPlugintem, 'suggestions' | 'socialData' | 'manifest'>[];
+};
+
+export enum SortBy {
+  MostLiked = 'liked',
+  MostUsed = 'used',
+  Newest = 'newest',
+  Oldest = 'oldest',
+  Recommended = 'recommended',
+}
+
+export enum TimePeriod {
+  All = 'all',
+  Day = 'day',
+  Month = 'month',
+  Week = 'week',
+  Year = 'year',
+}
+
+export enum AuthorRange {
+  Everyone = 'everyone',
+  Followed = 'followed',
+}
+
+export interface FilterBy {
+  author?: AuthorRange;
+  content?: number;
+  fc?: boolean;
+  knowledge?: boolean;
+  plugin?: boolean;
+  price?: number;
+  time?: TimePeriod;
+  token?: number;
+  vision?: boolean;
+}

package/src/types/llm.ts

@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
 
+export type ModelPriceCurrency = 'CNY' | 'USD';
+
 export interface ChatModelCard {
   /**
    * only used in azure
@@ -39,7 +41,7 @@ export interface ChatModelCard {
      * the currency of the pricing
      * @default USD
      */
-    currency?: 'CNY' | 'USD';
+    currency?: ModelPriceCurrency;
     /**
      * the input pricing, e.g. $1 / 1M tokens
      */
@@ -128,7 +130,7 @@ export interface ModelProviderCard {
   /**
    * provider's website url
    */
-  url?: string;
+  url: string;
 }
 
 // 语言模型的设置参数

package/src/types/meta.ts

@@ -10,6 +10,7 @@ export const LobeMetaDataSchema = z.object({
    */
   backgroundColor: z.string().optional(),
   description: z.string().optional(),
+
   tags: z.array(z.string()).optional(),
   /**
    * 名称