@lobehub/chat 1.46.6 → 1.47.0

package/src/features/DevPanel/PostgresViewer/Schema.tsx

@@ -0,0 +1,196 @@
+import { Icon } from '@lobehub/ui';
+import { createStyles } from 'antd-style';
+import { ChevronDown, ChevronRight, Database, Table as TableIcon } from 'lucide-react';
+import React, { useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
+import useSWR from 'swr';
+
+import { tableViewerService } from '@/services/tableViewer';
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+
+import TableColumns from './TableColumns';
+
+// 样式定义
+const useStyles = createStyles(({ token, css }) => ({
+  button: css`
+    cursor: pointer;
+
+    display: flex;
+    gap: 4px;
+    align-items: center;
+
+    padding-block: ${token.paddingXS}px;
+    padding-inline: ${token.padding}px;
+    border: none;
+    border-radius: ${token.borderRadius}px;
+
+    color: ${token.colorText};
+
+    background: ${token.colorFillSecondary};
+
+    transition: all ${token.motionDurationMid};
+
+    &:hover {
+      background: ${token.colorFillTertiary};
+    }
+  `,
+  count: css`
+    font-size: 12px;
+    color: ${token.colorTextTertiary};
+  `,
+  dataPanel: css`
+    overflow: hidden;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+
+    height: 100%;
+
+    background: ${token.colorBgContainer};
+  `,
+  schema: css`
+    font-family: ${token.fontFamilyCode};
+    font-size: 12px;
+    font-weight: normal;
+    color: ${token.colorTextTertiary};
+  `,
+  schemaHeader: css`
+    display: flex;
+    gap: 8px;
+    align-items: center;
+
+    padding-block: 12px;
+    padding-inline: 16px;
+
+    font-weight: ${token.fontWeightStrong};
+    color: ${token.colorText};
+  `,
+  schemaPanel: css`
+    overflow: scroll;
+
+    width: 280px;
+    height: 100%;
+    border-inline-end: 1px solid ${token.colorBorderSecondary};
+
+    background: ${token.colorBgContainer};
+  `,
+  selected: css`
+    background: ${token.colorFillSecondary};
+  `,
+  table: css`
+    overflow: hidden;
+    flex: 1;
+
+    table {
+      border-collapse: collapse;
+      width: 100%;
+    }
+
+    th {
+      position: sticky;
+      z-index: 1;
+      inset-block-start: 0;
+
+      padding: ${token.padding}px;
+      border-block-end: 1px solid ${token.colorBorderSecondary};
+
+      font-weight: ${token.fontWeightStrong};
+      text-align: start;
+
+      background: ${token.colorFillQuaternary};
+    }
+
+    td {
+      padding: ${token.padding}px;
+      border-block-end: 1px solid ${token.colorBorderSecondary};
+      transition: all ${token.motionDurationMid};
+
+      &:hover {
+        background: ${token.colorFillQuaternary};
+      }
+    }
+  `,
+  tableItem: css`
+    cursor: pointer;
+
+    display: flex;
+    gap: 8px;
+    align-items: center;
+
+    margin-inline: 8px;
+    padding: 8px;
+    border-radius: ${token.borderRadius}px;
+
+    color: ${token.colorText};
+
+    &:hover {
+      background: ${token.colorFillSecondary};
+    }
+  `,
+}));
+
+interface SchemaPanelProps {
+  onTableSelect: (tableName: string) => void;
+  selectedTable?: string;
+}
+const SchemaPanel = ({ onTableSelect, selectedTable }: SchemaPanelProps) => {
+  const { styles, cx } = useStyles();
+  const [expandedTables, setExpandedTables] = useState(new Set());
+
+  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
+
+  const { data, isLoading } = useSWR(isDBInited ? 'fetch-tables' : null, () =>
+    tableViewerService.getAllTables(),
+  );
+
+  const toggleTable = (tableName: string) => {
+    const newExpanded = new Set(expandedTables);
+    if (newExpanded.has(tableName)) {
+      newExpanded.delete(tableName);
+    } else {
+      newExpanded.add(tableName);
+    }
+    setExpandedTables(newExpanded);
+  };
+
+  return (
+    <div className={styles.schemaPanel}>
+      <div className={styles.schemaHeader}>
+        <Database size={16} />
+        <Flexbox align={'center'} horizontal justify={'space-between'}>
+          <span>Tables {data?.length}</span>
+          <span className={styles.schema}>public</span>
+        </Flexbox>
+      </div>
+      {isLoading ? (
+        <div>Loading...</div>
+      ) : (
+        <Flexbox>
+          {data?.map((table) => (
+            <div key={table.name}>
+              <Flexbox
+                className={cx(styles.tableItem, selectedTable === table.name && styles.selected)}
+                horizontal
+                onClick={() => {
+                  toggleTable(table.name);
+                  onTableSelect(table.name);
+                }}
+              >
+                <Icon icon={expandedTables.has(table.name) ? ChevronDown : ChevronRight} />
+                <TableIcon size={16} />
+                <Flexbox align={'center'} horizontal justify={'space-between'}>
+                  <span>{table.name}</span>
+                  <span className={styles.count}>{table.count}</span>
+                </Flexbox>
+              </Flexbox>
+              {expandedTables.has(table.name) && <TableColumns tableName={table.name} />}
+            </div>
+          ))}
+        </Flexbox>
+      )}
+    </div>
+  );
+};
+
+export default SchemaPanel;

package/src/features/DevPanel/PostgresViewer/TableColumns.tsx

@@ -0,0 +1,67 @@
+import { Tag } from 'antd';
+import { createStyles } from 'antd-style';
+import React from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import { useTableColumns } from './useTableColumns';
+
+const useStyles = createStyles(({ token, css }) => ({
+  container: css`
+    margin-inline: 40px 4px;
+    font-size: ${token.fontSizeSM}px;
+    color: ${token.colorTextSecondary};
+  `,
+  item: css`
+    padding-block: 4px;
+    padding-inline: 0;
+    font-family: ${token.fontFamilyCode};
+  `,
+  type: css`
+    font-size: 10px;
+    color: ${token.red9};
+  `,
+}));
+
+interface TableColumnsProps {
+  tableName: string;
+}
+
+const TableColumns = ({ tableName }: TableColumnsProps) => {
+  const { styles } = useStyles();
+
+  const { data, isLoading } = useTableColumns(tableName);
+
+  return (
+    <div className={styles.container}>
+      {isLoading ? (
+        <div>Loading...</div>
+      ) : (
+        <Flexbox>
+          {data?.map((column) => (
+            <Flexbox
+              align={'center'}
+              className={styles.item}
+              horizontal
+              justify={'space-between'}
+              key={column.name}
+            >
+              <Flexbox>
+                <Flexbox>{column.name}</Flexbox>
+                <span className={styles.type}>{column.type}</span>
+              </Flexbox>
+              {column.isPrimaryKey && (
+                <div>
+                  <Tag bordered={false} color={'cyan'}>
+                    Primary
+                  </Tag>
+                </div>
+              )}
+            </Flexbox>
+          ))}
+        </Flexbox>
+      )}
+    </div>
+  );
+};
+
+export default TableColumns;

package/src/features/DevPanel/PostgresViewer/index.tsx

@@ -0,0 +1,19 @@
+import React, { useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import DataTable from './DataTable';
+import SchemaPanel from './Schema';
+
+// Main Database Panel Component
+const DatabasePanel = () => {
+  const [selectedTable, setSelectedTable] = useState<string>('');
+
+  return (
+    <Flexbox height={'100%'} horizontal>
+      <SchemaPanel onTableSelect={setSelectedTable} selectedTable={selectedTable} />
+      <DataTable tableName={selectedTable} />
+    </Flexbox>
+  );
+};
+
+export default DatabasePanel;

package/src/features/DevPanel/PostgresViewer/useTableColumns.ts

@@ -0,0 +1,13 @@
+import useSWR from 'swr';
+
+import { tableViewerService } from '@/services/tableViewer';
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+
+export const useTableColumns = (tableName?: string) => {
+  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
+
+  return useSWR(isDBInited && tableName ? ['fetch-table-columns', tableName] : null, ([, table]) =>
+    tableViewerService.getTableDetails(table),
+  );
+};

package/src/features/DevPanel/index.tsx

@@ -0,0 +1,12 @@
+'use client';
+
+import FloatPanel from './FloatPanel';
+import PostgresViewer from './PostgresViewer';
+
+const DevPanel = () => (
+  <FloatPanel>
+    <PostgresViewer />
+  </FloatPanel>
+);
+
+export default DevPanel;

package/src/features/ModelSwitchPanel/index.tsx

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { ModelItemRender, ProviderItemRender } from '@/components/ModelSelect';
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { useEnabledChatModels } from '@/hooks/useEnabledChatModels';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useAgentStore } from '@/store/agent';
@@ -76,7 +76,9 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
               </Flexbox>
             ),
             onClick: () => {
-              router.push(!isServerMode ? '/settings/llm' : `/settings/provider/${provider.id}`);
+              router.push(
+                isDeprecatedEdition ? '/settings/llm' : `/settings/provider/${provider.id}`,
+              );
             },
           },
         ];

package/src/hooks/useEnabledChatModels.ts

@@ -1,6 +1,6 @@
 import isEqual from 'fast-deep-equal';
 
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';
@@ -10,7 +10,7 @@ export const useEnabledChatModels = (): EnabledProviderWithModels[] => {
   const enabledList = useUserStore(modelProviderSelectors.modelProviderListForModelSelect, isEqual);
   const enabledChatModelList = useAiInfraStore((s) => s.enabledChatModelList, isEqual);
 
-  if (!isServerMode) {
+  if (isDeprecatedEdition) {
     return enabledList;
   }
 

package/src/hooks/useModelContextWindowTokens.ts

@@ -1,4 +1,4 @@
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';
@@ -8,7 +8,7 @@ export const useModelContextWindowTokens = (model: string, provider: string) =>
 
   // TODO: remove this in V2.0
   const oldValue = useUserStore(modelProviderSelectors.modelMaxToken(model));
-  if (!isServerMode) return oldValue;
+  if (isDeprecatedEdition) return oldValue;
   //
 
   return newValue as number;

package/src/hooks/useModelHasContextWindowToken.ts

@@ -1,4 +1,4 @@
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/slices/chat';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
@@ -12,7 +12,7 @@ export const useModelHasContextWindowToken = () => {
 
   // TODO: remove this in V2.0
   const oldValue = useUserStore(modelProviderSelectors.isModelHasMaxToken(model));
-  if (!isServerMode) return oldValue;
+  if (isDeprecatedEdition) return oldValue;
   //
 
   return newValue;

package/src/hooks/useModelSupportToolUse.ts

@@ -1,4 +1,4 @@
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';
@@ -8,7 +8,7 @@ export const useModelSupportToolUse = (model: string, provider: string) => {
 
   // TODO: remove this in V2.0
   const oldValue = useUserStore(modelProviderSelectors.isModelEnabledFunctionCall(model));
-  if (!isServerMode) return oldValue;
+  if (isDeprecatedEdition) return oldValue;
   //
 
   return newValue;

package/src/hooks/useModelSupportVision.ts

@@ -1,4 +1,4 @@
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';
@@ -8,7 +8,7 @@ export const useModelSupportVision = (model: string, provider: string) => {
 
   // TODO: remove this in V2.0
   const oldValue = useUserStore(modelProviderSelectors.isModelEnabledVision(model));
-  if (!isServerMode) return oldValue;
+  if (isDeprecatedEdition) return oldValue;
   //
 
   return newValue;

package/src/layout/GlobalProvider/index.tsx

@@ -9,7 +9,7 @@ import {
   LOBE_THEME_NEUTRAL_COLOR,
   LOBE_THEME_PRIMARY_COLOR,
 } from '@/const/theme';
-import DebugUI from '@/features/DebugUI';
+import DevPanel from '@/features/DevPanel';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { ServerConfigStoreProvider } from '@/store/serverConfig';
 import { getAntdLocale, parseBrowserLanguage } from '@/utils/locale';
@@ -65,9 +65,9 @@ const GlobalLayout = async ({ children }: PropsWithChildren) => {
             <Suspense>
               <StoreInitialization />
               <ReactScan />
+              {process.env.NODE_ENV === 'development' && <DevPanel />}
             </Suspense>
           </ServerConfigStoreProvider>
-          <DebugUI />
         </AppTheme>
         <AntdV5MonkeyPatch />
       </Locale>

package/src/server/globalConfig/parseFilesConfig.test.ts

@@ -3,15 +3,134 @@ import { describe, expect, it } from 'vitest';
 import { parseFilesConfig } from './parseFilesConfig';
 
 describe('parseFilesConfig', () => {
+  it('parses full configuration correctly', () => {
+    const envStr =
+      'embedding_model=openai/embedding-text-3-small,reranker_model=cohere/rerank-english-v3.0,query_mode=full_text';
+    const expected = {
+      embeddingModel: { provider: 'openai', model: 'embedding-text-3-small' },
+      rerankerModel: { provider: 'cohere', model: 'rerank-english-v3.0' },
+      queryMode: 'full_text',
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
   // 测试embeddings配置是否被正确解析
   it('parses embeddings configuration correctly', () => {
-    const envStr =
-      'embedding_model=openai/embedding-text-3-large,reranker_model=cohere/rerank-english-v3.0,query_model=full_text';
+    const envStr = 'embedding_model=openai/embedding-text-3-large';
     const expected = {
       embeddingModel: { provider: 'openai', model: 'embedding-text-3-large' },
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
+  it('parses rerank configuration correctly', () => {
+    const envStr = 'reranker_model=cohere/rerank-english-v3.0';
+    const expected = {
+      rerankerModel: { provider: 'cohere', model: 'rerank-english-v3.0' },
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
+  it('parses queryMode configuration correctly', () => {
+    const envStr = 'query_mode=full_text';
+    const expected = {
+      queryMode: 'full_text',
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
+  it('parses queryMode rerank configuration correctly', () => {
+    const envStr = 'reranker_model=cohere/rerank-english-v3.0,query_mode=full_text';
+    const expected = {
+      queryMode: 'full_text',
+      rerankerModel: { provider: 'cohere', model: 'rerank-english-v3.0' },
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
+  it('parses queryMode embeddings configuration correctly', () => {
+    const envStr = 'embedding_model=openai/embedding-text-3-small,query_mode=full_text';
+    const expected = {
+      queryMode: 'full_text',
+      embeddingModel: { provider: 'openai', model: 'embedding-text-3-small' },
+    };
+    expect(parseFilesConfig(envStr)).toEqual(expected);
+  });
+
+  it('parses rerank embeddings configuration correctly', () => {
+    const envStr =
+      'reranker_model=cohere/rerank-english-v3.0,embedding_model=openai/embedding-text-3-small';
+    const expected = {
+      embeddingModel: { provider: 'openai', model: 'embedding-text-3-small' },
       rerankerModel: { provider: 'cohere', model: 'rerank-english-v3.0' },
-      queryModel: 'full_text',
     };
     expect(parseFilesConfig(envStr)).toEqual(expected);
   });
+
+  it('should throw an error for invalid embedding_model format', () => {
+    const envStr =
+      'reranker_model=cohere/rerank-english-v3.0,embedding_model=/embedding-text-3-small';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(
+      new Error(
+        'Invalid environment variable format.  expected of the form embedding_model=provider/model',
+      ),
+    );
+  });
+
+  it('should throw an error for invalid embedding_model format', () => {
+    const envStr = 'reranker_model=cohere/rerank-english-v3.0,embedding_model=openai';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(
+      new Error(
+        'Invalid environment variable format.  expected of the form embedding_model=provider/model',
+      ),
+    );
+  });
+
+  it('should throw an error for invalid embedding_model format', () => {
+    const envStr = 'reranker_model=cohere/rerank-english-v3.0,embedding_model=';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrowError(new Error('Invalid environment variable format.'));
+  });
+
+  it('should throw an error for invalid reranker_model format', () => {
+    const envStr =
+      'reranker_model=/rerank-english-v3.0,embedding_model=openai/embedding-text-3-small';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(
+      new Error(
+        'Invalid environment variable format.  expected of the form reranker_model=provider/model',
+      ),
+    );
+  });
+
+  it('should throw an error for invalid reranker_model format', () => {
+    const envStr = 'reranker_model=cohere/,embedding_model=openai/embedding-text-3-small';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(
+      new Error(
+        'Invalid environment variable format.  expected of the form reranker_model=provider/model',
+      ),
+    );
+  });
+
+  it('should throw an error for invalid reranker_model format', () => {
+    const envStr = 'reranker_model=,embedding_model=openai/embedding-text-3-small';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(new Error('Invalid environment variable format.'));
+  });
+
+  it('should throw an error for invalid query_mode format', () => {
+    const envStr = 'query_mode=';
+    expect(() => {
+      parseFilesConfig(envStr);
+    }).toThrow(new Error('Invalid environment variable format.'));
+  });
 });

package/src/server/globalConfig/parseFilesConfig.ts

@@ -4,7 +4,7 @@ import { FilesConfig } from '@/types/user/settings/filesConfig';
 
 const protectedKeys = Object.keys({
   embedding_model: null,
-  query_model: null,
+  query_mode: null,
   reranker_model: null,
 });
 
@@ -24,34 +24,40 @@ export const parseFilesConfig = (envString: string = ''): SystemEmbeddingConfig
       const [provider, ...modelParts] = value.split('/');
       const model = modelParts.join('/');
 
-      if ((!provider || !model) && key !== 'query_model') {
-        throw new Error('Missing model or provider value');
-      }
-
-      if (key === 'query_model' && value === '') {
-        throw new Error('Missing query mode value');
-      }
-
       if (protectedKeys.includes(key)) {
         switch (key) {
           case 'embedding_model': {
+            if (!provider || !model) {
+              throw new Error(
+                'Invalid environment variable format.  expected of the form embedding_model=provider/model',
+              );
+            }
             config.embeddingModel = { model: model.trim(), provider: provider.trim() };
             break;
           }
           case 'reranker_model': {
+            if (!provider || !model) {
+              throw new Error(
+                'Invalid environment variable format.  expected of the form reranker_model=provider/model',
+              );
+            }
             config.rerankerModel = { model: model.trim(), provider: provider.trim() };
             break;
           }
-          case 'query_model': {
-            config.queryModel = value;
+          case 'query_mode': {
+            config.queryMode = value;
             break;
           }
+          default: {
+            throw new Error(
+              'Invalid environment variable format. expected one of embedding_model, reranker_model, query_mode',
+            );
+          }
         }
       }
     } else {
-      throw new Error('Invalid environment variable format');
+      throw new Error('Invalid environment variable format.');
     }
   }
-
   return config;
 };

package/src/server/modules/S3/index.ts

@@ -44,6 +44,9 @@ export class S3 {
       endpoint: fileEnv.S3_ENDPOINT,
       forcePathStyle: fileEnv.S3_ENABLE_PATH_STYLE,
       region: fileEnv.S3_REGION || DEFAULT_S3_REGION,
+      // refs: https://github.com/lobehub/lobe-chat/pull/5479
+      requestChecksumCalculation: 'WHEN_REQUIRED',
+      responseChecksumValidation: 'WHEN_REQUIRED',
     });
   }
 

package/src/services/_auth.ts

@@ -1,5 +1,5 @@
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
-import { isServerMode } from '@/const/version';
+import { isDeprecatedEdition } from '@/const/version';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
@@ -94,7 +94,7 @@ export const createPayloadWithKeyVaults = (provider: string) => {
   let keyVaults = {};
 
   // TODO: remove this condition in V2.0
-  if (!isServerMode) {
+  if (isDeprecatedEdition) {
     keyVaults = keyVaultsConfigSelectors.getVaultByProvider(provider as any)(
       useUserStore.getState(),
     );