♻️ refactor: remove language_model_settings and remove isDeprecatedEdition (#10264)

Author: arvinxx

packages/const/src/version.ts

@@ -4,13 +4,8 @@ import { BRANDING_NAME, ORG_NAME } from './branding';
 
 export const CURRENT_VERSION = pkg.version;
 
-export const isServerMode = true;
-export const isUsePgliteDB = false;
-
 export const isDesktop = process.env.NEXT_PUBLIC_IS_DESKTOP_APP === '1';
 
-export const isDeprecatedEdition = false;
-
 // @ts-ignore
 export const isCustomBranding = BRANDING_NAME !== 'LobeHub';
 // @ts-ignore

packages/database/src/models/__tests__/chunk.test.ts

@@ -287,6 +287,44 @@ describe('ChunkModel', () => {
       expect(result[1].index).toBe(1);
       expect(result[2].index).toBe(2);
     });
+
+    it('should handle chunks with null metadata and return undefined pageNumber', async () => {
+      const fileId = '1';
+      const [chunk] = await serverDB
+        .insert(chunks)
+        .values([{ text: 'Chunk with null metadata', userId, index: 0, metadata: null }])
+        .returning();
+
+      await serverDB.insert(fileChunks).values([{ fileId, chunkId: chunk.id, userId }]);
+
+      const result = await chunkModel.findByFileId(fileId, 0);
+
+      expect(result).toHaveLength(1);
+      expect(result[0].metadata).toBeNull();
+      expect(result[0].pageNumber).toBeUndefined();
+    });
+
+    it('should handle chunks with metadata containing pageNumber', async () => {
+      const fileId = '1';
+      const [chunk] = await serverDB
+        .insert(chunks)
+        .values([
+          {
+            text: 'Chunk with pageNumber',
+            userId,
+            index: 0,
+            metadata: { pageNumber: 5 } as any,
+          },
+        ])
+        .returning();
+
+      await serverDB.insert(fileChunks).values([{ fileId, chunkId: chunk.id, userId }]);
+
+      const result = await chunkModel.findByFileId(fileId, 0);
+
+      expect(result).toHaveLength(1);
+      expect(result[0].pageNumber).toBe(5);
+    });
   });
 
   describe('getChunksTextByFileId', () => {

src/app/(backend)/api/webhooks/clerk/route.ts

@@ -1,14 +1,13 @@
 import { NextResponse } from 'next/server';
 
-import { isServerMode } from '@/const/version';
 import { serverDB } from '@/database/server';
 import { authEnv } from '@/envs/auth';
 import { pino } from '@/libs/logger';
 import { UserService } from '@/server/services/user';
 
 import { validateRequest } from './validateRequest';
 
-if (authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH && isServerMode && !authEnv.CLERK_WEBHOOK_SECRET) {
+if (authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH && !authEnv.CLERK_WEBHOOK_SECRET) {
   throw new Error('`CLERK_WEBHOOK_SECRET` environment variable is missing');
 }
 

src/app/[variants]/(main)/(mobile)/me/(home)/__tests__/useCategory.test.tsx

@@ -23,10 +23,6 @@ vi.mock('react-i18next', () => ({
   })),
 }));
 
-vi.mock('../../settings/features/useCategory', () => ({
-  useCategory: vi.fn(() => [{ key: 'extraSetting', label: 'Extra Setting' }]),
-}));
-
 // 定义一个变量来存储 enableAuth 的值
 let enableAuth = true;
 let enableClerk = true;
@@ -68,7 +64,6 @@ describe('useCategory', () => {
       const items = result.current;
       expect(items.some((item) => item.key === 'profile')).toBe(true);
       expect(items.some((item) => item.key === 'setting')).toBe(true);
-      expect(items.some((item) => item.key === 'data')).toBe(true);
       expect(items.some((item) => item.key === 'docs')).toBe(true);
       expect(items.some((item) => item.key === 'feedback')).toBe(true);
       expect(items.some((item) => item.key === 'changelog')).toBe(true);
@@ -93,19 +88,4 @@ describe('useCategory', () => {
       expect(items.some((item) => item.key === 'changelog')).toBe(true);
     });
   });
-
-  it('should handle settings for non-authenticated users', () => {
-    act(() => {
-      useUserStore.setState({ isSignedIn: false });
-    });
-    enableClerk = false;
-    enableAuth = false;
-
-    const { result } = renderHook(() => useCategory(), { wrapper });
-
-    act(() => {
-      const items = result.current;
-      expect(items.some((item) => item.key === 'extraSetting')).toBe(true);
-    });
-  });
 });

src/app/[variants]/(main)/(mobile)/me/(home)/features/useCategory.tsx

@@ -1,8 +1,8 @@
+import { DOCUMENTS, FEEDBACK, LOBE_CHAT_CLOUD, OFFICIAL_URL, UTM_SOURCE } from '@lobechat/const';
 import {
   Book,
   CircleUserRound,
   Cloudy,
-  Database,
   Download,
   Feather,
   FileClockIcon,
@@ -12,26 +12,17 @@ import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
 
 import { CellProps } from '@/components/Cell';
-import { enableAuth } from '@/const/auth';
-import { LOBE_CHAT_CLOUD } from '@/const/branding';
-import { DOCUMENTS, FEEDBACK, OFFICIAL_URL, UTM_SOURCE } from '@/const/url';
-import { isServerMode } from '@/const/version';
 import { usePWAInstall } from '@/hooks/usePWAInstall';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
-import { useCategory as useSettingsCategory } from '../../settings/features/useCategory';
-
 export const useCategory = () => {
   const router = useRouter();
   const { canInstall, install } = usePWAInstall();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
-  const [isLogin, isLoginWithAuth] = useUserStore((s) => [
-    authSelectors.isLogin(s),
-    authSelectors.isLoginWithAuth(s),
-  ]);
+  const [isLoginWithAuth] = useUserStore((s) => [authSelectors.isLoginWithAuth(s)]);
 
   const profile: CellProps[] = [
     {
@@ -66,29 +57,10 @@ export const useCategory = () => {
     },
   ];
 
-  const settingsWithoutAuth = [
-    ...useSettingsCategory(),
-    {
-      type: 'divider',
-    },
-  ];
-
   /* ↓ cloud slot ↓ */
 
   /* ↑ cloud slot ↑ */
 
-  const data: CellProps[] = [
-    {
-      icon: Database,
-      key: 'data',
-      label: t('userPanel.data'),
-      onClick: () => router.push('/me/data'),
-    },
-    {
-      type: 'divider',
-    },
-  ];
-
   const helps: CellProps[] = [
     showCloudPromotion && {
       icon: Cloudy,
@@ -120,13 +92,12 @@ export const useCategory = () => {
     {
       type: 'divider',
     },
-    ...(!enableAuth || (enableAuth && isLoginWithAuth) ? profile : []),
-    ...(enableAuth ? (isLoginWithAuth ? settings : []) : settingsWithoutAuth),
+    ...(isLoginWithAuth ? profile : []),
+    ...(isLoginWithAuth ? settings : []),
     /* ↓ cloud slot ↓ */
 
     /* ↑ cloud slot ↑ */
     ...(canInstall ? pwa : []),
-    ...(isLogin && !isServerMode ? data : []),
     ...(!hideDocs ? helps : []),
   ].filter(Boolean) as CellProps[];
 

src/app/[variants]/(main)/(mobile)/me/profile/features/Category.tsx

@@ -6,8 +6,6 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import Cell, { CellProps } from '@/components/Cell';
-import { enableAuth } from '@/const/auth';
-import { isDeprecatedEdition } from '@/const/version';
 import { ProfileTabs } from '@/store/global/initialState';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
@@ -27,33 +25,30 @@ const Category = memo(() => {
       label: t('tab.profile'),
       onClick: () => router.push('/profile'),
     },
-    enableAuth &&
-      isLoginWithClerk && {
-        icon: ShieldCheck,
-        key: ProfileTabs.Security,
-        label: t('tab.security'),
-        onClick: () => router.push('/profile/security'),
-      },
-    !isDeprecatedEdition && {
+    isLoginWithClerk && {
+      icon: ShieldCheck,
+      key: ProfileTabs.Security,
+      label: t('tab.security'),
+      onClick: () => router.push('/profile/security'),
+    },
+    {
       icon: ChartColumnBigIcon,
       key: ProfileTabs.Stats,
       label: t('tab.stats'),
       onClick: () => router.push('/profile/stats'),
     },
-    enableAuth &&
-      isLogin && {
-        type: 'divider',
-      },
-    enableAuth &&
-      isLogin && {
-        icon: LogOut,
-        key: 'logout',
-        label: t('signout', { ns: 'auth' }),
-        onClick: () => {
-          signOut();
-          router.push('/login');
-        },
+    isLogin && {
+      type: 'divider',
+    },
+    isLogin && {
+      icon: LogOut,
+      key: 'logout',
+      label: t('signout', { ns: 'auth' }),
+      onClick: () => {
+        signOut();
+        router.push('/login');
       },
+    },
   ].filter(Boolean) as CellProps[];
 
   return items?.map(({ key, ...item }, index) => <Cell key={key || index} {...item} />);

src/app/[variants]/(main)/(mobile)/me/settings/features/useCategory.tsx

@@ -3,14 +3,11 @@ import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
 
 import { CellProps } from '@/components/Cell';
-import { isDeprecatedEdition } from '@/const/version';
 import { SettingsTabs } from '@/store/global/initialState';
-import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 
 export const useCategory = () => {
   const router = useRouter();
   const { t } = useTranslation('setting');
-  const { showLLM } = useServerConfigStore(featureFlagsSelectors);
 
   const items: CellProps[] = [
     {
@@ -23,18 +20,11 @@ export const useCategory = () => {
       key: SettingsTabs.SystemAgent,
       label: t('tab.system-agent'),
     },
-    showLLM &&
-      (isDeprecatedEdition
-        ? {
-            icon: Brain,
-            key: SettingsTabs.LLM,
-            label: t('tab.llm'),
-          }
-        : {
-            icon: Brain,
-            key: SettingsTabs.Provider,
-            label: t('tab.provider'),
-          }),
+    {
+      icon: Brain,
+      key: SettingsTabs.Provider,
+      label: t('tab.provider'),
+    },
     { icon: Mic2, key: SettingsTabs.TTS, label: t('tab.tts') },
     {
       icon: Bot,

src/app/[variants]/(main)/discover/(detail)/provider/[...slugs]/features/Sidebar/ActionButton/ProviderConfig.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { isDesktop } from '@lobechat/const';
 import { Button, Icon } from '@lobehub/ui';
 import { Dropdown } from 'antd';
 import { createStyles } from 'antd-style';
@@ -9,8 +10,6 @@ import { useRouter } from 'nextjs-toploader/app';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { isDeprecatedEdition, isDesktop } from '@/const/version';
-
 import { useDetailContext } from '../../DetailProvider';
 
 const useStyles = createStyles(({ css }) => ({
@@ -27,10 +26,8 @@ const ProviderConfig = memo(() => {
   const { url, modelsUrl, identifier } = useDetailContext();
   const router = useRouter();
   const openSettings = async () => {
-    const searchParams = isDeprecatedEdition
-      ? { active: 'llm' }
-      : { active: 'provider', provider: identifier };
-    const tab = isDeprecatedEdition ? 'llm' : 'provider';
+    const searchParams = { active: 'provider', provider: identifier };
+    const tab = 'provider';
 
     if (isDesktop) {
       const { dispatch } = await import('@lobechat/electron-client-ipc');
@@ -41,11 +38,7 @@ const ProviderConfig = memo(() => {
       return;
     }
 
-    router.push(
-      isDeprecatedEdition
-        ? '/settings?active=llm'
-        : `/settings?active=provider&provider=${identifier}`,
-    );
+    router.push(`/settings?active=provider&provider=${identifier}`);
   };
 
   const icon = <Icon icon={SquareArrowOutUpRight} size={16} />;