Eval dev merge

.gitignore

@@ -37,4 +37,5 @@ files/helm/fastgpt/charts/*.tgz
 
 tmp/
 coverage
-document/.source
+document/.source
+AGENTS.md

deploy/docker/docker-compose-milvus.yml

@@ -185,6 +185,8 @@ services:
       - AIPROXY_API_ENDPOINT=http://aiproxy:3000
       # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
       - AIPROXY_API_TOKEN=aiproxy
+      # diting 地址
+      - DITING_BASE_URL=http://diting:3000
 
       # 数据库最大连接数
       - DB_MAX_LINK=30
@@ -298,5 +300,23 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
+
+  # diting
+  diting:
+    image: ghcr.io/labring/diting:v0.1.0
+    container_name: diting
+    restart: unless-stopped
+    networks:
+      - fastgpt
+    environment:
+      # 对应fastgpt中的aiproxy的AIPROXY_API_ENDPOINT
+      - AIPROXY_API_ENDPOINT=http://aiproxy:3000
+      # 对应fastgpt中的aiproxy的AIPROXY_API_TOKEN
+      - AIPROXY_API_TOKEN=aiproxy
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/v1/healthz']
+      interval: 5s
+      timeout: 5s
+      retries: 10
 networks:
   fastgpt:

deploy/docker/docker-compose-oceanbase/docker-compose.yml

@@ -160,6 +160,8 @@ services:
       - AIPROXY_API_ENDPOINT=http://aiproxy:3000
       # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
       - AIPROXY_API_TOKEN=aiproxy
+      # diting 地址
+      - DITING_BASE_URL=http://diting:3000
 
       # 数据库最大连接数
       - DB_MAX_LINK=30
@@ -272,5 +274,23 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
+
+  # diting
+  diting:
+    image: ghcr.io/labring/diting:v0.1.0
+    container_name: diting
+    restart: unless-stopped
+    networks:
+      - fastgpt
+    environment:
+      # 对应fastgpt中的aiproxy的AIPROXY_API_ENDPOINT
+      - AIPROXY_API_ENDPOINT=http://aiproxy:3000
+      # 对应fastgpt中的aiproxy的AIPROXY_API_TOKEN
+      - AIPROXY_API_TOKEN=aiproxy
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/v1/healthz']
+      interval: 5s
+      timeout: 5s
+      retries: 10
 networks:
   fastgpt:

deploy/docker/docker-compose-pgvector.yml

@@ -146,6 +146,8 @@ services:
       - AIPROXY_API_ENDPOINT=http://aiproxy:3000
       # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
       - AIPROXY_API_TOKEN=aiproxy
+      # diting 地址
+      - DITING_BASE_URL=http://diting:3000
 
       # 数据库最大连接数
       - DB_MAX_LINK=30
@@ -258,5 +260,23 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
+
+  # diting
+  diting:
+    image: ghcr.io/labring/diting:v0.1.0
+    container_name: diting
+    restart: unless-stopped
+    networks:
+      - fastgpt
+    environment:
+      # 对应fastgpt中的aiproxy的AIPROXY_API_ENDPOINT
+      - AIPROXY_API_ENDPOINT=http://aiproxy:3000
+      # 对应fastgpt中的aiproxy的AIPROXY_API_TOKEN
+      - AIPROXY_API_TOKEN=aiproxy
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/v1/healthz']
+      interval: 5s
+      timeout: 5s
+      retries: 10
 networks:
   fastgpt:

deploy/docker/docker-compose-zilliz.yml

@@ -126,6 +126,8 @@ services:
       - AIPROXY_API_ENDPOINT=http://aiproxy:3000
       # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
       - AIPROXY_API_TOKEN=aiproxy
+      # diting 地址
+      - DITING_BASE_URL=http://diting:3000
 
       # 数据库最大连接数
       - DB_MAX_LINK=30
@@ -240,5 +242,23 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
+
+  # diting
+  diting:
+    image: ghcr.io/labring/diting:v0.1.0
+    container_name: diting
+    restart: unless-stopped
+    networks:
+      - fastgpt
+    environment:
+      # 对应fastgpt中的aiproxy的AIPROXY_API_ENDPOINT
+      - AIPROXY_API_ENDPOINT=http://aiproxy:3000
+      # 对应fastgpt中的aiproxy的AIPROXY_API_TOKEN
+      - AIPROXY_API_TOKEN=aiproxy
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/v1/healthz']
+      interval: 5s
+      timeout: 5s
+      retries: 10
 networks:
   fastgpt:

packages/global/common/error/code/database.ts

@@ -0,0 +1,139 @@
+import { i18nT } from '../../../../web/i18n/utils';
+import { type ErrType } from '../errorCode';
+
+/* database: 509000 */
+export enum DatabaseErrEnum {
+  // 知识库相关
+  datasetParamsError = 'datasetParamsError',
+  // 客户端创建和管理错误
+  clientCreateError = 'databaseClientCreateError',
+  clientUpdateError = 'databaseClientUpdateError',
+  clientDestroyError = 'databaseClientDestroyError',
+  clientAlreadyExists = 'databaseClientAlreadyExists',
+  clientNotFound = 'databaseClientNotFound',
+
+  // 连接相关错误
+  authError = 'databaseAuthError',
+  databaseNameError = 'databaseNameError',
+  databasePortError = 'databasePortError',
+  hostError = 'databaseHostError',
+  checkError = 'databaseCheckError',
+  econnRefused = 'connectionRefused',
+  connectionFailed = 'databaseConnectionFailed',
+  connectionTimeout = 'databaseConnectionTimeout',
+  connectionLost = 'databaseConnectionLost',
+
+  // 数据库类型和支持错误
+  notSupportType = 'databaseNotSupportType',
+  notImplemented = 'databaseNotImplemented',
+
+  // API 请求和验证错误
+  requestValidationError = 'databaseRequestValidationError',
+  invalidTableName = 'databaseInvalidTableName',
+  fetchInfoError = 'databaseFetchInfoError',
+  dbConfigNotFound = 'databaseConfigNotFound',
+  opUnknownDatabaseError = 'opUnknownDatabaseError',
+  dativeServiceError = 'dativeServiceError'
+}
+
+const databaseErr = [
+  // 客户端管理错误
+  {
+    statusText: DatabaseErrEnum.clientCreateError,
+    message: 'core.database.error.client_create_failed'
+  },
+  {
+    statusText: DatabaseErrEnum.clientUpdateError,
+    message: 'core.database.error.client_update_failed'
+  },
+  {
+    statusText: DatabaseErrEnum.clientDestroyError,
+    message: i18nT('database_client:client_destory_error')
+  },
+  {
+    statusText: DatabaseErrEnum.clientNotFound,
+    message: i18nT('database_client:client_not_found')
+  },
+
+  // 连接错误
+  {
+    statusText: DatabaseErrEnum.authError,
+    message: i18nT('database_client:authentication_failed')
+  },
+  {
+    statusText: DatabaseErrEnum.databaseNameError,
+    message: i18nT('database_client:database_not_exist')
+  },
+  {
+    statusText: DatabaseErrEnum.databasePortError,
+    message: i18nT('database_client:database_port_error')
+  },
+  {
+    statusText: DatabaseErrEnum.hostError,
+    message: i18nT('database_client:host_error')
+  },
+  {
+    statusText: DatabaseErrEnum.econnRefused,
+    message: i18nT('database_client:connection_refused')
+  },
+  {
+    statusText: DatabaseErrEnum.checkError,
+    message: i18nT('database_client:connection_check_error')
+  },
+  {
+    statusText: DatabaseErrEnum.connectionLost,
+    message: i18nT('database_client:connection_lost')
+  },
+  {
+    statusText: DatabaseErrEnum.connectionFailed,
+    message: i18nT('database_client:connection_failed')
+  },
+  {
+    statusText: DatabaseErrEnum.connectionTimeout,
+    message: i18nT('database_client:connection_timeout')
+  },
+
+  // 类型支持错误
+  {
+    statusText: DatabaseErrEnum.notSupportType,
+    message: i18nT('database_client:not_support_databaseType')
+  },
+  {
+    statusText: DatabaseErrEnum.notImplemented,
+    message: i18nT('database_client:not_implemented_databaseType')
+  },
+
+  // 请求验证错误
+  {
+    statusText: DatabaseErrEnum.invalidTableName,
+    message: i18nT('database_client:invalid_table_name')
+  },
+  {
+    statusText: DatabaseErrEnum.fetchInfoError,
+    message: i18nT('database_client:fetch_info_error')
+  },
+  {
+    statusText: DatabaseErrEnum.dbConfigNotFound,
+    message: i18nT('database_client:database_config_not_found')
+  },
+  {
+    statusText: DatabaseErrEnum.opUnknownDatabaseError,
+    message: i18nT('database_client:op_unknown_database_error')
+  },
+  {
+    statusText: DatabaseErrEnum.dativeServiceError,
+    message: i18nT('database_client:dative_service_error')
+  }
+];
+
+export default databaseErr.reduce((acc, cur, index) => {
+  return {
+    ...acc,
+    [cur.statusText]: {
+      code: 509000 + index,
+      statusText: cur.statusText,
+      message: cur.message,
+      data: null
+    }
+  };
+}, {} as ErrType<`${DatabaseErrEnum}`>);