@lobehub/lobehub 2.0.0-next.211 → 2.0.0-next.213

package/src/features/ResourceManager/components/Explorer/MasonryView/index.tsx

@@ -6,106 +6,134 @@ import { cssVar } from 'antd-style';
 import { type UIEvent, memo, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
-import { type FileListItem } from '@/types/files';
+import { useFolderPath } from '@/app/[variants]/(main)/resource/features/hooks/useFolderPath';
+import {
+  useResourceManagerFetchKnowledgeItems,
+  useResourceManagerStore,
+} from '@/app/[variants]/(main)/resource/features/store';
+import { sortFileList } from '@/app/[variants]/(main)/resource/features/store/selectors';
 
 import { useMasonryColumnCount } from '../useMasonryColumnCount';
 import MasonryItemWrapper from './MasonryFileItem/MasonryItemWrapper';
 
-interface MasonryViewProps {
-  data: FileListItem[] | undefined;
-  hasMore: boolean;
-  isMasonryReady: boolean;
-  loadMore: () => Promise<void>;
-  onOpenFile?: (id: string) => void;
-  selectFileIds: string[];
-  setSelectedFileIds: (ids: string[]) => void;
-}
+const MasonryView = memo(() => {
+  // Access all state from Resource Manager store
+  const [
+    libraryId,
+    category,
+    searchQuery,
+    selectedFileIds,
+    setSelectedFileIds,
+    loadMoreKnowledgeItems,
+    fileListHasMore,
+    isMasonryReady,
+    sorter,
+    sortType,
+  ] = useResourceManagerStore((s) => [
+    s.libraryId,
+    s.category,
+    s.searchQuery,
+    s.selectedFileIds,
+    s.setSelectedFileIds,
+    s.loadMoreKnowledgeItems,
+    s.fileListHasMore,
+    s.isMasonryReady,
+    s.sorter,
+    s.sortType,
+  ]);
 
-const MasonryView = memo<MasonryViewProps>(
-  ({ data, hasMore, isMasonryReady, loadMore, onOpenFile, selectFileIds, setSelectedFileIds }) => {
-    const { t } = useTranslation('file');
-    const columnCount = useMasonryColumnCount();
-    const [isLoadingMore, setIsLoadingMore] = useState(false);
+  const { t } = useTranslation('file');
+  const columnCount = useMasonryColumnCount();
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
 
-    const libraryId = useResourceManagerStore((s) => s.libraryId);
+  const { currentFolderSlug } = useFolderPath();
 
-    const masonryContext = useMemo(
-      () => ({
-        knowledgeBaseId: libraryId,
-        openFile: onOpenFile,
-        selectFileIds,
-        setSelectedFileIds,
-      }),
-      [onOpenFile, libraryId, selectFileIds, setSelectedFileIds],
-    );
+  // Fetch data with SWR
+  const { data: rawData } = useResourceManagerFetchKnowledgeItems({
+    category,
+    knowledgeBaseId: libraryId,
+    parentId: currentFolderSlug || null,
+    q: searchQuery ?? undefined,
+    showFilesInKnowledgeBase: false,
+  });
 
-    // Handle automatic load more when scrolling to bottom
-    const handleLoadMore = useCallback(async () => {
-      if (!hasMore || isLoadingMore) return;
+  // Sort data using current sort settings
+  const data = sortFileList(rawData, sorter, sortType);
 
-      setIsLoadingMore(true);
-      try {
-        await loadMore();
-      } finally {
-        setIsLoadingMore(false);
-      }
-    }, [hasMore, loadMore, isLoadingMore]);
+  const masonryContext = useMemo(
+    () => ({
+      knowledgeBaseId: libraryId,
+      selectFileIds: selectedFileIds,
+      setSelectedFileIds,
+    }),
+    [libraryId, selectedFileIds, setSelectedFileIds],
+  );
+
+  // Handle automatic load more when scrolling to bottom
+  const handleLoadMore = useCallback(async () => {
+    if (!fileListHasMore || isLoadingMore) return;
 
-    // Handle scroll event to detect when near bottom
-    const handleScroll = useCallback(
-      (e: UIEvent<HTMLDivElement>) => {
-        const target = e.currentTarget;
-        const scrollTop = target.scrollTop;
-        const scrollHeight = target.scrollHeight;
-        const clientHeight = target.clientHeight;
+    setIsLoadingMore(true);
+    try {
+      await loadMoreKnowledgeItems();
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [fileListHasMore, loadMoreKnowledgeItems, isLoadingMore]);
 
-        // Trigger load when within 300px of bottom
-        if (scrollHeight - scrollTop - clientHeight < 300) {
-          handleLoadMore();
-        }
-      },
-      [handleLoadMore],
-    );
+  // Handle scroll event to detect when near bottom
+  const handleScroll = useCallback(
+    (e: UIEvent<HTMLDivElement>) => {
+      const target = e.currentTarget;
+      const scrollTop = target.scrollTop;
+      const scrollHeight = target.scrollHeight;
+      const clientHeight = target.clientHeight;
+
+      // Trigger load when within 300px of bottom
+      if (scrollHeight - scrollTop - clientHeight < 300) {
+        handleLoadMore();
+      }
+    },
+    [handleLoadMore],
+  );
 
-    return (
-      <div
-        onScroll={handleScroll}
-        style={{
-          flex: 1,
-          height: '100%',
-          opacity: isMasonryReady ? 1 : 0,
-          overflowY: 'auto',
-          transition: 'opacity 0.2s ease-in-out',
-        }}
-      >
-        <div style={{ paddingBlockEnd: 24, paddingBlockStart: 12, paddingInline: 24 }}>
-          <VirtuosoMasonry
-            ItemContent={MasonryItemWrapper}
-            columnCount={columnCount}
-            context={masonryContext}
-            data={data || []}
+  return (
+    <div
+      onScroll={handleScroll}
+      style={{
+        flex: 1,
+        height: '100%',
+        opacity: isMasonryReady ? 1 : 0,
+        overflowY: 'auto',
+        transition: 'opacity 0.2s ease-in-out',
+      }}
+    >
+      <div style={{ paddingBlockEnd: 24, paddingBlockStart: 12, paddingInline: 24 }}>
+        <VirtuosoMasonry
+          ItemContent={MasonryItemWrapper}
+          columnCount={columnCount}
+          context={masonryContext}
+          data={data || []}
+          style={{
+            gap: '16px',
+            overflow: 'hidden',
+          }}
+        />
+        {isLoadingMore && (
+          <Center
             style={{
-              gap: '16px',
-              overflow: 'hidden',
+              color: cssVar.colorTextDescription,
+              fontSize: 14,
+              marginBlockStart: 16,
+              minHeight: 40,
             }}
-          />
-          {isLoadingMore && (
-            <Center
-              style={{
-                color: cssVar.colorTextDescription,
-                fontSize: 14,
-                marginBlockStart: 16,
-                minHeight: 40,
-              }}
-            >
-              {t('loading', { defaultValue: 'Loading...' })}
-            </Center>
-          )}
-        </div>
+          >
+            {t('loading', { defaultValue: 'Loading...' })}
+          </Center>
+        )}
       </div>
-    );
-  },
-);
+    </div>
+  );
+});
 
 export default MasonryView;

package/src/features/ResourceManager/components/Explorer/ToolBar/BatchActionsDropdown.tsx

@@ -11,6 +11,8 @@ import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
+import RepoIcon from '@/components/LibIcon';
+import { useKnowledgeBaseStore } from '@/store/knowledgeBase';
 
 import ActionIconWithChevron from './ActionIconWithChevron';
 
@@ -30,10 +32,18 @@ interface BatchActionsDropdownProps {
 
 const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
   ({ selectCount, onActionClick, disabled }) => {
-    const { t } = useTranslation(['components', 'common', 'file']);
+    const { t } = useTranslation(['components', 'common', 'file', 'knowledgeBase']);
     const { modal, message } = App.useApp();
 
-    const libraryId = useResourceManagerStore((s) => s.libraryId);
+    const [libraryId, selectedFileIds] = useResourceManagerStore((s) => [
+      s.libraryId,
+      s.selectedFileIds,
+    ]);
+    const [useFetchKnowledgeBaseList, addFilesToKnowledgeBase] = useKnowledgeBaseStore((s) => [
+      s.useFetchKnowledgeBaseList,
+      s.addFilesToKnowledgeBase,
+    ]);
+    const { data: knowledgeBases } = useFetchKnowledgeBaseList();
 
     const menuItems = useMemo<DropdownItem[]>(() => {
       const items: DropdownItem[] = [];
@@ -60,44 +70,64 @@ const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
         return items;
       }
 
+      // Filter out current knowledge base and create submenu items
+      const availableKnowledgeBases = (knowledgeBases || []).filter((kb) => kb.id !== libraryId);
+
+      const addToKnowledgeBaseSubmenu: DropdownItem[] = availableKnowledgeBases.map((kb) => ({
+        icon: <RepoIcon />,
+        key: `add-to-kb-${kb.id}`,
+        label: <span style={{ marginLeft: 8 }}>{kb.name}</span>,
+        onClick: async () => {
+          try {
+            await addFilesToKnowledgeBase(kb.id, selectedFileIds);
+            message.success(
+              t('addToKnowledgeBase.addSuccess', {
+                count: selectCount,
+                ns: 'knowledgeBase',
+              }),
+            );
+          } catch (e) {
+            console.error(e);
+            message.error(t('addToKnowledgeBase.error', { ns: 'knowledgeBase' }));
+          }
+        },
+      }));
+
       if (libraryId) {
-        items.push(
-          {
-            icon: <Icon icon={BookMinusIcon} />,
-            key: 'removeFromKnowledgeBase',
-            label: t('FileManager.actions.removeFromKnowledgeBase'),
-            onClick: () => {
-              modal.confirm({
-                okButtonProps: {
-                  danger: true,
-                },
-                onOk: async () => {
-                  await onActionClick('removeFromKnowledgeBase');
-                  message.success(t('FileManager.actions.removeFromKnowledgeBaseSuccess'));
-                },
-                title: t('FileManager.actions.confirmRemoveFromKnowledgeBase', {
-                  count: selectCount,
-                }),
-              });
-            },
+        items.push({
+          icon: <Icon icon={BookMinusIcon} />,
+          key: 'removeFromKnowledgeBase',
+          label: t('FileManager.actions.removeFromKnowledgeBase'),
+          onClick: () => {
+            modal.confirm({
+              okButtonProps: {
+                danger: true,
+              },
+              onOk: async () => {
+                await onActionClick('removeFromKnowledgeBase');
+                message.success(t('FileManager.actions.removeFromKnowledgeBaseSuccess'));
+              },
+              title: t('FileManager.actions.confirmRemoveFromKnowledgeBase', {
+                count: selectCount,
+              }),
+            });
           },
-          {
+        });
+
+        if (availableKnowledgeBases.length > 0) {
+          items.push({
+            children: addToKnowledgeBaseSubmenu as any,
             icon: <Icon icon={BookPlusIcon} />,
             key: 'addToOtherKnowledgeBase',
             label: t('FileManager.actions.addToOtherKnowledgeBase'),
-            onClick: () => {
-              onActionClick('addToOtherKnowledgeBase');
-            },
-          },
-        );
-      } else {
+          });
+        }
+      } else if (availableKnowledgeBases.length > 0) {
         items.push({
+          children: addToKnowledgeBaseSubmenu as any,
           icon: <Icon icon={BookPlusIcon} />,
           key: 'addToKnowledgeBase',
           label: t('FileManager.actions.addToKnowledgeBase'),
-          onClick: () => {
-            onActionClick('addToKnowledgeBase');
-          },
         });
       }
 
@@ -134,7 +164,17 @@ const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
       );
 
       return items;
-    }, [libraryId, selectCount, onActionClick, t, modal, message]);
+    }, [
+      libraryId,
+      selectCount,
+      selectedFileIds,
+      onActionClick,
+      addFilesToKnowledgeBase,
+      t,
+      modal,
+      message,
+      knowledgeBases,
+    ]);
 
     return (
       <DropdownMenu items={menuItems} placement="bottomLeft" triggerProps={{ disabled }}>

package/src/features/ResourceManager/components/Explorer/index.tsx

@@ -41,10 +41,7 @@ const ResourceExplorer = memo(() => {
     isTransitioning,
     isMasonryReady,
     searchQuery,
-    selectedFileIds,
     setSelectedFileIds,
-    loadMoreKnowledgeItems,
-    fileListHasMore,
     sorter,
     sortType,
   ] = useResourceManagerStore((s) => [
@@ -54,10 +51,7 @@ const ResourceExplorer = memo(() => {
     s.isTransitioning,
     s.isMasonryReady,
     s.searchQuery,
-    s.selectedFileIds,
     s.setSelectedFileIds,
-    s.loadMoreKnowledgeItems,
-    s.fileListHasMore,
     s.sorter,
     s.sortType,
   ]);
@@ -114,14 +108,7 @@ const ResourceExplorer = memo(() => {
       ) : viewMode === 'list' ? (
         <ListView />
       ) : (
-        <MasonryView
-          data={data}
-          hasMore={fileListHasMore}
-          isMasonryReady={isMasonryReady}
-          loadMore={loadMoreKnowledgeItems}
-          selectFileIds={selectedFileIds}
-          setSelectedFileIds={setSelectedFileIds}
-        />
+        <MasonryView />
       )}
     </Flexbox>
   );

package/src/libs/better-auth/define-config.ts

@@ -64,10 +64,7 @@ const enabledSSOProviders = parseSSOProviders(authEnv.AUTH_SSO_PROVIDERS);
 const { socialProviders, genericOAuthProviders } = initBetterAuthSSOProviders();
 
 async function customEmailValidator(email: string): Promise<boolean> {
-  if (ENABLE_BUSINESS_FEATURES && !(await businessEmailValidator(email))) {
-    return false;
-  }
-  return validateEmail(email);
+  return ENABLE_BUSINESS_FEATURES ? businessEmailValidator(email) : validateEmail(email);
 }
 
 interface CustomBetterAuthOptions {

package/src/libs/redis/upstash.ts

@@ -25,7 +25,10 @@ export class UpstashRedisProvider implements BaseRedisProvider {
   constructor(options: UpstashConfig | RedisConfigNodejs) {
     const { prefix, ...clientOptions } = options as UpstashConfig & RedisConfigNodejs;
     this.prefix = prefix ? `${prefix}:` : '';
-    this.client = new Redis(clientOptions as RedisConfigNodejs);
+    this.client = new Redis({
+      ...clientOptions,
+      automaticDeserialization: false,
+    } as RedisConfigNodejs);
   }
 
   /**

package/src/server/services/comfyui/config/constants.ts

@@ -1,11 +1,11 @@
 /**
  * ComfyUI framework constants configuration
- * Unified management of hardcoded values with environment variable overrides / 统一管理硬编码值，支持环境变量覆盖
+ * Unified management of hardcoded values with environment variable overrides
  */
 
 /**
- * Default configuration / 默认配置
- * 注意：BASE_URL不再处理环境变量，由构造函数统一处理优先级
+ * Default configuration
+ * Note: BASE_URL no longer handles environment variables, priority is uniformly handled by constructor
  */
 export const COMFYUI_DEFAULTS = {
   BASE_URL: 'http://localhost:8000',
@@ -14,8 +14,8 @@ export const COMFYUI_DEFAULTS = {
 } as const;
 
 /**
- * FLUX model configuration / FLUX 模型配置
- * Removed over-engineered dynamic T5 selection, maintain simple fixed configuration / 移除过度工程化的动态T5选择，保持简单固定配置
+ * FLUX model configuration
+ * Removed over-engineered dynamic T5 selection, maintain simple fixed configuration
  */
 export const FLUX_MODEL_CONFIG = {
   FILENAME_PREFIXES: {
@@ -40,8 +40,8 @@ export const SD_MODEL_CONFIG = {
 } as const;
 
 /**
- * Default workflow node parameters / 工作流节点默认参数
- * Based on 2024 community best practices configuration / 基于 2024 年社区最佳实践配置
+ * Default workflow node parameters
+ * Based on 2024 community best practices configuration
  */
 
 /**

package/src/server/services/comfyui/config/promptToolConst.ts

@@ -1,16 +1,16 @@
 /**
  * Prompt Optimizer Configuration
- * 提示词优化器配置 - 用于智能分割和优化提示词
+ * Prompt optimizer configuration - for intelligent splitting and optimization of prompts
  */
 
 /**
  * Style keywords configuration - organized by category
- * 风格关键词配置 - 按类别组织便于维护和扩展
+ * Style keyword configuration - organized by category for easy maintenance and extension
  */
 
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 export const STYLE_KEYWORDS = {
-  // Artists and platforms / 艺术家和平台
+  // Artists and platforms
   ARTISTS: [
     'by greg rutkowski',
     'by artgerm',
@@ -34,7 +34,7 @@ export const STYLE_KEYWORDS = {
     'digital painting',
   ],
 
-  // Art styles / 艺术风格
+  // Art styles
   ART_STYLES: [
     'photorealistic',
     'photo realistic',
@@ -90,7 +90,7 @@ export const STYLE_KEYWORDS = {
     'retrowave',
   ],
 
-  // Lighting effects / 光照效果
+  // Lighting effects
   LIGHTING: [
     'dramatic lighting',
     'soft lighting',
@@ -131,7 +131,7 @@ export const STYLE_KEYWORDS = {
     'incandescent',
   ],
 
-  // Photography terms / 摄影术语
+  // Photography terms
   PHOTOGRAPHY: [
     'depth of field',
     'shallow depth of field',
@@ -184,7 +184,7 @@ export const STYLE_KEYWORDS = {
     'instant photo',
   ],
 
-  // Quality descriptions / 质量描述
+  // Quality descriptions
   QUALITY: [
     'high quality',
     'best quality',
@@ -227,7 +227,7 @@ export const STYLE_KEYWORDS = {
     'exquisite',
   ],
 
-  // Rendering and effects / 渲染和效果
+  // Rendering and effects
   RENDERING: [
     'octane render',
     'octane',
@@ -270,7 +270,7 @@ export const STYLE_KEYWORDS = {
     'high dynamic range',
   ],
 
-  // Color and mood / 颜色和氛围
+  // Color and mood
   COLOR_MOOD: [
     'vibrant',
     'vibrant colors',
@@ -330,7 +330,7 @@ export const STYLE_KEYWORDS = {
     'gothic atmosphere',
   ],
 
-  // Texture and materials / 纹理和材质
+  // Texture and materials
   TEXTURE_MATERIAL: [
     'glossy',
     'matte',
@@ -397,7 +397,7 @@ export const STYLE_KEYWORDS = {
 
 /**
  * Style synonyms mapping for better recognition
- * 同义词映射，提高识别准确率
+ * Synonym mapping to improve recognition accuracy
  */
 export const STYLE_SYNONYMS: Record<string, string[]> = {
   // Photography variations
@@ -443,7 +443,7 @@ export const STYLE_SYNONYMS: Record<string, string[]> = {
 
 /**
  * Compound styles that should be recognized as a whole
- * 组合风格，应该作为整体识别
+ * Compound styles that should be recognized as a complete unit
  */
 export const COMPOUND_STYLES = [
   // Studio and brand styles
@@ -536,37 +536,37 @@ export const COMPOUND_STYLES = [
 
 /**
  * Precise adjective patterns for style extraction
- * 精确的形容词模式，用于风格提取
+ * Precise adjective patterns for style extraction
  */
 export const STYLE_ADJECTIVE_PATTERNS = {
-  // Visual quality related / 视觉质量相关
+  // Visual quality related
   quality:
     /^(sharp|blur(ry)?|clear|crisp|clean|smooth|rough|grainy|noisy|pristine|flawless|perfect|polished)$/i,
 
-  // Artistic style related / 艺术风格相关
+  // Artistic style related
   artistic:
     /^(abstract|surreal|minimal(ist)?|ornate|baroque|gothic|modern|contemporary|traditional|classical|vintage|retro|antique|futuristic|avant-garde)$/i,
 
-  // Color and lighting / 颜色和光照
+  // Color and lighting
   visual:
     /^(bright|dark|dim|vibrant|vivid|muted|saturated|desaturated|warm|cool|cold|hot|soft|hard|harsh|gentle|subtle|bold|pale|rich|deep)$/i,
 
-  // Mood and atmosphere / 情绪和氛围
+  // Mood and atmosphere
   mood: /^(dramatic|peaceful|chaotic|serene|calm|mysterious|mystical|magical|epic|legendary|heroic|romantic|melancholic|nostalgic|whimsical|playful|serious|solemn|cheerful|gloomy|ominous|eerie|creepy|scary|dreamy|ethereal|fantastical|moody|atmospheric)$/i,
 
-  // Texture and material / 纹理和材质
+  // Texture and material
   texture:
     /^(metallic|wooden|glass(y)?|crystalline|fabric|leather|plastic|rubber|organic|synthetic|liquid|solid|transparent|translucent|opaque|reflective|matte|glossy|satin|rough|smooth|wet|dry|dusty|rusty|weathered|aged|new|fresh|worn)$/i,
 
-  // Size and scale / 尺寸和规模
+  // Size and scale
   scale:
     /^(tiny|small|medium|large|huge|massive|gigantic|colossal|enormous|microscopic|miniature|oversized|epic-scale|human-scale|intimate|vast|infinite)$/i,
 
-  // Complexity and detail / 复杂度和细节
+  // Complexity and detail
   detail:
     /^(simple|complex|intricate|elaborate|detailed|minimal|advanced|sophisticated|primitive|refined|crude|delicate|robust)$/i,
 
-  // Professional quality / 专业质量
+  // Professional quality
   professional:
     /^(professional|amateur|masterful|skilled|expert|novice|polished|raw|finished|unfinished|complete|incomplete|refined|rough)$/i,
 } as const;
@@ -575,7 +575,7 @@ export const STYLE_ADJECTIVE_PATTERNS = {
 
 /**
  * Get all style keywords as a flattened array
- * 获取所有风格关键词的扁平数组
+ * Get all style keywords as a flattened array
  */
 export function getAllStyleKeywords(): readonly string[] {
   return Object.values(STYLE_KEYWORDS).flat();
@@ -583,7 +583,7 @@ export function getAllStyleKeywords(): readonly string[] {
 
 /**
  * Get all compound styles
- * 获取所有组合风格
+ * Get all compound styles
  */
 export function getCompoundStyles(): readonly string[] {
   return COMPOUND_STYLES;
@@ -591,7 +591,7 @@ export function getCompoundStyles(): readonly string[] {
 
 /**
  * Normalize a style term using synonyms
- * 使用同义词标准化风格术语
+ * Normalize a style term using synonyms
  */
 export function normalizeStyleTerm(term: string): string {
   const lowerTerm = term.toLowerCase();
@@ -608,7 +608,7 @@ export function normalizeStyleTerm(term: string): string {
 
 /**
  * Check if a word matches any style adjective pattern
- * 检查词语是否匹配任何风格形容词模式
+ * Check if a word matches any style adjective pattern
  */
 export function isStyleAdjective(word: string): boolean {
   const lowerWord = word.toLowerCase();
@@ -617,7 +617,7 @@ export function isStyleAdjective(word: string): boolean {
 
 /**
  * Extract style adjectives from words based on precise patterns
- * 基于精确模式从词语中提取风格形容词
+ * Extract style adjectives from words based on precise patterns
  */
 export function extractStyleAdjectives(words: string[]): string[] {
   return words.filter((word) => isStyleAdjective(word));