Skip to content

Commit 6e82ce8

Browse files
HenryHengZJHenryHengZJ
committed
Merge branch 'main' into chore/Models-Update
2 parents 3185d65 + 54ff43e commit 6e82ce8

File tree

214 files changed

+42695
-45914
lines changed

Some content is hidden

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

214 files changed

+42695
-45914
lines changed

‎.eslintignore

-2
This file was deleted.

‎.prettierignore

-3
This file was deleted.

‎.prettierrc.js

-9
This file was deleted.

‎CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributor Covenant Code of Conduct
22

3-
English | [中文](<./i18n/CODE_OF_CONDUCT-ZH.md>)
3+
English | [中文](./i18n/CODE_OF_CONDUCT-ZH.md)
44

55
## Our Pledge
66

‎CONTRIBUTING.md

+35-35
Original file line numberDiff line numberDiff line change
@@ -120,41 +120,41 @@ Flowise has 3 different modules in a single mono repository.
120120

121121
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)
122122

123-
| Variable | Description | Type | Default |
124-
| ---------------------------- | -------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------- |
125-
| 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 | |
128-
| FLOWISE_USERNAME | Username to login | String | |
129-
| FLOWISE_PASSWORD | Password to login | String | |
130-
| FLOWISE_FILE_SIZE_LIMIT | Upload File Size Limit | String | 50mb |
131-
| DISABLE_CHATFLOW_REUSE | Forces the creation of a new ChatFlow for each call instead of reusing existing ones from cache | Boolean | |
132-
| DEBUG | Print logs from components | Boolean | |
133-
| LOG_PATH | Location where log files are stored | String | `your-path/Flowise/logs` |
134-
| LOG_LEVEL | Different levels of logs | Enum String: `error`, `info`, `verbose`, `debug` | `info` |
135-
| LOG_JSON_SPACES | Spaces to beautify JSON logs | | 2 |
136-
| APIKEY_PATH | Location where api keys are saved | String | `your-path/Flowise/packages/server` |
137-
| TOOL_FUNCTION_BUILTIN_DEP | NodeJS built-in modules to be used for Tool Function | String | |
138-
| TOOL_FUNCTION_EXTERNAL_DEP | External modules to be used for Tool Function | String | |
139-
| DATABASE_TYPE | Type of database to store the flowise data | Enum String: `sqlite`, `mysql`, `postgres` | `sqlite` |
140-
| DATABASE_PATH | Location where database is saved (When DATABASE_TYPE is sqlite) | String | `your-home-dir/.flowise` |
141-
| DATABASE_HOST | Host URL or IP address (When DATABASE_TYPE is not sqlite) | String | |
142-
| DATABASE_PORT | Database port (When DATABASE_TYPE is not sqlite) | String | |
143-
| DATABASE_USER | Database username (When DATABASE_TYPE is not sqlite) | String | |
144-
| DATABASE_PASSWORD | Database password (When DATABASE_TYPE is not sqlite) | String | |
145-
| DATABASE_NAME | Database name (When DATABASE_TYPE is not sqlite) | String | |
146-
| DATABASE_SSL_KEY_BASE64 | Database SSL client cert in base64 (takes priority over DATABASE_SSL) | Boolean | false |
147-
| DATABASE_SSL | Database connection overssl (When DATABASE_TYPE is postgre) | Boolean | false |
148-
| SECRETKEY_PATH | Location where encryption key (used to encrypt/decrypt credentials) is saved | String | `your-path/Flowise/packages/server` |
149-
| FLOWISE_SECRETKEY_OVERWRITE | Encryption key to be used instead of the key stored in SECRETKEY_PATH | String |
150-
| DISABLE_FLOWISE_TELEMETRY | Turn off telemetry | Boolean |
151-
| MODEL_LIST_CONFIG_JSON | File path to load list of models from your local config file | String | `/your_model_list_config_file_path` |
152-
| STORAGE_TYPE | Type of storage for uploaded files. default is `local` | Enum String: `s3`, `local` | `local` |
153-
| BLOB_STORAGE_PATH | Local folder path where uploaded files are stored when `STORAGE_TYPE` is `local` | String | `your-home-dir/.flowise/storage` |
154-
| S3_STORAGE_BUCKET_NAME | Bucket name to hold the uploaded files when `STORAGE_TYPE` is `s3` | String | |
155-
| S3_STORAGE_ACCESS_KEY_ID | AWS Access Key | String | |
156-
| S3_STORAGE_SECRET_ACCESS_KEY | AWS Secret Key | String | |
157-
| S3_STORAGE_REGION | Region for S3 bucket | String | |
123+
| Variable | Description | Type | Default |
124+
| ---------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------- |
125+
| 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 | |
128+
| FLOWISE_USERNAME | Username to login | String | |
129+
| FLOWISE_PASSWORD | Password to login | String | |
130+
| FLOWISE_FILE_SIZE_LIMIT | Upload File Size Limit | String | 50mb |
131+
| DISABLE_CHATFLOW_REUSE | Forces the creation of a new ChatFlow for each call instead of reusing existing ones from cache | Boolean | |
132+
| DEBUG | Print logs from components | Boolean | |
133+
| LOG_PATH | Location where log files are stored | String | `your-path/Flowise/logs` |
134+
| LOG_LEVEL | Different levels of logs | Enum String: `error`, `info`, `verbose`, `debug` | `info` |
135+
| LOG_JSON_SPACES | Spaces to beautify JSON logs | | 2 |
136+
| APIKEY_PATH | Location where api keys are saved | String | `your-path/Flowise/packages/server` |
137+
| TOOL_FUNCTION_BUILTIN_DEP | NodeJS built-in modules to be used for Tool Function | String | |
138+
| TOOL_FUNCTION_EXTERNAL_DEP | External modules to be used for Tool Function | String | |
139+
| DATABASE_TYPE | Type of database to store the flowise data | Enum String: `sqlite`, `mysql`, `postgres` | `sqlite` |
140+
| DATABASE_PATH | Location where database is saved (When DATABASE_TYPE is sqlite) | String | `your-home-dir/.flowise` |
141+
| DATABASE_HOST | Host URL or IP address (When DATABASE_TYPE is not sqlite) | String | |
142+
| DATABASE_PORT | Database port (When DATABASE_TYPE is not sqlite) | String | |
143+
| DATABASE_USER | Database username (When DATABASE_TYPE is not sqlite) | String | |
144+
| DATABASE_PASSWORD | Database password (When DATABASE_TYPE is not sqlite) | String | |
145+
| DATABASE_NAME | Database name (When DATABASE_TYPE is not sqlite) | String | |
146+
| DATABASE_SSL_KEY_BASE64 | Database SSL client cert in base64 (takes priority over DATABASE_SSL) | Boolean | false |
147+
| DATABASE_SSL | Database connection overssl (When DATABASE_TYPE is postgre) | Boolean | false |
148+
| SECRETKEY_PATH | Location where encryption key (used to encrypt/decrypt credentials) is saved | String | `your-path/Flowise/packages/server` |
149+
| FLOWISE_SECRETKEY_OVERWRITE | Encryption key to be used instead of the key stored in SECRETKEY_PATH | String |
150+
| DISABLE_FLOWISE_TELEMETRY | Turn off telemetry | Boolean |
151+
| MODEL_LIST_CONFIG_JSON | File path to load list of models from your local config file | String | `/your_model_list_config_file_path` |
152+
| STORAGE_TYPE | Type of storage for uploaded files. default is `local` | Enum String: `s3`, `local` | `local` |
153+
| BLOB_STORAGE_PATH | Local folder path where uploaded files are stored when `STORAGE_TYPE` is `local` | String | `your-home-dir/.flowise/storage` |
154+
| S3_STORAGE_BUCKET_NAME | Bucket name to hold the uploaded files when `STORAGE_TYPE` is `s3` | String | |
155+
| S3_STORAGE_ACCESS_KEY_ID | AWS Access Key | String | |
156+
| S3_STORAGE_SECRET_ACCESS_KEY | AWS Secret Key | String | |
157+
| S3_STORAGE_REGION | Region for S3 bucket | String | |
158158

159159
You can also specify the env variables when using `npx`. For example:
160160

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Download and Install [NodeJS](https://nodejs.org/en/download) >= 18.15.0
4444

4545
1. Go to `docker` folder at the root of the project
4646
2. Copy `.env.example` file, paste it into the same location, and rename to `.env`
47-
3. `docker-compose up -d`
47+
3. `docker compose up -d`
4848
4. Open [http://localhost:3000](http://localhost:3000)
49-
5. You can bring the containers down by `docker-compose stop`
49+
5. You can bring the containers down by `docker compose stop`
5050

5151
### Docker Image
5252

‎babel.config.js

-13
This file was deleted.

‎docker/.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BLOB_STORAGE_PATH=/root/.flowise/storage
2626
# DISABLE_CHATFLOW_REUSE=true
2727

2828
# DEBUG=true
29-
# LOG_LEVEL=debug (error | warn | info | verbose | debug)
29+
# LOG_LEVEL=info (error | warn | info | verbose | debug)
3030
# TOOL_FUNCTION_BUILTIN_DEP=crypto,fs
3131
# TOOL_FUNCTION_EXTERNAL_DEP=moment,lodash
3232

‎docker/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Starts Flowise from [DockerHub Image](https://hub.docker.com/r/flowiseai/flowise
55
## Usage
66

77
1. Create `.env` file and specify the `PORT` (refer to `.env.example`)
8-
2. `docker-compose up -d`
8+
2. `docker compose up -d`
99
3. Open [http://localhost:3000](http://localhost:3000)
10-
4. You can bring the containers down by `docker-compose stop`
10+
4. You can bring the containers down by `docker compose stop`
1111

1212
## 🔒 Authentication
1313

@@ -19,9 +19,9 @@ Starts Flowise from [DockerHub Image](https://hub.docker.com/r/flowiseai/flowise
1919
- FLOWISE_USERNAME=${FLOWISE_USERNAME}
2020
- FLOWISE_PASSWORD=${FLOWISE_PASSWORD}
2121
```
22-
3. `docker-compose up -d`
22+
3. `docker compose up -d`
2323
4. Open [http://localhost:3000](http://localhost:3000)
24-
5. You can bring the containers down by `docker-compose stop`
24+
5. You can bring the containers down by `docker compose stop`
2525
2626
## 🌱 Env Variables
2727

‎i18n/CODE_OF_CONDUCT-ZH.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# 贡献者公约行为准则
44

5-
[English](<../CODE_OF_CONDUCT.md>) | 中文
5+
[English](../CODE_OF_CONDUCT.md) | 中文
66

77
## 我们的承诺
88

@@ -44,6 +44,6 @@
4444

4545
## 归属
4646

47-
该行为准则的内容来自于[贡献者公约](http://contributor-covenant.org/)1.4版，可在[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4)上获取。
47+
该行为准则的内容来自于[贡献者公约](http://contributor-covenant.org/)1.4 版，可在[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4)上获取。
4848

4949
[主页]: http://contributor-covenant.org

0 commit comments

Comments
 (0)