Skip to content

Commit 21a81dd

Browse files
bradtaylorsfbradtaylorsf
authored
Merge pull request #5 from Answers-AI/rebase-v1.5
Rebase to Flowise v1.5
2 parents a7fcae6 + 959e54c commit 21a81dd

File tree

525 files changed

+20916
-4076
lines changed

Some content is hidden

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

525 files changed

+20916
-4076
lines changed

‎.github/workflows/autoSyncMergedPullRequest.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: autoSyncMergedPullRequest
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
branches: ['main']
7+
jobs:
8+
autoSyncMergedPullRequest:
9+
if: github.event.pull_request.merged == true
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: write
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Show PR info
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
run: |
19+
echo The PR #${{ github.event.pull_request.number }} was merged on main branch!
20+
- name: Repository Dispatch
21+
uses: peter-evans/repository-dispatch@v2
22+
with:
23+
token: ${{ secrets.AUTOSYNC_TOKEN }}
24+
repository: ${{ secrets.AUTOSYNC_CH_URL }}
25+
event-type: ${{ secrets.AUTOSYNC_PR_EVENT_TYPE }}
26+
client-payload: >-
27+
{
28+
"ref": "${{ github.ref }}",
29+
"prNumber": "${{ github.event.pull_request.number }}",
30+
"prTitle": "${{ github.event.pull_request.title }}",
31+
"prDescription": "${{ github.event.pull_request.description }}",
32+
"sha": "${{ github.sha }}"
33+
}

‎.github/workflows/autoSyncSingleCommit.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: autoSyncSingleCommit
2+
on:
3+
push:
4+
branches:
5+
- main
6+
jobs:
7+
doNotAutoSyncSingleCommit:
8+
if: github.event.commits[1] != null
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: IGNORE autoSyncSingleCommit
13+
run: |
14+
echo This single commit has came from a merged commit. We will ignore it. This case is handled in autoSyncMergedPullRequest workflow for merge commits comming from merged pull requests only! Beware, the regular merge commits are not handled by any workflow for the moment.
15+
autoSyncSingleCommit:
16+
if: github.event.commits[1] == null
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: autoSyncSingleCommit
21+
env:
22+
GITHUB_CONTEXT: ${{ toJSON(github) }}
23+
run: |
24+
echo Autosync a single commit with id: ${{ github.sha }} from openSource main branch towards cloud hosted version.
25+
- name: Repository Dispatch
26+
uses: peter-evans/repository-dispatch@v2
27+
with:
28+
token: ${{ secrets.AUTOSYNC_TOKEN }}
29+
repository: ${{ secrets.AUTOSYNC_CH_URL }}
30+
event-type: ${{ secrets.AUTOSYNC_SC_EVENT_TYPE }}
31+
client-payload: >-
32+
{
33+
"ref": "${{ github.ref }}",
34+
"sha": "${{ github.sha }}",
35+
"commitMessage": "${{ github.event.commits[0].message }}"
36+
}

‎CONTRIBUTING-ZH.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
123123
| PORT | Flowise 运行的 HTTP 端口 | 数字 | 3000 |
124124
| FLOWISE_USERNAME | 登录用户名 | 字符串 | |
125125
| FLOWISE_PASSWORD | 登录密码 | 字符串 | |
126+
| FLOWISE_FILE_SIZE_LIMIT | 上传文件大小限制 | 字符串 | 50mb |
126127
| DEBUG | 打印组件的日志 | 布尔值 | |
127128
| LOG_PATH | 存储日志文件的位置 | 字符串 | `your-path/Flowise/logs` |
128129
| LOG_LEVEL | 日志的不同级别 | 枚举字符串: `error`, `info`, `verbose`, `debug` | `info` |
@@ -138,6 +139,7 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
138139
| DATABASE_NAME | 数据库名称（当 DATABASE_TYPE 不是 sqlite 时） | 字符串 | |
139140
| SECRETKEY_PATH | 保存加密密钥（用于加密/解密凭据）的位置 | 字符串 | `your-path/Flowise/packages/server` |
140141
| FLOWISE_SECRETKEY_OVERWRITE | 加密密钥用于替代存储在 SECRETKEY_PATH 中的密钥 | 字符串 |
142+
| DISABLE_FLOWISE_TELEMETRY | 关闭遥测 | 字符串 |
141143

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

‎CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,11 @@ Flowise support different environment variables to configure your instance. You
123123
| Variable | Description | Type | Default |
124124
| --------------------------- | ---------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------- |
125125
| PORT | The HTTP port Flowise runs on | Number | 3000 |
126+
| CORS_ORIGINS | The allowed origins for all cross-origin HTTP calls | String | |
127+
| IFRAME_ORIGINS | The allowed origins for iframe src embedding | String | |
126128
| FLOWISE_USERNAME | Username to login | String | |
127129
| FLOWISE_PASSWORD | Password to login | String | |
130+
| FLOWISE_FILE_SIZE_LIMIT | Upload File Size Limit | String | 50mb |
128131
| DEBUG | Print logs from components | Boolean | |
129132
| LOG_PATH | Location where log files are stored | String | `your-path/Flowise/logs` |
130133
| LOG_LEVEL | Different levels of logs | Enum String: `error`, `info`, `verbose`, `debug` | `info` |
@@ -138,8 +141,11 @@ Flowise support different environment variables to configure your instance. You
138141
| DATABASE_USER | Database username (When DATABASE_TYPE is not sqlite) | String | |
139142
| DATABASE_PASSWORD | Database password (When DATABASE_TYPE is not sqlite) | String | |
140143
| DATABASE_NAME | Database name (When DATABASE_TYPE is not sqlite) | String | |
144+
| DATABASE_SSL_KEY_BASE64 | Database SSL client cert in base64 (takes priority over DATABASE_SSL) | Boolean | false |
145+
| DATABASE_SSL | Database connection overssl (When DATABASE_TYPE is postgre) | Boolean | false |
141146
| SECRETKEY_PATH | Location where encryption key (used to encrypt/decrypt credentials) is saved | String | `your-path/Flowise/packages/server` |
142147
| FLOWISE_SECRETKEY_OVERWRITE | Encryption key to be used instead of the key stored in SECRETKEY_PATH | String |
148+
| DISABLE_FLOWISE_TELEMETRY | Turn off telemetry | Boolean |
143149

144150
You can also specify the env variables when using `npx`. For example:
145151

‎LICENSE.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
Version 2.0, January 2004
33
http://www.apache.org/licenses/
44

5-
Flowise is governed by the Apache License 2.0, with additional terms and conditions outlined below:
6-
7-
Flowise can be used for commercial purposes for "backend-as-a-service" for your applications or as a development platform for enterprises. However, under specific conditions, you must reach out to the project's administrators to secure a commercial license:
8-
9-
a. Multi-tenant SaaS service: Unless you have explicit written authorization from Flowise, you may not utilize the Flowise source code to operate a multi-tenant SaaS service that closely resembles the Flowise cloud-based services.
10-
b. Logo and copyright information: While using Flowise in commercial application, you are prohibited from removing or altering the LOGO or copyright information displayed in the Flowise console and UI.
11-
12-
For inquiries regarding licensing matters, please contact [email protected] via email.
13-
14-
Contributors are required to consent to the following terms related to their contributed code:
15-
16-
a. The project maintainers have the authority to modify the open-source agreement to be more stringent or lenient.
17-
b. Contributed code can be used for commercial purposes, including Flowise's cloud-based services.
18-
19-
All other rights and restrictions are in accordance with the Apache License 2.0.
20-
215
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
226

237
1. Definitions.

‎README-ZH.md

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,40 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
145145
146146
## 🌐 自托管
147147
148-
### [Railway](https://docs.flowiseai.com/deployment/railway)
148+
在您现有的基础设施中部署自托管的 Flowise，我们支持各种[部署](https://docs.flowiseai.com/configuration/deployment)
149149
150-
[![在 Railway 上部署](https://railway.app/button.svg)](https://railway.app/template/pn4G8S?referralCode=WVNPD9)
150+
- [AWS](https://docs.flowiseai.com/deployment/aws)
151+
- [Azure](https://docs.flowiseai.com/deployment/azure)
152+
- [Digital Ocean](https://docs.flowiseai.com/deployment/digital-ocean)
153+
- [GCP](https://docs.flowiseai.com/deployment/gcp)
154+
- <details>
155+
<summary>其他</summary>
151156
152-
### [Render](https://docs.flowiseai.com/deployment/render)
157+
- [Railway](https://docs.flowiseai.com/deployment/railway)
153158
154-
[![部署到 Render](https://render.com/images/deploy-to-render-button.svg)](https://docs.flowiseai.com/deployment/render)
159+
[![在 Railway 上部署](https://railway.app/button.svg)](https://railway.app/template/pn4G8S?referralCode=WVNPD9)
155160
156-
### [HuggingFace Spaces](https://docs.flowiseai.com/deployment/hugging-face)
161+
- [Render](https://docs.flowiseai.com/deployment/render)
157162
158-
<a href="https://huggingface.co/spaces/FlowiseAI/Flowise"><img src="https://huggingface.co/datasets/huggingface/badges/raw/main/open-in-hf-spaces-sm.svg" alt="HuggingFace Spaces"></a>
163+
[![部署到 Render](https://render.com/images/deploy-to-render-button.svg)](https://docs.flowiseai.com/deployment/render)
159164
160-
### [AWS](https://docs.flowiseai.com/deployment/aws)
165+
- [HuggingFace Spaces](https://docs.flowiseai.com/deployment/hugging-face)
161166
162-
### [Azure](https://docs.flowiseai.com/deployment/azure)
167+
<a href="https://huggingface.co/spaces/FlowiseAI/Flowise"><img src="https://huggingface.co/datasets/huggingface/badges/raw/main/open-in-hf-spaces-sm.svg" alt="HuggingFace Spaces"></a>
163168
164-
### [DigitalOcean](https://docs.flowiseai.com/deployment/digital-ocean)
169+
- [Elestio](https://elest.io/open-source/flowiseai)
165170
166-
### [GCP](https://docs.flowiseai.com/deployment/gcp)
171+
[![Deploy](https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png)](https://elest.io/open-source/flowiseai)
172+
173+
- [Sealos](https://cloud.sealos.io/?openapp=system-template%3FtemplateName%3Dflowise)
174+
175+
[![部署到 Sealos](https://raw.githubusercontent.com/labring-actions/templates/main/Deploy-on-Sealos.svg)](https://cloud.sealos.io/?openapp=system-template%3FtemplateName%3Dflowise)
176+
177+
- [RepoCloud](https://repocloud.io/details/?app_id=29)
178+
179+
[![部署到 RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=29)
180+
181+
</details>
167182
168183
## 💻 云托管
169184

‎README.md

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,29 +145,40 @@ Flowise support different environment variables to configure your instance. You
145145
146146
## 🌐 Self Host
147147
148-
### [Railway](https://docs.flowiseai.com/deployment/railway)
148+
Deploy Flowise self-hosted in your existing infrastructure, we support various [deployments](https://docs.flowiseai.com/configuration/deployment)
149149
150-
[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/pn4G8S?referralCode=WVNPD9)
150+
- [AWS](https://docs.flowiseai.com/deployment/aws)
151+
- [Azure](https://docs.flowiseai.com/deployment/azure)
152+
- [Digital Ocean](https://docs.flowiseai.com/deployment/digital-ocean)
153+
- [GCP](https://docs.flowiseai.com/deployment/gcp)
154+
- <details>
155+
<summary>Others</summary>
151156
152-
### [Render](https://docs.flowiseai.com/deployment/render)
157+
- [Railway](https://docs.flowiseai.com/deployment/railway)
153158
154-
[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://docs.flowiseai.com/deployment/render)
159+
[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/pn4G8S?referralCode=WVNPD9)
155160
156-
### [Elestio](https://elest.io/open-source/flowiseai)
161+
- [Render](https://docs.flowiseai.com/deployment/render)
157162
158-
[![Deploy](https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png)](https://elest.io/open-source/flowiseai)
163+
[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://docs.flowiseai.com/deployment/render)
159164
160-
### [HuggingFace Spaces](https://docs.flowiseai.com/deployment/hugging-face)
165+
- [HuggingFace Spaces](https://docs.flowiseai.com/deployment/hugging-face)
161166
162-
<a href="https://huggingface.co/spaces/FlowiseAI/Flowise"><img src="https://huggingface.co/datasets/huggingface/badges/raw/main/open-in-hf-spaces-sm.svg" alt="HuggingFace Spaces"></a>
167+
<a href="https://huggingface.co/spaces/FlowiseAI/Flowise"><img src="https://huggingface.co/datasets/huggingface/badges/raw/main/open-in-hf-spaces-sm.svg" alt="HuggingFace Spaces"></a>
163168
164-
### [AWS](https://docs.flowiseai.com/deployment/aws)
169+
- [Elestio](https://elest.io/open-source/flowiseai)
165170
166-
### [Azure](https://docs.flowiseai.com/deployment/azure)
171+
[![Deploy](https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png)](https://elest.io/open-source/flowiseai)
167172
168-
### [DigitalOcean](https://docs.flowiseai.com/deployment/digital-ocean)
173+
- [Sealos](https://cloud.sealos.io/?openapp=system-template%3FtemplateName%3Dflowise)
169174
170-
### [GCP](https://docs.flowiseai.com/deployment/gcp)
175+
[![](https://raw.githubusercontent.com/labring-actions/templates/main/Deploy-on-Sealos.svg)](https://cloud.sealos.io/?openapp=system-template%3FtemplateName%3Dflowise)
176+
177+
- [RepoCloud](https://repocloud.io/details/?app_id=29)
178+
179+
[![Deploy on RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=29)
180+
181+
</details>
171182
172183
## 💻 Cloud Hosted
173184

‎artillery-load-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ scenarios:
3333
# Seconds
3434
# Total Users = 2 + 3 + 3 = 8
3535
# Each making 1 HTTP call
36-
# Over a duration of 3 seconds
36+
# Over a durations of 3 seconds

‎docker/.env.example

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ APIKEY_PATH=/root/.flowise
44
SECRETKEY_PATH=/root/.flowise
55
LOG_PATH=/root/.flowise/logs
66

7+
# CORS_ORIGINS="*"
8+
# IFRAME_ORIGINS="*"
9+
710
# NUMBER_OF_PROXIES= 1
811

912
# DATABASE_TYPE=postgres
@@ -12,10 +15,13 @@ LOG_PATH=/root/.flowise/logs
1215
# DATABASE_NAME="flowise"
1316
# DATABASE_USER=""
1417
# DATABASE_PASSWORD=""
18+
# DATABASE_SSL=true
19+
# DATABASE_SSL_KEY_BASE64=<Self signed certificate in BASE64>
1520

1621
# FLOWISE_USERNAME=user
1722
# FLOWISE_PASSWORD=1234
1823
# FLOWISE_SECRETKEY_OVERWRITE=myencryptionkey
24+
# FLOWISE_FILE_SIZE_LIMIT=50mb
1925
# DEBUG=true
2026
# LOG_LEVEL=debug (error | warn | info | verbose | debug)
2127
# TOOL_FUNCTION_BUILTIN_DEP=crypto,fs
@@ -24,4 +30,6 @@ LOG_PATH=/root/.flowise/logs
2430
# LANGCHAIN_TRACING_V2=true
2531
# LANGCHAIN_ENDPOINT=https://api.smith.langchain.com
2632
# LANGCHAIN_API_KEY=your_api_key
27-
# LANGCHAIN_PROJECT=your_project
33+
# LANGCHAIN_PROJECT=your_project
34+
35+
# DISABLE_FLOWISE_TELEMETRY=true

‎docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Flowise Docker Hub Image
22

3-
Starts Flowise from [DockerHub Image](https://hub.docker.com/repository/docker/flowiseai/flowise/general)
3+
Starts Flowise from [DockerHub Image](https://hub.docker.com/r/flowiseai/flowise)
44

55
## Usage
66

‎docker/docker-compose.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ services:
66
restart: always
77
environment:
88
- PORT=${PORT}
9+
- CORS_ORIGINS=${CORS_ORIGINS}
10+
- IFRAME_ORIGINS=${IFRAME_ORIGINS}
911
- FLOWISE_USERNAME=${FLOWISE_USERNAME}
1012
- FLOWISE_PASSWORD=${FLOWISE_PASSWORD}
13+
- FLOWISE_FILE_SIZE_LIMIT=${FLOWISE_FILE_SIZE_LIMIT}
1114
- DEBUG=${DEBUG}
1215
- DATABASE_PATH=${DATABASE_PATH}
1316
- DATABASE_TYPE=${DATABASE_TYPE}
@@ -16,11 +19,14 @@ services:
1619
- DATABASE_NAME=${DATABASE_NAME}
1720
- DATABASE_USER=${DATABASE_USER}
1821
- DATABASE_PASSWORD=${DATABASE_PASSWORD}
22+
- DATABASE_SSL=${DATABASE_SSL}
23+
- DATABASE_SSL_KEY_BASE64=${DATABASE_SSL_KEY_BASE64}
1924
- APIKEY_PATH=${APIKEY_PATH}
2025
- SECRETKEY_PATH=${SECRETKEY_PATH}
2126
- FLOWISE_SECRETKEY_OVERWRITE=${FLOWISE_SECRETKEY_OVERWRITE}
2227
- LOG_LEVEL=${LOG_LEVEL}
2328
- LOG_PATH=${LOG_PATH}
29+
- DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
2430
ports:
2531
- '${PORT}:${PORT}'
2632
volumes:

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flowise",
3-
"version": "1.4.5",
3+
"version": "1.5.0",
44
"private": true,
55
"homepage": "https://flowiseai.com",
66
"workspaces": [
@@ -48,7 +48,7 @@
4848
"pretty-quick": "^3.1.3",
4949
"rimraf": "^3.0.2",
5050
"run-script-os": "^1.1.6",
51-
"turbo": "1.7.4",
51+
"turbo": "^1.7.4",
5252
"typescript": "^4.8.4"
5353
},
5454
"engines": {

0 commit comments

Comments
 (0)