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

Merge branch 'main' into vectara-upload-files

Browse Source
This commit is contained in:
Seif
2023-09-15 07:24:40 -07:00
committed by GitHub
parent 4925cf664e 0c71e62c2d
commit 7a33a4dcaa
48 changed files with 820 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/components/nodes/agents/AirtableAgent/AirtableAgent.ts
+5 -4
View File
@@ -4,7 +4,7 @@ import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../
import { LoadPyodide, finalSystemPrompt, systemPrompt } from './core'
import { LLMChain } from 'langchain/chains'
import { BaseLanguageModel } from 'langchain/base_language'
import { ConsoleCallbackHandler, CustomChainHandler } from '../../../src/handler'
import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
import axios from 'axios'
class Airtable_Agents implements INode {
@@ -102,6 +102,7 @@ class Airtable_Agents implements INode {
const loggerHandler = new ConsoleCallbackHandler(options.logger)
const handler = new CustomChainHandler(options.socketIO, options.socketIOClientId)
const callbacks = await additionalCallbacks(nodeData, options)
const pyodide = await LoadPyodide()
@@ -141,7 +142,7 @@ json.dumps(my_dict)`
dict: dataframeColDict,
question: input
}
const res = await chain.call(inputs, [loggerHandler])
const res = await chain.call(inputs, [loggerHandler, ...callbacks])
pythonCode = res?.text
}
@@ -169,10 +170,10 @@ json.dumps(my_dict)`
}
if (options.socketIO && options.socketIOClientId) {
const result = await chain.call(inputs, [loggerHandler, handler])
const result = await chain.call(inputs, [loggerHandler, handler, ...callbacks])
return result?.text
} else {
const result = await chain.call(inputs, [loggerHandler])
const result = await chain.call(inputs, [loggerHandler, ...callbacks])
return result?.text
}
}
packages/components/nodes/agents/CSVAgent/CSVAgent.ts
+5 -4
View File
@@ -4,7 +4,7 @@ import { getBaseClasses } from '../../../src/utils'
import { LoadPyodide, finalSystemPrompt, systemPrompt } from './core'
import { LLMChain } from 'langchain/chains'
import { BaseLanguageModel } from 'langchain/base_language'
import { ConsoleCallbackHandler, CustomChainHandler } from '../../../src/handler'
import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
class CSV_Agents implements INode {
label: string
@@ -63,6 +63,7 @@ class CSV_Agents implements INode {
const loggerHandler = new ConsoleCallbackHandler(options.logger)
const handler = new CustomChainHandler(options.socketIO, options.socketIOClientId)
const callbacks = await additionalCallbacks(nodeData, options)
let files: string[] = []
@@ -119,7 +120,7 @@ json.dumps(my_dict)`
dict: dataframeColDict,
question: input
}
const res = await chain.call(inputs, [loggerHandler])
const res = await chain.call(inputs, [loggerHandler, ...callbacks])
pythonCode = res?.text
}
@@ -149,10 +150,10 @@ json.dumps(my_dict)`
}
if (options.socketIO && options.socketIOClientId) {
const result = await chain.call(inputs, [loggerHandler, handler])
const result = await chain.call(inputs, [loggerHandler, handler, ...callbacks])
return result?.text
} else {
const result = await chain.call(inputs, [loggerHandler])
const result = await chain.call(inputs, [loggerHandler, ...callbacks])
return result?.text
}
}
packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts
+4 -2
View File
@@ -5,6 +5,7 @@ import { BaseChatMemory } from 'langchain/memory'
import { getBaseClasses, mapChatHistory } from '../../../src/utils'
import { BaseLanguageModel } from 'langchain/base_language'
import { flatten } from 'lodash'
import { additionalCallbacks } from '../../../src/handler'
const DEFAULT_PREFIX = `Assistant is a large language model trained by OpenAI.
@@ -91,13 +92,14 @@ class ConversationalAgent_Agents implements INode {
const executor = nodeData.instance as AgentExecutor
const memory = nodeData.inputs?.memory as BaseChatMemory
const callbacks = await additionalCallbacks(nodeData, options)
if (options && options.chatHistory) {
memory.chatHistory = mapChatHistory(options)
executor.memory = memory
}
const result = await executor.call({ input })
const result = await executor.call({ input }, [...callbacks])
return result?.output
}
}
packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
+4 -3
View File
@@ -3,7 +3,7 @@ import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/age
import { getBaseClasses, mapChatHistory } from '../../../src/utils'
import { flatten } from 'lodash'
import { BaseChatMemory } from 'langchain/memory'
import { ConsoleCallbackHandler, CustomChainHandler } from '../../../src/handler'
import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
const defaultMessage = `Do your best to answer the questions. Feel free to use any tools available to look up relevant information, only if necessary.`
@@ -86,13 +86,14 @@ class ConversationalRetrievalAgent_Agents implements INode {
}
const loggerHandler = new ConsoleCallbackHandler(options.logger)
const callbacks = await additionalCallbacks(nodeData, options)
if (options.socketIO && options.socketIOClientId) {
const handler = new CustomChainHandler(options.socketIO, options.socketIOClientId)
const result = await executor.call({ input }, [loggerHandler, handler])
const result = await executor.call({ input }, [loggerHandler, handler, ...callbacks])
return result?.output
} else {
const result = await executor.call({ input }, [loggerHandler])
const result = await executor.call({ input }, [loggerHandler, ...callbacks])
return result?.output
}
}
packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts
+7 -3
View File
@@ -1,9 +1,10 @@
import { INode, INodeData, INodeParams } from '../../../src/Interface'
import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/agents'
import { getBaseClasses } from '../../../src/utils'
import { Tool } from 'langchain/tools'
import { BaseLanguageModel } from 'langchain/base_language'
import { flatten } from 'lodash'
import { additionalCallbacks } from '../../../src/handler'
class MRKLAgentChat_Agents implements INode {
label: string
@@ -51,9 +52,12 @@ class MRKLAgentChat_Agents implements INode {
return executor
}
async run(nodeData: INodeData, input: string): Promise<string> {
async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
const executor = nodeData.instance as AgentExecutor
const result = await executor.call({ input })
const callbacks = await additionalCallbacks(nodeData, options)
const result = await executor.call({ input }, [...callbacks])
return result?.output
}
packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts
+7 -3
View File
@@ -1,9 +1,10 @@
import { INode, INodeData, INodeParams } from '../../../src/Interface'
import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/agents'
import { Tool } from 'langchain/tools'
import { getBaseClasses } from '../../../src/utils'
import { BaseLanguageModel } from 'langchain/base_language'
import { flatten } from 'lodash'
import { additionalCallbacks } from '../../../src/handler'
class MRKLAgentLLM_Agents implements INode {
label: string
@@ -52,9 +53,12 @@ class MRKLAgentLLM_Agents implements INode {
return executor
}
async run(nodeData: INodeData, input: string): Promise<string> {
async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
const executor = nodeData.instance as AgentExecutor
const result = await executor.call({ input })
const callbacks = await additionalCallbacks(nodeData, options)
const result = await executor.call({ input }, [...callbacks])
return result?.output
}
packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
+4 -3
View File
@@ -4,7 +4,7 @@ import { getBaseClasses, mapChatHistory } from '../../../src/utils'
import { BaseLanguageModel } from 'langchain/base_language'
import { flatten } from 'lodash'
import { BaseChatMemory } from 'langchain/memory'
import { ConsoleCallbackHandler, CustomChainHandler } from '../../../src/handler'
import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
class OpenAIFunctionAgent_Agents implements INode {
label: string
@@ -86,13 +86,14 @@ class OpenAIFunctionAgent_Agents implements INode {
}
const loggerHandler = new ConsoleCallbackHandler(options.logger)
const callbacks = await additionalCallbacks(nodeData, options)
if (options.socketIO && options.socketIOClientId) {
const handler = new CustomChainHandler(options.socketIO, options.socketIOClientId)
const result = await executor.run(input, [loggerHandler, handler])
const result = await executor.run(input, [loggerHandler, handler, ...callbacks])
return result
} else {
const result = await executor.run(input, [loggerHandler])
const result = await executor.run(input, [loggerHandler, ...callbacks])
return result
}
}