@lobehub/lobehub 2.0.0-next.3 → 2.0.0-next.31

package/src/server/routers/lambda/config/__snapshots__/index.test.ts.snap

@@ -8,24 +8,50 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "claude-2",
     "gpt-4-0125-preview",
   ],
-  "serverModelCards": [
+  "serverModelLists": [
     {
+      "abilities": {},
       "displayName": "llama",
       "enabled": true,
       "id": "llama",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": "claude-2",
       "enabled": true,
       "id": "claude-2",
+      "type": "chat",
     },
     {
+      "abilities": {
+        "functionCall": true,
+      },
       "contextWindowTokens": 128000,
       "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
       "displayName": "gpt-4-32k",
       "enabled": true,
-      "functionCall": true,
       "id": "gpt-4-0125-preview",
+      "pricing": {
+        "units": [
+          {
+            "name": "textInput",
+            "rate": 10,
+            "strategy": "fixed",
+            "unit": "millionTokens",
+          },
+          {
+            "name": "textOutput",
+            "rate": 30,
+            "strategy": "fixed",
+            "unit": "millionTokens",
+          },
+        ],
+      },
+      "providerId": "openai",
+      "releasedAt": "2024-01-25",
+      "source": "builtin",
+      "type": "chat",
     },
   ],
 }
@@ -34,61 +60,190 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
 exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST > should work correct with gpt-4 1`] = `
 [
   {
-    "contextWindowTokens": 16385,
+    "abilities": {
+      "functionCall": true,
+    },
+    "contextWindowTokens": 16384,
     "description": "GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125",
     "displayName": "GPT-3.5 Turbo 1106",
     "enabled": true,
-    "functionCall": true,
     "id": "gpt-3.5-turbo-1106",
+    "pricing": {
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 1,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 2,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
+    },
+    "providerId": "openai",
+    "releasedAt": "2023-11-06",
+    "source": "builtin",
+    "type": "chat",
   },
   {
-    "contextWindowTokens": 16385,
+    "abilities": {
+      "functionCall": true,
+    },
+    "contextWindowTokens": 16384,
     "description": "GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125",
     "displayName": "GPT-3.5 Turbo",
     "enabled": true,
-    "functionCall": true,
     "id": "gpt-3.5-turbo",
+    "pricing": {
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 0.5,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 1.5,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
+    },
+    "providerId": "openai",
+    "source": "builtin",
+    "type": "chat",
   },
   {
+    "abilities": {
+      "functionCall": true,
+    },
     "contextWindowTokens": 8192,
     "description": "GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。",
     "displayName": "GPT-4",
     "enabled": true,
-    "functionCall": true,
     "id": "gpt-4",
+    "pricing": {
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 30,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 60,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
+    },
+    "providerId": "openai",
+    "source": "builtin",
+    "type": "chat",
   },
   {
+    "abilities": {
+      "functionCall": true,
+    },
     "contextWindowTokens": 32768,
     "description": "GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。",
     "displayName": "GPT-4 32K",
     "enabled": true,
-    "functionCall": true,
     "id": "gpt-4-32k",
+    "pricing": {
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 60,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 120,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
+    },
+    "providerId": "openai",
+    "source": "builtin",
+    "type": "chat",
   },
   {
+    "abilities": {
+      "functionCall": true,
+    },
     "contextWindowTokens": 128000,
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
     "displayName": "GPT-4 Turbo Preview 1106",
     "enabled": true,
-    "functionCall": true,
     "id": "gpt-4-1106-preview",
+    "pricing": {
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 10,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 30,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
+    },
+    "providerId": "openai",
+    "releasedAt": "2023-11-06",
+    "source": "builtin",
+    "type": "chat",
   },
   {
+    "abilities": {},
     "displayName": "gpt-4-vision",
     "enabled": true,
     "id": "gpt-4-vision",
+    "type": "chat",
   },
 ]
 `;
 
 exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST > show the hidden model 1`] = `
 {
+  "abilities": {
+    "functionCall": true,
+  },
   "contextWindowTokens": 128000,
   "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
   "displayName": "GPT-4 Turbo Preview 1106",
   "enabled": true,
-  "functionCall": true,
   "id": "gpt-4-1106-preview",
+  "pricing": {
+    "units": [
+      {
+        "name": "textInput",
+        "rate": 10,
+        "strategy": "fixed",
+        "unit": "millionTokens",
+      },
+      {
+        "name": "textOutput",
+        "rate": 30,
+        "strategy": "fixed",
+        "unit": "millionTokens",
+      },
+    ],
+  },
+  "releasedAt": "2023-11-06",
+  "type": "chat",
 }
 `;
 
@@ -99,20 +254,28 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENROUTER_MODEL_
     "meta-llama/llama-3.1-8b-instruct:free",
     "google/gemma-2-9b-it:free",
   ],
-  "serverModelCards": [
+  "serverModelLists": [
     {
-      "contextWindowTokens": 32768,
+      "abilities": {},
+      "contextWindowTokens": 131072,
       "description": "LLaMA 3.1 提供多语言支持，是业界领先的生成模型之一。",
       "displayName": "Llama 3.1 8B (Free)",
       "enabled": true,
       "id": "meta-llama/llama-3.1-8b-instruct:free",
+      "providerId": "openrouter",
+      "source": "builtin",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "contextWindowTokens": 8192,
       "description": "Gemma 2 是Google轻量化的开源文本模型系列。",
       "displayName": "Gemma 2 9B (Free)",
       "enabled": true,
       "id": "google/gemma-2-9b-it:free",
+      "providerId": "openrouter",
+      "source": "builtin",
+      "type": "chat",
     },
   ],
 }

package/src/server/routers/lambda/config/index.test.ts

@@ -4,8 +4,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 /**
  * This file contains the root router of your tRPC-backend
  */
-import { createCallerFactory } from '@/libs/trpc/edge';
-import { AuthContext, createContextInner } from '@/libs/trpc/edge/context';
+import { createCallerFactory } from '@/libs/trpc/lambda';
+import { AuthContext, createContextInner } from '@/libs/trpc/lambda/context';
 
 import { configRouter } from './index';
 
@@ -36,7 +36,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.serverConfig.languageModel?.openai;
+          const result = response.serverConfig.aiProvider?.openai;
 
           expect(result).toMatchSnapshot();
           process.env.OPENAI_MODEL_LIST = '';
@@ -48,7 +48,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result).toMatchSnapshot();
 
@@ -61,7 +61,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result?.find((s) => s.id === 'gpt-4-0125-preview')?.displayName).toEqual(
             'gpt-4-32k',
@@ -75,7 +75,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result?.find((r) => r.id === 'gpt-4')).toBeUndefined();
 
@@ -87,7 +87,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           const model = result?.find((o) => o.id === 'gpt-4-1106-preview');
 
@@ -101,28 +101,36 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
-
-          expect(result).toContainEqual({
-            displayName: 'model1',
-            id: 'model1',
-            enabled: true,
-          });
-          expect(result).toContainEqual({
-            displayName: 'model2',
-            enabled: true,
-            id: 'model2',
-          });
-          expect(result).toContainEqual({
-            displayName: 'model3',
-            enabled: true,
-            id: 'model3',
-          });
-          expect(result).toContainEqual({
-            displayName: 'model4',
-            enabled: true,
-            id: 'model4',
-          });
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
+
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model1',
+              id: 'model1',
+              enabled: true,
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model2',
+              enabled: true,
+              id: 'model2',
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model3',
+              enabled: true,
+              id: 'model3',
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model4',
+              enabled: true,
+              id: 'model4',
+            }),
+          );
 
           process.env.OPENAI_MODEL_LIST = '';
         });
@@ -136,7 +144,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.serverConfig.languageModel?.openrouter;
+          const result = response.serverConfig.aiProvider?.openrouter;
 
           expect(result).toMatchSnapshot();
 

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

@@ -3,10 +3,10 @@ import { serialize } from 'cookie';
 import debug from 'debug';
 import { z } from 'zod';
 
-import { isDesktop } from '@/const/version';
+import { isDesktop } from '@lobechat/const';
 import { publicProcedure, router } from '@/libs/trpc/lambda';
 import { DiscoverService } from '@/server/services/discover';
-import { AssistantSorts, McpSorts, ModelSorts, PluginSorts, ProviderSorts } from '@/types/discover';
+import { AssistantSorts, McpConnectionType, McpSorts, ModelSorts, PluginSorts, ProviderSorts } from '@/types/discover';
 
 const log = debug('lambda-router:market');
 
@@ -83,6 +83,7 @@ export const marketRouter = router({
       z
         .object({
           category: z.string().optional(),
+          connectionType: z.nativeEnum(McpConnectionType).optional(),
           locale: z.string().optional(),
           order: z.enum(['asc', 'desc']).optional(),
           page: z.number().optional(),
@@ -178,6 +179,7 @@ export const marketRouter = router({
       z
         .object({
           category: z.string().optional(),
+          connectionType: z.nativeEnum(McpConnectionType).optional(),
           locale: z.string().optional(),
           order: z.enum(['asc', 'desc']).optional(),
           page: z.number().optional(),

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

@@ -1,4 +1,8 @@
-import { BatchTaskResult, UIChatMessage, UpdateMessageRAGParamsSchema } from '@lobechat/types';
+import {
+  CreateNewMessageParamsSchema,
+  UpdateMessageParamsSchema,
+  UpdateMessageRAGParamsSchema,
+} from '@lobechat/types';
 import { z } from 'zod';
 
 import { MessageModel } from '@/database/models/message';
@@ -7,8 +11,7 @@ import { getServerDB } from '@/database/server';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
 import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
-
-type ChatMessageList = UIChatMessage[];
+import { MessageService } from '@/server/services/message';
 
 const messageProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {
   const { ctx } = opts;
@@ -17,19 +20,12 @@ const messageProcedure = authedProcedure.use(serverDatabase).use(async (opts) =>
     ctx: {
       fileService: new FileService(ctx.serverDB, ctx.userId),
       messageModel: new MessageModel(ctx.serverDB, ctx.userId),
+      messageService: new MessageService(ctx.serverDB, ctx.userId),
     },
   });
 });
 
 export const messageRouter = router({
-  batchCreateMessages: messageProcedure
-    .input(z.array(z.any()))
-    .mutation(async ({ input, ctx }): Promise<BatchTaskResult> => {
-      const data = await ctx.messageModel.batchCreate(input);
-
-      return { added: data.rowCount as number, ids: [], skips: [], success: true };
-    }),
-
   count: messageProcedure
     .input(
       z
@@ -58,36 +54,11 @@ export const messageRouter = router({
       return ctx.messageModel.countWords(input);
     }),
 
-  createMessage: messageProcedure
-    .input(z.object({}).passthrough().partial())
-    .mutation(async ({ input, ctx }) => {
-      const data = await ctx.messageModel.create(input as any);
-
-      return data.id;
-    }),
-
   createNewMessage: messageProcedure
-    .input(z.object({}).passthrough().partial())
+    .input(CreateNewMessageParamsSchema.extend({ useGroup: z.boolean().optional() }))
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.createNewMessage(input as any, {
-        postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
-      });
-    }),
-
-  // TODO: it will be removed in V2
-  getAllMessages: messageProcedure.query(async ({ ctx }): Promise<ChatMessageList> => {
-    return ctx.messageModel.queryAll() as any;
-  }),
-
-  // TODO: it will be removed in V2
-  getAllMessagesInSession: messageProcedure
-    .input(
-      z.object({
-        sessionId: z.string().nullable().optional(),
-      }),
-    )
-    .query(async ({ ctx, input }): Promise<ChatMessageList> => {
-      return ctx.messageModel.queryBySessionId(input.sessionId) as any;
+      const { useGroup, ...params } = input;
+      return ctx.messageService.createNewMessage(params as any, { useGroup });
     }),
 
   getHeatmaps: messageProcedure.query(async ({ ctx }) => {
@@ -103,16 +74,20 @@ export const messageRouter = router({
         pageSize: z.number().optional(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
       }),
     )
     .query(async ({ input, ctx }) => {
       if (!ctx.userId) return [];
       const serverDB = await getServerDB();
 
+      const { useGroup, ...queryParams } = input;
+
       const messageModel = new MessageModel(serverDB, ctx.userId);
       const fileService = new FileService(serverDB, ctx.userId);
 
-      return messageModel.query(input, {
+      return messageModel.query(queryParams, {
+        groupAssistantMessages: useGroup ?? false,
         postProcessUrl: (path) => fileService.getFullFileUrl(path),
       });
     }),
@@ -126,9 +101,17 @@ export const messageRouter = router({
   }),
 
   removeMessage: messageProcedure
-    .input(z.object({ id: z.string() }))
+    .input(
+      z.object({
+        id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.deleteMessage(input.id);
+      const { id, ...options } = input;
+      return ctx.messageService.removeMessage(id, options);
     }),
 
   removeMessageQuery: messageProcedure
@@ -138,9 +121,17 @@ export const messageRouter = router({
     }),
 
   removeMessages: messageProcedure
-    .input(z.object({ ids: z.array(z.string()) }))
+    .input(
+      z.object({
+        ids: z.array(z.string()),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.deleteMessages(input.ids);
+      const { ids, ...options } = input;
+      return ctx.messageService.removeMessages(ids, options);
     }),
 
   removeMessagesByAssistant: messageProcedure
@@ -180,11 +171,15 @@ export const messageRouter = router({
     .input(
       z.object({
         id: z.string(),
-        value: z.object({}).passthrough().partial(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+        value: UpdateMessageParamsSchema,
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.update(input.id, input.value);
+      const { id, value, ...options } = input;
+      return ctx.messageService.updateMessage(id, value as any, options);
     }),
 
   updateMessagePlugin: messageProcedure
@@ -199,9 +194,16 @@ export const messageRouter = router({
     }),
 
   updateMessageRAG: messageProcedure
-    .input(UpdateMessageRAGParamsSchema)
+    .input(
+      UpdateMessageRAGParamsSchema.extend({
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
-      await ctx.messageModel.updateMessageRAG(input.id, input.value);
+      const { id, value, ...options } = input;
+      return ctx.messageService.updateMessageRAG(id, value, options);
     }),
 
   updateMetadata: messageProcedure
@@ -219,22 +221,30 @@ export const messageRouter = router({
     .input(
       z.object({
         id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough().nullable(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.updateMessagePlugin(input.id, { error: input.value });
+      const { id, value, ...options } = input;
+      return ctx.messageService.updatePluginError(id, value, options);
     }),
 
   updatePluginState: messageProcedure
     .input(
       z.object({
         id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.updatePluginState(input.id, input.value);
+      const { id, value, ...options } = input;
+      return ctx.messageService.updatePluginState(id, value, options);
     }),
 
   updateTTS: messageProcedure
@@ -279,5 +289,3 @@ export const messageRouter = router({
       return ctx.messageModel.updateTranslate(input.id, input.value);
     }),
 });
-
-export type MessageRouter = typeof messageRouter;

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

@@ -97,14 +97,17 @@ export const sessionRouter = router({
     }),
 
   getGroupedSessions: publicProcedure.query(async ({ ctx }): Promise<ChatSessionList> => {
-    if (!ctx.userId) return { sessionGroups: [], sessions: [] };
+    const userId = ctx.userId;
+    if (!userId) return { sessionGroups: [], sessions: [] };
 
     const serverDB = await getServerDB();
-    const sessionModel = new SessionModel(serverDB, ctx.userId!);
-    const chatGroupModel = new ChatGroupModel(serverDB, ctx.userId!);
+    const sessionModel = new SessionModel(serverDB, userId);
+    const chatGroupModel = new ChatGroupModel(serverDB, userId);
 
-    const { sessions, sessionGroups } = await sessionModel.queryWithGroups();
-    const chatGroups = await chatGroupModel.queryWithMemberDetails();
+    const [{ sessions, sessionGroups }, chatGroups] = await Promise.all([
+      sessionModel.queryWithGroups(),
+      chatGroupModel.queryWithMemberDetails(),
+    ]);
 
     const groupSessions: LobeGroupSession[] = chatGroups.map((group) => {
       const { title, description, avatar, backgroundColor, groupId, ...rest } = group;

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

@@ -128,7 +128,13 @@ export const topicRouter = router({
     }),
 
   searchTopics: topicProcedure
-    .input(z.object({ keywords: z.string(), sessionId: z.string().nullable().optional() }))
+    .input(
+      z.object({
+        groupId: z.string().nullable().optional(),
+        keywords: z.string(),
+        sessionId: z.string().nullable().optional(),
+      }),
+    )
     .query(async ({ input, ctx }) => {
       return ctx.topicModel.queryByKeyword(input.keywords, input.sessionId);
     }),