From da56cd5f689fdc06fe88911bfc6234d8f2947d43 Mon Sep 17 00:00:00 2001 From: Miles Zimmerman Date: Sun, 16 Apr 2023 13:48:41 +0000 Subject: [PATCH 1/7] feat(components): cohere.ai embeddings node --- .../CohereEmbedding/CohereEmbedding.ts | 40 ++++++++++++++++++ .../embeddings/CohereEmbedding/cohere.png | Bin 0 -> 7847 bytes packages/components/package.json | 3 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts create mode 100644 packages/components/nodes/embeddings/CohereEmbedding/cohere.png diff --git a/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts b/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts new file mode 100644 index 000000000..923cf6c64 --- /dev/null +++ b/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts @@ -0,0 +1,40 @@ +import { INode, INodeData, INodeParams } from '../../../src/Interface' +import { getBaseClasses } from '../../../src/utils' +import { CohereEmbeddings } from 'langchain/embeddings/cohere' + +class CohereEmbedding_Embeddings implements INode { + label: string + name: string + type: string + icon: string + category: string + description: string + baseClasses: string[] + inputs: INodeParams[] + + constructor() { + this.label = 'Cohere Embeddings' + this.name = 'cohereEmbeddings' + this.type = 'CohereEmbeddings' + this.icon = 'cohere.png' + this.category = 'Embeddings' + this.description = 'Cohere API to generate embeddings for a given text' + this.baseClasses = [this.type, ...getBaseClasses(CohereEmbeddings)] + this.inputs = [ + { + label: 'Cohere API Key', + name: 'cohereApiKey', + type: 'password' + } + ] + } + + async init(nodeData: INodeData): Promise { + const apiKey = nodeData.inputs?.cohereApiKey as string + + const model = new CohereEmbeddings({ apiKey }) + return model + } +} + +module.exports = { nodeClass: CohereEmbedding_Embeddings } diff --git a/packages/components/nodes/embeddings/CohereEmbedding/cohere.png b/packages/components/nodes/embeddings/CohereEmbedding/cohere.png new file mode 100644 index 0000000000000000000000000000000000000000..266adeac2214b8627504eaf299c990b28f0448e0 GIT binary patch literal 7847 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 literal 0 HcmV?d00001 diff --git a/packages/components/package.json b/packages/components/package.json index d2d680376..d71499a18 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -21,10 +21,11 @@ "@pinecone-database/pinecone": "^0.0.12", "axios": "^0.27.2", "chromadb": "^1.3.1", + "cohere-ai": "^6.2.0", "dotenv": "^16.0.0", "express": "^4.17.3", "form-data": "^4.0.0", - "langchain": "^0.0.53", + "langchain": "^0.0.56", "moment": "^2.29.3", "node-fetch": "2", "pdf-parse": "^1.1.1", From b28546c2ac6fc134e2bd4fce48f7fb98ff91d1c5 Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Mon, 17 Apr 2023 21:53:47 +0700 Subject: [PATCH 2/7] add cheerio web scraper --- .../nodes/documentloaders/Cheerio/Cheerio.ts | 64 +++++++++++++++++++ .../nodes/documentloaders/Cheerio/cheerio.svg | 5 ++ packages/components/package.json | 1 + 3 files changed, 70 insertions(+) create mode 100644 packages/components/nodes/documentloaders/Cheerio/Cheerio.ts create mode 100644 packages/components/nodes/documentloaders/Cheerio/cheerio.svg diff --git a/packages/components/nodes/documentloaders/Cheerio/Cheerio.ts b/packages/components/nodes/documentloaders/Cheerio/Cheerio.ts new file mode 100644 index 000000000..8be10f742 --- /dev/null +++ b/packages/components/nodes/documentloaders/Cheerio/Cheerio.ts @@ -0,0 +1,64 @@ +import { INode, INodeData, INodeParams } from '../../../src/Interface' +import { TextSplitter } from 'langchain/text_splitter' +import { CheerioWebBaseLoader } from 'langchain/document_loaders/web/cheerio' + +class Cheerio_DocumentLoaders implements INode { + label: string + name: string + description: string + type: string + icon: string + category: string + baseClasses: string[] + inputs: INodeParams[] + + constructor() { + this.label = 'Cheerio Web Scraper' + this.name = 'cheerioWebScraper' + this.type = 'Document' + this.icon = 'cheerio.svg' + this.category = 'Document Loaders' + this.description = `Load data from webpages` + this.baseClasses = [this.type] + this.inputs = [ + { + label: 'URL', + name: 'url', + type: 'string' + }, + { + label: 'Text Splitter', + name: 'textSplitter', + type: 'TextSplitter', + optional: true + } + ] + } + + async init(nodeData: INodeData): Promise { + const textSplitter = nodeData.inputs?.textSplitter as TextSplitter + let url = nodeData.inputs?.url as string + + var urlPattern = new RegExp( + '^(https?:\\/\\/)?' + // validate protocol + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // validate domain name + '((\\d{1,3}\\.){3}\\d{1,3}))' + // validate OR ip (v4) address + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // validate port and path + '(\\?[;&a-z\\d%_.~+=-]*)?' + // validate query string + '(\\#[-a-z\\d_]*)?$', + 'i' + ) // validate fragment locator + + const loader = new CheerioWebBaseLoader(urlPattern.test(url.trim()) ? url.trim() : '') + + if (textSplitter) { + const docs = await loader.loadAndSplit(textSplitter) + return docs + } else { + const docs = await loader.load() + return docs + } + } +} + +module.exports = { nodeClass: Cheerio_DocumentLoaders } diff --git a/packages/components/nodes/documentloaders/Cheerio/cheerio.svg b/packages/components/nodes/documentloaders/Cheerio/cheerio.svg new file mode 100644 index 000000000..8e3334b9f --- /dev/null +++ b/packages/components/nodes/documentloaders/Cheerio/cheerio.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/components/package.json b/packages/components/package.json index d75cda9d5..1775a8cfd 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -20,6 +20,7 @@ "@huggingface/inference": "^1.6.3", "@pinecone-database/pinecone": "^0.0.12", "axios": "^0.27.2", + "cheerio": "^1.0.0-rc.12", "chromadb": "^1.3.1", "d3-dsv": "2", "dotenv": "^16.0.0", From 180990b0258a34640c589c1708296da1241bcb8a Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 17 Apr 2023 20:33:32 +0100 Subject: [PATCH 3/7] clear connected input if node/edge is removed --- .../ui/src/store/context/ReactFlowContext.js | 48 +++++++++++++++++-- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/packages/ui/src/store/context/ReactFlowContext.js b/packages/ui/src/store/context/ReactFlowContext.js index b8b32606b..1a6b979f1 100644 --- a/packages/ui/src/store/context/ReactFlowContext.js +++ b/packages/ui/src/store/context/ReactFlowContext.js @@ -13,13 +13,51 @@ export const flowContext = createContext(initialValue) export const ReactFlowContext = ({ children }) => { const [reactFlowInstance, setReactFlowInstance] = useState(null) - const deleteNode = (id) => { - reactFlowInstance.setNodes(reactFlowInstance.getNodes().filter((n) => n.id !== id)) - reactFlowInstance.setEdges(reactFlowInstance.getEdges().filter((ns) => ns.source !== id && ns.target !== id)) + const deleteNode = (nodeid) => { + deleteConnectedInput(nodeid, 'node') + reactFlowInstance.setNodes(reactFlowInstance.getNodes().filter((n) => n.id !== nodeid)) + reactFlowInstance.setEdges(reactFlowInstance.getEdges().filter((ns) => ns.source !== nodeid && ns.target !== nodeid)) } - const deleteEdge = (id) => { - reactFlowInstance.setEdges(reactFlowInstance.getEdges().filter((edge) => edge.id !== id)) + const deleteEdge = (edgeid) => { + deleteConnectedInput(edgeid, 'edge') + reactFlowInstance.setEdges(reactFlowInstance.getEdges().filter((edge) => edge.id !== edgeid)) + } + + const deleteConnectedInput = (id, type) => { + const connectedEdges = + type === 'node' + ? reactFlowInstance.getEdges().filter((edge) => edge.source === id) + : reactFlowInstance.getEdges().filter((edge) => edge.id === id) + + for (const edge of connectedEdges) { + const targetNodeId = edge.target + const sourceNodeId = edge.source + const targetInput = edge.targetHandle.split('-')[2] + + reactFlowInstance.setNodes((nds) => + nds.map((node) => { + if (node.id === targetNodeId) { + let value + const inputAnchor = node.data.inputAnchors.find((ancr) => ancr.name === targetInput) + if (inputAnchor && inputAnchor.list) { + const values = node.data.inputs[targetInput] || [] + value = values.filter((item) => !item.includes(sourceNodeId)) + } else { + value = '' + } + node.data = { + ...node.data, + inputs: { + ...node.data.inputs, + [targetInput]: value + } + } + } + return node + }) + ) + } } return ( From 4a9d91dd34a177f0118f0f5b1b3552c8bc5811c5 Mon Sep 17 00:00:00 2001 From: Henry Heng Date: Mon, 17 Apr 2023 20:50:57 +0100 Subject: [PATCH 4/7] Update langchain version to ^0.0.53 --- packages/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/package.json b/packages/components/package.json index edf0336f3..83e3e0237 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -26,7 +26,7 @@ "dotenv": "^16.0.0", "express": "^4.17.3", "form-data": "^4.0.0", - "langchain": "^0.0.56", + "langchain": "^0.0.53", "moment": "^2.29.3", "node-fetch": "2", "pdf-parse": "^1.1.1", From eb3897b042b973f35f53a893e51c25b0fe782365 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 17 Apr 2023 22:12:12 +0100 Subject: [PATCH 5/7] add fix to chat message scroll --- packages/ui/src/views/chatmessage/ChatMessage.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index 4fbb54e68..4dbdc8498 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -39,6 +39,7 @@ export const ChatMessage = ({ chatflowid }) => { const customization = useSelector((state) => state.customization) const { confirm } = useConfirm() const dispatch = useDispatch() + const ps = useRef() useNotifier() const enqueueSnackbar = (...args) => dispatch(enqueueSnackbarAction(...args)) @@ -115,7 +116,9 @@ export const ChatMessage = ({ chatflowid }) => { } const scrollToBottom = () => { - messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' }) + if (ps.current) { + ps.current.scrollTo({ top: Number.MAX_SAFE_INTEGER, behavior: 'smooth' }) + } } const addChatMessage = async (message, type) => { @@ -286,7 +289,7 @@ export const ChatMessage = ({ chatflowid }) => {
-
+
{messages.map((message, index) => { return ( // The latest message sent by the user will be animated while waiting for a response @@ -331,7 +334,6 @@ export const ChatMessage = ({ chatflowid }) => { ) })} -
From f938ee7b4b412be2050dabcbaaad1012d05e8b00 Mon Sep 17 00:00:00 2001 From: Henry Heng Date: Tue, 18 Apr 2023 00:03:45 +0100 Subject: [PATCH 6/7] Fix yarn lint --- packages/ui/src/views/chatmessage/ChatMessage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index 4dbdc8498..b6632b1ea 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -55,7 +55,6 @@ export const ChatMessage = ({ chatflowid }) => { } ]) - const messagesEndRef = useRef(null) const inputRef = useRef(null) const anchorRef = useRef(null) const prevOpen = useRef(open) From e1624d11d5ae069b58b9095029a643e695ca6647 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 18 Apr 2023 00:36:18 +0100 Subject: [PATCH 7/7] add sqldbchain and example --- .../SqlDatabaseChain/SqlDatabaseChain.ts | 81 +++++++++ .../chains/SqlDatabaseChain/sqlchain.svg | 7 + .../server/marketplaces/SQL DB Chain.json | 163 ++++++++++++++++++ 3 files changed, 251 insertions(+) create mode 100644 packages/components/nodes/chains/SqlDatabaseChain/SqlDatabaseChain.ts create mode 100644 packages/components/nodes/chains/SqlDatabaseChain/sqlchain.svg create mode 100644 packages/server/marketplaces/SQL DB Chain.json diff --git a/packages/components/nodes/chains/SqlDatabaseChain/SqlDatabaseChain.ts b/packages/components/nodes/chains/SqlDatabaseChain/SqlDatabaseChain.ts new file mode 100644 index 000000000..1f6d9fddb --- /dev/null +++ b/packages/components/nodes/chains/SqlDatabaseChain/SqlDatabaseChain.ts @@ -0,0 +1,81 @@ +import { INode, INodeData, INodeParams } from '../../../src/Interface' +import { SqlDatabaseChain } from 'langchain/chains' +import { getBaseClasses } from '../../../src/utils' +import { DataSource } from 'typeorm' +import { SqlDatabase } from 'langchain/sql_db' +import { BaseLLM } from 'langchain/llms/base' + +class SqlDatabaseChain_Chains implements INode { + label: string + name: string + type: string + icon: string + category: string + baseClasses: string[] + description: string + inputs: INodeParams[] + + constructor() { + this.label = 'Sql Database Chain' + this.name = 'sqlDatabaseChain' + this.type = 'SqlDatabaseChain' + this.icon = 'sqlchain.svg' + this.category = 'Chains' + this.description = 'Answer questions over a SQL database' + this.baseClasses = [this.type, ...getBaseClasses(SqlDatabaseChain)] + this.inputs = [ + { + label: 'LLM', + name: 'llm', + type: 'BaseLLM' + }, + { + label: 'Database', + name: 'database', + type: 'options', + options: [ + { + label: 'SQlite', + name: 'sqlite' + } + ], + default: 'sqlite' + }, + { + label: 'Database File Path', + name: 'dbFilePath', + type: 'string', + placeholder: 'C:/Users/chinook.db' + } + ] + } + + async init(nodeData: INodeData): Promise { + const databaseType = nodeData.inputs?.database + const llm = nodeData.inputs?.llm as BaseLLM + const dbFilePath = nodeData.inputs?.dbFilePath + + const datasource = new DataSource({ + type: databaseType, + database: dbFilePath + }) + + const db = await SqlDatabase.fromDataSourceParams({ + appDataSource: datasource + }) + + const chain = new SqlDatabaseChain({ + llm, + database: db + }) + return chain + } + + async run(nodeData: INodeData, input: string): Promise { + const chain = nodeData.instance as SqlDatabaseChain + const res = await chain.run(input) + return res + } +} + +module.exports = { nodeClass: SqlDatabaseChain_Chains } diff --git a/packages/components/nodes/chains/SqlDatabaseChain/sqlchain.svg b/packages/components/nodes/chains/SqlDatabaseChain/sqlchain.svg new file mode 100644 index 000000000..dcf937b35 --- /dev/null +++ b/packages/components/nodes/chains/SqlDatabaseChain/sqlchain.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/packages/server/marketplaces/SQL DB Chain.json b/packages/server/marketplaces/SQL DB Chain.json new file mode 100644 index 000000000..4d8b35c8a --- /dev/null +++ b/packages/server/marketplaces/SQL DB Chain.json @@ -0,0 +1,163 @@ +{ + "description": "Answer questions over a SQL database", + "nodes": [ + { + "width": 300, + "height": 424, + "id": "sqlDatabaseChain_0", + "position": { + "x": 1271.2742585099204, + "y": 232.91561199714107 + }, + "type": "customNode", + "data": { + "id": "sqlDatabaseChain_0", + "label": "Sql Database Chain", + "name": "sqlDatabaseChain", + "type": "SqlDatabaseChain", + "baseClasses": ["SqlDatabaseChain", "BaseChain"], + "category": "Chains", + "description": "Answer questions over a SQL database", + "inputParams": [ + { + "label": "Database", + "name": "database", + "type": "options", + "options": [ + { + "label": "SQlite", + "name": "sqlite" + } + ], + "default": "sqlite" + }, + { + "label": "Database File Path", + "name": "dbFilePath", + "type": "string", + "placeholder": "C:/Users/chinook.db" + } + ], + "inputAnchors": [ + { + "label": "LLM", + "name": "llm", + "type": "BaseLLM", + "id": "sqlDatabaseChain_0-input-llm-BaseLLM" + } + ], + "inputs": { + "llm": "{{openAI_0.data.instance}}", + "database": "sqlite", + "dbFilePath": "" + }, + "outputAnchors": [ + { + "id": "sqlDatabaseChain_0-output-sqlDatabaseChain-SqlDatabaseChain|BaseChain", + "name": "sqlDatabaseChain", + "label": "SqlDatabaseChain", + "type": "SqlDatabaseChain | BaseChain" + } + ], + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 1271.2742585099204, + "y": 232.91561199714107 + }, + "dragging": false + }, + { + "width": 300, + "height": 472, + "id": "openAI_0", + "position": { + "x": 867.8574087065126, + "y": 209.58625096303308 + }, + "type": "customNode", + "data": { + "id": "openAI_0", + "label": "OpenAI", + "name": "openAI", + "type": "OpenAI", + "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], + "category": "LLMs", + "description": "Wrapper around OpenAI large language models", + "inputParams": [ + { + "label": "OpenAI Api Key", + "name": "openAIApiKey", + "type": "password" + }, + { + "label": "Model Name", + "name": "modelName", + "type": "options", + "options": [ + { + "label": "text-davinci-003", + "name": "text-davinci-003" + }, + { + "label": "text-davinci-002", + "name": "text-davinci-002" + }, + { + "label": "text-curie-001", + "name": "text-curie-001" + }, + { + "label": "text-babbage-001", + "name": "text-babbage-001" + } + ], + "default": "text-davinci-003", + "optional": true + }, + { + "label": "Temperature", + "name": "temperature", + "type": "number", + "default": 0.7, + "optional": true + } + ], + "inputAnchors": [], + "inputs": { + "modelName": "text-davinci-003", + "temperature": "0" + }, + "outputAnchors": [ + { + "id": "openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel", + "name": "openAI", + "label": "OpenAI", + "type": "OpenAI | BaseLLM | BaseLanguageModel" + } + ], + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 867.8574087065126, + "y": 209.58625096303308 + }, + "dragging": false + } + ], + "edges": [ + { + "source": "openAI_0", + "sourceHandle": "openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel", + "target": "sqlDatabaseChain_0", + "targetHandle": "sqlDatabaseChain_0-input-llm-BaseLLM", + "type": "buttonedge", + "id": "openAI_0-openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel-sqlDatabaseChain_0-sqlDatabaseChain_0-input-llm-BaseLLM", + "data": { + "label": "" + } + } + ] +}