@lobehub/lobehub 2.0.0-next.22 → 2.0.0-next.24

package/src/app/[variants]/(main)/labs/components/LabCard.tsx

@@ -6,6 +6,8 @@ import Image from 'next/image';
 import { PropsWithChildren, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { SkeletonSwitch } from '@/components/Skeleton';
+
 interface LabCardProps {
   checked: boolean;
   cover?: string;
@@ -80,11 +82,9 @@ const LabCard = memo<PropsWithChildren<LabCardProps>>(
               <div className={styles.desc}>{desc}</div>
               {meta ? <div className={styles.meta}>{meta}</div> : null}
             </Flexbox>
-            {!loading && (
-              <Flexbox align={'flex-end'} height={'100%'} justify={'center'} paddingInline={8}>
-                <Switch checked={checked} onChange={onChange} />
-              </Flexbox>
-            )}
+            <Flexbox align={'flex-end'} height={'100%'} justify={'center'} paddingInline={8}>
+              {loading ? <SkeletonSwitch /> : <Switch checked={checked} onChange={onChange} />}
+            </Flexbox>
           </div>
         </div>
       </div>

package/src/app/[variants]/(main)/labs/page.tsx

@@ -1,11 +1,11 @@
 'use client';
 
-import { memo, useCallback } from 'react';
+import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors } from '@/store/user/selectors';
+import { labPreferSelectors, preferenceSelectors } from '@/store/user/selectors';
 
 import Hero from './components/Hero';
 import LabCard from './components/LabCard';
@@ -15,7 +15,6 @@ interface LabItem {
   cover?: string;
   desc: string;
   key: string;
-  onChange: (checked: boolean) => void;
   title: string;
 }
 
@@ -24,40 +23,37 @@ const LabsPage = memo(() => {
 
   const [
     isPreferenceInit,
-    inputMarkdownRender,
+    enableInputMarkdown,
+    // enableAssistantMessageGroup,
     // enableGroupChat,
-    updatePreference,
+    updateLab,
   ] = useUserStore((s) => [
     preferenceSelectors.isPreferenceInit(s),
-    preferenceSelectors.inputMarkdownRender(s),
-    // preferenceSelectors.enableGroupChat(s),
-    s.updatePreference,
+    labPreferSelectors.enableInputMarkdown(s),
+    // labPreferSelectors.enableAssistantMessageGroup(s),
+    // labPreferSelectors.enableGroupChat(s),
+    s.updateLab,
   ]);
 
-  const onToggleMarkdown = useCallback(
-    (checked: boolean) => updatePreference({ disableInputMarkdownRender: !checked }),
-    [updatePreference],
-  );
-  // const onToggleGroupChat = useCallback(
-  //   (checked: boolean) => updatePreference({ enableGroupChat: checked }),
-  //   [updatePreference],
-  // );
-
   const labItems: LabItem[] = [
     {
-      checked: inputMarkdownRender,
+      checked: enableInputMarkdown,
       cover: 'https://github.com/user-attachments/assets/0527a966-3d95-46b4-b880-c0f3fca18f02',
       desc: t('features.inputMarkdown.desc'),
-      key: 'inputMarkdown',
-      onChange: onToggleMarkdown,
+      key: 'enableInputMarkdown',
       title: t('features.inputMarkdown.title'),
     },
     // {
+    //   checked: enableAssistantMessageGroup,
+    //   desc: t('features.assistantMessageGroup.desc'),
+    //   key: 'enableAssistantMessageGroup',
+    //   title: t('features.assistantMessageGroup.title'),
+    // },
+    // {
     //   checked: enableGroupChat,
     //   cover: 'https://github.com/user-attachments/assets/72894d24-a96a-4d7c-a823-ff9e6a1a8b6d',
     //   desc: t('features.groupChat.desc'),
     //   key: 'groupChat',
-    //   onChange: onToggleGroupChat,
     //   title: t('features.groupChat.title'),
     // },
   ];
@@ -73,7 +69,7 @@ const LabsPage = memo(() => {
           desc={item.desc}
           key={item.key}
           loading={!isPreferenceInit}
-          onChange={item.onChange}
+          onChange={(checked: boolean) => updateLab({ [item.key]: checked })}
           title={item.title}
         />
       ))}

package/src/app/[variants]/(main)/settings/provider/detail/azure/index.tsx

@@ -6,11 +6,11 @@ import { ModelProvider } from 'model-bank';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { AzureProviderCard } from '@/config/modelProviders';
 import { aiModelSelectors, aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/azureai/index.tsx

@@ -4,11 +4,11 @@ import { ModelProvider } from 'model-bank';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { AzureAIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/bedrock/index.tsx

@@ -4,12 +4,12 @@ import { Select } from '@lobehub/ui';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { BedrockProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/cloudflare/index.tsx

@@ -3,12 +3,12 @@
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { CloudflareProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/comfyui/index.tsx

@@ -5,12 +5,12 @@ import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import KeyValueEditor from '@/components/KeyValueEditor';
+import { SkeletonInput } from '@/components/Skeleton';
 import { ComfyUIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/github/index.tsx

@@ -5,12 +5,12 @@ import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { GithubProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/vertexai/index.tsx

@@ -5,12 +5,12 @@ import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { VertexAIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/features/ProviderConfig/index.tsx

@@ -21,6 +21,7 @@ import urlJoin from 'url-join';
 import { z } from 'zod';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput, SkeletonSwitch } from '@/components/Skeleton';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { AES_GCM_URL, BASE_PROVIDER_DOC_URL } from '@/const/url';
 import { isDesktop, isServerMode } from '@/const/version';
@@ -34,7 +35,6 @@ import {
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
 import Checker, { CheckErrorRender } from './Checker';
 import EnableSwitch from './EnableSwitch';
-import { SkeletonInput } from './SkeletonInput';
 import UpdateProviderInfo from './UpdateProviderInfo';
 
 const useStyles = createStyles(({ css, prefixCls, responsive, token }) => ({
@@ -298,7 +298,7 @@ const ProviderConfig = memo<ProviderConfigProps>(
         (showApiKey && isProviderApiKeyNotEmpty));
     const clientFetchItem = showClientFetch && {
       children: isLoading ? (
-        <Skeleton.Button active className={styles.switchLoading} />
+        <SkeletonSwitch />
       ) : (
         <Switch checked={isFetchOnClient} disabled={configUpdating} />
       ),
@@ -424,5 +424,3 @@ const ProviderConfig = memo<ProviderConfigProps>(
 );
 
 export default ProviderConfig;
-
-export { SkeletonInput } from './SkeletonInput';

package/src/components/Skeleton/SkeletonSwitch.tsx

@@ -0,0 +1,13 @@
+import { Skeleton } from 'antd';
+import { css, cx } from 'antd-style';
+
+const switchLoading = cx(css`
+  width: 44px !important;
+  min-width: 44px !important;
+  height: 22px !important;
+  border-radius: 12px !important;
+`);
+
+export const SkeletonSwitch = () => {
+  return <Skeleton.Button active className={switchLoading} />;
+};

package/src/components/Skeleton/index.ts

@@ -0,0 +1,2 @@
+export * from './SkeletonInput';
+export * from './SkeletonSwitch';

package/src/features/ChatInput/ActionBar/index.tsx

@@ -4,7 +4,7 @@ import { memo, useMemo } from 'react';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors } from '@/store/user/slices/preference/selectors';
+import { labPreferSelectors } from '@/store/user/slices/preference/selectors';
 
 import { ActionKeys, actionMap } from '../ActionBar/config';
 import { useChatInputStore } from '../store';
@@ -44,7 +44,7 @@ const ActionToolbar = memo(() => {
     systemStatusSelectors.expandInputActionbar(s),
     s.toggleExpandInputActionbar,
   ]);
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const leftActions = useChatInputStore((s) =>
     s.leftActions.filter((item) => (enableRichRender ? true : item !== 'typo')),

package/src/features/ChatInput/InputEditor/index.tsx

@@ -21,7 +21,7 @@ import { useHotkeysContext } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
+import { labPreferSelectors, preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
 
 import { useChatInputStore, useStoreApi } from '../store';
 import Placeholder from './Placeholder';
@@ -69,7 +69,7 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
     };
   }, [state.isEmpty]);
 
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const richRenderProps = useMemo(
     () =>

package/src/locales/default/labs.ts

@@ -1,6 +1,10 @@
 export default {
   desc: '这里会不定期更新我们正在探索的新功能，欢迎试用！',
   features: {
+    assistantMessageGroup: {
+      desc: '将助手消息及其工具调用结果聚合到分组里显示',
+      title: '助手消息聚合分组',
+    },
     groupChat: {
       desc: '启用多智能体群聊编排能力。',
       title: '群聊（多智能体）',

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

@@ -1,7 +1,6 @@
 import {
   CreateMessageParamsSchema,
   CreateNewMessageParamsSchema,
-  UIChatMessage,
   UpdateMessageParamsSchema,
   UpdateMessageRAGParamsSchema,
 } from '@lobechat/types';
@@ -14,8 +13,6 @@ import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
 import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
 
-type ChatMessageList = UIChatMessage[];
-
 const messageProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {
   const { ctx } = opts;
 
@@ -72,22 +69,6 @@ export const messageRouter = router({
       });
     }),
 
-  // 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;
-    }),
-
   getHeatmaps: messageProcedure.query(async ({ ctx }) => {
     return ctx.messageModel.getHeatmaps();
   }),
@@ -101,16 +82,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),
       });
     }),