Merge commit '57efa25fe59c0e4041281a0f8561b110ea691fe0'

* commit '57efa25fe59c0e4041281a0f8561b110ea691fe0': (521 commits)
  🥳 flowise@1.6.2 release
  🥳 flowise-ui@1.6.2 release
  🥳 flowise-components@1.6.4 release
  Feature/OpenAI Tool Agent (FlowiseAI#1991)
  Fix#1947 (FlowiseAI#1960)
  Update autoSyncSingleCommit.yml
  Update autoSyncSingleCommit.yml (FlowiseAI#1985)
  Feature/delete backspace (FlowiseAI#1983)
  Send valid JSON to autosync workflows for multi-line commit messages (FlowiseAI#1981)
  Feature/Custom Tool OverrideConfig (FlowiseAI#1979)
  Feature/Mistral FunctionAgent (FlowiseAI#1912)
  update the version number for AzureChatOpenAI
  Adding support for AzureChatOpenAI
  Update pnpm-lock.yaml
  Update lockFileVersion
  Enable github workflow pnpm caching
  update lock file
  update lock file
  Merge branch 'main' into feature/Indexing
  Set embed versions to latest (FlowiseAI#1957)
  ...

Author: gagaboy

.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+dist

.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,7 +27,8 @@ If applicable, add screenshots to help explain your problem.
 If applicable, add exported flow in order to help replicating the problem.
 
 **Setup**
--   Installation [e.g. docker, `npx flowise start`, `yarn start`]
+
+-   Installation [e.g. docker, `npx flowise start`, `pnpm start`]
 -   Flowise Version [e.g. 1.2.11]
 -   OS: [e.g. macOS, Windows, Linux]
 -   Browser [e.g. chrome, safari]

.github/workflows/autoSyncMergedPullRequest.yml

@@ -0,0 +1,33 @@
+name: autoSyncMergedPullRequest
+on:
+    pull_request_target:
+        types:
+            - closed
+        branches: ['main']
+jobs:
+    autoSyncMergedPullRequest:
+        if: github.event.pull_request.merged == true
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+        steps:
+            - uses: actions/checkout@v3
+            - name: Show PR info
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  echo The PR #${{ github.event.pull_request.number }} was merged on main branch!
+            - name: Repository Dispatch
+              uses: peter-evans/repository-dispatch@v2
+              with:
+                  token: ${{ secrets.AUTOSYNC_TOKEN }}
+                  repository: ${{ secrets.AUTOSYNC_CH_URL }}
+                  event-type: ${{ secrets.AUTOSYNC_PR_EVENT_TYPE }}
+                  client-payload: >-
+                      {
+                        "ref": "${{ github.ref }}",
+                        "prNumber": "${{ github.event.pull_request.number }}",
+                        "prTitle": "${{ github.event.pull_request.title }}",
+                        "prDescription": "${{ toJSON(github.event.pull_request.description) }}",
+                        "sha": "${{ github.sha }}"
+                      }

.github/workflows/autoSyncSingleCommit.yml

@@ -0,0 +1,36 @@
+name: autoSyncSingleCommit
+on:
+    push:
+        branches:
+            - main
+jobs:
+    doNotAutoSyncSingleCommit:
+        if: github.event.commits[1] != null
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - name: IGNORE autoSyncSingleCommit
+              run: |
+                  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.
+    autoSyncSingleCommit:
+        if: github.event.commits[1] == null
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - name: autoSyncSingleCommit
+              env:
+                  GITHUB_CONTEXT: ${{ toJSON(github) }}
+              run: |
+                  echo Autosync a single commit with id: ${{ github.sha }} from openSource main branch towards cloud hosted version.
+            - name: Repository Dispatch
+              uses: peter-evans/repository-dispatch@v3
+              with:
+                  token: ${{ secrets.AUTOSYNC_TOKEN }}
+                  repository: ${{ secrets.AUTOSYNC_CH_URL }}
+                  event-type: ${{ secrets.AUTOSYNC_SC_EVENT_TYPE }}
+                  client-payload: >-
+                      {
+                        "ref": "${{ github.ref }}",
+                        "sha": "${{ github.sha }}",
+                        "commitMessage": "${{ github.event.commits[0].id }}"
+                      }

.github/workflows/main.yml

@@ -22,16 +22,21 @@ jobs:
         env:
             PUPPETEER_SKIP_DOWNLOAD: true
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: 6.32.9
             - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: ${{ matrix.node-version }}
+                  check-latest: false
+                  cache: 'pnpm'
 
-            - run: npm i -g yarn
+            - run: npm i -g pnpm
 
-            - run: yarn install --ignore-engines
+            - run: pnpm install
 
-            - run: yarn lint
+            - run: pnpm lint
 
-            - run: yarn build
+            - run: pnpm build

.husky/pre-commit

@@ -1,5 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn quick # prettify
-yarn lint-staged # eslint lint(also include prettify but prettify support more file extensions than eslint, so run prettify first)
+pnpm quick # prettify
+pnpm lint-staged # eslint lint(also include prettify but prettify support more file extensions than eslint, so run prettify first)

.npmrc

@@ -0,0 +1,6 @@
+auto-install-peers = true
+strict-peer-dependencies = false
+prefer-workspace-packages = true
+link-workspace-packages = deep
+hoist = true
+shamefully-hoist = true

CONTRIBUTING-ZH.md

@@ -30,7 +30,7 @@
 
 不确定要贡献什么？一些想法：
 
--   从 Langchain 创建新组件
+-   从 `packages/components` 创建新组件
 -   更新现有组件，如扩展功能、修复错误
 -   添加新的 Chatflow 想法
 
@@ -40,13 +40,13 @@ Flowise 在一个单一的单体存储库中有 3 个不同的模块。
 
 -   `server`：用于提供 API 逻辑的 Node 后端
 -   `ui`：React 前端
--   `components`：Langchain 组件
+-   `components`：Langchain/LlamaIndex 组件
 
 #### 先决条件
 
--   安装 [Yarn v1](https://classic.yarnpkg.com/en/docs/install)
+-   安装 [PNPM](https://pnpm.io/installation)
     ```bash
-    npm i -g yarn
+    npm i -g pnpm
     ```
 
 #### 逐步指南
@@ -71,45 +71,45 @@ Flowise 在一个单一的单体存储库中有 3 个不同的模块。
 6. 安装所有模块的依赖项：
 
     ```bash
-    yarn install
+    pnpm install
     ```
 
 7. 构建所有代码：
 
     ```bash
-    yarn build
+    pnpm build
     ```
 
 8. 在[http://localhost:3000](http://localhost:3000)上启动应用程序
 
     ```bash
-    yarn start
+    pnpm start
     ```
 
 9. 开发时：
 
-    - 在`packages/ui`中创建`.env`文件并指定`PORT`（参考`.env.example`）
+    - 在`packages/ui`中创建`.env`文件并指定`VITE_PORT`（参考`.env.example`）
     - 在`packages/server`中创建`.env`文件并指定`PORT`（参考`.env.example`）
     - 运行
 
     ```bash
-    yarn dev
+    pnpm dev
     ```
 
     对`packages/ui`或`packages/server`进行的任何更改都将反映在[http://localhost:8080](http://localhost:8080)上
 
-    对于`packages/components`中进行的更改，再次运行`yarn build`以应用更改。
+    对于`packages/components`中进行的更改，再次运行`pnpm build`以应用更改。
 
 10. 做完所有的更改后，运行以下命令来确保在生产环境中一切正常：
 
     ```bash
-    yarn build
+    pnpm build
     ```
 
     和
 
     ```bash
-    yarn start
+    pnpm start
     ```
 
 11. 提交代码并从指向 [Flowise 主分支](https://github.com/FlowiseAI/Flowise/tree/master) 的分叉分支上提交 Pull Request。
@@ -123,7 +123,9 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
 | PORT                        | Flowise 运行的 HTTP 端口                               | 数字                                            | 3000                                |
 | FLOWISE_USERNAME            | 登录用户名                                             | 字符串                                          |                                     |
 | FLOWISE_PASSWORD            | 登录密码                                               | 字符串                                          |                                     |
+| FLOWISE_FILE_SIZE_LIMIT     | 上传文件大小限制                                       | 字符串                                          | 50mb                                |
 | DEBUG                       | 打印组件的日志                                         | 布尔值                                          |                                     |
+| BLOB_STORAGE_PATH           | 存储位置                                               | 字符串                                          | `your-home-dir/.flowise/storage`    |
 | LOG_PATH                    | 存储日志文件的位置                                     | 字符串                                          | `your-path/Flowise/logs`            |
 | LOG_LEVEL                   | 日志的不同级别                                         | 枚举字符串: `error`, `info`, `verbose`, `debug` | `info`                              |
 | APIKEY_PATH                 | 存储 API 密钥的位置                                    | 字符串                                          | `your-path/Flowise/packages/server` |
@@ -138,6 +140,7 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
 | DATABASE_NAME               | 数据库名称（当 DATABASE_TYPE 不是 sqlite 时）          | 字符串                                          |                                     |
 | SECRETKEY_PATH              | 保存加密密钥（用于加密/解密凭据）的位置                | 字符串                                          | `your-path/Flowise/packages/server` |
 | FLOWISE_SECRETKEY_OVERWRITE | 加密密钥用于替代存储在 SECRETKEY_PATH 中的密钥         | 字符串                                          |
+| DISABLE_FLOWISE_TELEMETRY   | 关闭遥测                                               | 字符串                                          |
 
 您也可以在使用 `npx` 时指定环境变量。例如：
 

CONTRIBUTING.md

@@ -30,7 +30,7 @@ Found an issue? [Report it](https://github.com/FlowiseAI/Flowise/issues/new/choo
 
 Not sure what to contribute? Some ideas:
 
--   Create new components from Langchain
+-   Create new components from `packages/components`
 -   Update existing components such as extending functionality, fixing bugs
 -   Add new chatflow ideas
 
@@ -40,13 +40,13 @@ Flowise has 3 different modules in a single mono repository.
 
 -   `server`: Node backend to serve API logics
 -   `ui`: React frontend
--   `components`: Langchain components
+-   `components`: Third-party nodes integrations
 
 #### Prerequisite
 
--   Install [Yarn v1](https://classic.yarnpkg.com/en/docs/install)
+-   Install [PNPM](https://pnpm.io/installation)
     ```bash
-    npm i -g yarn
+    npm i -g pnpm
     ```
 
 #### Step by step
@@ -71,45 +71,45 @@ Flowise has 3 different modules in a single mono repository.
 6. Install all dependencies of all modules:
 
     ```bash
-    yarn install
+    pnpm install
     ```
 
 7. Build all the code:
 
     ```bash
-    yarn build
+    pnpm build
     ```
 
 8. Start the app on [http://localhost:3000](http://localhost:3000)
 
     ```bash
-    yarn start
+    pnpm start
     ```
 
 9. For development:
 
-    - Create `.env` file and specify the `PORT` (refer to `.env.example`) in `packages/ui`
+    - Create `.env` file and specify the `VITE_PORT` (refer to `.env.example`) in `packages/ui`
     - Create `.env` file and specify the `PORT` (refer to `.env.example`) in `packages/server`
     - Run
 
     ```bash
-    yarn dev
+    pnpm dev
     ```
 
     Any changes made in `packages/ui` or `packages/server` will be reflected on [http://localhost:8080](http://localhost:8080)
 
-    For changes made in `packages/components`, run `yarn build` again to pickup the changes.
+    For changes made in `packages/components`, run `pnpm build` again to pickup the changes.
 
 10. After making all the changes, run
 
     ```bash
-    yarn build
+    pnpm build
     ```
 
     and
 
     ```bash
-    yarn start
+    pnpm start
     ```
 
     to make sure everything works fine in production.
@@ -123,9 +123,13 @@ Flowise support different environment variables to configure your instance. You
 | Variable                    | Description                                                                  | Type                                             | Default                             |
 | --------------------------- | ---------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------- |
 | PORT                        | The HTTP port Flowise runs on                                                | Number                                           | 3000                                |
+| CORS_ORIGINS                | The allowed origins for all cross-origin HTTP calls                          | String                                           |                                     |
+| IFRAME_ORIGINS              | The allowed origins for iframe src embedding                                 | String                                           |                                     |
 | FLOWISE_USERNAME            | Username to login                                                            | String                                           |                                     |
 | FLOWISE_PASSWORD            | Password to login                                                            | String                                           |                                     |
+| FLOWISE_FILE_SIZE_LIMIT     | Upload File Size Limit                                                       | String                                           | 50mb                                |
 | DEBUG                       | Print logs from components                                                   | Boolean                                          |                                     |
+| BLOB_STORAGE_PATH           | Location where uploaded files are stored                                     | String                                           | `your-home-dir/.flowise/storage`    |
 | LOG_PATH                    | Location where log files are stored                                          | String                                           | `your-path/Flowise/logs`            |
 | LOG_LEVEL                   | Different levels of logs                                                     | Enum String: `error`, `info`, `verbose`, `debug` | `info`                              |
 | APIKEY_PATH                 | Location where api keys are saved                                            | String                                           | `your-path/Flowise/packages/server` |
@@ -138,8 +142,11 @@ Flowise support different environment variables to configure your instance. You
 | DATABASE_USER               | Database username (When DATABASE_TYPE is not sqlite)                         | String                                           |                                     |
 | DATABASE_PASSWORD           | Database password (When DATABASE_TYPE is not sqlite)                         | String                                           |                                     |
 | DATABASE_NAME               | Database name (When DATABASE_TYPE is not sqlite)                             | String                                           |                                     |
+| DATABASE_SSL_KEY_BASE64     | Database SSL client cert in base64 (takes priority over DATABASE_SSL)        | Boolean                                          | false                               |
+| DATABASE_SSL                | Database connection overssl (When DATABASE_TYPE is postgre)                  | Boolean                                          | false                               |
 | SECRETKEY_PATH              | Location where encryption key (used to encrypt/decrypt credentials) is saved | String                                           | `your-path/Flowise/packages/server` |
 | FLOWISE_SECRETKEY_OVERWRITE | Encryption key to be used instead of the key stored in SECRETKEY_PATH        | String                                           |
+| DISABLE_FLOWISE_TELEMETRY   | Turn off telemetry                                                           | Boolean                                          |
 
 You can also specify the env variables when using `npx`. For example:
 

Dockerfile

@@ -12,30 +12,21 @@ RUN apk add --no-cache build-base cairo-dev pango-dev
 # Install Chromium
 RUN apk add --no-cache chromium
 
+#install PNPM globaly
+RUN npm install -g pnpm
+
 ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
-WORKDIR /usr/src/packages
-
-# Copy root package.json and lockfile
-COPY package.json yarn.loc[k] ./
-
-# Copy components package.json
-COPY packages/components/package.json ./packages/components/package.json
-
-# Copy ui package.json
-COPY packages/ui/package.json ./packages/ui/package.json
-
-# Copy server package.json
-COPY packages/server/package.json ./packages/server/package.json
-
-RUN yarn install
+WORKDIR /usr/src
 
 # Copy app source
 COPY . .
 
-RUN yarn build
+RUN pnpm install
+
+RUN pnpm build
 
 EXPOSE 3000
 
-CMD [ "yarn", "start" ]
+CMD [ "pnpm", "start" ]

LICENSE.md

@@ -2,22 +2,6 @@
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
-Flowise is governed by the Apache License 2.0, with additional terms and conditions outlined below:
-
-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:
-
-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.
-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.
-
-For inquiries regarding licensing matters, please contact hello@flowiseai.com via email.
-
-Contributors are required to consent to the following terms related to their contributed code:
-
-a. The project maintainers have the authority to modify the open-source agreement to be more stringent or lenient.
-b. Contributed code can be used for commercial purposes, including Flowise's cloud-based services.
-
-All other rights and restrictions are in accordance with the Apache License 2.0.
-
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 1. Definitions.