Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add conversation history selection options to ConditionAgent node #3719

Merged
merged 3 commits into from
Dec 18, 2024
Merged

feat: Add conversation history selection options to ConditionAgent node #3719

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df5cdc0
feat: Enhance ConditionAgent with conversation history selection options
jeanibarz Dec 16, 2024
f904123
Bump version from 2.0 to 3.0
jeanibarz Dec 17, 2024
f41ef4f
Merge remote-tracking branch 'origin/main' into feat/seq-agents-filte…
jeanibarz Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion packages/components/nodes/sequentialagents/ConditionAgent/ConditionAgent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { RunnableSequence, RunnablePassthrough, RunnableConfig } from '@langchai
import { BaseMessage } from '@langchain/core/messages'
import { BaseChatModel } from '@langchain/core/language_models/chat_models'
import {
ConversationHistorySelection,
ICommonObject,
IDatabaseEntity,
INode,
Expand All @@ -23,6 +24,7 @@ import {
customGet,
getVM,
transformObjectPropertyToFunction,
filterConversationHistory,
restructureMessages
} from '../commonUtils'
import { ChatGoogleGenerativeAI } from '../../chatmodels/ChatGoogleGenerativeAI/FlowiseChatGoogleGenerativeAI'
Expand Down Expand Up @@ -149,7 +151,7 @@ class ConditionAgent_SeqAgents implements INode {
constructor() {
this.label = 'Condition Agent'
this.name = 'seqConditionAgent'
this.version = 2.0
this.version = 3.0
this.type = 'ConditionAgent'
this.icon = 'condition.svg'
this.category = 'Sequential Agents'
Expand Down Expand Up @@ -185,6 +187,42 @@ class ConditionAgent_SeqAgents implements INode {
additionalParams: true,
optional: true
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @jeanibarz ! can we increment the this.version = 2.0 to 3.0, and have the parameter order as the same in Agent/LLMNode:

  1. System Prompt
  2. Prepend Messages History
  3. Conversation History
  4. Human Prompt

label: 'Conversation History',
name: 'conversationHistorySelection',
type: 'options',
options: [
{
label: 'User Question',
name: 'user_question',
description: 'Use the user question from the historical conversation messages as input.'
},
{
label: 'Last Conversation Message',
name: 'last_message',
description: 'Use the last conversation message from the historical conversation messages as input.'
},
{
label: 'All Conversation Messages',
name: 'all_messages',
description: 'Use all conversation messages from the historical conversation messages as input.'
},
{
label: 'Empty',
name: 'empty',
description:
'Do not use any messages from the conversation history. ' +
'Ensure to use either System Prompt, Human Prompt, or Messages History.'
}
],
default: 'all_messages',
optional: true,
description:
'Select which messages from the conversation history to include in the prompt. ' +
'The selected messages will be inserted between the System Prompt (if defined) and ' +
'Human Prompt.',
additionalParams: true
},
{
label: 'Human Prompt',
name: 'humanMessagePrompt',
Expand Down Expand Up @@ -481,6 +519,9 @@ const runCondition = async (
})
}

const historySelection = (nodeData.inputs?.conversationHistorySelection || 'all_messages') as ConversationHistorySelection
// @ts-ignore
state.messages = filterConversationHistory(historySelection, input, state)
// @ts-ignore
state.messages = restructureMessages(model, state)

Expand Down
Loading