Merge branch 'FlowiseAI:main' into main

packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI.ts

@@ -1,7 +1,6 @@
-import { OpenAIBaseInput } from 'langchain/dist/types/openai-types'
 import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
-import { AzureOpenAIInput, ChatOpenAI } from 'langchain/chat_models/openai'
+import { AzureOpenAIInput, ChatOpenAI, OpenAIChatInput } from 'langchain/chat_models/openai'
 import { BaseCache } from 'langchain/schema'
 import { BaseLLMParams } from 'langchain/llms/base'
 
@@ -123,7 +122,7 @@ class AzureChatOpenAI_ChatModels implements INode {
         const azureOpenAIApiDeploymentName = getCredentialParam('azureOpenAIApiDeploymentName', credentialData, nodeData)
         const azureOpenAIApiVersion = getCredentialParam('azureOpenAIApiVersion', credentialData, nodeData)
 
-        const obj: Partial<AzureOpenAIInput> & BaseLLMParams & Partial<OpenAIBaseInput> = {
+        const obj: Partial<AzureOpenAIInput> & BaseLLMParams & Partial<OpenAIChatInput> = {
             temperature: parseFloat(temperature),
             modelName,
             azureOpenAIApiKey,

packages/components/nodes/chatmodels/ChatMistral/ChatMistral.ts

@@ -124,13 +124,13 @@ class ChatMistral_ChatModels implements INode {
         const safeMode = nodeData.inputs?.safeMode as boolean
         const randomSeed = nodeData.inputs?.safeMode as string
         const overrideEndpoint = nodeData.inputs?.overrideEndpoint as string
-        // Waiting fix from langchain + mistral to enable streaming - https://github.com/mistralai/client-js/issues/18
-
+        const streaming = nodeData.inputs?.streaming as boolean
         const cache = nodeData.inputs?.cache as BaseCache
 
         const obj: ChatMistralAIInput = {
             apiKey: apiKey,
-            modelName: modelName
+            modelName: modelName,
+            streaming: streaming ?? true
         }
 
         if (maxOutputTokens) obj.maxTokens = parseInt(maxOutputTokens, 10)

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

@@ -1,8 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
-import { ChatOllama } from 'langchain/chat_models/ollama'
+import { ChatOllama, ChatOllamaInput } from 'langchain/chat_models/ollama'
 import { BaseCache } from 'langchain/schema'
-import { OllamaInput } from 'langchain/dist/util/ollama'
 import { BaseLLMParams } from 'langchain/llms/base'
 
 class ChatOllama_ChatModels implements INode {
@@ -209,7 +208,7 @@ class ChatOllama_ChatModels implements INode {
 
         const cache = nodeData.inputs?.cache as BaseCache
 
-        const obj: OllamaInput & BaseLLMParams = {
+        const obj: ChatOllamaInput & BaseLLMParams = {
             baseUrl,
             temperature: parseFloat(temperature),
             model: modelName

packages/components/nodes/embeddings/OllamaEmbedding/OllamaEmbedding.ts

@@ -1,7 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
+import { OllamaInput } from 'langchain/llms/ollama'
 import { OllamaEmbeddings } from 'langchain/embeddings/ollama'
-import { OllamaInput } from 'langchain/dist/util/ollama'
 
 class OllamaEmbedding_Embeddings implements INode {
     label: string

packages/components/nodes/llms/Ollama/Ollama.ts

@@ -1,8 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
-import { Ollama } from 'langchain/llms/ollama'
+import { Ollama, OllamaInput } from 'langchain/llms/ollama'
 import { BaseCache } from 'langchain/schema'
-import { OllamaInput } from 'langchain/dist/util/ollama'
 import { BaseLLMParams } from 'langchain/llms/base'
 
 class Ollama_LLMs implements INode {