@lobehub/chat 1.51.1 → 1.51.3

package/src/server/modules/AgentRuntime/index.test.ts

@@ -25,7 +25,6 @@ import {
 } from '@/libs/agent-runtime';
 import { AgentRuntime } from '@/libs/agent-runtime';
 import { LobeStepfunAI } from '@/libs/agent-runtime/stepfun';
-import LobeWenxinAI from '@/libs/agent-runtime/wenxin';
 
 import { initAgentRuntimeWithUserPayload } from './index';
 
@@ -55,9 +54,6 @@ vi.mock('@/config/llm', () => ({
     TOGETHERAI_API_KEY: 'test-togetherai-key',
     QWEN_API_KEY: 'test-qwen-key',
     STEPFUN_API_KEY: 'test-stepfun-key',
-
-    WENXIN_ACCESS_KEY: 'test-wenxin-access-key',
-    WENXIN_SECRET_KEY: 'test-wenxin-secret-key',
   })),
 }));
 
@@ -207,16 +203,6 @@ describe('initAgentRuntimeWithUserPayload method', () => {
       expect(runtime['_runtime']).toBeInstanceOf(LobeStepfunAI);
     });
 
-    it.skip('Wenxin AI provider: with apikey', async () => {
-      const jwtPayload: JWTPayload = {
-        wenxinAccessKey: 'user-wenxin-accessKey',
-        wenxinSecretKey: 'wenxin-secret-key',
-      };
-      const runtime = await initAgentRuntimeWithUserPayload(ModelProvider.Wenxin, jwtPayload);
-      expect(runtime).toBeInstanceOf(AgentRuntime);
-      expect(runtime['_runtime']).toBeInstanceOf(LobeWenxinAI);
-    });
-
     it('Unknown Provider: with apikey and endpoint, should initialize to OpenAi', async () => {
       const jwtPayload: JWTPayload = {
         apiKey: 'user-unknown-key',
@@ -364,13 +350,6 @@ describe('initAgentRuntimeWithUserPayload method', () => {
       expect(runtime['_runtime']).toBeInstanceOf(LobeTogetherAI);
     });
 
-    it.skip('Wenxin AI provider: without apikey', async () => {
-      const jwtPayload = {};
-      const runtime = await initAgentRuntimeWithUserPayload(ModelProvider.Wenxin, jwtPayload);
-      expect(runtime).toBeInstanceOf(AgentRuntime);
-      expect(runtime['_runtime']).toBeInstanceOf(LobeWenxinAI);
-    });
-
     it('OpenAI provider: without apikey with OPENAI_PROXY_URL', async () => {
       process.env.OPENAI_PROXY_URL = 'https://proxy.example.com/v1';
 

package/src/services/_auth.ts

@@ -9,7 +9,6 @@ import {
   AzureOpenAIKeyVault,
   CloudflareKeyVault,
   OpenAICompatibleKeyVault,
-  WenxinKeyVault,
 } from '@/types/user/settings';
 import { createJWT } from '@/utils/jwt';
 
@@ -18,7 +17,6 @@ export const getProviderAuthPayload = (
   keyVaults: OpenAICompatibleKeyVault &
     AzureOpenAIKeyVault &
     AWSBedrockKeyVault &
-    WenxinKeyVault &
     CloudflareKeyVault,
 ) => {
   switch (provider) {
@@ -47,18 +45,6 @@ export const getProviderAuthPayload = (
       };
     }
 
-    case ModelProvider.Wenxin: {
-      const { secretKey, accessKey } = keyVaults;
-
-      const apiKey = (accessKey || '') + (secretKey || '');
-
-      return {
-        apiKey,
-        wenxinAccessKey: accessKey,
-        wenxinSecretKey: secretKey,
-      };
-    }
-
     case ModelProvider.Azure: {
       return {
         apiKey: keyVaults.apiKey,

package/src/store/chat/slices/portal/selectors.test.ts

@@ -1,16 +1,23 @@
 import { describe, expect, it } from 'vitest';
 
 import type { ChatStoreState } from '@/store/chat';
+import { ChatMessage } from '@/types/message';
 
 import { chatPortalSelectors } from './selectors';
 
 describe('chatDockSelectors', () => {
-  const createState = (overrides?: Partial<ChatStoreState>) =>
-    ({
+  const createState = (overrides?: Partial<ChatStoreState>) => {
+    const state = {
       showPortal: false,
       portalToolMessage: undefined,
+      messagesMap: {},
+      activeId: 'test-id',
+      activeTopicId: undefined,
       ...overrides,
-    }) as ChatStoreState;
+    } as ChatStoreState;
+
+    return state;
+  };
 
   describe('showDock', () => {
     it('should return the showDock state', () => {
@@ -92,4 +99,163 @@ describe('chatDockSelectors', () => {
       expect(chatPortalSelectors.previewFileId(state)).toBe('file-id');
     });
   });
+
+  describe('artifactMessageContent', () => {
+    it('should return empty string when message not found', () => {
+      const state = createState();
+      expect(chatPortalSelectors.artifactMessageContent('non-existent-id')(state)).toBe('');
+    });
+
+    it('should return message content when message exists', () => {
+      const messageContent = 'Test message content';
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: messageContent,
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.artifactMessageContent('test-id')(state)).toBe(messageContent);
+    });
+  });
+
+  describe('artifactCode', () => {
+    it('should return empty string when no artifact tag found', () => {
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: 'No artifact tag here',
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.artifactCode('test-id')(state)).toBe('');
+    });
+
+    it('should extract content from artifact tag', () => {
+      const artifactContent = 'Test artifact content';
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: `<lobeArtifact type="text">${artifactContent}</lobeArtifact>`,
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.artifactCode('test-id')(state)).toBe(artifactContent);
+    });
+
+    it('should remove markdown code block wrapping HTML content', () => {
+      const htmlContent = `<!DOCTYPE html>
+<html>
+<head>
+  <title>Test</title>
+</head>
+<body>
+  <div>Test content</div>
+</body>
+</html>`;
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: `<lobeArtifact type="text/html">
+\`\`\`html
+${htmlContent}
+\`\`\`
+</lobeArtifact>`,
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.artifactCode('test-id')(state)).toBe(htmlContent);
+    });
+  });
+
+  describe('isArtifactTagClosed', () => {
+    it('should return false for unclosed artifact tag', () => {
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: '<lobeArtifact type="text">Test content',
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.isArtifactTagClosed('test-id')(state)).toBe(false);
+    });
+
+    it('should return true for closed artifact tag', () => {
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: '<lobeArtifact type="text">Test content</lobeArtifact>',
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.isArtifactTagClosed('test-id')(state)).toBe(true);
+    });
+
+    it('should return false when no artifact tag exists', () => {
+      const state = createState({
+        messagesMap: {
+          'test-id_null': [
+            {
+              id: 'test-id',
+              content: 'No artifact tag here',
+              createdAt: Date.now(),
+              updatedAt: Date.now(),
+              role: 'user',
+              meta: {},
+              sessionId: 'test-id',
+            } as ChatMessage,
+          ],
+        },
+      });
+      expect(chatPortalSelectors.isArtifactTagClosed('test-id')(state)).toBe(false);
+    });
+  });
 });

package/src/store/chat/slices/portal/selectors.ts

@@ -35,7 +35,12 @@ const artifactCode = (id: string) => (s: ChatStoreState) => {
   const messageContent = artifactMessageContent(id)(s);
   const result = messageContent.match(ARTIFACT_TAG_REGEX);
 
-  return result?.groups?.content || '';
+  let content = result?.groups?.content || '';
+
+  // Remove markdown code block if content is wrapped
+  content = content.replace(/^\s*```[^\n]*\n([\S\s]*?)\n```\s*$/, '$1');
+
+  return content;
 };
 
 const isArtifactTagClosed = (id: string) => (s: ChatStoreState) => {

package/src/store/user/slices/modelList/selectors/keyVaults.ts

@@ -14,7 +14,6 @@ export const keyVaultsSettings = (s: UserStore): UserKeyVaults =>
 
 const openAIConfig = (s: UserStore) => keyVaultsSettings(s).openai || {};
 const bedrockConfig = (s: UserStore) => keyVaultsSettings(s).bedrock || {};
-const wenxinConfig = (s: UserStore) => keyVaultsSettings(s).wenxin || {};
 const ollamaConfig = (s: UserStore) => keyVaultsSettings(s).ollama || {};
 const azureConfig = (s: UserStore) => keyVaultsSettings(s).azure || {};
 const cloudflareConfig = (s: UserStore) => keyVaultsSettings(s).cloudflare || {};
@@ -45,5 +44,4 @@ export const keyVaultsConfigSelectors = {
   ollamaConfig,
   openAIConfig,
   password,
-  wenxinConfig,
 };

package/src/types/aiProvider.ts

@@ -23,7 +23,6 @@ export const AiProviderSDKEnum = {
   Huggingface: 'huggingface',
   Ollama: 'ollama',
   Openai: 'openai',
-  Wenxin: 'wenxin',
 } as const;
 
 export type AiProviderSDKType = (typeof AiProviderSDKEnum)[keyof typeof AiProviderSDKEnum];

package/src/types/user/settings/keyVaults.ts

@@ -25,11 +25,6 @@ export interface CloudflareKeyVault {
   baseURLOrAccountID?: string;
 }
 
-export interface WenxinKeyVault {
-  accessKey?: string;
-  secretKey?: string;
-}
-
 export interface UserKeyVaults {
   ai21?: OpenAICompatibleKeyVault;
   ai360?: OpenAICompatibleKeyVault;
@@ -68,7 +63,7 @@ export interface UserKeyVaults {
   taichu?: OpenAICompatibleKeyVault;
   togetherai?: OpenAICompatibleKeyVault;
   upstage?: OpenAICompatibleKeyVault;
-  wenxin?: WenxinKeyVault;
+  wenxin?: OpenAICompatibleKeyVault;
   xai?: OpenAICompatibleKeyVault;
   zeroone?: OpenAICompatibleKeyVault;
   zhipu?: OpenAICompatibleKeyVault;

package/src/app/(backend)/webapi/chat/wenxin/route.test.ts

@@ -1,27 +0,0 @@
-// @vitest-environment edge-runtime
-import { describe, expect, it, vi } from 'vitest';
-
-import { POST as UniverseRoute } from '../[provider]/route';
-import { POST, runtime } from './route';
-
-// 模拟 '../[provider]/route'
-vi.mock('../[provider]/route', () => ({
-  POST: vi.fn().mockResolvedValue('mocked response'),
-}));
-
-describe('Configuration tests', () => {
-  it('should have runtime set to "edge"', () => {
-    expect(runtime).toBe('nodejs');
-  });
-});
-
-describe('Wenxin POST function tests', () => {
-  it('should call UniverseRoute with correct parameters', async () => {
-    const mockRequest = new Request('https://example.com', { method: 'POST' });
-    await POST(mockRequest);
-    expect(UniverseRoute).toHaveBeenCalledWith(mockRequest, {
-      createRuntime: expect.anything(),
-      params: Promise.resolve({ provider: 'wenxin' }),
-    });
-  });
-});

package/src/app/(backend)/webapi/chat/wenxin/route.ts

@@ -1,30 +0,0 @@
-import { getLLMConfig } from '@/config/llm';
-import { AgentRuntime, ModelProvider } from '@/libs/agent-runtime';
-import LobeWenxinAI from '@/libs/agent-runtime/wenxin';
-
-import { POST as UniverseRoute } from '../[provider]/route';
-
-export const runtime = 'nodejs';
-
-export const maxDuration = 30;
-
-export const POST = async (req: Request) =>
-  UniverseRoute(req, {
-    createRuntime: (payload) => {
-      const { WENXIN_ACCESS_KEY, WENXIN_SECRET_KEY } = getLLMConfig();
-      let accessKey: string | undefined = WENXIN_ACCESS_KEY;
-      let secretKey: string | undefined = WENXIN_SECRET_KEY;
-
-      // if the payload has the api key, use user
-      if (payload.apiKey) {
-        accessKey = payload?.wenxinAccessKey;
-        secretKey = payload?.wenxinSecretKey;
-      }
-
-      const params = { accessKey, secretKey };
-      const instance = new LobeWenxinAI(params);
-
-      return new AgentRuntime(instance);
-    },
-    params: Promise.resolve({ provider: ModelProvider.Wenxin }),
-  });

package/src/app/(main)/settings/llm/ProviderList/Wenxin/index.tsx

@@ -1,44 +0,0 @@
-'use client';
-
-import { Input } from 'antd';
-import { useTranslation } from 'react-i18next';
-
-import { WenxinProviderCard } from '@/config/modelProviders';
-import { GlobalLLMProviderKey } from '@/types/user/settings';
-
-import { KeyVaultsConfigKey } from '../../const';
-import { ProviderItem } from '../../type';
-
-const providerKey: GlobalLLMProviderKey = 'wenxin';
-
-export const useWenxinProvider = (): ProviderItem => {
-  const { t } = useTranslation('modelProvider');
-
-  return {
-    ...WenxinProviderCard,
-    apiKeyItems: [
-      {
-        children: (
-          <Input.Password
-            autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.accessKey.placeholder`)}
-          />
-        ),
-        desc: t(`${providerKey}.accessKey.desc`),
-        label: t(`${providerKey}.accessKey.title`),
-        name: [KeyVaultsConfigKey, providerKey, 'accessKey'],
-      },
-      {
-        children: (
-          <Input.Password
-            autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.secretKey.placeholder`)}
-          />
-        ),
-        desc: t(`${providerKey}.secretKey.desc`),
-        label: t(`${providerKey}.secretKey.title`),
-        name: [KeyVaultsConfigKey, providerKey, 'secretKey'],
-      },
-    ],
-  };
-};

package/src/app/(main)/settings/provider/(detail)/wenxin/page.tsx

@@ -1,61 +0,0 @@
-'use client';
-
-import { useTranslation } from 'react-i18next';
-
-import { FormPassword } from '@/components/FormInput';
-import { WenxinProviderCard } 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 '../[id]';
-
-const providerKey: GlobalLLMProviderKey = 'wenxin';
-
-const useProviderCard = (): ProviderItem => {
-  const { t } = useTranslation('modelProvider');
-
-  const isLoading = useAiInfraStore(aiProviderSelectors.isAiProviderConfigLoading(providerKey));
-
-  return {
-    ...WenxinProviderCard,
-    apiKeyItems: [
-      {
-        children: isLoading ? (
-          <SkeletonInput />
-        ) : (
-          <FormPassword
-            autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.accessKey.placeholder`)}
-          />
-        ),
-        desc: t(`${providerKey}.accessKey.desc`),
-        label: t(`${providerKey}.accessKey.title`),
-        name: [KeyVaultsConfigKey, 'accessKey'],
-      },
-      {
-        children: isLoading ? (
-          <SkeletonInput />
-        ) : (
-          <FormPassword
-            autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.secretKey.placeholder`)}
-          />
-        ),
-        desc: t(`${providerKey}.secretKey.desc`),
-        label: t(`${providerKey}.secretKey.title`),
-        name: [KeyVaultsConfigKey, 'secretKey'],
-      },
-    ],
-  };
-};
-
-const Page = () => {
-  const card = useProviderCard();
-
-  return <ProviderDetail {...card} />;
-};
-
-export default Page;

package/src/features/Conversation/Error/APIKeyForm/Wenxin.tsx

@@ -1,49 +0,0 @@
-import { Wenxin } from '@lobehub/icons';
-import { Input } from 'antd';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { ModelProvider } from '@/libs/agent-runtime';
-import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors } from '@/store/user/selectors';
-
-import { FormAction } from '../style';
-
-const WenxinForm = memo(() => {
-  const { t } = useTranslation('modelProvider');
-
-  const [accessKey, secretKey, setConfig] = useUserStore((s) => [
-    keyVaultsConfigSelectors.wenxinConfig(s).accessKey,
-    keyVaultsConfigSelectors.wenxinConfig(s).secretKey,
-    s.updateKeyVaultConfig,
-  ]);
-
-  return (
-    <FormAction
-      avatar={<Wenxin.Color size={56} />}
-      description={t('wenxin.unlock.description')}
-      title={t('wenxin.unlock.title')}
-    >
-      <Input.Password
-        autoComplete={'new-password'}
-        onChange={(e) => {
-          setConfig(ModelProvider.Wenxin, { accessKey: e.target.value });
-        }}
-        placeholder={'Access Key'}
-        type={'block'}
-        value={accessKey}
-      />
-      <Input.Password
-        autoComplete={'new-password'}
-        onChange={(e) => {
-          setConfig(ModelProvider.Wenxin, { secretKey: e.target.value });
-        }}
-        placeholder={'Secret Key'}
-        type={'block'}
-        value={secretKey}
-      />
-    </FormAction>
-  );
-});
-
-export default WenxinForm;

package/src/features/DevPanel/FloatPanel.tsx

@@ -1,136 +0,0 @@
-import { ActionIcon, Icon } from '@lobehub/ui';
-import { FloatButton } from 'antd';
-import { createStyles } from 'antd-style';
-import { BugIcon, BugOff, XIcon } from 'lucide-react';
-import React, { PropsWithChildren, useEffect, useState } from 'react';
-import { Flexbox } from 'react-layout-kit';
-import { Rnd } from 'react-rnd';
-
-// 定义样式
-const useStyles = createStyles(({ token, css }) => {
-  return {
-    collapsed: css`
-      pointer-events: none;
-      transform: scale(0.8);
-      opacity: 0;
-    `,
-    content: css`
-      overflow: auto;
-      flex: 1;
-      height: 100%;
-      color: ${token.colorText};
-    `,
-
-    expanded: css`
-      pointer-events: auto;
-      transform: scale(1);
-      opacity: 1;
-    `,
-
-    header: css`
-      cursor: move;
-      user-select: none;
-
-      padding-block: 8px;
-      padding-inline: 16px;
-      border-block-end: 1px solid ${token.colorBorderSecondary};
-      border-start-start-radius: 12px;
-      border-start-end-radius: 12px;
-
-      font-weight: ${token.fontWeightStrong};
-      color: ${token.colorText};
-
-      background: ${token.colorFillAlter};
-    `,
-    panel: css`
-      position: fixed;
-      z-index: 1000;
-
-      overflow: hidden;
-      display: flex;
-
-      border-radius: 12px;
-
-      background: ${token.colorBgContainer};
-      box-shadow: ${token.boxShadow};
-
-      transition: opacity ${token.motionDurationMid} ${token.motionEaseInOut};
-    `,
-  };
-});
-
-const minWidth = 800;
-const minHeight = 600;
-
-const CollapsibleFloatPanel = ({ children }: PropsWithChildren) => {
-  const { styles } = useStyles();
-  const [isExpanded, setIsExpanded] = useState(false);
-  const [position, setPosition] = useState({ x: 100, y: 100 });
-  const [size, setSize] = useState({ height: minHeight, width: minWidth });
-
-  useEffect(() => {
-    try {
-      const localStoragePosition = localStorage.getItem('debug-panel-position');
-      if (localStoragePosition && JSON.parse(localStoragePosition)) {
-        setPosition(JSON.parse(localStoragePosition));
-      }
-    } catch {
-      /* empty */
-    }
-
-    try {
-      const localStorageSize = localStorage.getItem('debug-panel-size');
-      if (localStorageSize && JSON.parse(localStorageSize)) {
-        setSize(JSON.parse(localStorageSize));
-      }
-    } catch {
-      /* empty */
-    }
-  }, []);
-
-  return (
-    <>
-      <FloatButton
-        icon={<Icon icon={isExpanded ? BugOff : BugIcon} />}
-        onClick={() => setIsExpanded(!isExpanded)}
-        style={{ bottom: 24, right: 24 }}
-      />
-      {isExpanded && (
-        <Rnd
-          bounds="window"
-          className={`${styles.panel} ${isExpanded ? styles.expanded : styles.collapsed}`}
-          dragHandleClassName="panel-drag-handle"
-          minHeight={minHeight}
-          minWidth={minWidth}
-          onDragStop={(e, d) => {
-            setPosition({ x: d.x, y: d.y });
-          }}
-          onResizeStop={(e, direction, ref, delta, position) => {
-            setSize({
-              height: Number(ref.style.height),
-              width: Number(ref.style.width),
-            });
-            setPosition(position);
-          }}
-          position={position}
-          size={size}
-        >
-          <Flexbox height={'100%'}>
-            <Flexbox
-              align={'center'}
-              className={`panel-drag-handle ${styles.header}`}
-              horizontal
-              justify={'space-between'}
-            >
-              开发者面板
-              <ActionIcon icon={XIcon} onClick={() => setIsExpanded(false)} />
-            </Flexbox>
-            <Flexbox className={styles.content}>{children}</Flexbox>
-          </Flexbox>
-        </Rnd>
-      )}
-    </>
-  );
-};
-
-export default CollapsibleFloatPanel;