@lobehub/lobehub 2.0.0-next.67 → 2.0.0-next.69

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.69](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.68...v2.0.0-next.69)
+
+<sup>Released on **2025-11-17**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Remove `language_model_settings` and remove isDeprecatedEdition.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Remove `language_model_settings` and remove isDeprecatedEdition, closes [#10264](https://github.com/lobehub/lobe-chat/issues/10264) ([ae613c7](https://github.com/lobehub/lobe-chat/commit/ae613c7))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.68](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.67...v2.0.0-next.68)
+
+<sup>Released on **2025-11-16**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: The tool to fail execution on ollama when a message contains b….
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: The tool to fail execution on ollama when a message contains b…, closes [#10259](https://github.com/lobehub/lobe-chat/issues/10259) ([1ad8080](https://github.com/lobehub/lobe-chat/commit/1ad8080))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.67](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.66...v2.0.0-next.67)
 
 <sup>Released on **2025-11-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Remove language_model_settings and remove isDeprecatedEdition."
+      ]
+    },
+    "date": "2025-11-17",
+    "version": "2.0.0-next.69"
+  },
+  {
+    "children": {
+      "fixes": [
+        "The tool to fail execution on ollama when a message contains b…."
+      ]
+    },
+    "date": "2025-11-16",
+    "version": "2.0.0-next.68"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.67",
+  "version": "2.0.0-next.69",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -122,9 +122,6 @@
       "eslint --fix"
     ]
   },
-  "overrides": {
-    "eta": "4.0.1"
-  },
   "dependencies": {
     "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "^2.8.10",
@@ -398,9 +395,6 @@
   "pnpm": {
     "onlyBuiltDependencies": [
       "@vercel/speed-insights"
-    ],
-    "overrides": {
-      "eta": "4.0.1"
-    }
+    ]
   }
 }

package/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

package/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', () => {

package/packages/model-runtime/src/core/streams/ollama.test.ts

@@ -235,6 +235,73 @@ describe('OllamaStream', () => {
       expect(onToolCall).toHaveBeenCalledTimes(1);
       expect(onCompletionMock).toHaveBeenCalledTimes(1);
     });
+
+    it('tools use with a done', async () => {
+      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
+
+      const mockOllamaStream = new ReadableStream<ChatResponse>({
+        start(controller) {
+          controller.enqueue({
+            model: 'qwen2.5',
+            created_at: new Date('2024-12-01T03:34:55.166692Z'),
+            message: {
+              role: 'assistant',
+              content: '',
+              tool_calls: [
+                {
+                  function: {
+                    name: 'realtime-weather____fetchCurrentWeather',
+                    arguments: { city: '杭州' },
+                  },
+                },
+              ],
+            },
+            done_reason: 'stop',
+            done: true,
+            total_duration: 1122415333,
+            load_duration: 26178333,
+            prompt_eval_count: 221,
+            prompt_eval_duration: 507000000,
+            eval_count: 26,
+            eval_duration: 583000000,
+          } as unknown as ChatResponse);
+
+          controller.close();
+        },
+      });
+      const onStartMock = vi.fn();
+      const onTextMock = vi.fn();
+      const onToolCall = vi.fn();
+      const onCompletionMock = vi.fn();
+
+      const protocolStream = OllamaStream(mockOllamaStream, {
+        onStart: onStartMock,
+        onText: onTextMock,
+        onCompletion: onCompletionMock,
+        onToolsCalling: onToolCall,
+      });
+
+      const decoder = new TextDecoder();
+      const chunks = [];
+
+      // @ts-ignore
+      for await (const chunk of protocolStream) {
+        chunks.push(decoder.decode(chunk, { stream: true }));
+      }
+
+      expect(chunks).toEqual(
+        [
+          'id: chat_1',
+          'event: tool_calls',
+          `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0_abcd1234","index":0,"type":"function"}]\n`,
+        ].map((i) => `${i}\n`),
+      );
+
+      expect(onTextMock).toHaveBeenCalledTimes(0);
+      expect(onStartMock).toHaveBeenCalledTimes(1);
+      expect(onToolCall).toHaveBeenCalledTimes(1);
+      expect(onCompletionMock).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('should handle empty stream', async () => {

package/packages/model-runtime/src/core/streams/ollama.ts

@@ -11,11 +11,6 @@ import {
 } from './protocol';
 
 const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): StreamProtocolChunk => {
-  // maybe need another structure to add support for multiple choices
-  if (chunk.done && !chunk.message.content) {
-    return { data: 'finished', id: stack.id, type: 'stop' };
-  }
-
   if (chunk.message.thinking) {
     return { data: chunk.message.thinking, id: stack.id, type: 'reasoning' };
   }
@@ -36,6 +31,11 @@ const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): Strea
     };
   }
 
+  // maybe need another structure to add support for multiple choices
+  if (chunk.done && !chunk.message.content) {
+    return { data: 'finished', id: stack.id, type: 'stop' };
+  }
+
   // 判断是否有 <think> 或 </think> 标签，更新 thinkingInContent 状态
   if (chunk.message.content.includes('<think>')) {
     stack.thinkingInContent = true;

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

@@ -1,6 +1,5 @@
 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';
@@ -8,7 +7,7 @@ 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');
 }
 

package/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);
-    });
-  });
 });

package/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[];
 

package/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} />);

package/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,

package/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} />;

package/src/app/[variants]/(main)/image/@menu/features/ConfigPanel/components/ModelSelect/index.tsx

@@ -1,3 +1,4 @@
+import { EnabledProviderWithModels } from '@lobechat/types';
 import { ActionIcon, Icon, Select, type SelectProps } from '@lobehub/ui';
 import { createStyles, useTheme } from 'antd-style';
 import { LucideArrowRight, LucideBolt } from 'lucide-react';
@@ -8,13 +9,10 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { ProviderItemRender } from '@/components/ModelSelect';
-import { isDeprecatedEdition } from '@/const/version';
 import { useAiInfraStore } from '@/store/aiInfra';
 import { aiProviderSelectors } from '@/store/aiInfra/slices/aiProvider/selectors';
 import { useImageStore } from '@/store/image';
-import { imageGenerationConfigSelectors } from '@/store/image/slices/generationConfig/selectors';
-import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
-import { EnabledProviderWithModels } from '@/types/aiProvider';
+import { imageGenerationConfigSelectors } from '@/store/image/selectors';
 
 import ImageModelItem from './ImageModelItem';
 
@@ -36,7 +34,6 @@ const ModelSelect = memo(() => {
   const { styles } = useStyles();
   const { t } = useTranslation('components');
   const theme = useTheme();
-  const { showLLM } = useServerConfigStore(featureFlagsSelectors);
   const router = useRouter();
 
   const [currentModel, currentProvider] = useImageStore((s) => [
@@ -67,11 +64,7 @@ const ModelSelect = memo(() => {
               </Flexbox>
             ),
             onClick: () => {
-              router.push(
-                isDeprecatedEdition
-                  ? '/settings?active=llm'
-                  : `/settings?active=provider&provider=${provider.id}`,
-              );
+              router.push(`/settings?active=provider&provider=${provider.id}`);
             },
             value: `${provider.id}/empty`,
           },
@@ -93,7 +86,7 @@ const ModelSelect = memo(() => {
             </Flexbox>
           ),
           onClick: () => {
-            router.push(isDeprecatedEdition ? '/settings?active=llm' : '/settings?active=provider');
+            router.push('/settings?active=provider');
           },
           value: 'no-provider',
         },
@@ -114,26 +107,18 @@ const ModelSelect = memo(() => {
             provider={provider.id}
             source={provider.source}
           />
-          {showLLM && (
-            <Link
-              href={
-                isDeprecatedEdition
-                  ? '/settings?active=llm'
-                  : `/settings?active=provider&provider=${provider.id}`
-              }
-            >
-              <ActionIcon
-                icon={LucideBolt}
-                size={'small'}
-                title={t('ModelSwitchPanel.goToSettings')}
-              />
-            </Link>
-          )}
+          <Link href={`/settings?active=provider&provider=${provider.id}`}>
+            <ActionIcon
+              icon={LucideBolt}
+              size={'small'}
+              title={t('ModelSwitchPanel.goToSettings')}
+            />
+          </Link>
         </Flexbox>
       ),
       options: getImageModels(provider),
     }));
-  }, [enabledImageModelList, showLLM, t, theme.colorTextTertiary, router]);
+  }, [enabledImageModelList, t, theme.colorTextTertiary, router]);
 
   const labelRender: SelectProps['labelRender'] = (props) => {
     const modelInfo = enabledImageModelList

package/src/app/[variants]/(main)/image/layout.tsx

@@ -1,7 +1,5 @@
 import ServerLayout from '@/components/server/ServerLayout';
-import { isServerMode } from '@/const/version';
 
-import NotSupportClient from './NotSupportClient';
 import Desktop from './_layout/Desktop';
 import Mobile from './_layout/Mobile';
 import { LayoutProps } from './_layout/type';
@@ -11,8 +9,6 @@ const AiImageLayout = ServerLayout({ Desktop, Mobile });
 AiImageLayout.displayName = 'AiImageLayout';
 
 const Layout = (props: LayoutProps) => {
-  if (!isServerMode) return <NotSupportClient />;
-
   return <AiImageLayout {...props} />;
 };