Feat/update ollama for function calling (#2892)

update ollama for function calling

Author: HenryHengZJ

package.json

@@ -56,7 +56,10 @@
         "onlyBuiltDependencies": [
             "faiss-node",
             "sqlite3"
-        ]
+        ],
+        "overrides": {
+            "@langchain/core": "0.2.18"
+        }
     },
     "engines": {
         "node": ">=18.15.0 <19.0.0 || ^20",

packages/components/nodes/chatmodels/ChatOllama/ChatOllama.ts

@@ -1,9 +1,8 @@
-import { ChatOllama } from '@langchain/community/chat_models/ollama'
+import { ChatOllama, ChatOllamaInput } from '@langchain/ollama'
+import { BaseChatModelParams } from '@langchain/core/language_models/chat_models'
 import { BaseCache } from '@langchain/core/caches'
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
-import { OllamaInput } from '@langchain/community/llms/ollama'
-import { BaseChatModelParams } from '@langchain/core/language_models/chat_models'
 
 class ChatOllama_ChatModels implements INode {
     label: string
@@ -20,7 +19,7 @@ class ChatOllama_ChatModels implements INode {
     constructor() {
         this.label = 'ChatOllama'
         this.name = 'chatOllama'
-        this.version = 2.0
+        this.version = 3.0
         this.type = 'ChatOllama'
         this.icon = 'Ollama.svg'
         this.category = 'Chat Models'
@@ -55,6 +54,15 @@ class ChatOllama_ChatModels implements INode {
                 default: 0.9,
                 optional: true
             },
+            {
+                label: 'Keep Alive',
+                name: 'keepAlive',
+                type: 'string',
+                description: 'How long to keep connection alive. A duration string (such as "10m" or "24h")',
+                default: '5m',
+                optional: true,
+                additionalParams: true
+            },
             {
                 label: 'Top P',
                 name: 'topP',
@@ -115,16 +123,6 @@ class ChatOllama_ChatModels implements INode {
                 optional: true,
                 additionalParams: true
             },
-            {
-                label: 'Number of GQA groups',
-                name: 'numGqa',
-                type: 'number',
-                description:
-                    'The number of GQA groups in the transformer layer. Required for some models, for example it is 8 for llama2:70b. Refer to <a target="_blank" href="https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">docs</a> for more details',
-                step: 1,
-                optional: true,
-                additionalParams: true
-            },
             {
                 label: 'Number of GPU',
                 name: 'numGpu',
@@ -199,17 +197,16 @@ class ChatOllama_ChatModels implements INode {
         const mirostatEta = nodeData.inputs?.mirostatEta as string
         const mirostatTau = nodeData.inputs?.mirostatTau as string
         const numCtx = nodeData.inputs?.numCtx as string
-        const numGqa = nodeData.inputs?.numGqa as string
+        const keepAlive = nodeData.inputs?.keepAlive as string
         const numGpu = nodeData.inputs?.numGpu as string
         const numThread = nodeData.inputs?.numThread as string
         const repeatLastN = nodeData.inputs?.repeatLastN as string
         const repeatPenalty = nodeData.inputs?.repeatPenalty as string
-        const stop = nodeData.inputs?.stop as string
         const tfsZ = nodeData.inputs?.tfsZ as string
 
         const cache = nodeData.inputs?.cache as BaseCache
 
-        const obj: OllamaInput & BaseChatModelParams = {
+        const obj: ChatOllamaInput & BaseChatModelParams = {
             baseUrl,
             temperature: parseFloat(temperature),
             model: modelName
@@ -221,16 +218,12 @@ class ChatOllama_ChatModels implements INode {
         if (mirostatEta) obj.mirostatEta = parseFloat(mirostatEta)
         if (mirostatTau) obj.mirostatTau = parseFloat(mirostatTau)
         if (numCtx) obj.numCtx = parseFloat(numCtx)
-        if (numGqa) obj.numGqa = parseFloat(numGqa)
         if (numGpu) obj.numGpu = parseFloat(numGpu)
         if (numThread) obj.numThread = parseFloat(numThread)
         if (repeatLastN) obj.repeatLastN = parseFloat(repeatLastN)
         if (repeatPenalty) obj.repeatPenalty = parseFloat(repeatPenalty)
         if (tfsZ) obj.tfsZ = parseFloat(tfsZ)
-        if (stop) {
-            const stopSequences = stop.split(',')
-            obj.stop = stopSequences
-        }
+        if (keepAlive) obj.keepAlive = keepAlive
         if (cache) obj.cache = cache
 
         const model = new ChatOllama(obj)

packages/components/nodes/chatmodels/ChatOllamaFunction/ChatOllamaFunction.ts

@@ -43,6 +43,7 @@ class ChatOllamaFunction_ChatModels implements INode {
         this.type = 'ChatOllamaFunction'
         this.icon = 'Ollama.svg'
         this.category = 'Chat Models'
+        this.badge = 'DEPRECATING'
         this.description = 'Run open-source function-calling compatible LLM on Ollama'
         this.baseClasses = [this.type, ...getBaseClasses(OllamaFunctions)]
         this.inputs = [

packages/components/nodes/memory/MongoDBMemory/MongoDBMemory.ts

@@ -111,6 +111,7 @@ const initializeMongoDB = async (nodeData: INodeData, options: ICommonObject): P
         sessionId
     })
 
+    // @ts-ignore
     mongoDBChatMessageHistory.getMessages = async (): Promise<BaseMessage[]> => {
         const document = await collection.findOne({
             sessionId: (mongoDBChatMessageHistory as any).sessionId
@@ -119,6 +120,7 @@ const initializeMongoDB = async (nodeData: INodeData, options: ICommonObject): P
         return messages.map(mapStoredMessageToChatMessage)
     }
 
+    // @ts-ignore
     mongoDBChatMessageHistory.addMessage = async (message: BaseMessage): Promise<void> => {
         const messages = [message].map((msg) => msg.toDict())
         await collection.updateOne(
@@ -136,6 +138,7 @@ const initializeMongoDB = async (nodeData: INodeData, options: ICommonObject): P
 
     return new BufferMemoryExtended({
         memoryKey: memoryKey ?? 'chat_history',
+        // @ts-ignore
         chatHistory: mongoDBChatMessageHistory,
         sessionId,
         collection

packages/components/nodes/outputparsers/StructuredOutputParser/StructuredOutputParser.ts

@@ -71,7 +71,8 @@ class StructuredOutputParser implements INode {
         const autoFix = nodeData.inputs?.autofixParser as boolean
 
         try {
-            const structuredOutputParser = LangchainStructuredOutputParser.fromZodSchema(z.object(convertSchemaToZod(jsonStructure)))
+            const zodSchema = z.object(convertSchemaToZod(jsonStructure)) as any
+            const structuredOutputParser = LangchainStructuredOutputParser.fromZodSchema(zodSchema)
 
             // NOTE: When we change Flowise to return a json response, the following has to be changed to: JsonStructuredOutputParser
             Object.defineProperty(structuredOutputParser, 'autoFix', {

packages/components/nodes/tools/ChatflowTool/ChatflowTool.ts

@@ -174,7 +174,7 @@ class ChatflowTool extends StructuredTool {
 
     schema = z.object({
         input: z.string().describe('input question')
-    })
+    }) as any
 
     constructor({
         name,

packages/components/nodes/tools/CustomTool/core.ts

@@ -42,6 +42,7 @@ export class DynamicStructuredTool<
 
     func: DynamicStructuredToolInput['func']
 
+    // @ts-ignore
     schema: T
     private variables: any[]
     private flowObj: any

packages/components/nodes/tools/ReadFile/ReadFile.ts

@@ -63,7 +63,7 @@ export class ReadFileTool extends StructuredTool {
 
     schema = z.object({
         file_path: z.string().describe('name of file')
-    })
+    }) as any
 
     name = 'read_file'
 

packages/components/nodes/tools/RetrieverTool/RetrieverTool.ts

@@ -77,7 +77,7 @@ class Retriever_Tools implements INode {
 
         const schema = z.object({
             input: z.string().describe('input to look up in retriever')
-        })
+        }) as any
 
         const tool = new DynamicStructuredTool({ ...input, func, schema })
         return tool

packages/components/nodes/tools/WriteFile/WriteFile.ts

@@ -64,7 +64,7 @@ export class WriteFileTool extends StructuredTool {
     schema = z.object({
         file_path: z.string().describe('name of file'),
         text: z.string().describe('text to write to file')
-    })
+    }) as any
 
     name = 'write_file'