farcasclaudiu/Flowise
1
0
Fork 0
mirror of https://github.com/farcasclaudiu/Flowise.git synced 2026-06-28 19:00:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

update credentials

Browse Source
This commit is contained in:
Henry
2023-10-25 12:39:35 +01:00
parent 6e9cbc0e04
commit 2653cb62da
2 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/components/credentials/RedisApi.credential.ts
-43
View File
@@ -1,43 +0,0 @@
import { INodeParams, INodeCredential } from '../src/Interface'
class RedisApi implements INodeCredential {
label: string
name: string
version: number
description: string
inputs: INodeParams[]
constructor() {
this.label = 'Redis API'
this.name = 'redisApi'
this.version = 1.0
this.inputs = [
{
label: 'Redis Host',
name: 'redisHost',
type: 'string',
default: '127.0.0.1'
},
{
label: 'Port',
name: 'redisPort',
type: 'number',
default: '6789'
},
{
label: 'User',
name: 'redisUser',
type: 'string',
placeholder: '<REDIS_USERNAME>'
},
{
label: 'Password',
name: 'redisPwd',
type: 'password',
placeholder: '<REDIS_PASSWORD>'
}
]
}
}
module.exports = { credClass: RedisApi }
packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts
+25 -18
View File
@@ -31,7 +31,7 @@ class RedisBackedChatMemory_Memory implements INode {
name: 'credential', name: 'credential',
type: 'credential', type: 'credential',
optional: true, optional: true,
credentialNames: ['redisApi'] credentialNames: ['redisCacheApi', 'redisCacheUrlApi']
} }
this.inputs = [ this.inputs = [
{ {
@@ -81,25 +81,32 @@ const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Prom
const memoryKey = nodeData.inputs?.memoryKey as string const memoryKey = nodeData.inputs?.memoryKey as string
const chatId = options?.chatId as string const chatId = options?.chatId as string
const credentialData = await getCredentialData(nodeData.credential ?? '', options)
const username = getCredentialParam('redisUser', credentialData, nodeData)
const password = getCredentialParam('redisPwd', credentialData, nodeData)
const portStr = getCredentialParam('redisPort', credentialData, nodeData)
const host = getCredentialParam('redisHost', credentialData, nodeData)
let isSessionIdUsingChatMessageId = false let isSessionIdUsingChatMessageId = false
if (!sessionId && chatId) isSessionIdUsingChatMessageId = true if (!sessionId && chatId) isSessionIdUsingChatMessageId = true
const redisClient = new Redis({ const credentialData = await getCredentialData(nodeData.credential ?? '', options)
port: portStr ? parseInt(portStr) : 6379, const redisUrl = getCredentialParam('redisUrl', credentialData, nodeData)
host,
username, let client: Redis
password if (!redisUrl || redisUrl === '') {
}) const username = getCredentialParam('redisCacheUser', credentialData, nodeData)
const password = getCredentialParam('redisCachePwd', credentialData, nodeData)
const portStr = getCredentialParam('redisCachePort', credentialData, nodeData)
const host = getCredentialParam('redisCacheHost', credentialData, nodeData)
client = new Redis({
port: portStr ? parseInt(portStr) : 6379,
host,
username,
password
})
} else {
client = new Redis(redisUrl)
}
let obj: RedisChatMessageHistoryInput = { let obj: RedisChatMessageHistoryInput = {
sessionId: sessionId ? sessionId : chatId, sessionId: sessionId ? sessionId : chatId,
client: redisClient client
} }
if (sessionTTL) { if (sessionTTL) {
@@ -112,21 +119,21 @@ const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Prom
const redisChatMessageHistory = new RedisChatMessageHistory(obj) const redisChatMessageHistory = new RedisChatMessageHistory(obj)
redisChatMessageHistory.getMessages = async (): Promise<BaseMessage[]> => { redisChatMessageHistory.getMessages = async (): Promise<BaseMessage[]> => {
const rawStoredMessages = await redisClient.lrange(sessionId ? sessionId : chatId, 0, -1) const rawStoredMessages = await client.lrange(sessionId ? sessionId : chatId, 0, -1)
const orderedMessages = rawStoredMessages.reverse().map((message) => JSON.parse(message)) const orderedMessages = rawStoredMessages.reverse().map((message) => JSON.parse(message))
return orderedMessages.map(mapStoredMessageToChatMessage) return orderedMessages.map(mapStoredMessageToChatMessage)
} }
redisChatMessageHistory.addMessage = async (message: BaseMessage): Promise<void> => { redisChatMessageHistory.addMessage = async (message: BaseMessage): Promise<void> => {
const messageToAdd = [message].map((msg) => msg.toDict()) const messageToAdd = [message].map((msg) => msg.toDict())
await redisClient.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0])) await client.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0]))
if (sessionTTL) { if (sessionTTL) {
await redisClient.expire(sessionId ? sessionId : chatId, sessionTTL) await client.expire(sessionId ? sessionId : chatId, sessionTTL)
} }
} }
redisChatMessageHistory.clear = async (): Promise<void> => { redisChatMessageHistory.clear = async (): Promise<void> => {
await redisClient.del(sessionId ? sessionId : chatId) await client.del(sessionId ? sessionId : chatId)
} }
const memory = new BufferMemoryExtended({ const memory = new BufferMemoryExtended({