@lobehub/lobehub 2.0.0-next.15 → 2.0.0-next.17

package/packages/model-runtime/src/utils/googleErrorParser.ts

@@ -17,64 +17,81 @@ export interface GoogleChatError {
 export type GoogleChatErrors = GoogleChatError[];
 
 /**
- * 清理错误消息，移除格式化字符和多余的空格
- * @param message - 原始错误消息
- * @returns 清理后的错误消息
+ * Clean error message by removing formatting characters and extra spaces
+ * @param message - Original error message
+ * @returns Cleaned error message
  */
 export function cleanErrorMessage(message: string): string {
   return message
-    .replaceAll(/^\*\s*/g, '') // 移除开头的星号和空格
-    .replaceAll('\\n', '\n') // 转换转义的换行符
-    .replaceAll(/\n+/g, ' ') // 将多个换行符替换为单个空格
-    .trim(); // 去除首尾空格
+    .replaceAll(/^\*\s*/g, '') // Remove leading asterisks and spaces
+    .replaceAll('\\n', '\n') // Convert escaped newlines
+    .replaceAll(/\n+/g, ' ') // Replace multiple newlines with single space
+    .trim(); // Trim leading/trailing spaces
 }
 
 /**
- * 从错误消息中提取状态码信息
- * @param message - 错误消息
- * @returns 提取的错误详情和前缀
+ * Extract status code information from error message
+ * @param message - Error message
+ * @returns Extracted error details and prefix
  */
 export function extractStatusCodeFromError(message: string): {
   errorDetails: any;
   prefix: string;
 } {
-  // 使用正则表达式匹配状态码部分 [数字 描述文本]
-  const regex = /^(.*?)(\[\d+ [^\]]+])(.*)$/;
-  const match = message.match(regex);
-
-  if (match) {
-    const prefix = match[1].trim();
-    const statusCodeWithBrackets = match[2].trim();
-    const messageContent = match[3].trim();
-
-    // 提取状态码数字
-    const statusCodeMatch = statusCodeWithBrackets.match(/\[(\d+)/);
-    const statusCode = statusCodeMatch ? parseInt(statusCodeMatch[1]) : null;
-
-    // 创建包含状态码和消息的JSON
-    const resultJson = {
-      message: messageContent,
-      statusCode: statusCode,
-      statusCodeText: statusCodeWithBrackets,
-    };
+  // Match status code pattern [number description text]
+  // Use string methods instead of regex to avoid ReDoS attacks
+  // We need to find a bracket that contains a status code (3-digit number followed by space and text)
+
+  let searchStart = 0;
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const openBracketIndex = message.indexOf('[', searchStart);
+    if (openBracketIndex === -1) {
+      return { errorDetails: null, prefix: message };
+    }
 
-    return {
-      errorDetails: resultJson,
-      prefix: prefix,
-    };
-  }
+    const closeBracketIndex = message.indexOf(']', openBracketIndex);
+    if (closeBracketIndex === -1) {
+      return { errorDetails: null, prefix: message };
+    }
 
-  // 如果无法匹配，返回原始消息
-  return {
-    errorDetails: null,
-    prefix: message,
-  };
+    const bracketContent = message.slice(openBracketIndex + 1, closeBracketIndex).trim();
+
+    // Find the first space to separate status code from description
+    const spaceIndex = bracketContent.indexOf(' ');
+    if (spaceIndex !== -1) {
+      const statusCodeStr = bracketContent.slice(0, spaceIndex);
+      const statusCode = parseInt(statusCodeStr, 10);
+
+      // Validate that statusCode is a valid HTTP status code (3 digits)
+      if (!isNaN(statusCode) && statusCode >= 100 && statusCode < 600) {
+        const statusText = bracketContent.slice(spaceIndex + 1).trim();
+        const prefix = message.slice(0, openBracketIndex).trim();
+        const messageContent = message.slice(closeBracketIndex + 1).trim();
+
+        // Create JSON containing status code and message
+        const resultJson = {
+          message: messageContent,
+          statusCode: statusCode,
+          statusCodeText: `[${statusCode} ${statusText}]`,
+        };
+
+        return {
+          errorDetails: resultJson,
+          prefix: prefix,
+        };
+      }
+    }
+
+    // Move to next bracket
+    searchStart = openBracketIndex + 1;
+  }
 }
 
 /**
- * 解析Google AI API返回的错误消息
- * @param message - 原始错误消息
- * @returns 解析后的错误对象和错误类型
+ * Parse error message from Google AI API
+ * @param message - Original error message
+ * @returns Parsed error object and error type
  */
 export function parseGoogleErrorMessage(message: string): ParsedError {
   const defaultError = {
@@ -82,12 +99,12 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
     errorType: AgentRuntimeErrorType.ProviderBizError,
   };
 
-  // 快速识别特殊错误
+  // Quick identification of special errors
   if (message.includes('location is not supported')) {
     return { error: { message }, errorType: AgentRuntimeErrorType.LocationNotSupportError };
   }
 
-  // 统一的错误类型判断函数
+  // Unified error type determination function
   const getErrorType = (code: number | null, message: string): ILobeAgentRuntimeErrorType => {
     if (code === 400 && message.includes('API key not valid')) {
       return AgentRuntimeErrorType.InvalidProviderAPIKey;
@@ -97,30 +114,30 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
     return AgentRuntimeErrorType.ProviderBizError;
   };
 
-  // 递归解析JSON，处理嵌套的JSON字符串
+  // Recursively parse JSON, handling nested JSON strings
   const parseJsonRecursively = (str: string, maxDepth: number = 5): any => {
     if (maxDepth <= 0) return null;
 
     try {
       const parsed = JSON.parse(str);
 
-      // 如果解析出的对象包含error字段
+      // If parsed object contains error field
       if (parsed && typeof parsed === 'object' && parsed.error) {
         const errorInfo = parsed.error;
 
-        // 清理错误消息
+        // Clean error message
         if (typeof errorInfo.message === 'string') {
           errorInfo.message = cleanErrorMessage(errorInfo.message);
 
-          // 如果error.message还是一个JSON字符串，继续递归解析
+          // If error.message is still a JSON string, continue recursive parsing
           try {
             const nestedResult = parseJsonRecursively(errorInfo.message, maxDepth - 1);
-            // 只有当深层结果包含带有 code 的 error 对象时，才优先返回深层结果
+            // Only return deeper result if it contains an error object with code
             if (nestedResult && nestedResult.error && nestedResult.error.code) {
               return nestedResult;
             }
           } catch {
-            // 如果嵌套解析失败，使用当前层的信息
+            // If nested parsing fails, use current layer info
           }
         }
 
@@ -133,31 +150,40 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
     }
   };
 
-  // 1. 处理 "got status: UNAVAILABLE. {JSON}" 格式
-  const statusJsonMatch = message.match(/got status: (\w+)\.\s*({.*})$/);
-  if (statusJsonMatch) {
-    const statusFromMessage = statusJsonMatch[1];
-    const jsonPart = statusJsonMatch[2];
-
-    const parsedError = parseJsonRecursively(jsonPart);
-    if (parsedError && parsedError.error) {
-      const errorInfo = parsedError.error;
-      const finalMessage = errorInfo.message || message;
-      const finalCode = errorInfo.code || null;
-      const finalStatus = errorInfo.status || statusFromMessage;
-
-      return {
-        error: {
-          code: finalCode,
-          message: finalMessage,
-          status: finalStatus,
-        },
-        errorType: getErrorType(finalCode, finalMessage),
-      };
+  // 1. Handle "got status: UNAVAILABLE. {JSON}" format
+  const statusPrefix = 'got status: ';
+  const statusPrefixIndex = message.indexOf(statusPrefix);
+  if (statusPrefixIndex !== -1) {
+    const afterPrefix = message.slice(statusPrefixIndex + statusPrefix.length);
+    const dotIndex = afterPrefix.indexOf('.');
+    if (dotIndex !== -1) {
+      const statusFromMessage = afterPrefix.slice(0, dotIndex).trim();
+      const afterDot = afterPrefix.slice(dotIndex + 1).trim();
+      const braceIndex = afterDot.indexOf('{');
+      if (braceIndex !== -1) {
+        const jsonPart = afterDot.slice(braceIndex);
+
+        const parsedError = parseJsonRecursively(jsonPart);
+        if (parsedError && parsedError.error) {
+          const errorInfo = parsedError.error;
+          const finalMessage = errorInfo.message || message;
+          const finalCode = errorInfo.code || null;
+          const finalStatus = errorInfo.status || statusFromMessage;
+
+          return {
+            error: {
+              code: finalCode,
+              message: finalMessage,
+              status: finalStatus,
+            },
+            errorType: getErrorType(finalCode, finalMessage),
+          };
+        }
+      }
     }
   }
 
-  // 2. 尝试直接解析整个消息作为JSON
+  // 2. Try to parse entire message as JSON directly
   const directParsed = parseJsonRecursively(message);
   if (directParsed && directParsed.error) {
     const errorInfo = directParsed.error;
@@ -175,7 +201,7 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
     };
   }
 
-  // 3. 处理嵌套JSON格式，特别是message字段包含JSON的情况
+  // 3. Handle nested JSON format, especially when message field contains JSON
   try {
     const firstLevelParsed = JSON.parse(message);
     if (firstLevelParsed && firstLevelParsed.error && firstLevelParsed.error.message) {
@@ -197,10 +223,10 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
       }
     }
   } catch {
-    // 继续其他解析方式
+    // Continue with other parsing methods
   }
 
-  // 4. 原有的数组格式解析逻辑
+  // 4. Original array format parsing logic
   const startIndex = message.lastIndexOf('[');
   if (startIndex !== -1) {
     try {
@@ -214,11 +240,11 @@ export function parseGoogleErrorMessage(message: string): ParsedError {
 
       return { error: json, errorType: AgentRuntimeErrorType.ProviderBizError };
     } catch {
-      // 忽略解析错误
+      // Ignore parsing errors
     }
   }
 
-  // 5. 使用状态码提取逻辑作为最后的后备方案
+  // 5. Use status code extraction logic as last fallback
   const errorObj = extractStatusCodeFromError(message);
   if (errorObj.errorDetails) {
     return { error: errorObj.errorDetails, errorType: AgentRuntimeErrorType.ProviderBizError };

package/packages/types/src/serverConfig.ts

@@ -15,9 +15,9 @@ export interface ServerModelProviderConfig {
   enabledModels?: string[];
   fetchOnClient?: boolean;
   /**
-   * the model cards defined in server
+   * the model lists defined in server
    */
-  serverModelCards?: ChatModelCard[];
+  serverModelLists?: ChatModelCard[];
 }
 
 export type ServerLanguageModel = Partial<Record<GlobalLLMProviderKey, ServerModelProviderConfig>>;
@@ -32,10 +32,6 @@ export interface GlobalServerConfig {
    */
   enabledOAuthSSO?: boolean;
   image?: PartialDeep<UserImageConfig>;
-  /**
-   * @deprecated
-   */
-  languageModel?: ServerLanguageModel;
   oAuthSSOProviders?: string[];
   systemAgent?: PartialDeep<UserSystemAgentConfig>;
   telemetry: {

package/src/app/[variants]/(auth)/signup/[[...signup]]/page.tsx

@@ -1,7 +1,6 @@
 import { SignUp } from '@clerk/nextjs';
-import { notFound, redirect } from 'next/navigation';
+import { notFound } from 'next/navigation';
 
-import { serverFeatureFlags } from '@/config/featureFlags';
 import { enableClerk } from '@/const/auth';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
@@ -21,12 +20,6 @@ export const generateMetadata = async (props: DynamicLayoutProps) => {
 const Page = () => {
   if (!enableClerk) return notFound();
 
-  const enableClerkSignUp = serverFeatureFlags().enableClerkSignUp;
-
-  if (!enableClerkSignUp) {
-    redirect('/login');
-  }
-
   return <SignUp path="/signup" />;
 };
 

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

@@ -6,7 +6,6 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { enableAuth, enableNextAuth } from '@/const/auth';
-import { isDeprecatedEdition } from '@/const/version';
 import DataStatistics from '@/features/User/DataStatistics';
 import UserInfo from '@/features/User/UserInfo';
 import UserLoginOrSignup from '@/features/User/UserLoginOrSignup/Community';
@@ -25,11 +24,9 @@ const UserBanner = memo(() => {
           <Link href={'/profile'} style={{ color: 'inherit' }}>
             <UserInfo />
           </Link>
-          {!isDeprecatedEdition && (
-            <Link href={'/profile/stats'} style={{ color: 'inherit' }}>
-              <DataStatistics paddingInline={12} />
-            </Link>
-          )}
+          <Link href={'/profile/stats'} style={{ color: 'inherit' }}>
+            <DataStatistics paddingInline={12} />
+          </Link>
         </>
       ) : (
         <UserLoginOrSignup

package/src/app/[variants]/(main)/discover/(list)/features/Pagination.tsx

@@ -52,6 +52,7 @@ const Pagination = memo<PaginationProps>(({ tab, currentPage, total, pageSize })
     <Page
       className={styles.page}
       current={page ? Number(page) : currentPage}
+      data-testid="pagination"
       onChange={handlePageChange}
       pageSize={pageSize}
       showSizeChanger={false}

package/src/app/[variants]/(main)/discover/(list)/features/SortButton/index.tsx

@@ -174,7 +174,7 @@ const SortButton = memo(() => {
       }}
       trigger={['click', 'hover']}
     >
-      <Button icon={<Icon icon={ArrowDownWideNarrow} />} type={'text'}>
+      <Button data-testid="sort-dropdown" icon={<Icon icon={ArrowDownWideNarrow} />} type={'text'}>
         {activeItem.label}
         <Icon icon={ChevronDown} />
       </Button>

package/src/app/[variants]/(main)/discover/(list)/mcp/features/List/Item.tsx

@@ -82,6 +82,7 @@ const McpItem = memo<DiscoverMcpItem>(
     return (
       <Block
         clickable
+        data-testid="mcp-item"
         height={'100%'}
         onClick={() => {
           navigate(link);

package/src/app/[variants]/(main)/discover/(list)/model/features/List/Item.tsx

@@ -61,6 +61,7 @@ const ModelItem = memo<DiscoverModelItem>(
     return (
       <Block
         clickable
+        data-testid="model-item"
         height={'100%'}
         onClick={() => {
           navigate(link);

package/src/app/[variants]/(main)/discover/(list)/provider/features/List/Item.tsx

@@ -54,6 +54,7 @@ const ProviderItem = memo<DiscoverProviderItem>(
     return (
       <Block
         clickable
+        data-testid="provider-item"
         height={'100%'}
         onClick={() => {
           navigate(link);

package/src/app/[variants]/(main)/discover/components/CategoryMenu.tsx

@@ -31,7 +31,15 @@ const useStyles = createStyles(({ css, prefixCls }) => {
 const CategoryMenu = memo<MenuProps>(({ style, ...rest }) => {
   const { styles } = useStyles();
 
-  return <Menu className={styles.menu} mode="inline" style={style} {...rest} />;
+  return (
+    <Menu
+      className={styles.menu}
+      data-testid="category-menu"
+      mode="inline"
+      style={style}
+      {...rest}
+    />
+  );
 });
 
 export default CategoryMenu;

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

@@ -71,7 +71,9 @@ const LabCard = memo<PropsWithChildren<LabCardProps>>(
         <div className={styles.card}>
           <div className={styles.row}>
             <div className={styles.thumb}>
-              {cover && <Image alt={title} fill src={cover} style={{ objectFit: 'cover' }} />}
+              {cover && (
+                <Image alt={title} fill src={cover} style={{ objectFit: 'cover' }} unoptimized />
+              )}
             </div>
             <Flexbox gap={6}>
               <div className={styles.title}>{title}</div>

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

@@ -7,9 +7,7 @@ import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import { AzureProviderCard } from '@/config/modelProviders';
-import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
-import { useUserStore } from '@/store/user';
-import { modelProviderSelectors } from '@/store/user/selectors';
+import { aiModelSelectors, aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
 import { SkeletonInput } from '../../features/ProviderConfig';
@@ -35,11 +33,11 @@ const useProviderCard = (): ProviderItem => {
   const { styles } = useStyles();
 
   // Get the first model card's deployment name as the check model
-  const checkModel = useUserStore((s) => {
-    const chatModelCards = modelProviderSelectors.getModelCardsById(providerKey)(s);
+  const checkModel = useAiInfraStore((s) => {
+    const modelList = aiModelSelectors.enabledAiProviderModelList(s);
 
-    if (chatModelCards.length > 0) {
-      return chatModelCards[0].deploymentName;
+    if (modelList.length > 0) {
+      return modelList[0].id;
     }
 
     return 'gpt-35-turbo';

package/src/components/InvalidAPIKey/APIKeyForm/Bedrock.tsx

@@ -7,21 +7,16 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FormAction } from '@/features/Conversation/Error/style';
-import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors } from '@/store/user/selectors';
+import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 const BedrockForm = memo<{ description: string }>(({ description }) => {
   const { t } = useTranslation('modelProvider');
   const [showRegion, setShow] = useState(false);
   const [showSessionToken, setShowSessionToken] = useState(false);
 
-  const [accessKeyId, secretAccessKey, sessionToken, region, setConfig] = useUserStore((s) => [
-    keyVaultsConfigSelectors.bedrockConfig(s).accessKeyId,
-    keyVaultsConfigSelectors.bedrockConfig(s).secretAccessKey,
-    keyVaultsConfigSelectors.bedrockConfig(s).sessionToken,
-    keyVaultsConfigSelectors.bedrockConfig(s).region,
-    s.updateKeyVaultConfig,
-  ]);
+  const config = useAiInfraStore(aiProviderSelectors.providerKeyVaults(ModelProvider.Bedrock));
+  const setConfig = useAiInfraStore((s) => s.updateAiProviderConfig);
+  const { accessKeyId, secretAccessKey, sessionToken, region } = config || {};
 
   const theme = useTheme();
   return (
@@ -33,7 +28,7 @@ const BedrockForm = memo<{ description: string }>(({ description }) => {
       <InputPassword
         autoComplete={'new-password'}
         onChange={(e) => {
-          setConfig(ModelProvider.Bedrock, { accessKeyId: e.target.value });
+          setConfig(ModelProvider.Bedrock, { keyVaults: { accessKeyId: e.target.value } });
         }}
         placeholder={'Aws Access Key Id'}
         value={accessKeyId}
@@ -42,7 +37,7 @@ const BedrockForm = memo<{ description: string }>(({ description }) => {
       <InputPassword
         autoComplete={'new-password'}
         onChange={(e) => {
-          setConfig(ModelProvider.Bedrock, { secretAccessKey: e.target.value });
+          setConfig(ModelProvider.Bedrock, { keyVaults: { secretAccessKey: e.target.value } });
         }}
         placeholder={'Aws Secret Access Key'}
         value={secretAccessKey}
@@ -52,7 +47,7 @@ const BedrockForm = memo<{ description: string }>(({ description }) => {
         <InputPassword
           autoComplete={'new-password'}
           onChange={(e) => {
-            setConfig(ModelProvider.Bedrock, { sessionToken: e.target.value });
+            setConfig(ModelProvider.Bedrock, { keyVaults: { sessionToken: e.target.value } });
           }}
           placeholder={'Aws Session Token'}
           value={sessionToken}
@@ -73,7 +68,7 @@ const BedrockForm = memo<{ description: string }>(({ description }) => {
       {showRegion ? (
         <Select
           onChange={(region) => {
-            setConfig('bedrock', { region });
+            setConfig('bedrock', { keyVaults: { region } });
           }}
           options={['us-east-1', 'us-west-2', 'ap-southeast-1', 'eu-central-1'].map((i) => ({
             label: i,

package/src/config/featureFlags/schema.test.ts

@@ -111,7 +111,6 @@ describe('mapFeatureFlagsEnvToState', () => {
       plugins: true,
       knowledge_base: false,
       rag_eval: true,
-      clerk_sign_up: false,
       market: true,
       speech_to_text: true,
       changelog: false,
@@ -140,7 +139,6 @@ describe('mapFeatureFlagsEnvToState', () => {
       showWelcomeSuggest: true,
       enableKnowledgeBase: false,
       enableRAGEval: true,
-      enableClerkSignUp: false,
       showMarket: true,
       enableSTT: true,
       showPinList: true,

package/src/config/featureFlags/schema.ts

@@ -30,8 +30,6 @@ export const FeatureFlagsSchema = z.object({
   welcome_suggest: FeatureFlagValue.optional(),
   changelog: FeatureFlagValue.optional(),
 
-  clerk_sign_up: FeatureFlagValue.optional(),
-
   market: FeatureFlagValue.optional(),
   knowledge_base: FeatureFlagValue.optional(),
 
@@ -93,8 +91,6 @@ export const DEFAULT_FEATURE_FLAGS: IFeatureFlags = {
   knowledge_base: true,
   rag_eval: false,
 
-  clerk_sign_up: true,
-
   cloud_promotion: false,
 
   market: true,
@@ -133,8 +129,6 @@ export const mapFeatureFlagsEnvToState = (config: IFeatureFlags, userId?: string
     enableCheckUpdates: evaluateFeatureFlag(config.check_updates, userId),
     showWelcomeSuggest: evaluateFeatureFlag(config.welcome_suggest, userId),
 
-    enableClerkSignUp: evaluateFeatureFlag(config.clerk_sign_up, userId),
-
     enableKnowledgeBase: evaluateFeatureFlag(config.knowledge_base, userId),
     enableRAGEval: evaluateFeatureFlag(config.rag_eval, userId),
 

package/src/config/modelProviders/ai21.ts

@@ -2,22 +2,7 @@ import { ModelProviderCard } from '@/types/llm';
 
 // ref https://docs.ai21.com/reference/jamba-15-api-ref
 const Ai21: ModelProviderCard = {
-  chatModels: [
-    {
-      contextWindowTokens: 256_000,
-      displayName: 'Jamba 1.5 Mini',
-      enabled: true,
-      functionCall: true,
-      id: 'jamba-1.5-mini',
-    },
-    {
-      contextWindowTokens: 256_000,
-      displayName: 'Jamba 1.5 Large',
-      enabled: true,
-      functionCall: true,
-      id: 'jamba-1.5-large',
-    },
-  ],
+  chatModels: [],
   checkModel: 'jamba-mini',
   description: 'AI21 Labs 为企业构建基础模型和人工智能系统，加速生成性人工智能在生产中的应用。',
   id: 'ai21',