@lobehub/chat 0.145.3 → 0.145.5

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.145.5](https://github.com/lobehub/lobe-chat/compare/v0.145.4...v0.145.5)
+
+<sup>Released on **2024-03-30**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Add qwen api models patch in ollama.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Add qwen api models patch in ollama, closes [#1630](https://github.com/lobehub/lobe-chat/issues/1630) ([a1e754c](https://github.com/lobehub/lobe-chat/commit/a1e754c))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.145.4](https://github.com/lobehub/lobe-chat/compare/v0.145.3...v0.145.4)
+
+<sup>Released on **2024-03-29**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix plugin install loading state error.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix plugin install loading state error, closes [#1815](https://github.com/lobehub/lobe-chat/issues/1815) ([2412a73](https://github.com/lobehub/lobe-chat/commit/2412a73))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.145.3](https://github.com/lobehub/lobe-chat/compare/v0.145.2...v0.145.3)
 
 <sup>Released on **2024-03-29**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.145.3",
+  "version": "0.145.5",
   "description": "Lobe Chat - an open-source, high-performance chatbot 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",

package/src/components/AntdStaticMethods.tsx

@@ -0,0 +1,20 @@
+// Entry component
+import { App } from 'antd';
+import type { MessageInstance } from 'antd/es/message/interface';
+import type { ModalStaticFunctions } from 'antd/es/modal/confirm';
+import type { NotificationInstance } from 'antd/es/notification/interface';
+import { memo } from 'react';
+
+let message: MessageInstance;
+let notification: NotificationInstance;
+let modal: Omit<ModalStaticFunctions, 'warn'>;
+
+export default memo(() => {
+  const staticFunction = App.useApp();
+  message = staticFunction.message;
+  modal = staticFunction.modal;
+  notification = staticFunction.notification;
+  return null;
+});
+
+export { message, modal, notification };

package/src/config/modelProviders/ollama.ts

@@ -153,6 +153,55 @@ const Ollama: ModelProviderCard = {
       tokens: 4000,
       vision: true,
     },
+    // TODO: 在单独支持千问之后这些 Qwen 模型需要移动到千问的配置中
+    {
+      displayName: 'Qwen Plus',
+      functionCall: true,
+      hidden: true,
+      id: 'qwen-plus',
+      tokens: 30_000,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Turbo',
+      functionCall: true,
+      hidden: true,
+      id: 'qwen-turbo',
+      tokens: 6000,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Max',
+      functionCall: true,
+      hidden: true,
+      id: 'qwen-max',
+      tokens: 6000,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen Max Long',
+      functionCall: true,
+      hidden: true,
+      id: 'qwen-max-longcontext',
+      tokens: 28_000,
+      vision: false,
+    },
+    {
+      displayName: 'Qwen VL Max',
+      functionCall: false,
+      hidden: true,
+      id: 'qwen-vl-max',
+      tokens: 6000,
+      vision: true,
+    },
+    {
+      displayName: 'Qwen VL Plus',
+      functionCall: false,
+      hidden: true,
+      id: 'qwen-vl-plus',
+      tokens: 30_000,
+      vision: true,
+    },
   ],
   id: 'ollama',
 };

package/src/layout/GlobalProvider/AppTheme.tsx

@@ -7,6 +7,7 @@ import 'antd/dist/reset.css';
 import Image from 'next/image';
 import { PropsWithChildren, ReactNode, memo, useEffect } from 'react';
 
+import AntdStaticMethods from '@/components/AntdStaticMethods';
 import {
   LOBE_THEME_APPEARANCE,
   LOBE_THEME_NEUTRAL_COLOR,
@@ -76,6 +77,7 @@ const AppTheme = memo<AppThemeProps>(
         themeMode={themeMode}
       >
         <GlobalStyle />
+        <AntdStaticMethods />
         <ConfigProvider config={{ imgAs: Image, imgUnoptimized: true }}>
           <Container>{children}</Container>
         </ConfigProvider>

package/src/store/session/slices/session/action.ts

@@ -1,9 +1,9 @@
-import { message } from 'antd';
 import { t } from 'i18next';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { DeepPartial } from 'utility-types';
 import { StateCreator } from 'zustand/vanilla';
 
+import { message } from '@/components/AntdStaticMethods';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { useClientDataSWR } from '@/libs/swr';
 import { sessionService } from '@/services/session';

package/src/store/tool/slices/customPlugin/action.ts

@@ -1,8 +1,8 @@
-import { notification } from 'antd';
 import { t } from 'i18next';
 import { merge } from 'lodash-es';
 import { StateCreator } from 'zustand/vanilla';
 
+import { notification } from '@/components/AntdStaticMethods';
 import { pluginService } from '@/services/plugin';
 import { pluginHelpers } from '@/store/tool/helpers';
 import { LobeToolCustomPlugin, PluginInstallError } from '@/types/tool/plugin';

package/src/store/tool/slices/store/action.test.ts

@@ -1,14 +1,19 @@
 import { LobeChatPluginManifest, LobeChatPluginMeta } from '@lobehub/chat-plugin-sdk';
 import { act, renderHook } from '@testing-library/react';
-import { notification } from 'antd';
 import useSWR from 'swr';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { notification } from '@/components/AntdStaticMethods';
 import { pluginService } from '@/services/plugin';
-import { LobeToolCustomPlugin } from '@/types/tool/plugin';
 
 import { useToolStore } from '../../store';
 
+// Mock necessary modules and functions
+vi.mock('@/components/AntdStaticMethods', () => ({
+  notification: {
+    error: vi.fn(),
+  },
+}));
 // Mock the pluginService.getPluginList method
 vi.mock('@/services/plugin', () => ({
   pluginService: {
@@ -173,8 +178,6 @@ describe('useToolStore:pluginStore', () => {
 
   describe('installPlugin', () => {
     it('should install a plugin with valid manifest', async () => {
-      vi.spyOn(notification, 'error');
-
       const pluginIdentifier = 'plugin1';
 
       const originalUpdateInstallLoadingState = useToolStore.getState().updateInstallLoadingState;
@@ -250,7 +253,6 @@ describe('useToolStore:pluginStore', () => {
       const error = new TypeError('noManifest');
 
       // Mock necessary modules and functions
-      vi.spyOn(notification, 'error');
       (pluginService.getPluginManifest as Mock).mockRejectedValue(error);
 
       useToolStore.setState({

package/src/store/tool/slices/store/action.ts

@@ -1,10 +1,10 @@
 import { LobeChatPluginsMarketIndex } from '@lobehub/chat-plugin-sdk';
-import { notification } from 'antd';
 import { t } from 'i18next';
 import { produce } from 'immer';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
+import { notification } from '@/components/AntdStaticMethods';
 import { pluginService } from '@/services/plugin';
 import { pluginStoreSelectors } from '@/store/tool/selectors';
 import { LobeTool } from '@/types/tool';
@@ -40,9 +40,8 @@ export const createPluginStoreSlice: StateCreator<
     const plugin = pluginStoreSelectors.getPluginById(name)(get());
     if (!plugin) return;
 
+    const { updateInstallLoadingState, refreshPlugins } = get();
     try {
-      const { updateInstallLoadingState, refreshPlugins } = get();
-
       updateInstallLoadingState(name, true);
       const data = await pluginService.getPluginManifest(plugin.manifest);
       updateInstallLoadingState(name, undefined);
@@ -52,8 +51,9 @@ export const createPluginStoreSlice: StateCreator<
       await refreshPlugins();
     } catch (error) {
       console.error(error);
-      const err = error as PluginInstallError;
+      updateInstallLoadingState(name, undefined);
 
+      const err = error as PluginInstallError;
       notification.error({
         description: t(`error.${err.message}`, { ns: 'plugin' }),
         message: t('error.installError', { name: plugin.meta.title, ns: 'plugin' }),

package/src/utils/config.ts

@@ -1,5 +1,4 @@
-import { notification } from 'antd';
-
+import { notification } from '@/components/AntdStaticMethods';
 import { CURRENT_CONFIG_VERSION, Migration } from '@/migrations';
 import {
   ConfigFile,