From ffebe7c769eed2f2f09badae08626afa11d0709b Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 10 Jun 2023 01:34:37 +0100 Subject: [PATCH] change flat to flatten from lodash --- packages/components/nodes/agents/AutoGPT/AutoGPT.ts | 3 ++- .../nodes/agents/ConversationalAgent/ConversationalAgent.ts | 3 ++- .../components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts | 3 ++- packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts | 3 ++- .../nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts | 3 ++- .../components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts | 3 ++- .../nodes/vectorstores/InMemory/InMemoryVectorStore.ts | 3 ++- .../nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts | 3 ++- .../nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts | 3 ++- .../nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/components/nodes/agents/AutoGPT/AutoGPT.ts b/packages/components/nodes/agents/AutoGPT/AutoGPT.ts index 4775507b2..ca1185004 100644 --- a/packages/components/nodes/agents/AutoGPT/AutoGPT.ts +++ b/packages/components/nodes/agents/AutoGPT/AutoGPT.ts @@ -3,6 +3,7 @@ import { BaseChatModel } from 'langchain/chat_models/base' import { AutoGPT } from 'langchain/experimental/autogpt' import { Tool } from 'langchain/tools' import { VectorStoreRetriever } from 'langchain/vectorstores/base' +import { flatten } from 'lodash' class AutoGPT_Agents implements INode { label: string @@ -67,7 +68,7 @@ class AutoGPT_Agents implements INode { const model = nodeData.inputs?.model as BaseChatModel const vectorStoreRetriever = nodeData.inputs?.vectorStoreRetriever as VectorStoreRetriever let tools = nodeData.inputs?.tools as Tool[] - tools = tools.flat() + tools = flatten(tools) const aiName = (nodeData.inputs?.aiName as string) || 'AutoGPT' const aiRole = (nodeData.inputs?.aiRole as string) || 'Assistant' const maxLoop = nodeData.inputs?.maxLoop as string diff --git a/packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts b/packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts index d2106e185..363b39076 100644 --- a/packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts +++ b/packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts @@ -5,6 +5,7 @@ import { BaseChatMemory, ChatMessageHistory } from 'langchain/memory' import { getBaseClasses } from '../../../src/utils' import { AIChatMessage, HumanChatMessage } from 'langchain/schema' import { BaseLanguageModel } from 'langchain/base_language' +import { flatten } from 'lodash' class ConversationalAgent_Agents implements INode { label: string @@ -63,7 +64,7 @@ class ConversationalAgent_Agents implements INode { async init(nodeData: INodeData): Promise { const model = nodeData.inputs?.model as BaseLanguageModel let tools = nodeData.inputs?.tools as Tool[] - tools = tools.flat() + tools = flatten(tools) const memory = nodeData.inputs?.memory as BaseChatMemory const humanMessage = nodeData.inputs?.humanMessage as string const systemMessage = nodeData.inputs?.systemMessage as string diff --git a/packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts b/packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts index 34b36fc1e..d2a52d6cf 100644 --- a/packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts +++ b/packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts @@ -3,6 +3,7 @@ import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/age import { getBaseClasses } from '../../../src/utils' import { Tool } from 'langchain/tools' import { BaseLanguageModel } from 'langchain/base_language' +import { flatten } from 'lodash' class MRKLAgentChat_Agents implements INode { label: string @@ -40,7 +41,7 @@ class MRKLAgentChat_Agents implements INode { async init(nodeData: INodeData): Promise { const model = nodeData.inputs?.model as BaseLanguageModel let tools = nodeData.inputs?.tools as Tool[] - tools = tools.flat() + tools = flatten(tools) const executor = await initializeAgentExecutorWithOptions(tools, model, { agentType: 'chat-zero-shot-react-description', verbose: process.env.DEBUG === 'true' ? true : false diff --git a/packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts b/packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts index 20246ffa1..eb685531c 100644 --- a/packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts +++ b/packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts @@ -3,6 +3,7 @@ import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/age import { Tool } from 'langchain/tools' import { getBaseClasses } from '../../../src/utils' import { BaseLanguageModel } from 'langchain/base_language' +import { flatten } from 'lodash' class MRKLAgentLLM_Agents implements INode { label: string @@ -40,7 +41,7 @@ class MRKLAgentLLM_Agents implements INode { async init(nodeData: INodeData): Promise { const model = nodeData.inputs?.model as BaseLanguageModel let tools = nodeData.inputs?.tools as Tool[] - tools = tools.flat() + tools = flatten(tools) const executor = await initializeAgentExecutorWithOptions(tools, model, { agentType: 'zero-shot-react-description', diff --git a/packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts b/packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts index fb7c404e3..87cce2c45 100644 --- a/packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts +++ b/packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts @@ -3,6 +3,7 @@ import { Chroma } from 'langchain/vectorstores/chroma' import { Embeddings } from 'langchain/embeddings/base' import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' +import { flatten } from 'lodash' class ChromaUpsert_VectorStores implements INode { label: string @@ -68,7 +69,7 @@ class ChromaUpsert_VectorStores implements INode { const chromaURL = nodeData.inputs?.chromaURL as string const output = nodeData.outputs?.output as string - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i])) diff --git a/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts b/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts index 2db6a0384..c94a30762 100644 --- a/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts +++ b/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts @@ -3,6 +3,7 @@ import { Embeddings } from 'langchain/embeddings/base' import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' import { FaissStore } from 'langchain/vectorstores/faiss' +import { flatten } from 'lodash' class FaissUpsert_VectorStores implements INode { label: string @@ -63,7 +64,7 @@ class FaissUpsert_VectorStores implements INode { const output = nodeData.outputs?.output as string const basePath = nodeData.inputs?.basePath as string - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i])) diff --git a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts index 8d89b2ef1..5efae4f4e 100644 --- a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts +++ b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts @@ -3,6 +3,7 @@ import { MemoryVectorStore } from 'langchain/vectorstores/memory' import { Embeddings } from 'langchain/embeddings/base' import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' +import { flatten } from 'lodash' class InMemoryVectorStore_VectorStores implements INode { label: string @@ -55,7 +56,7 @@ class InMemoryVectorStore_VectorStores implements INode { const embeddings = nodeData.inputs?.embeddings as Embeddings const output = nodeData.outputs?.output as string - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i])) diff --git a/packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts b/packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts index d89174d3d..6af660c18 100644 --- a/packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts +++ b/packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts @@ -4,6 +4,7 @@ import { PineconeLibArgs, PineconeStore } from 'langchain/vectorstores/pinecone' import { Embeddings } from 'langchain/embeddings/base' import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' +import { flatten } from 'lodash' class PineconeUpsert_VectorStores implements INode { label: string @@ -90,7 +91,7 @@ class PineconeUpsert_VectorStores implements INode { const pineconeIndex = client.Index(index) - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i])) diff --git a/packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts b/packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts index 0a8af6fd1..18c657896 100644 --- a/packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts +++ b/packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts @@ -4,6 +4,7 @@ import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' import { SupabaseVectorStore } from 'langchain/vectorstores/supabase' import { createClient } from '@supabase/supabase-js' +import { flatten } from 'lodash' class SupabaseUpsert_VectorStores implements INode { label: string @@ -82,7 +83,7 @@ class SupabaseUpsert_VectorStores implements INode { const client = createClient(supabaseProjUrl, supabaseApiKey) - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i])) diff --git a/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts b/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts index 0528d2492..a05f97d22 100644 --- a/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts +++ b/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts @@ -4,6 +4,7 @@ import { Document } from 'langchain/document' import { getBaseClasses } from '../../../src/utils' import { WeaviateLibArgs, WeaviateStore } from 'langchain/vectorstores/weaviate' import weaviate, { WeaviateClient, ApiKey } from 'weaviate-ts-client' +import { flatten } from 'lodash' class WeaviateUpsert_VectorStores implements INode { label: string @@ -122,7 +123,7 @@ class WeaviateUpsert_VectorStores implements INode { const client: WeaviateClient = weaviate.client(clientConfig) - const flattenDocs = docs && docs.length ? docs.flat() : [] + const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { finalDocs.push(new Document(flattenDocs[i]))