Skip to content

Commit 8b60a01

Browse files
JJK801JJK801
committed
Merge branch 'feature/postgres-vector-store-add-pgvector-driver-option' into fixee-main
2 parents 3f1359f + 4e1f4c4 commit 8b60a01

File tree

48 files changed

+1526
-307
lines changed

Some content is hidden

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

48 files changed

+1526
-307
lines changed

Diff for: ‎CONTRIBUTING.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,19 @@ Flowise support different environment variables to configure your instance. You
159159
| S3_ENDPOINT_URL | Custom Endpoint for S3 | String | |
160160
| S3_FORCE_PATH_STYLE | Set this to true to force the request to use path-style addressing | Boolean | false |
161161
| SHOW_COMMUNITY_NODES | Show nodes created by community | Boolean | |
162-
162+
| POSTGRES_VECTORSTORE_HOST | Default `host` for Postgres Vector Store | String | |
163+
| POSTGRES_VECTORSTORE_PORT | Default `port` for Postgres Vector Store | Number | 5432 |
164+
| POSTGRES_VECTORSTORE_USER | Default `user` for Postgres Vector Store | String | |
165+
| POSTGRES_VECTORSTORE_PASSWORD | Default `password` for Postgres Vector Store | String | |
166+
| POSTGRES_VECTORSTORE_DATABASE | Default `database` for Postgres Vector Store | String | |
167+
| POSTGRES_VECTORSTORE_TABLE_NAME | Default `tableName` for Postgres Vector Store | String | documents |
168+
| POSTGRES_VECTORSTORE_CONTENT_COLUMN_NAME | Default `contentColumnName` for Postgres Vector Store | String | pageContent |
169+
| POSTGRES_RECORDMANAGER_HOST | Default `host` for Postgres Record Manager | String | |
170+
| POSTGRES_RECORDMANAGER_PORT | Default `port` for Postgres Record Manager | Number | 5432 |
171+
| POSTGRES_RECORDMANAGER_USER | Default `user` for Postgres Record Manager | String | |
172+
| POSTGRES_RECORDMANAGER_PASSWORD | Default `password` for Postgres Record Manager | String | |
173+
| POSTGRES_RECORDMANAGER_DATABASE | Default `database` for Postgres Record Manager | String | |
174+
| POSTGRES_RECORDMANAGER_TABLE_NAME | Default `tableName` for Postgres Record Manager | String | upsertion_records |
163175
You can also specify the env variables when using `npx`. For example:
164176

165177
```

Diff for: ‎docker/.env.example

+35-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,38 @@ BLOB_STORAGE_PATH=/root/.flowise/storage
5151
# S3_FORCE_PATH_STYLE=false
5252

5353
# APIKEY_STORAGE_TYPE=json (json | db)
54-
# SHOW_COMMUNITY_NODES=true
54+
# SHOW_COMMUNITY_NODES=true
55+
56+
############################################
57+
# Default postgres vectorstore credentials #
58+
############################################
59+
60+
# POSTGRES_VECTORSTORE_USER=
61+
# POSTGRES_VECTORSTORE_PASSWORD=
62+
63+
#######################################
64+
# Default postgres vectorstore config #
65+
#######################################
66+
67+
# POSTGRES_VECTORSTORE_HOST=
68+
# POSTGRES_VECTORSTORE_DATABASE=
69+
# POSTGRES_VECTORSTORE_PORT=
70+
# POSTGRES_VECTORSTORE_TABLE_NAME=
71+
# POSTGRES_VECTORSTORE_CONTENT_COLUMN_NAME=
72+
73+
###############################################
74+
# Default postgres record manager credentials #
75+
###############################################
76+
77+
# POSTGRES_RECORDMANAGER_USER=
78+
# POSTGRES_RECORDMANAGER_PASSWORD=
79+
80+
##########################################
81+
# Default postgres record manager config #
82+
##########################################
83+
84+
# POSTGRES_RECORDMANAGER_HOST=
85+
# POSTGRES_RECORDMANAGER_DATABASE=
86+
# POSTGRES_RECORDMANAGER_PORT=
87+
# POSTGRES_RECORDMANAGER_TABLE_NAME=
88+
# POSTGRES_RECORDMANAGER_CONTENT_COLUMN_NAME=

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flowise",
3-
"version": "2.1.2",
3+
"version": "2.1.3",
44
"private": true,
55
"homepage": "https://flowiseai.com",
66
"workspaces": [

Diff for: ‎packages/api-documentation/src/yml/swagger.yml

+74-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
tags:
22
- name: assistants
3+
- name: attachments
34
- name: chatmessage
45
- name: chatflows
56
- name: document-store
@@ -270,6 +271,61 @@ paths:
270271
'500':
271272
description: Internal error
272273

274+
/attachments/{chatflowId}/{chatId}:
275+
post:
276+
tags:
277+
- attachments
278+
security:
279+
- bearerAuth: []
280+
operationId: createAttachment
281+
summary: Create attachments array
282+
description: Return contents of the files in plain string format
283+
parameters:
284+
- in: path
285+
name: chatflowId
286+
required: true
287+
schema:
288+
type: string
289+
description: Chatflow ID
290+
- in: path
291+
name: chatId
292+
required: true
293+
schema:
294+
type: string
295+
description: Chat ID
296+
requestBody:
297+
content:
298+
multipart/form-data:
299+
schema:
300+
type: object
301+
properties:
302+
files:
303+
type: array
304+
items:
305+
type: string
306+
format: binary
307+
description: Files to be uploaded
308+
required:
309+
- files
310+
required: true
311+
responses:
312+
'200':
313+
description: Attachments created successfully
314+
content:
315+
application/json:
316+
schema:
317+
type: array
318+
items:
319+
$ref: '#/components/schemas/CreateAttachmentResponse'
320+
'400':
321+
description: Invalid input provided
322+
'404':
323+
description: Chatflow or ChatId not found
324+
'422':
325+
description: Validation error
326+
'500':
327+
description: Internal server error
328+
273329
/chatflows:
274330
post:
275331
tags:
@@ -1825,7 +1881,8 @@ components:
18251881
properties:
18261882
type:
18271883
type: string
1828-
description: The type of file upload (e.g., 'file', 'audio', 'url')
1884+
enum: [audio, url, file, file:rag, file:full]
1885+
description: The type of file upload
18291886
example: file
18301887
name:
18311888
type: string
@@ -2193,6 +2250,22 @@ components:
21932250
format: date-time
21942251
description: Date and time when the feedback was created
21952252

2253+
CreateAttachmentResponse:
2254+
type: object
2255+
properties:
2256+
name:
2257+
type: string
2258+
description: Name of the file
2259+
mimeType:
2260+
type: string
2261+
description: Mime type of the file
2262+
size:
2263+
type: string
2264+
description: Size of the file
2265+
content:
2266+
type: string
2267+
description: Content of the file in string format
2268+
21962269
securitySchemes:
21972270
bearerAuth:
21982271
type: http

Diff for: ‎packages/components/credentials/CerebrasApi.credential.ts

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { INodeParams, INodeCredential } from '../src/Interface'
2+
3+
class CerebrasAPIAuth implements INodeCredential {
4+
label: string
5+
name: string
6+
version: number
7+
description: string
8+
inputs: INodeParams[]
9+
10+
constructor() {
11+
this.label = 'Cerebras API Key'
12+
this.name = 'cerebrasAIApi'
13+
this.version = 1.0
14+
this.inputs = [
15+
{
16+
label: 'Cerebras API Key',
17+
name: 'cerebrasApiKey',
18+
type: 'password',
19+
description: 'API Key (cloud.cerebras.ai)'
20+
}
21+
]
22+
}
23+
}
24+
25+
module.exports = { credClass: CerebrasAPIAuth }

Diff for: ‎packages/components/models.json

+52-17
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,29 @@
44
"name": "awsChatBedrock",
55
"models": [
66
{
7-
"label": "anthropic.claude-3-haiku",
8-
"name": "anthropic.claude-3-haiku-20240307-v1:0",
9-
"description": "Image to text, conversation, chat optimized"
7+
"label": "anthropic.claude-3.5-sonnet-20241022-v2:0",
8+
"name": "anthropic.claude-3-5-sonnet-20241022-v2:0",
9+
"description": "(20241022-v2:0) specific version of Claude Sonnet 3.5 - most intelligent model"
1010
},
1111
{
12-
"label": "anthropic.claude-3.5-sonnet",
12+
"label": "anthropic.claude-3.5-sonnet-20240620-v1:0",
1313
"name": "anthropic.claude-3-5-sonnet-20240620-v1:0",
14-
"description": "3.5 version of Claude Sonnet model"
14+
"description": "(20240620-v1:0) specific version of Claude Sonnet 3.5 - most intelligent model"
15+
},
16+
{
17+
"label": "anthropic.claude-3-opus",
18+
"name": "anthropic.claude-3-opus-20240229-v1:0",
19+
"description": "Powerful model for highly complex tasks, reasoning and analysis"
1520
},
1621
{
1722
"label": "anthropic.claude-3-sonnet",
1823
"name": "anthropic.claude-3-sonnet-20240229-v1:0",
19-
"description": "Image to text and code, multilingual conversation, complex reasoning and analysis"
24+
"description": "Balance of intelligence and speed"
2025
},
2126
{
22-
"label": "anthropic.claude-3-opus",
23-
"name": "anthropic.claude-3-opus-20240229-v1:0",
24-
"description": "Image to text and code, multilingual conversation, complex reasoning and analysis"
27+
"label": "anthropic.claude-3-haiku",
28+
"name": "anthropic.claude-3-haiku-20240307-v1:0",
29+
"description": "Fastest and most compact model for near-instant responsiveness"
2530
},
2631
{
2732
"label": "anthropic.claude-instant-v1",
@@ -295,25 +300,35 @@
295300
"name": "chatAnthropic",
296301
"models": [
297302
{
298-
"label": "claude-3-haiku",
299-
"name": "claude-3-haiku-20240307",
300-
"description": "Fastest and most compact model, designed for near-instant responsiveness"
303+
"label": "claude-3.5-sonnet-latest",
304+
"name": "claude-3-5-sonnet-latest",
305+
"description": "Most recent snapshot version of Claude Sonnet 3.5 model - most intelligent model"
301306
},
302307
{
303-
"label": "claude-3-opus",
304-
"name": "claude-3-opus-20240229",
305-
"description": "Most powerful model for highly complex tasks"
308+
"label": "claude-3.5-sonnet-20241022",
309+
"name": "claude-3-5-sonnet-20241022",
310+
"description": "(20241022) specific version of Claude Sonnet 3.5 - most intelligent model"
306311
},
307312
{
308-
"label": "claude-3.5-sonnet",
313+
"label": "claude-3.5-sonnet-20240620",
309314
"name": "claude-3-5-sonnet-20240620",
310-
"description": "3.5 version of Claude Sonnet model"
315+
"description": "(20240620) specific version of Claude Sonnet 3.5 - most intelligent model"
316+
},
317+
{
318+
"label": "claude-3-opus",
319+
"name": "claude-3-opus-20240229",
320+
"description": "Powerful model for highly complex tasks, reasoning and analysis"
311321
},
312322
{
313323
"label": "claude-3-sonnet",
314324
"name": "claude-3-sonnet-20240229",
315325
"description": "Ideal balance of intelligence and speed for enterprise workloads"
316326
},
327+
{
328+
"label": "claude-3-haiku",
329+
"name": "claude-3-haiku-20240307",
330+
"description": "Fastest and most compact model, designed for near-instant responsiveness"
331+
},
317332
{
318333
"label": "claude-2.0 (legacy)",
319334
"name": "claude-2.0",
@@ -439,6 +454,26 @@
439454
"label": "gemini-1.0-pro-vision",
440455
"name": "gemini-1.0-pro-vision"
441456
},
457+
{
458+
"label": "claude-3-5-sonnet-v2@20241022",
459+
"name": "claude-3-5-sonnet-v2@20241022",
460+
"description": "(20241022-v2:0) specific version of Claude Sonnet 3.5 - most intelligent model"
461+
},
462+
{
463+
"label": "claude-3-opus@20240229",
464+
"name": "claude-3-opus@20240229",
465+
"description": "Powerful model for highly complex tasks, reasoning and analysis"
466+
},
467+
{
468+
"label": "claude-3-sonnet@20240229",
469+
"name": "claude-3-sonnet@20240229",
470+
"description": "Balance of intelligence and speed"
471+
},
472+
{
473+
"label": "claude-3-haiku@20240307",
474+
"name": "claude-3-haiku@20240307",
475+
"description": "Fastest and most compact model for near-instant responsiveness"
476+
},
442477
{
443478
"label": "chat-bison",
444479
"name": "chat-bison"

0 commit comments

Comments
 (0)