Merge branch 'main' into feature/Credential

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

@@ -77,6 +77,9 @@ class ConversationChain_Chains implements INode {
             finalText += finalDocs[i].pageContent
         }
 
+        const replaceChar: string[] = ['{', '}']
+        for (const char of replaceChar) finalText = finalText.replaceAll(char, '')
+
         if (finalText) systemMessage = `${systemMessage}\nThe AI has the following context:\n${finalText}`
 
         const obj: any = {

packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts

@@ -141,8 +141,8 @@ class ChatAnthropic_ChatModels implements INode {
         }
 
         if (maxTokensToSample) obj.maxTokensToSample = parseInt(maxTokensToSample, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
-        if (topK) obj.topK = parseInt(topK, 10)
+        if (topK) obj.topK = parseFloat(topK)
 
         const model = new ChatAnthropic(obj)
         return model

packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts

@@ -106,8 +106,8 @@ class ChatHuggingFace_ChatModels implements INode {
 
         if (temperature) obj.temperature = parseFloat(temperature)
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
-        if (hfTopK) obj.topK = parseInt(hfTopK, 10)
+        if (hfTopK) obj.topK = parseFloat(hfTopK)
         if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
         if (endpoint) obj.endpoint = endpoint
 

packages/components/nodes/chatmodels/ChatLocalAI/ChatLocalAI.ts

@@ -80,7 +80,7 @@ class ChatLocalAI_ChatModels implements INode {
         }
 
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
         if (timeout) obj.timeout = parseInt(timeout, 10)
 
         const model = new OpenAIChat(obj, { basePath })

packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts

@@ -143,7 +143,7 @@ class ChatOpenAI_ChatModels implements INode {
         }
 
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
         if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
         if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
         if (timeout) obj.timeout = parseInt(timeout, 10)

packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts

@@ -165,7 +165,7 @@ class AzureOpenAI_LLMs implements INode {
         }
 
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
         if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
         if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
         if (timeout) obj.timeout = parseInt(timeout, 10)

packages/components/nodes/llms/HuggingFaceInference/HuggingFaceInference.ts

@@ -106,8 +106,8 @@ class HuggingFaceInference_LLMs implements INode {
 
         if (temperature) obj.temperature = parseFloat(temperature)
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
-        if (hfTopK) obj.topK = parseInt(hfTopK, 10)
+        if (hfTopK) obj.topK = parseFloat(hfTopK)
         if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
         if (endpoint) obj.endpoint = endpoint
 

packages/components/nodes/llms/OpenAI/OpenAI.ts

@@ -143,7 +143,7 @@ class OpenAI_LLMs implements INode {
         }
 
         if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
-        if (topP) obj.topP = parseInt(topP, 10)
+        if (topP) obj.topP = parseFloat(topP)
         if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
         if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
         if (timeout) obj.timeout = parseInt(timeout, 10)

packages/components/nodes/vectorstores/Chroma_Existing/Chroma_Existing.ts

@@ -69,7 +69,7 @@ class Chroma_Existing_VectorStores implements INode {
         const chromaURL = nodeData.inputs?.chromaURL as string
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const obj: {
             collectionName: string

packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts

@@ -78,7 +78,7 @@ class ChromaUpsert_VectorStores implements INode {
         const chromaURL = nodeData.inputs?.chromaURL as string
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const flattenDocs = docs && docs.length ? flatten(docs) : []
         const finalDocs = []

packages/components/nodes/vectorstores/Faiss_Existing/Faiss_Existing.ts

@@ -64,7 +64,7 @@ class Faiss_Existing_VectorStores implements INode {
         const basePath = nodeData.inputs?.basePath as string
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const vectorStore = await FaissStore.load(basePath, embeddings)
 

packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts

@@ -73,7 +73,7 @@ class FaissUpsert_VectorStores implements INode {
         const output = nodeData.outputs?.output as string
         const basePath = nodeData.inputs?.basePath as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const flattenDocs = docs && docs.length ? flatten(docs) : []
         const finalDocs = []

packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts

@@ -64,7 +64,7 @@ class InMemoryVectorStore_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const flattenDocs = docs && docs.length ? flatten(docs) : []
         const finalDocs = []

packages/components/nodes/vectorstores/OpenSearch_Existing/OpenSearch_existing.ts

@@ -70,7 +70,7 @@ class OpenSearch_Existing_VectorStores implements INode {
         const indexName = nodeData.inputs?.indexName as string
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const client = new Client({
             nodes: [opensearchURL]

packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts

@@ -79,7 +79,7 @@ class OpenSearchUpsert_VectorStores implements INode {
         const indexName = nodeData.inputs?.indexName as string
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const flattenDocs = docs && docs.length ? flatten(docs) : []
         const finalDocs = []

packages/components/nodes/vectorstores/Pinecone_Existing/Pinecone_Existing.ts

@@ -87,7 +87,7 @@ class Pinecone_Existing_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const pineconeApiKey = getCredentialParam('pineconeApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts

@@ -88,7 +88,7 @@ class PineconeUpsert_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const pineconeApiKey = getCredentialParam('pineconeApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts

@@ -87,7 +87,7 @@ class Qdrant_Existing_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts

@@ -88,7 +88,7 @@ class QdrantUpsert_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Singlestore_Existing/Singlestore_Existing.ts

@@ -124,7 +124,7 @@ class SingleStoreExisting_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         let vectorStore: SingleStoreVectorStore
 

packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts

@@ -133,7 +133,7 @@ class SingleStoreUpsert_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const flattenDocs = docs && docs.length ? flatten(docs) : []
         const finalDocs = []

packages/components/nodes/vectorstores/Supabase_Existing/Supabase_Exisiting.ts

@@ -90,7 +90,7 @@ class Supabase_Existing_VectorStores implements INode {
         const supabaseMetadataFilter = nodeData.inputs?.supabaseMetadataFilter
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const supabaseApiKey = getCredentialParam('supabaseApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts

@@ -91,7 +91,7 @@ class SupabaseUpsert_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const supabaseApiKey = getCredentialParam('supabaseApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Weaviate_Existing/Weaviate_Existing.ts

@@ -116,7 +116,7 @@ class Weaviate_Existing_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const weaviateApiKey = getCredentialParam('weaviateApiKey', credentialData, nodeData)

packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts

@@ -125,7 +125,7 @@ class WeaviateUpsert_VectorStores implements INode {
         const embeddings = nodeData.inputs?.embeddings as Embeddings
         const output = nodeData.outputs?.output as string
         const topK = nodeData.inputs?.topK as string
-        const k = topK ? parseInt(topK, 10) : 4
+        const k = topK ? parseFloat(topK) : 4
 
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const weaviateApiKey = getCredentialParam('weaviateApiKey', credentialData, nodeData)