Merge branch 'main' into main

FlowiseAI · Nov 4, 2024 · 05b9fda · 05b9fda
2 parents 2a62de9 + 012eabc
commit 05b9fda
Show file tree

Hide file tree

Showing 80 changed files with 2,448 additions and 717 deletions.
diff --git a/README.md b/README.md
@@ -41,9 +41,10 @@ Download and Install [NodeJS](https://nodejs.org/en/download) >= 18.15.0
 ## 🐳 Docker
 
 ### Docker Compose
+
 1. Clone the Flowise project
 2. Go to `docker` folder at the root of the project
-3. Copy `.env.example` file, paste it into the same location, and rename to `.env`
+3. Copy `.env.example` file, paste it into the same location, and rename to `.env` file
 4. `docker compose up -d`
 5. Open [http://localhost:3000](http://localhost:3000)
 6. You can bring the containers down by `docker compose stop`

diff --git a/docker/.env.example b/docker/.env.example
@@ -51,4 +51,10 @@ BLOB_STORAGE_PATH=/root/.flowise/storage
 # S3_FORCE_PATH_STYLE=false
 
 # APIKEY_STORAGE_TYPE=json (json | db)
-# SHOW_COMMUNITY_NODES=true
+# SHOW_COMMUNITY_NODES=true
+
+# Uncomment the following lines to enable global agent proxy
+# see https://www.npmjs.com/package/global-agent for more details
+# GLOBAL_AGENT_HTTP_PROXY=CorporateHttpProxyUrl
+# GLOBAL_AGENT_HTTPS_PROXY=CorporateHttpsProxyUrl
+# GLOBAL_AGENT_NO_PROXY=ExceptionHostsToBypassProxyIfNeeded
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -21,6 +21,7 @@ services:
             - DATABASE_PASSWORD=${DATABASE_PASSWORD}
             - DATABASE_SSL=${DATABASE_SSL}
             - DATABASE_SSL_KEY_BASE64=${DATABASE_SSL_KEY_BASE64}
+            - APIKEY_STORAGE_TYPE=${APIKEY_STORAGE_TYPE}
             - APIKEY_PATH=${APIKEY_PATH}
             - SECRETKEY_PATH=${SECRETKEY_PATH}
             - FLOWISE_SECRETKEY_OVERWRITE=${FLOWISE_SECRETKEY_OVERWRITE}
@@ -29,6 +30,9 @@ services:
             - BLOB_STORAGE_PATH=${BLOB_STORAGE_PATH}
             - DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY}
             - MODEL_LIST_CONFIG_JSON=${MODEL_LIST_CONFIG_JSON}
+            - GLOBAL_AGENT_HTTP_PROXY=${GLOBAL_AGENT_HTTP_PROXY}
+            - GLOBAL_AGENT_HTTPS_PROXY=${GLOBAL_AGENT_HTTPS_PROXY}
+            - GLOBAL_AGENT_NO_PROXY=${GLOBAL_AGENT_NO_PROXY}
         ports:
             - '${PORT}:${PORT}'
         volumes:

diff --git a/i18n/CONTRIBUTING-ZH.md b/i18n/CONTRIBUTING-ZH.md
@@ -150,7 +150,7 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package
 | S3_STORAGE_SECRET_ACCESS_KEY | AWS 密钥 (Secret Key)                                                | 字符串                                          |                                     |
 | S3_STORAGE_REGION            | S3 存储地区                                                          | 字符串                                          |                                     |
 | S3_ENDPOINT_URL              | S3 端点 URL                                                          | 字符串                                          |                                     |
-| S3_FORCE_PATH_STYLE          | 将其设置为 true 以强制请求使用路径样式寻址                              | Boolean                                          | false                               |
+| S3_FORCE_PATH_STYLE          | 将其设置为 true 以强制请求使用路径样式寻址                           | Boolean                                         | false                               |
 | SHOW_COMMUNITY_NODES         | 显示由社区创建的节点                                                 | 布尔值                                          |                                     |
 
 您也可以在使用 `npx` 时指定环境变量。例如：

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "flowise",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "private": true,
     "homepage": "https://flowiseai.com",
     "workspaces": [

diff --git a/packages/api-documentation/src/yml/swagger.yml b/packages/api-documentation/src/yml/swagger.yml
@@ -1,5 +1,6 @@
 tags:
     - name: assistants
+    - name: attachments
     - name: chatmessage
     - name: chatflows
     - name: document-store
@@ -270,6 +271,61 @@ paths:
                 '500':
                     description: Internal error
 
+    /attachments/{chatflowId}/{chatId}:
+        post:
+            tags:
+                - attachments
+            security:
+                - bearerAuth: []
+            operationId: createAttachment
+            summary: Create attachments array
+            description: Return contents of the files in plain string format
+            parameters:
+                - in: path
+                  name: chatflowId
+                  required: true
+                  schema:
+                      type: string
+                  description: Chatflow ID
+                - in: path
+                  name: chatId
+                  required: true
+                  schema:
+                      type: string
+                  description: Chat ID
+            requestBody:
+                content:
+                    multipart/form-data:
+                        schema:
+                            type: object
+                            properties:
+                                files:
+                                    type: array
+                                    items:
+                                        type: string
+                                        format: binary
+                                    description: Files to be uploaded
+                            required:
+                                - files
+                required: true
+            responses:
+                '200':
+                    description: Attachments created successfully
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    $ref: '#/components/schemas/CreateAttachmentResponse'
+                '400':
+                    description: Invalid input provided
+                '404':
+                    description: Chatflow or ChatId not found
+                '422':
+                    description: Validation error
+                '500':
+                    description: Internal server error
+
     /chatflows:
         post:
             tags:
@@ -1825,7 +1881,8 @@ components:
                         properties:
                             type:
                                 type: string
-                                description: The type of file upload (e.g., 'file', 'audio', 'url')
+                                enum: [audio, url, file, file:rag, file:full]
+                                description: The type of file upload
                                 example: file
                             name:
                                 type: string
@@ -2193,6 +2250,22 @@ components:
                     format: date-time
                     description: Date and time when the feedback was created
 
+        CreateAttachmentResponse:
+            type: object
+            properties:
+                name:
+                    type: string
+                    description: Name of the file
+                mimeType:
+                    type: string
+                    description: Mime type of the file
+                size:
+                    type: string
+                    description: Size of the file
+                content:
+                    type: string
+                    description: Content of the file in string format
+
     securitySchemes:
         bearerAuth:
             type: http

diff --git a/packages/components/credentials/CerebrasApi.credential.ts b/packages/components/credentials/CerebrasApi.credential.ts
@@ -0,0 +1,25 @@
+import { INodeParams, INodeCredential } from '../src/Interface'
+
+class CerebrasAPIAuth implements INodeCredential {
+    label: string
+    name: string
+    version: number
+    description: string
+    inputs: INodeParams[]
+
+    constructor() {
+        this.label = 'Cerebras API Key'
+        this.name = 'cerebrasAIApi'
+        this.version = 1.0
+        this.inputs = [
+            {
+                label: 'Cerebras API Key',
+                name: 'cerebrasApiKey',
+                type: 'password',
+                description: 'API Key (cloud.cerebras.ai)'
+            }
+        ]
+    }
+}
+
+module.exports = { credClass: CerebrasAPIAuth }
diff --git a/packages/components/credentials/CouchbaseApi.credential.ts b/packages/components/credentials/CouchbaseApi.credential.ts
@@ -1,7 +1,3 @@
-/*
-* Temporary disabled due to the incompatibility with the docker node-alpine:
-* https://github.com/FlowiseAI/Flowise/pull/2303
-
 import { INodeParams, INodeCredential } from '../src/Interface'
 
 class CouchbaseApi implements INodeCredential {
@@ -36,4 +32,3 @@ class CouchbaseApi implements INodeCredential {
 }
 
 module.exports = { credClass: CouchbaseApi }
-*/
diff --git a/packages/components/models.json b/packages/components/models.json
@@ -4,24 +4,29 @@
             "name": "awsChatBedrock",
             "models": [
                 {
-                    "label": "anthropic.claude-3-haiku",
-                    "name": "anthropic.claude-3-haiku-20240307-v1:0",
-                    "description": "Image to text, conversation, chat optimized"
+                    "label": "anthropic.claude-3.5-sonnet-20241022-v2:0",
+                    "name": "anthropic.claude-3-5-sonnet-20241022-v2:0",
+                    "description": "(20241022-v2:0) specific version of Claude Sonnet 3.5 - most intelligent model"
                 },
                 {
-                    "label": "anthropic.claude-3.5-sonnet",
+                    "label": "anthropic.claude-3.5-sonnet-20240620-v1:0",
                     "name": "anthropic.claude-3-5-sonnet-20240620-v1:0",
-                    "description": "3.5 version of Claude Sonnet model"
+                    "description": "(20240620-v1:0) specific version of Claude Sonnet 3.5 - most intelligent model"
+                },
+                {
+                    "label": "anthropic.claude-3-opus",
+                    "name": "anthropic.claude-3-opus-20240229-v1:0",
+                    "description": "Powerful model for highly complex tasks, reasoning and analysis"
                 },
                 {
                     "label": "anthropic.claude-3-sonnet",
                     "name": "anthropic.claude-3-sonnet-20240229-v1:0",
-                    "description": "Image to text and code, multilingual conversation, complex reasoning and analysis"
+                    "description": "Balance of intelligence and speed"
                 },
                 {
-                    "label": "anthropic.claude-3-opus",
-                    "name": "anthropic.claude-3-opus-20240229-v1:0",
-                    "description": "Image to text and code, multilingual conversation, complex reasoning and analysis"
+                    "label": "anthropic.claude-3-haiku",
+                    "name": "anthropic.claude-3-haiku-20240307-v1:0",
+                    "description": "Fastest and most compact model for near-instant responsiveness"
                 },
                 {
                     "label": "anthropic.claude-instant-v1",
@@ -295,25 +300,35 @@
             "name": "chatAnthropic",
             "models": [
                 {
-                    "label": "claude-3-haiku",
-                    "name": "claude-3-haiku-20240307",
-                    "description": "Fastest and most compact model, designed for near-instant responsiveness"
+                    "label": "claude-3.5-sonnet-latest",
+                    "name": "claude-3-5-sonnet-latest",
+                    "description": "Most recent snapshot version of Claude Sonnet 3.5 model - most intelligent model"
                 },
                 {
-                    "label": "claude-3-opus",
-                    "name": "claude-3-opus-20240229",
-                    "description": "Most powerful model for highly complex tasks"
+                    "label": "claude-3.5-sonnet-20241022",
+                    "name": "claude-3-5-sonnet-20241022",
+                    "description": "(20241022) specific version of Claude Sonnet 3.5 - most intelligent model"
                 },
                 {
-                    "label": "claude-3.5-sonnet",
+                    "label": "claude-3.5-sonnet-20240620",
                     "name": "claude-3-5-sonnet-20240620",
-                    "description": "3.5 version of Claude Sonnet model"
+                    "description": "(20240620) specific version of Claude Sonnet 3.5 - most intelligent model"
+                },
+                {
+                    "label": "claude-3-opus",
+                    "name": "claude-3-opus-20240229",
+                    "description": "Powerful model for highly complex tasks, reasoning and analysis"
                 },
                 {
                     "label": "claude-3-sonnet",
                     "name": "claude-3-sonnet-20240229",
                     "description": "Ideal balance of intelligence and speed for enterprise workloads"
                 },
+                {
+                    "label": "claude-3-haiku",
+                    "name": "claude-3-haiku-20240307",
+                    "description": "Fastest and most compact model, designed for near-instant responsiveness"
+                },
                 {
                     "label": "claude-2.0 (legacy)",
                     "name": "claude-2.0",
@@ -439,6 +454,26 @@
                     "label": "gemini-1.0-pro-vision",
                     "name": "gemini-1.0-pro-vision"
                 },
+                {
+                    "label": "claude-3-5-sonnet-v2@20241022",
+                    "name": "claude-3-5-sonnet-v2@20241022",
+                    "description": "(20241022-v2:0) specific version of Claude Sonnet 3.5 - most intelligent model"
+                },
+                {
+                    "label": "claude-3-opus@20240229",
+                    "name": "claude-3-opus@20240229",
+                    "description": "Powerful model for highly complex tasks, reasoning and analysis"
+                },
+                {
+                    "label": "claude-3-sonnet@20240229",
+                    "name": "claude-3-sonnet@20240229",
+                    "description": "Balance of intelligence and speed"
+                },
+                {
+                    "label": "claude-3-haiku@20240307",
+                    "name": "claude-3-haiku@20240307",
+                    "description": "Fastest and most compact model for near-instant responsiveness"
+                },
                 {
                     "label": "chat-bison",
                     "name": "chat-bison"
@@ -1153,6 +1188,16 @@
         {
             "name": "voyageAIEmbeddings",
             "models": [
+                {
+                    "label": "voyage-3",
+                    "name": "voyage-3",
+                    "description": "High-performance embedding model with excellent retrieval quality, 32K token context, and 1024 dimension size."
+                },
+                {
+                    "label": "voyage-3-lite",
+                    "name": "voyage-3-lite",
+                    "description": "Lightweight embedding model optimized for low latency and cost, 32K token context, and 512 dimension size."
+                },
                 {
                     "label": "voyage-2",
                     "name": "voyage-2",