@lobehub/lobehub 2.0.0-next.47 → 2.0.0-next.48

package/src/locales/default/setting.ts

@@ -2,6 +2,45 @@ export default {
   about: {
     title: '关于',
   },
+  agentInfoDescription: {
+    basic: {
+      avatar: '头像',
+      description: '描述',
+      name: '名称',
+      tags: '标签',
+      title: '助手信息',
+    },
+    chat: {
+      displayMode: '展示模式',
+      enableHistoryCount: '启用历史消息计数',
+      historyCount: '历史消息数量',
+      no: '否',
+      searchMode: '搜索模式',
+      title: '聊天偏好',
+      yes: '是',
+    },
+    model: {
+      maxTokens: '最大 Token 数',
+      model: '模型',
+      provider: '服务商',
+      temperature: '温度',
+      title: '模型设置',
+      topP: 'Top P 值',
+    },
+    plugins: {
+      count: '插件设置（{{count}}）',
+      empty: '尚未安装插件',
+      title: '已安装插件',
+    },
+    role: {
+      systemRole: '系统提示词',
+      title: '角色设置',
+    },
+    value: {
+      unset: '未设置',
+      untitled: '未命名助手',
+    },
+  },
   agentTab: {
     chat: '聊天偏好',
     meta: '助手信息',
@@ -18,6 +57,8 @@ export default {
     },
     title: '数据统计',
   },
+  checking: '检查中...',
+  checkingPermissions: '检查权限中...',
   danger: {
     clear: {
       action: '立即清除',
@@ -148,6 +189,58 @@ export default {
     },
     waitingForMore: '更多模型正在 <1>计划接入</1> 中，敬请期待',
   },
+  marketPublish: {
+    modal: {
+      changelog: {
+        extra: '描述此版本的主要变更和改进',
+        label: '变更日志',
+        maxLengthError: '变更日志不能超过500个字符',
+        placeholder: '请输入变更日志',
+        required: '请输入变更日志',
+      },
+      comparison: {
+        local: '本地当前版本',
+        remote: '当前发布版本',
+      },
+      identifier: {
+        extra: '标识符将作为助手的唯一标识，建议使用小写字母、数字和连字符',
+        label: '助手标识符',
+        lengthError: '标识符长度应在3-50个字符之间',
+        patternError: '标识符只能包含小写字母、数字和连字符',
+        placeholder: '请输入助手的唯一标识符，如: web-development',
+        required: '请输入助手标识符',
+      },
+      loading: {
+        fetchingRemote: '正在加载远程数据...',
+        submit: '正在发布助手...',
+        upload: '正在发布新版本...',
+      },
+      messages: {
+        createVersionFailed: '版本创建失败: {{message}}',
+        fetchRemoteFailed: '获取远程助手数据失败',
+        missingIdentifier: '当前助手还没有市场标识符',
+        notAuthenticated: '请先登录市场账户',
+        publishFailed: '发布失败: {{message}}',
+      },
+      submitButton: '发布',
+      title: {
+        submit: '分享到助手市场',
+        upload: '发布新版本',
+      },
+    },
+    resultModal: {
+      message: '助手已提交审核，审核通过后将自动上线。点击「在市场查看」查看已发布的助手。',
+      view: '在市场查看',
+    },
+    submit: {
+      button: '分享到市场',
+      tooltip: '分享助手到市场',
+    },
+    upload: {
+      button: '发布新版本',
+      tooltip: '发布新版本到助手市场',
+    },
+  },
   message: {
     success: '更新成功',
   },
@@ -565,7 +658,7 @@ export default {
   },
   submitAgentModal: {
     button: '提交助手',
-    identifier: 'identifier 助手标识符',
+    identifier: '助手标识符（identifier）',
     metaMiss: '请补全助手信息后提交，需要包含名称、描述和标签',
     placeholder: '请输入助手的标识符，需要是唯一的，比如 web-development',
     tooltips: '分享到助手市场',

package/src/server/globalConfig/genServerAiProviderConfig.test.ts

@@ -19,7 +19,7 @@ vi.mock('@/envs/llm', () => ({
   })),
 }));
 
-vi.mock('@/utils/parseModels', () => ({
+vi.mock('@/utils/server/parseModels', () => ({
   extractEnabledModels: vi.fn(async (providerId: string, modelString?: string) => {
     if (!modelString) return undefined;
     return [`${providerId}-model-1`, `${providerId}-model-2`];
@@ -98,7 +98,7 @@ describe('genServerAiProvidersConfig', () => {
   it('should use environment variables for model lists', async () => {
     process.env.OPENAI_MODEL_LIST = '+gpt-4,+gpt-3.5-turbo';
 
-    const { extractEnabledModels } = vi.mocked(await import('@/utils/parseModels'));
+    const { extractEnabledModels } = vi.mocked(await import('@/utils/server/parseModels'));
     extractEnabledModels.mockResolvedValue(['gpt-4', 'gpt-3.5-turbo']);
 
     const result = await genServerAiProvidersConfig({});
@@ -116,7 +116,7 @@ describe('genServerAiProvidersConfig', () => {
 
     process.env.CUSTOM_OPENAI_MODELS = '+custom-model';
 
-    const { extractEnabledModels } = vi.mocked(await import('@/utils/parseModels'));
+    const { extractEnabledModels } = vi.mocked(await import('@/utils/server/parseModels'));
 
     await genServerAiProvidersConfig(specificConfig);
 
@@ -133,7 +133,7 @@ describe('genServerAiProvidersConfig', () => {
     process.env.OPENAI_MODEL_LIST = '+gpt-4->deployment1';
 
     const { extractEnabledModels, transformToAiModelList } = vi.mocked(
-      await import('@/utils/parseModels'),
+      await import('@/utils/server/parseModels'),
     );
 
     await genServerAiProvidersConfig(specificConfig);
@@ -206,7 +206,7 @@ describe('genServerAiProvidersConfig Error Handling', () => {
       getLLMConfig: vi.fn(() => ({})),
     }));
 
-    vi.doMock('@/utils/parseModels', () => ({
+    vi.doMock('@/utils/server/parseModels', () => ({
       extractEnabledModels: vi.fn(async () => undefined),
       transformToAiModelList: vi.fn(async () => []),
     }));

package/src/server/globalConfig/genServerAiProviderConfig.ts

@@ -1,9 +1,9 @@
 import { ProviderConfig } from '@lobechat/types';
-import { extractEnabledModels, transformToAiModelList } from '@lobechat/utils';
 import { AiFullModelCard, ModelProvider } from 'model-bank';
 import * as AiModels from 'model-bank';
 
 import { getLLMConfig } from '@/envs/llm';
+import { extractEnabledModels, transformToAiModelList } from '@/utils/server/parseModels';
 
 interface ProviderSpecificConfig {
   enabled?: boolean;

package/src/server/routers/lambda/market/index.ts

@@ -1,15 +1,24 @@
+import { isDesktop } from '@lobechat/const';
 import { TRPCError } from '@trpc/server';
 import { serialize } from 'cookie';
 import debug from 'debug';
 import { z } from 'zod';
 
-import { isDesktop } from '@lobechat/const';
 import { publicProcedure, router } from '@/libs/trpc/lambda';
 import { DiscoverService } from '@/server/services/discover';
-import { AssistantSorts, McpConnectionType, McpSorts, ModelSorts, PluginSorts, ProviderSorts } from '@/types/discover';
+import {
+  AssistantSorts,
+  McpConnectionType,
+  McpSorts,
+  ModelSorts,
+  PluginSorts,
+  ProviderSorts,
+} from '@/types/discover';
 
 const log = debug('lambda-router:market');
 
+const marketSourceSchema = z.enum(['legacy', 'new']);
+
 const marketProcedure = publicProcedure.use(async ({ ctx, next }) => {
   return next({
     ctx: {
@@ -26,6 +35,7 @@ export const marketRouter = router({
         .object({
           locale: z.string().optional(),
           q: z.string().optional(),
+          source: marketSourceSchema.optional(),
         })
         .optional(),
     )
@@ -48,6 +58,8 @@ export const marketRouter = router({
       z.object({
         identifier: z.string(),
         locale: z.string().optional(),
+        source: marketSourceSchema.optional(),
+        version: z.string().optional(),
       }),
     )
     .query(async ({ input, ctx }) => {
@@ -64,19 +76,27 @@ export const marketRouter = router({
       }
     }),
 
-  getAssistantIdentifiers: marketProcedure.query(async ({ ctx }) => {
-    log('getAssistantIdentifiers called');
+  getAssistantIdentifiers: marketProcedure
+    .input(
+      z
+        .object({
+          source: marketSourceSchema.optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ input, ctx }) => {
+      log('getAssistantIdentifiers called with input: %O', input);
 
-    try {
-      return await ctx.discoverService.getAssistantIdentifiers();
-    } catch (error) {
-      log('Error fetching assistant identifiers: %O', error);
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'Failed to fetch assistant identifiers',
-      });
-    }
-  }),
+      try {
+        return await ctx.discoverService.getAssistantIdentifiers(input);
+      } catch (error) {
+        log('Error fetching assistant identifiers: %O', error);
+        throw new TRPCError({
+          code: 'INTERNAL_SERVER_ERROR',
+          message: 'Failed to fetch assistant identifiers',
+        });
+      }
+    }),
 
   getAssistantList: marketProcedure
     .input(
@@ -86,10 +106,12 @@ export const marketRouter = router({
           connectionType: z.nativeEnum(McpConnectionType).optional(),
           locale: z.string().optional(),
           order: z.enum(['asc', 'desc']).optional(),
+          ownerId: z.string().optional(),
           page: z.number().optional(),
           pageSize: z.number().optional(),
           q: z.string().optional(),
           sort: z.nativeEnum(AssistantSorts).optional(),
+          source: marketSourceSchema.optional(),
         })
         .optional(),
     )

package/src/server/routers/lambda/message.ts

@@ -1,12 +1,12 @@
 import {
   CreateNewMessageParamsSchema,
   UpdateMessageParamsSchema,
+  UpdateMessagePluginSchema,
   UpdateMessageRAGParamsSchema,
 } from '@lobechat/types';
 import { z } from 'zod';
 
 import { MessageModel } from '@/database/models/message';
-import { updateMessagePluginSchema } from '@/database/schemas';
 import { getServerDB } from '@/database/server';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
 import { serverDatabase } from '@/libs/trpc/lambda/middleware';
@@ -179,7 +179,7 @@ export const messageRouter = router({
     .input(
       z.object({
         id: z.string(),
-        value: updateMessagePluginSchema.partial(),
+        value: UpdateMessagePluginSchema.partial(),
       }),
     )
     .mutation(async ({ input, ctx }) => {

package/src/server/services/discover/index.test.ts

@@ -19,9 +19,6 @@ vi.mock('@/locales/resources', () => ({
   }),
 }));
 
-// Set environment variable for tests
-process.env.MARKET_BASE_URL = 'http://localhost:8787/api';
-
 // Mock constants with inline data
 vi.mock('model-bank', async (importOriginal) => {
   const actual = await importOriginal();
@@ -130,6 +127,68 @@ const mockAssistantList = [
   },
 ];
 
+const mockMarketAssistantList = [
+  {
+    identifier: 'market-assistant-1',
+    name: 'Market Assistant 1',
+    summary: 'First market assistant from new source',
+    author: { name: 'Market Author 1', avatar: 'https://example.com/avatar1.png' },
+    ownerId: 101,
+    category: 'productivity',
+    createdAt: '2024-02-01T00:00:00Z',
+    updatedAt: '2024-02-02T00:00:00Z',
+    avatar: 'https://example.com/avatar1.png',
+    tags: ['market', 'assistant'],
+    status: 'published',
+    tokenUsage: 256,
+    config: {
+      systemRole: 'You are a productive assistant.',
+      knowledgeBases: [{ id: 'kb-1' }],
+      plugins: [{ id: 'plugin-1' }],
+    },
+  },
+  {
+    identifier: 'market-assistant-2',
+    name: 'Market Assistant 2',
+    summary: 'Second market assistant from new source',
+    author: 'Market Author 2',
+    ownerId: 202,
+    category: 'creativity',
+    createdAt: '2024-02-04T00:00:00Z',
+    updatedAt: '2024-02-05T00:00:00Z',
+    avatar: 'https://example.com/avatar2.png',
+    tags: ['market', 'creative'],
+    status: 'published',
+    tokenUsage: 128,
+    config: {
+      systemRole: 'You are a creative assistant.',
+      knowledgeBases: [],
+      plugins: [],
+    },
+  },
+];
+
+const mockMarketAgentDetail = {
+  ...mockMarketAssistantList[0],
+  documentationUrl: 'https://example.com/docs',
+  version: '1.0.0',
+  versions: [
+    {
+      version: '1.0.0',
+      status: 'published',
+      isLatest: true,
+      isValidated: true,
+      createdAt: '2024-02-02T00:00:00Z',
+    },
+  ],
+  examples: [
+    {
+      content: 'Example content',
+      role: 'user',
+    },
+  ],
+};
+
 const mockPluginList = [
   {
     identifier: 'plugin-1',
@@ -182,6 +241,24 @@ describe('DiscoverService', () => {
 
     // Setup MarketSDK mock
     mockMarket = {
+      agents: {
+        getAgentList: vi.fn().mockResolvedValue({
+          items: mockMarketAssistantList,
+          totalCount: mockMarketAssistantList.length,
+          currentPage: 1,
+          pageSize: 20,
+          totalPages: 1,
+        }),
+        getAgentDetail: vi.fn().mockResolvedValue(mockMarketAgentDetail),
+        getCategories: vi.fn().mockResolvedValue([
+          { category: 'productivity', count: 10 },
+          { category: 'creativity', count: 5 },
+        ]),
+        getPublishedIdentifiers: vi.fn().mockResolvedValue([
+          { id: 'market-assistant-1', lastModified: '2024-02-02T00:00:00Z' },
+          { id: 'market-assistant-2', lastModified: '2024-02-05T00:00:00Z' },
+        ]),
+      },
       plugins: {
         getCategories: vi.fn().mockResolvedValue([
           { category: 'tools', count: 5 },
@@ -214,10 +291,68 @@ describe('DiscoverService', () => {
     service.market = mockMarket;
   });
 
-  describe('Assistant Market', () => {
+  describe('Assistant Market (new source)', () => {
+    it('getAssistantList should transform market SDK response', async () => {
+      const result = await service.getAssistantList();
+
+      expect(mockMarket.agents.getAgentList).toHaveBeenCalled();
+      expect(result.items[0]).toEqual(
+        expect.objectContaining({
+          identifier: 'market-assistant-1',
+          title: 'Market Assistant 1',
+          author: 'Market Author 1',
+          knowledgeCount: 1,
+          pluginCount: 1,
+        }),
+      );
+    });
+
+    it('getAssistantDetail should fetch from market SDK by default', async () => {
+      const result = await service.getAssistantDetail({
+        identifier: 'market-assistant-1',
+      });
+
+      expect(mockMarket.agents.getAgentDetail).toHaveBeenCalledWith('market-assistant-1', {
+        locale: 'en',
+        version: undefined,
+      });
+      expect(result).toEqual(
+        expect.objectContaining({
+          identifier: 'market-assistant-1',
+          title: 'Market Assistant 1',
+          related: expect.any(Array),
+        }),
+      );
+    });
+
+    it('getAssistantCategories should proxy to market SDK', async () => {
+      const result = await service.getAssistantCategories({ locale: 'en-US', q: 'market' });
+
+      expect(mockMarket.agents.getCategories).toHaveBeenCalledWith({
+        locale: 'en',
+        q: 'market',
+      });
+      expect(result).toEqual([
+        { category: 'productivity', count: 10 },
+        { category: 'creativity', count: 5 },
+      ]);
+    });
+
+    it('getAssistantIdentifiers should read from market SDK', async () => {
+      const result = await service.getAssistantIdentifiers();
+
+      expect(mockMarket.agents.getPublishedIdentifiers).toHaveBeenCalled();
+      expect(result).toEqual([
+        { identifier: 'market-assistant-1', lastModified: '2024-02-02T00:00:00Z' },
+        { identifier: 'market-assistant-2', lastModified: '2024-02-05T00:00:00Z' },
+      ]);
+    });
+  });
+
+  describe('Assistant Market (legacy source)', () => {
     describe('getAssistantList', () => {
       it('should return formatted assistant list with default parameters', async () => {
-        const result = await service.getAssistantList();
+        const result = await service.getAssistantList({ source: 'legacy' });
 
         expect(result).toEqual({
           currentPage: 1,
@@ -242,7 +377,10 @@ describe('DiscoverService', () => {
       });
 
       it('should filter by category', async () => {
-        const result = await service.getAssistantList({ category: 'productivity' });
+        const result = await service.getAssistantList({
+          category: 'productivity',
+          source: 'legacy',
+        });
 
         expect(result.items).toHaveLength(2);
         expect(result.items.map((item) => item.identifier)).toContain('assistant-1');
@@ -250,7 +388,7 @@ describe('DiscoverService', () => {
       });
 
       it('should filter by search query', async () => {
-        const result = await service.getAssistantList({ q: 'creative' });
+        const result = await service.getAssistantList({ q: 'creative', source: 'legacy' });
 
         expect(result.items).toHaveLength(2);
         expect(result.items.map((item) => item.identifier)).toContain('assistant-2');
@@ -261,6 +399,7 @@ describe('DiscoverService', () => {
         const result = await service.getAssistantList({
           sort: AssistantSorts.CreatedAt,
           order: 'desc',
+          source: 'legacy',
         });
 
         expect(result.items[0].identifier).toBe('assistant-3');
@@ -272,6 +411,7 @@ describe('DiscoverService', () => {
         const result = await service.getAssistantList({
           sort: AssistantSorts.Title,
           order: 'asc',
+          source: 'legacy',
         });
 
         // Note: The service has reversed logic for title sorting
@@ -280,7 +420,7 @@ describe('DiscoverService', () => {
       });
 
       it('should paginate results', async () => {
-        const result = await service.getAssistantList({ page: 1, pageSize: 1 });
+        const result = await service.getAssistantList({ page: 1, pageSize: 1, source: 'legacy' });
 
         expect(result.items).toHaveLength(1);
         expect(result.currentPage).toBe(1);
@@ -293,6 +433,7 @@ describe('DiscoverService', () => {
       it('should return assistant detail with related items', async () => {
         const result = await service.getAssistantDetail({
           identifier: 'assistant-1',
+          source: 'legacy',
         });
 
         expect(result).toEqual(
@@ -311,6 +452,7 @@ describe('DiscoverService', () => {
 
         const result = await service.getAssistantDetail({
           identifier: 'non-existent',
+          source: 'legacy',
         });
 
         expect(result).toBeUndefined();
@@ -319,7 +461,7 @@ describe('DiscoverService', () => {
 
     describe('getAssistantCategories', () => {
       it('should return category counts', async () => {
-        const result = await service.getAssistantCategories();
+        const result = await service.getAssistantCategories({ source: 'legacy' });
 
         expect(result).toEqual([
           { category: 'productivity', count: 2 },
@@ -328,7 +470,7 @@ describe('DiscoverService', () => {
       });
 
       it('should filter categories by search query', async () => {
-        const result = await service.getAssistantCategories({ q: 'creative' });
+        const result = await service.getAssistantCategories({ q: 'creative', source: 'legacy' });
 
         expect(result).toEqual([
           {
@@ -345,7 +487,7 @@ describe('DiscoverService', () => {
 
     describe('getAssistantIdentifiers', () => {
       it('should return list of identifiers with lastModified dates', async () => {
-        const result = await service.getAssistantIdentifiers();
+        const result = await service.getAssistantIdentifiers({ source: 'legacy' });
 
         expect(result).toEqual([
           { identifier: 'assistant-1', lastModified: '2024-01-01T00:00:00Z' },