Skip to content

Commit 42bf191

Browse files
jchui-wdjchui-wd
committed
resolved conflicts and merged with main
2 parents 0a50bf9 + 1298a39 commit 42bf191

142 files changed

Lines changed: 13214 additions & 918 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
platform: [ubuntu-latest]
17-
node-version: [18.15.0]
17+
node-version: [20.20.2]
1818
runs-on: ${{ matrix.platform }}
1919
env:
2020
PUPPETEER_SKIP_DOWNLOAD: true

‎.github/workflows/publish-agentflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- uses: actions/setup-node@v6
4444
with:
45-
node-version: '18.15.0'
45+
node-version: '20.20.2'
4646
registry-url: 'https://registry.npmjs.org'
4747

4848
- name: Validate custom version
@@ -107,7 +107,7 @@ jobs:
107107

108108
- uses: actions/setup-node@v6
109109
with:
110-
node-version: '18.15.0'
110+
node-version: '20.20.2'
111111
registry-url: 'https://registry.npmjs.org'
112112

113113
- name: Install dependencies

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Flowise has 3 different modules in a single mono repository.
152152

153153
## 🌱 Env Variables
154154

155-
Flowise support different environment variables to configure your instance. You can specify the following variables in the `.env` file inside `packages/server` folder. Read [more](https://docs.flowiseai.com/environment-variables)
155+
Flowise support different environment variables to configure your instance. You can specify the following variables in the `.env` file inside `packages/server` folder. Read [more](https://docs.flowiseai.com/configuration/environment-variables)
156156

157157
| Variable | Description | Type | Default |
158158
| ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------- |
@@ -162,6 +162,8 @@ Flowise support different environment variables to configure your instance. You
162162
| MCP_CORS_ORIGINS | The allowed origins for MCP endpoint cross-origin calls. If unset, only non-browser (no Origin header) requests are allowed. Set to `*` to allow all origins. | String | |
163163
| IFRAME_ORIGINS | The allowed origins for iframe src embedding | String | |
164164
| FLOWISE_FILE_SIZE_LIMIT | Upload File Size Limit | String | 50mb |
165+
| CUSTOM_MCP_TOOLS_MAX_BYTES | Maximum byte size of the JSON tools payload stored per Custom MCP Server row (after stringify). Rejects oversized payloads returned by remote MCP servers. Set to `0` to disable the check. | Number | 524288 (512 KB) |
166+
| CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS | Maximum time in milliseconds to wait for the MCP server handshake during authorize. Bounds the request so a slow/tarpit upstream cannot tie up the HTTP worker indefinitely. Minimum 1000. | Number | 15000 |
165167
| DEBUG | Print logs from components | Boolean | |
166168
| LOG_PATH | Location where log files are stored | String | `your-path/Flowise/logs` |
167169
| LOG_LEVEL | Different levels of logs | Enum String: `error`, `info`, `verbose`, `debug` | `info` |

‎docker/.env.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ PORT=3000
7979
# MCP_CORS_ORIGINS=*
8080
# IFRAME_ORIGINS=*
8181
# FLOWISE_FILE_SIZE_LIMIT=50mb
82+
# CUSTOM_MCP_TOOLS_MAX_BYTES=524288
83+
# CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=15000
8284
# SHOW_COMMUNITY_NODES=true
8385
# DISABLE_FLOWISE_TELEMETRY=true
8486
# DISABLED_NODES=bufferMemory,chatOpenAI (comma separated list of node names to disable)

‎docker/docker-compose-queue-prebuilt.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ services:
7979
- MCP_CORS_ORIGINS=${MCP_CORS_ORIGINS}
8080
- IFRAME_ORIGINS=${IFRAME_ORIGINS}
8181
- FLOWISE_FILE_SIZE_LIMIT=${FLOWISE_FILE_SIZE_LIMIT}
82+
- CUSTOM_MCP_TOOLS_MAX_BYTES=${CUSTOM_MCP_TOOLS_MAX_BYTES}
83+
- CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=${CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS}
8284
- SHOW_COMMUNITY_NODES=${SHOW_COMMUNITY_NODES}
8385
- DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
8486
- DISABLED_NODES=${DISABLED_NODES}
@@ -227,6 +229,8 @@ services:
227229
- CORS_ORIGINS=${CORS_ORIGINS}
228230
- IFRAME_ORIGINS=${IFRAME_ORIGINS}
229231
- FLOWISE_FILE_SIZE_LIMIT=${FLOWISE_FILE_SIZE_LIMIT}
232+
- CUSTOM_MCP_TOOLS_MAX_BYTES=${CUSTOM_MCP_TOOLS_MAX_BYTES}
233+
- CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=${CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS}
230234
- SHOW_COMMUNITY_NODES=${SHOW_COMMUNITY_NODES}
231235
- DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
232236
- DISABLED_NODES=${DISABLED_NODES}

‎docker/docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ services:
6464
- MCP_CORS_ORIGINS=${MCP_CORS_ORIGINS}
6565
- IFRAME_ORIGINS=${IFRAME_ORIGINS}
6666
- FLOWISE_FILE_SIZE_LIMIT=${FLOWISE_FILE_SIZE_LIMIT}
67+
- CUSTOM_MCP_TOOLS_MAX_BYTES=${CUSTOM_MCP_TOOLS_MAX_BYTES}
68+
- CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=${CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS}
6769
- SHOW_COMMUNITY_NODES=${SHOW_COMMUNITY_NODES}
6870
- DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
6971
- DISABLED_NODES=${DISABLED_NODES}

‎docker/worker/.env.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ WORKER_PORT=5566
7878
# CORS_ORIGINS=*
7979
# IFRAME_ORIGINS=*
8080
# FLOWISE_FILE_SIZE_LIMIT=50mb
81+
# CUSTOM_MCP_TOOLS_MAX_BYTES=524288
82+
# CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=15000
8183
# SHOW_COMMUNITY_NODES=true
8284
# DISABLE_FLOWISE_TELEMETRY=true
8385
# DISABLED_NODES=bufferMemory,chatOpenAI (comma separated list of node names to disable)

‎docker/worker/docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ services:
6363
- CORS_ORIGINS=${CORS_ORIGINS}
6464
- IFRAME_ORIGINS=${IFRAME_ORIGINS}
6565
- FLOWISE_FILE_SIZE_LIMIT=${FLOWISE_FILE_SIZE_LIMIT}
66+
- CUSTOM_MCP_TOOLS_MAX_BYTES=${CUSTOM_MCP_TOOLS_MAX_BYTES}
67+
- CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS=${CUSTOM_MCP_AUTHORIZE_TIMEOUT_MS}
6668
- SHOW_COMMUNITY_NODES=${SHOW_COMMUNITY_NODES}
6769
- DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
6870
- DISABLED_NODES=${DISABLED_NODES}

‎i18n/CONTRIBUTING-ZH.md‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -116,37 +116,37 @@ Flowise 在一个单一的单体存储库中有 3 个不同的模块。
116116

117117
## 🌱 环境变量
118118

119-
Flowise 支持不同的环境变量来配置您的实例。您可以在 `packages/server` 文件夹中的 `.env` 文件中指定以下变量。阅读[更多信息](https://docs.flowiseai.com/environment-variables)
120-
121-
| 变量名 | 描述 | 类型 | 默认值 |
122-
|-----------------------------|---------------------------------------------------------|-------------------------------------------------|-------------------------------------|
123-
| `PORT` | Flowise 运行的 HTTP 端口 | 数字 | 3000 |
124-
| `FLOWISE_FILE_SIZE_LIMIT` | 上传文件大小限制 | 字符串 | 50mb |
125-
| `DEBUG` | 打印组件的日志 | 布尔值 | |
126-
| `LOG_PATH` | 存储日志文件的位置 | 字符串 | `your-path/Flowise/logs` |
127-
| `LOG_LEVEL` | 日志的不同级别 | 枚举字符串: `error`, `info`, `verbose`, `debug` | `info` |
128-
| `TOOL_FUNCTION_BUILTIN_DEP` | 用于工具函数的 NodeJS 内置模块 | 字符串 | |
129-
| `TOOL_FUNCTION_EXTERNAL_DEP`| 用于工具函数的外部模块 | 字符串 | |
130-
| `DATABASE_TYPE` | 存储 Flowise 数据的数据库类型 | 枚举字符串: `sqlite`, `mysql`, `postgres` | `sqlite` |
131-
| `DATABASE_PATH` | 数据库保存的位置（当 `DATABASE_TYPE` 是 sqlite 时） | 字符串 | `your-home-dir/.flowise` |
132-
| `DATABASE_HOST` | 主机 URL 或 IP 地址（当 `DATABASE_TYPE` 不是 sqlite 时）| 字符串 | |
133-
| `DATABASE_PORT` | 数据库端口（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
134-
| `DATABASE_USERNAME` | 数据库用户名（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
135-
| `DATABASE_PASSWORD` | 数据库密码（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
136-
| `DATABASE_NAME` | 数据库名称（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
137-
| `SECRETKEY_PATH` | 保存加密密钥（用于加密/解密凭据）的位置 | 字符串 | `your-path/Flowise/packages/server` |
138-
| `FLOWISE_SECRETKEY_OVERWRITE`| 加密密钥用于替代存储在 `SECRETKEY_PATH` 中的密钥 | 字符串 | |
139-
| `MODEL_LIST_CONFIG_JSON` | 加载模型的位置 | 字符串 | `/your_model_list_config_file_path` |
140-
| `STORAGE_TYPE` | 上传文件的存储类型 | 枚举字符串: `local`, `s3` | `local` |
141-
| `BLOB_STORAGE_PATH` | 本地上传文件存储路径（当 `STORAGE_TYPE` 为 `local`） | 字符串 | `your-home-dir/.flowise/storage` |
142-
| `S3_STORAGE_BUCKET_NAME` | S3 存储文件夹路径（当 `STORAGE_TYPE` 为 `s3`） | 字符串 | |
143-
| `S3_STORAGE_ACCESS_KEY_ID` | AWS 访问密钥 (Access Key) | 字符串 | |
144-
| `S3_STORAGE_SECRET_ACCESS_KEY` | AWS 密钥 (Secret Key) | 字符串 | |
145-
| `S3_STORAGE_REGION` | S3 存储地区 | 字符串 | |
146-
| `S3_ENDPOINT_URL` | S3 端点 URL | 字符串 | |
147-
| `S3_FORCE_PATH_STYLE` | 设置为 true 以强制请求使用路径样式寻址 | 布尔值 | false |
148-
| `SHOW_COMMUNITY_NODES` | 显示由社区创建的节点 | 布尔值 | |
149-
| `DISABLED_NODES` | 从界面中隐藏节点（以逗号分隔的节点名称列表） | 字符串 | |
119+
Flowise 支持不同的环境变量来配置您的实例。您可以在 `packages/server` 文件夹中的 `.env` 文件中指定以下变量。阅读[更多信息](https://docs.flowiseai.com/configuration/environment-variables)
120+
121+
| 变量名 | 描述 | 类型 | 默认值 |
122+
| ------------------------------ | -------------------------------------------------------- | ----------------------------------------------- | ----------------------------------- |
123+
| `PORT` | Flowise 运行的 HTTP 端口 | 数字 | 3000 |
124+
| `FLOWISE_FILE_SIZE_LIMIT` | 上传文件大小限制 | 字符串 | 50mb |
125+
| `DEBUG` | 打印组件的日志 | 布尔值 | |
126+
| `LOG_PATH` | 存储日志文件的位置 | 字符串 | `your-path/Flowise/logs` |
127+
| `LOG_LEVEL` | 日志的不同级别 | 枚举字符串: `error`, `info`, `verbose`, `debug` | `info` |
128+
| `TOOL_FUNCTION_BUILTIN_DEP` | 用于工具函数的 NodeJS 内置模块 | 字符串 | |
129+
| `TOOL_FUNCTION_EXTERNAL_DEP` | 用于工具函数的外部模块 | 字符串 | |
130+
| `DATABASE_TYPE` | 存储 Flowise 数据的数据库类型 | 枚举字符串: `sqlite`, `mysql`, `postgres` | `sqlite` |
131+
| `DATABASE_PATH` | 数据库保存的位置（当 `DATABASE_TYPE` 是 sqlite 时） | 字符串 | `your-home-dir/.flowise` |
132+
| `DATABASE_HOST` | 主机 URL 或 IP 地址（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
133+
| `DATABASE_PORT` | 数据库端口（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
134+
| `DATABASE_USERNAME` | 数据库用户名（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
135+
| `DATABASE_PASSWORD` | 数据库密码（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
136+
| `DATABASE_NAME` | 数据库名称（当 `DATABASE_TYPE` 不是 sqlite 时） | 字符串 | |
137+
| `SECRETKEY_PATH` | 保存加密密钥（用于加密/解密凭据）的位置 | 字符串 | `your-path/Flowise/packages/server` |
138+
| `FLOWISE_SECRETKEY_OVERWRITE` | 加密密钥用于替代存储在 `SECRETKEY_PATH` 中的密钥 | 字符串 | |
139+
| `MODEL_LIST_CONFIG_JSON` | 加载模型的位置 | 字符串 | `/your_model_list_config_file_path` |
140+
| `STORAGE_TYPE` | 上传文件的存储类型 | 枚举字符串: `local`, `s3` | `local` |
141+
| `BLOB_STORAGE_PATH` | 本地上传文件存储路径（当 `STORAGE_TYPE` 为 `local`） | 字符串 | `your-home-dir/.flowise/storage` |
142+
| `S3_STORAGE_BUCKET_NAME` | S3 存储文件夹路径（当 `STORAGE_TYPE` 为 `s3`） | 字符串 | |
143+
| `S3_STORAGE_ACCESS_KEY_ID` | AWS 访问密钥 (Access Key) | 字符串 | |
144+
| `S3_STORAGE_SECRET_ACCESS_KEY` | AWS 密钥 (Secret Key) | 字符串 | |
145+
| `S3_STORAGE_REGION` | S3 存储地区 | 字符串 | |
146+
| `S3_ENDPOINT_URL` | S3 端点 URL | 字符串 | |
147+
| `S3_FORCE_PATH_STYLE` | 设置为 true 以强制请求使用路径样式寻址 | 布尔值 | false |
148+
| `SHOW_COMMUNITY_NODES` | 显示由社区创建的节点 | 布尔值 | |
149+
| `DISABLED_NODES` | 从界面中隐藏节点（以逗号分隔的节点名称列表） | 字符串 | |
150150

151151
您也可以在使用 `npx` 时指定环境变量。例如：
152152

0 commit comments

Comments
 (0)