touchup fixes

packages/components/nodes/chains/ConversationChain/ConversationChain.ts

@@ -1,16 +1,16 @@
 import { ConversationChain } from 'langchain/chains'
-import { getBaseClasses, handleEscapeCharacters } from '../../../src/utils'
-import { ChatPromptTemplate, HumanMessagePromptTemplate, MessagesPlaceholder, SystemMessagePromptTemplate } from 'langchain/prompts'
-import { FlowiseMemory, ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
-import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
-import { RunnableSequence } from 'langchain/schema/runnable'
-import { StringOutputParser } from 'langchain/schema/output_parser'
-import { HumanMessage } from 'langchain/schema'
+import { ChatPromptTemplate, HumanMessagePromptTemplate, MessagesPlaceholder, SystemMessagePromptTemplate } from '@langchain/core/prompts'
+import { RunnableSequence } from '@langchain/core/runnables'
+import { StringOutputParser } from '@langchain/core/output_parsers'
+import { HumanMessage } from '@langchain/core/messages'
 import { ConsoleCallbackHandler as LCConsoleCallbackHandler } from '@langchain/core/tracers/console'
 import { checkInputs, Moderation, streamResponse } from '../../moderation/Moderation'
 import { formatResponse } from '../../outputparsers/OutputParserHelpers'
 import { addImagesToMessages } from '../../../src/multiModalUtils'
 import { ChatOpenAI } from '../../chatmodels/ChatOpenAI/FlowiseChatOpenAI'
+import { FlowiseMemory, ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
+import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
+import { getBaseClasses, handleEscapeCharacters } from '../../../src/utils'
 
 let systemMessage = `The following is a friendly conversation between a human and an AI. The AI is talkative and provides lots of specific details from its context. If the AI does not know the answer to a question, it truthfully says it does not know.`
 const inputKey = 'input'
@@ -179,29 +179,28 @@ const prepareChatPrompt = (nodeData: INodeData, humanImageMessages: HumanMessage
 
 const prepareChain = (nodeData: INodeData, options: ICommonObject, sessionId?: string) => {
     const chatHistory = options.chatHistory
-    let model = nodeData.inputs?.model
+    let model = nodeData.inputs?.model as ChatOpenAI
     const memory = nodeData.inputs?.memory as FlowiseMemory
     const memoryKey = memory.memoryKey ?? 'chat_history'
 
     let humanImageMessages: HumanMessage[] = []
     if (model instanceof ChatOpenAI) {
-        const chatModel = model as ChatOpenAI
         const messageContent = addImagesToMessages(nodeData, options, model.multiModalOption)
 
         if (messageContent?.length) {
             // Change model to gpt-4-vision
-            chatModel.modelName = 'gpt-4-vision-preview'
+            model.modelName = 'gpt-4-vision-preview'
 
             // Change default max token to higher when using gpt-4-vision
-            chatModel.maxTokens = 1024
+            model.maxTokens = 1024
 
             for (const msg of messageContent) {
                 humanImageMessages.push(new HumanMessage({ content: [msg] }))
             }
         } else {
             // revert to previous values if image upload is empty
-            chatModel.modelName = chatModel.configuredModel
-            chatModel.maxTokens = chatModel.configuredMaxToken
+            model.modelName = model.configuredModel
+            model.maxTokens = model.configuredMaxToken
         }
     }
 

packages/components/nodes/chains/LLMChain/LLMChain.ts

@@ -1,5 +1,6 @@
 import { BaseLanguageModel, BaseLanguageModelCallOptions } from '@langchain/core/language_models/base'
 import { BaseLLMOutputParser, BaseOutputParser } from '@langchain/core/output_parsers'
+import { ChatPromptTemplate, FewShotPromptTemplate, PromptTemplate, HumanMessagePromptTemplate } from '@langchain/core/prompts'
 import { OutputFixingParser } from 'langchain/output_parsers'
 import { LLMChain } from 'langchain/chains'
 import { ICommonObject, INode, INodeData, INodeOutputsValue, INodeParams } from '../../../src/Interface'
@@ -9,7 +10,6 @@ import { checkInputs, Moderation, streamResponse } from '../../moderation/Modera
 import { formatResponse, injectOutputParser } from '../../outputparsers/OutputParserHelpers'
 import { ChatOpenAI } from '../../chatmodels/ChatOpenAI/FlowiseChatOpenAI'
 import { addImagesToMessages } from '../../../src/multiModalUtils'
-import { ChatPromptTemplate, FewShotPromptTemplate, PromptTemplate, SystemMessagePromptTemplate } from 'langchain/prompts'
 import { HumanMessage } from 'langchain/schema'
 
 class LLMChain_Chains implements INode {
@@ -184,6 +184,7 @@ const runPrediction = async (
      */
     const promptValues = handleEscapeCharacters(promptValuesRaw, true)
     const messageContent = addImagesToMessages(nodeData, options, model.multiModalOption)
+
     if (chain.llm instanceof ChatOpenAI) {
         const chatOpenAI = chain.llm as ChatOpenAI
         if (messageContent?.length) {
@@ -192,19 +193,22 @@ const runPrediction = async (
             chatOpenAI.maxTokens = 1024
             // Add image to the message
             if (chain.prompt instanceof PromptTemplate) {
-                const oldTemplate = chain.prompt.template as string
-                let cp2 = ChatPromptTemplate.fromMessages([SystemMessagePromptTemplate.fromTemplate(oldTemplate)])
-                cp2.promptMessages = [new HumanMessage({ content: messageContent })]
-                chain.prompt = cp2
+                const existingPromptTemplate = chain.prompt.template as string
+                let newChatPromptTemplate = ChatPromptTemplate.fromMessages([
+                    HumanMessagePromptTemplate.fromTemplate(existingPromptTemplate)
+                ])
+                newChatPromptTemplate.promptMessages.push(new HumanMessage({ content: messageContent }))
+                chain.prompt = newChatPromptTemplate
             } else if (chain.prompt instanceof ChatPromptTemplate) {
                 chain.prompt.promptMessages.push(new HumanMessage({ content: messageContent }))
             } else if (chain.prompt instanceof FewShotPromptTemplate) {
-                let currentPrompt = chain.prompt as FewShotPromptTemplate
-                const oldTemplate = currentPrompt.examplePrompt.template as string
-                let cp2 = ChatPromptTemplate.fromMessages([SystemMessagePromptTemplate.fromTemplate(oldTemplate)])
-                cp2.promptMessages = [new HumanMessage({ content: messageContent })]
+                let existingFewShotPromptTemplate = chain.prompt.examplePrompt.template as string
+                let newFewShotPromptTemplate = ChatPromptTemplate.fromMessages([
+                    HumanMessagePromptTemplate.fromTemplate(existingFewShotPromptTemplate)
+                ])
+                newFewShotPromptTemplate.promptMessages.push(new HumanMessage({ content: messageContent }))
                 // @ts-ignore
-                currentPrompt.examplePrompt = cp2
+                chain.prompt.examplePrompt = newFewShotPromptTemplate
             }
         } else {
             // revert to previous values if image upload is empty