Merge branch 'main' into FEATURE/RAG-VectorStores-Updates

FlowiseAI · Dec 31, 2023 · b3f3626 · b3f3626
2 parents ae9f5fb + 45a42c4
commit b3f3626
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 4 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -138,6 +138,7 @@ 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                | 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                                           |
 

diff --git a/docker/.env.example b/docker/.env.example
@@ -12,6 +12,7 @@ LOG_PATH=/root/.flowise/logs
 # DATABASE_NAME="flowise"
 # DATABASE_USER=""
 # DATABASE_PASSWORD=""
+# DATABASE_SSL=true
 
 # FLOWISE_USERNAME=user
 # FLOWISE_PASSWORD=1234

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -16,6 +16,7 @@ services:
             - DATABASE_NAME=${DATABASE_NAME}
             - DATABASE_USER=${DATABASE_USER}
             - DATABASE_PASSWORD=${DATABASE_PASSWORD}
+            - DATABASE_SSL=${DATABASE_SSL}
             - APIKEY_PATH=${APIKEY_PATH}
             - SECRETKEY_PATH=${SECRETKEY_PATH}
             - FLOWISE_SECRETKEY_OVERWRITE=${FLOWISE_SECRETKEY_OVERWRITE}

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

diff --git a/packages/components/nodes/documentloaders/Notion/NotionDB.ts b/packages/components/nodes/documentloaders/Notion/NotionDB.ts
@@ -66,6 +66,10 @@ class NotionDB_DocumentLoaders implements INode {
                 auth: notionIntegrationToken
             },
             id: databaseId,
+            callerOptions: {
+                maxConcurrency: 64 // Default value
+            },
+            propertiesAsHeader: true, // Prepends a front matter header of the page properties to the page contents
             type: 'database'
         }
         const loader = new NotionAPILoader(obj)

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
     "name": "flowise-components",
-    "version": "1.4.9",
+    "version": "1.5.0",
     "description": "Flowiseai Components",
     "main": "dist/src/index",
     "types": "dist/src/index.d.ts",

diff --git a/packages/server/.env.example b/packages/server/.env.example
@@ -12,6 +12,7 @@ PORT=3000
 # DATABASE_NAME="flowise"
 # DATABASE_USER=""
 # DATABASE_PASSWORD=""
+# DATABASE_SSL=true
 
 # FLOWISE_USERNAME=user
 # FLOWISE_PASSWORD=1234

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "flowise",
-    "version": "1.4.7",
+    "version": "1.4.8",
     "description": "Flowiseai Server",
     "main": "dist/index",
     "types": "dist/index.d.ts",

diff --git a/packages/server/src/DataSource.ts b/packages/server/src/DataSource.ts
@@ -46,6 +46,7 @@ export const init = async (): Promise<void> => {
                 username: process.env.DATABASE_USER,
                 password: process.env.DATABASE_PASSWORD,
                 database: process.env.DATABASE_NAME,
+                ssl: process.env.DATABASE_SSL === 'true',
                 synchronize: false,
                 migrationsRun: false,
                 entities: Object.values(entities),

diff --git a/packages/server/src/commands/start.ts b/packages/server/src/commands/start.ts
@@ -35,6 +35,7 @@ export default class Start extends Command {
         DATABASE_NAME: Flags.string(),
         DATABASE_USER: Flags.string(),
         DATABASE_PASSWORD: Flags.string(),
+        DATABASE_SSL: Flags.string(),
         LANGCHAIN_TRACING_V2: Flags.string(),
         LANGCHAIN_ENDPOINT: Flags.string(),
         LANGCHAIN_API_KEY: Flags.string(),
@@ -104,6 +105,7 @@ export default class Start extends Command {
         if (flags.DATABASE_NAME) process.env.DATABASE_NAME = flags.DATABASE_NAME
         if (flags.DATABASE_USER) process.env.DATABASE_USER = flags.DATABASE_USER
         if (flags.DATABASE_PASSWORD) process.env.DATABASE_PASSWORD = flags.DATABASE_PASSWORD
+        if (flags.DATABASE_SSL) process.env.DATABASE_SSL = flags.DATABASE_SSL
 
         // Langsmith tracing
         if (flags.LANGCHAIN_TRACING_V2) process.env.LANGCHAIN_TRACING_V2 = flags.LANGCHAIN_TRACING_V2

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "flowise-ui",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://flowiseai.com",
     "author": {