@n8n/n8n-nodes-langchain 1.57.0 → 1.58.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/known/nodes.json +4 -0
- package/dist/nodes/agents/Agent/Agent.node.js +1 -2
- package/dist/nodes/agents/Agent/Agent.node.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js +3 -4
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.js +10 -10
- package/dist/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js +1 -1
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js +2 -2
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/execute.js +8 -9
- package/dist/nodes/agents/Agent/agents/SqlAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.js +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/execute.js +28 -12
- package/dist/nodes/agents/Agent/agents/ToolsAgent/execute.js.map +1 -1
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js +5 -6
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js.map +1 -1
- package/dist/nodes/chains/ChainLLM/ChainLlm.node.js +5 -6
- package/dist/nodes/chains/ChainLLM/ChainLlm.node.js.map +1 -1
- package/dist/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.js +1 -1
- package/dist/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.js.map +1 -1
- package/dist/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.js +4 -5
- package/dist/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.js.map +1 -1
- package/dist/nodes/chains/InformationExtractor/InformationExtractor.node.js +2 -3
- package/dist/nodes/chains/InformationExtractor/InformationExtractor.node.js.map +1 -1
- package/dist/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.js +5 -7
- package/dist/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.js.map +1 -1
- package/dist/nodes/chains/TextClassifier/TextClassifier.node.js +17 -9
- package/dist/nodes/chains/TextClassifier/TextClassifier.node.js.map +1 -1
- package/dist/nodes/code/Code.node.js +7 -12
- package/dist/nodes/code/Code.node.js.map +1 -1
- package/dist/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.js +1 -1
- package/dist/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.js.map +1 -1
- package/dist/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.js +2 -4
- package/dist/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.js.map +1 -1
- package/dist/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.js +2 -3
- package/dist/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.js.map +1 -1
- package/dist/nodes/llms/LMOpenAi/LmOpenAi.node.js +3 -5
- package/dist/nodes/llms/LMOpenAi/LmOpenAi.node.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js +2 -3
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js.map +1 -1
- package/dist/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.js +3 -6
- package/dist/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.js.map +1 -1
- package/dist/nodes/llms/LmChatGoogleVertex/error-handling.js +1 -1
- package/dist/nodes/llms/LmChatGoogleVertex/error-handling.js.map +1 -1
- package/dist/nodes/llms/N8nLlmTracing.js +4 -5
- package/dist/nodes/llms/N8nLlmTracing.js.map +1 -1
- package/dist/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.js +1 -2
- package/dist/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.js.map +1 -1
- package/dist/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.js +3 -4
- package/dist/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.js.map +1 -1
- package/dist/nodes/memory/MemoryManager/MemoryManager.node.js +3 -5
- package/dist/nodes/memory/MemoryManager/MemoryManager.node.js.map +1 -1
- package/dist/nodes/output_parser/OutputParserItemList/ItemListOutputParser.js +2 -4
- package/dist/nodes/output_parser/OutputParserItemList/ItemListOutputParser.js.map +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js +4 -2
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js.map +1 -1
- package/dist/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.js +1 -1
- package/dist/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.js.map +1 -1
- package/dist/nodes/tools/ToolHttpRequest/utils.js +5 -6
- package/dist/nodes/tools/ToolHttpRequest/utils.js.map +1 -1
- package/dist/nodes/tools/ToolWorkflow/ToolWorkflow.node.js +1 -1
- package/dist/nodes/tools/ToolWorkflow/ToolWorkflow.node.js.map +1 -1
- package/dist/nodes/trigger/ChatTrigger/ChatTrigger.node.js +9 -11
- package/dist/nodes/trigger/ChatTrigger/ChatTrigger.node.js.map +1 -1
- package/dist/nodes/trigger/ChatTrigger/GenericFunctions.js +1 -2
- package/dist/nodes/trigger/ChatTrigger/GenericFunctions.js.map +1 -1
- package/dist/nodes/trigger/ChatTrigger/templates.js +1 -2
- package/dist/nodes/trigger/ChatTrigger/templates.js.map +1 -1
- package/dist/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.d.ts +12 -0
- package/dist/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.js +226 -0
- package/dist/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.js.map +1 -0
- package/dist/nodes/vector_store/VectorStorePGVector/postgres.svg +1 -0
- package/dist/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.js +3 -5
- package/dist/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.js.map +1 -1
- package/dist/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.js +2 -4
- package/dist/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.js.map +1 -1
- package/dist/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.js +3 -5
- package/dist/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.js.map +1 -1
- package/dist/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.js +2 -3
- package/dist/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.js.map +1 -1
- package/dist/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.js +1 -2
- package/dist/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.js.map +1 -1
- package/dist/nodes/vector_store/shared/createVectorStoreNode.js +7 -10
- package/dist/nodes/vector_store/shared/createVectorStoreNode.js.map +1 -1
- package/dist/nodes/vector_store/shared/methods/listSearch.js +1 -2
- package/dist/nodes/vector_store/shared/methods/listSearch.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/create.operation.js +2 -3
- package/dist/nodes/vendors/OpenAi/actions/assistant/create.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js +6 -7
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/update.operation.js +1 -2
- package/dist/nodes/vendors/OpenAi/actions/assistant/update.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/file/upload.operation.js +1 -2
- package/dist/nodes/vendors/OpenAi/actions/file/upload.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/router.js +1 -1
- package/dist/nodes/vendors/OpenAi/actions/router.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/text/message.operation.js +5 -6
- package/dist/nodes/vendors/OpenAi/actions/text/message.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js +1 -1
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/methods/listSearch.js +8 -14
- package/dist/nodes/vendors/OpenAi/methods/listSearch.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/transport/index.js +2 -2
- package/dist/nodes/vendors/OpenAi/transport/index.js.map +1 -1
- package/dist/types/nodes.json +5 -4
- package/dist/utils/N8nBinaryLoader.js +1 -1
- package/dist/utils/N8nBinaryLoader.js.map +1 -1
- package/dist/utils/N8nJsonLoader.js +1 -2
- package/dist/utils/N8nJsonLoader.js.map +1 -1
- package/dist/utils/N8nTool.js +1 -1
- package/dist/utils/N8nTool.js.map +1 -1
- package/dist/utils/helpers.js +3 -6
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/logWrapper.d.ts +4 -3
- package/dist/utils/logWrapper.js +3 -5
- package/dist/utils/logWrapper.js.map +1 -1
- package/dist/utils/schemaParsing.js +2 -4
- package/dist/utils/schemaParsing.js.map +1 -1
- package/dist/utils/sharedFields.js +1 -2
- package/dist/utils/sharedFields.js.map +1 -1
- package/dist/utils/tracing.js +1 -2
- package/dist/utils/tracing.js.map +1 -1
- package/package.json +5 -4
package/dist/known/nodes.json
CHANGED
|
@@ -271,6 +271,10 @@
|
|
|
271
271
|
"className": "VectorStoreInMemoryLoad",
|
|
272
272
|
"sourcePath": "dist/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.js"
|
|
273
273
|
},
|
|
274
|
+
"vectorStorePGVector": {
|
|
275
|
+
"className": "VectorStorePGVector",
|
|
276
|
+
"sourcePath": "dist/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.js"
|
|
277
|
+
},
|
|
274
278
|
"vectorStorePinecone": {
|
|
275
279
|
"className": "VectorStorePinecone",
|
|
276
280
|
"sourcePath": "dist/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.js"
|
|
@@ -208,7 +208,6 @@ const agentTypeProperty = {
|
|
|
208
208
|
};
|
|
209
209
|
class Agent {
|
|
210
210
|
constructor() {
|
|
211
|
-
var _a;
|
|
212
211
|
this.description = {
|
|
213
212
|
displayName: 'AI Agent',
|
|
214
213
|
name: 'agent',
|
|
@@ -280,7 +279,7 @@ class Agent {
|
|
|
280
279
|
},
|
|
281
280
|
{
|
|
282
281
|
...agentTypeProperty,
|
|
283
|
-
options:
|
|
282
|
+
options: agentTypeProperty?.options?.filter((o) => 'value' in o && o.value !== 'toolsAgent'),
|
|
284
283
|
displayOptions: { show: { '@version': [{ _cnd: { lte: 1.5 } }] } },
|
|
285
284
|
default: 'conversationalAgent',
|
|
286
285
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.node.js","sourceRoot":"","sources":["../../../../nodes/agents/Agent/Agent.node.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;
|
|
1
|
+
{"version":3,"file":"Agent.node.js","sourceRoot":"","sources":["../../../../nodes/agents/Agent/Agent.node.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AAUtE,8DAA2E;AAC3E,0EAAyF;AACzF,kEAAkF;AAClF,2EAA2F;AAC3F,mEAAoF;AACpF,0EAAyF;AACzF,kEAAkF;AAClF,iEAA4E;AAC5E,yDAAqE;AACrE,+DAAwE;AACxE,uDAAiE;AACjE,iEAAuE;AACvE,yDAAgE;AAIhE,SAAS,SAAS,CACjB,KAAgG,EAChG,eAAyB;IAQzB,MAAM,YAAY,GAAG,CACpB,MAAsB,EACgC,EAAE;QACxD,MAAM,YAAY,GAA8B;YAC/C,oBAAoC,EAAE,OAAO;YAC7C,aAA6B,EAAE,QAAQ;YACvC,WAA2B,EAAE,MAAM;YACnC,mBAAmC,EAAE,eAAe;SACpD,CAAC;QAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;YACtC,MAAM,WAAW,GAAG,IAAI,uBAAuC,CAAC;YAChE,IAAI,WAAW,GAAG,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,IACC,WAAW;gBACX,CAAC,sBAAsB,EAAE,YAAY,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC5E,CAAC;gBACF,WAAW,GAAG,YAAY,CAAC;YAC5B,CAAC;YACD,MAAM,KAAK,GAA4B;gBACtC,IAAI;gBACJ,WAAW;gBACX,QAAQ,EAAE,WAAW;gBACrB,cAAc,EAAE,iCAAiE,CAAC,QAAQ,CACzF,IAA0B,CAC1B;oBACA,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,SAAS;aACZ,CAAC;YAEF,IAAI,MAAM,EAAE,CAAC;gBACZ,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,CAAC;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,aAAa,GAAmB,EAAE,CAAC;IAEvC,IAAI,KAAK,KAAK,qBAAqB,EAAE,CAAC;QACrC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;gBACxC,MAAM,EAAE;oBACP,KAAK,EAAE;wBACN,0CAA0C;wBAC1C,2CAA2C;wBAC3C,qCAAqC;wBACrC,uCAAuC;wBACvC,uCAAuC;wBACvC,2CAA2C;wBAC3C,6CAA6C;wBAC7C,6CAA6C;wBAC7C,6CAA6C;wBAC7C,4CAA4C;qBAC5C;iBACD;aACD;YACD;gBACC,IAAI,aAA6B;aACjC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QACnC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;gBACxC,MAAM,EAAE;oBACP,KAAK,EAAE;wBACN,0CAA0C;wBAC1C,4CAA4C;wBAC5C,6CAA6C;wBAC7C,uCAAuC;wBACvC,uCAAuC;wBACvC,qCAAqC;wBACrC,6CAA6C;qBAC7C;iBACD;aACD;YACD;gBACC,IAAI,aAA6B;aACjC;YACD;gBACC,IAAI,WAA2B;gBAC/B,QAAQ,EAAE,IAAI;aACd;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,sBAAsB,EAAE,CAAC;QAC7C,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;gBACxC,MAAM,EAAE;oBACP,KAAK,EAAE;wBACN,uCAAuC;wBACvC,4CAA4C;qBAC5C;iBACD;aACD;YACD;gBACC,IAAI,aAA6B;aACjC;YACD;gBACC,IAAI,WAA2B;gBAC/B,QAAQ,EAAE,IAAI;aACd;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QACnC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;QACjC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,aAA6B;aACjC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,qBAAqB,EAAE,CAAC;QAC5C,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;IAED,IAAI,eAAe,KAAK,KAAK,EAAE,CAAC;QAC/B,aAAa,GAAG,aAAa,CAAC,MAAM,CACnC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,sBAAsC,CAC3D,CAAC;IACH,CAAC;IACD,OAAO,SAA0B,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,iBAAiB,GAAoB;IAC1C,WAAW,EAAE,OAAO;IACpB,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,SAAS;IACf,gBAAgB,EAAE,IAAI;IAEtB,OAAO,EAAE;QACR;YACC,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,YAAY;YACnB,WAAW,EACV,4NAA4N;SAC7N;QACD;YACC,IAAI,EAAE,sBAAsB;YAC5B,KAAK,EAAE,qBAAqB;YAC5B,WAAW,EACV,sOAAsO;SACvO;QACD;YACC,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,sBAAsB;YAC7B,WAAW,EACV,2KAA2K;SAC5K;QACD;YACC,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,qBAAqB;YAC5B,WAAW,EACV,oJAAoJ;SACrJ;QACD;YACC,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,YAAY;YACnB,WAAW,EACV,4IAA4I;SAC7I;QACD;YACC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,UAAU;YACjB,WAAW,EACV,gJAAgJ;SACjJ;KACD;IACD,OAAO,EAAE,EAAE;CACX,CAAC;AAEF,MAAa,KAAK;IAAlB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,OAAO;YAClB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YAC1C,WAAW,EAAE,mEAAmE;YAChF,QAAQ,EACP,sPAAsP;YACvP,QAAQ,EAAE;gBACT,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,SAAS;aAChB;YACD,KAAK,EAAE;gBACN,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC;gBACpF,UAAU,EAAE,CAAC,IAAI,CAAC;gBAClB,aAAa,EAAE;oBACd,EAAE,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;iBAC5B;gBACD,SAAS,EAAE;oBACV,oBAAoB,EAAE;wBACrB;4BACC,GAAG,EAAE,8FAA8F;yBACnG;qBACD;iBACD;aACD;YACD,MAAM,EAAE;;MAEJ,SAAS,CAAC,QAAQ,EAAE;;;KAGrB;YACH,OAAO,EAAE,QAAyB;YAClC,WAAW,EAAE;gBACZ;oBAEC,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,qBAAqB;oBAC/B,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;4BACnB,aAAa,EAAE,CAAC,OAAO,CAAC;yBACxB;qBACD;iBACD;gBACD;oBACC,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI;oBACd,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;4BACnB,aAAa,EAAE,CAAC,UAAU,CAAC;yBAC3B;qBACD;iBACD;aACD;YACD,UAAU,EAAE;gBACX;oBACC,WAAW,EACV,yNAAyN;oBAC1N,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;yBAC5C;qBACD;iBACD;gBAED;oBACC,GAAG,iBAAiB;oBACpB,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,YAAY,CAC/C;oBACD,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;oBAClE,OAAO,EAAE,qBAAqB;iBAC9B;gBAED;oBACC,GAAG,iBAAiB;oBACpB,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;oBAClE,OAAO,EAAE,YAAY;iBACrB;gBACD;oBACC,GAAG,gCAAiB;oBACpB,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;4BACpC,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,GAAG,wBAAS;oBACZ,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,QAAQ,CAAC;yBACtB;wBACD,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,WAAW,EAAE,gCAAgC;oBAC7C,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,KAAK;oBACd,gBAAgB,EAAE,IAAI;oBACtB,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;4BACpC,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,WAAW,EAAE,8FAA8F,iBAAiC,4EAA4E;oBACxN,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,eAAe,EAAE,CAAC,IAAI,CAAC;yBACvB;qBACD;iBACD;gBAED,GAAG,kCAAoB;gBACvB,GAAG,2CAA6B;gBAChC,GAAG,4CAA8B;gBACjC,GAAG,uCAAyB;gBAC5B,GAAG,qCAAuB;gBAC1B,GAAG,2CAA6B;aAChC;SACD,CAAC;IAsBH,CAAC;IApBA,KAAK,CAAC,OAAO;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAW,CAAC;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;QAE/C,IAAI,SAAS,KAAK,qBAAqB,EAAE,CAAC;YACzC,OAAO,MAAM,oCAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,SAAS,KAAK,YAAY,EAAE,CAAC;YACvC,OAAO,MAAM,2BAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;YACjD,OAAO,MAAM,qCAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,SAAS,KAAK,YAAY,EAAE,CAAC;YACvC,OAAO,MAAM,gCAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YACrC,OAAO,MAAM,8BAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,SAAS,KAAK,qBAAqB,EAAE,CAAC;YAChD,OAAO,MAAM,oCAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,mBAAmB,SAAS,oBAAoB,CAAC,CAAC;IAChG,CAAC;CACD;AAlKD,sBAkKC"}
|
|
@@ -9,7 +9,6 @@ const helpers_1 = require("../../../../../utils/helpers");
|
|
|
9
9
|
const tracing_1 = require("../../../../../utils/tracing");
|
|
10
10
|
const schemaParsing_1 = require("../../../../../utils/schemaParsing");
|
|
11
11
|
async function conversationalAgentExecute(nodeVersion) {
|
|
12
|
-
var _a;
|
|
13
12
|
this.logger.debug('Executing Conversational Agent');
|
|
14
13
|
const model = await this.getInputConnectionData("ai_languageModel", 0);
|
|
15
14
|
if (!(0, helpers_1.isChatInstance)(model)) {
|
|
@@ -22,8 +21,8 @@ async function conversationalAgentExecute(nodeVersion) {
|
|
|
22
21
|
const agentExecutor = await (0, agents_1.initializeAgentExecutorWithOptions)(tools, model, {
|
|
23
22
|
agentType: 'chat-conversational-react-description',
|
|
24
23
|
memory,
|
|
25
|
-
returnIntermediateSteps:
|
|
26
|
-
maxIterations:
|
|
24
|
+
returnIntermediateSteps: options?.returnIntermediateSteps === true,
|
|
25
|
+
maxIterations: options.maxIterations ?? 10,
|
|
27
26
|
agentArgs: {
|
|
28
27
|
systemMessage: options.systemMessage,
|
|
29
28
|
humanMessage: options.humanMessage,
|
|
@@ -79,7 +78,7 @@ async function conversationalAgentExecute(nodeVersion) {
|
|
|
79
78
|
}
|
|
80
79
|
catch (error) {
|
|
81
80
|
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
82
|
-
if (this.continueOnFail(
|
|
81
|
+
if (this.continueOnFail()) {
|
|
83
82
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
84
83
|
continue;
|
|
85
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":";;AAiBA,gEA6GC;AA9HD,+CAAsE;AAGtE,6CAAsE;AAGtE,qDAAyD;AACzD,6DAAiE;AACjE,0DAKsC;AACtC,0DAAgE;AAChE,sEAAuE;AAEhE,KAAK,UAAU,0BAA0B,CAE/C,WAAmB
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const openai_1 = require("@langchain/openai");
|
|
|
10
10
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
11
11
|
const tracing_1 = require("../../../../../utils/tracing");
|
|
12
12
|
async function openAiFunctionsAgentExecute(nodeVersion) {
|
|
13
|
-
var _a;
|
|
14
13
|
this.logger.debug('Executing OpenAi Functions Agent');
|
|
15
14
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
16
15
|
if (!(model instanceof openai_1.ChatOpenAI)) {
|
|
@@ -26,14 +25,15 @@ async function openAiFunctionsAgentExecute(nodeVersion) {
|
|
|
26
25
|
prefix: options.systemMessage,
|
|
27
26
|
}),
|
|
28
27
|
tools,
|
|
29
|
-
maxIterations:
|
|
30
|
-
returnIntermediateSteps:
|
|
31
|
-
memory: memory
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
28
|
+
maxIterations: options.maxIterations ?? 10,
|
|
29
|
+
returnIntermediateSteps: options?.returnIntermediateSteps === true,
|
|
30
|
+
memory: memory ??
|
|
31
|
+
new memory_1.BufferMemory({
|
|
32
|
+
returnMessages: true,
|
|
33
|
+
memoryKey: 'chat_history',
|
|
34
|
+
inputKey: 'input',
|
|
35
|
+
outputKey: 'output',
|
|
36
|
+
}),
|
|
37
37
|
};
|
|
38
38
|
const agentExecutor = agents_1.AgentExecutor.fromAgentAndTools(agentConfig);
|
|
39
39
|
const returnData = [];
|
|
@@ -79,7 +79,7 @@ async function openAiFunctionsAgentExecute(nodeVersion) {
|
|
|
79
79
|
returnData.push({ json: response });
|
|
80
80
|
}
|
|
81
81
|
catch (error) {
|
|
82
|
-
if (this.continueOnFail(
|
|
82
|
+
if (this.continueOnFail()) {
|
|
83
83
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
84
84
|
continue;
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts"],"names":[],"mappings":";;AAqBA,kEA2GC;AAhID,+CAKsB;AAGtB,6CAA8D;AAE9D,qDAAyD;AACzD,6DAAiE;AACjE,6CAAqE;AACrE,8CAA+C;AAC/C,0DAIsC;AACtC,0DAAgE;AAEzD,KAAK,UAAU,2BAA2B,CAEhD,WAAmB
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ async function planAndExecuteAgentExecute(nodeVersion) {
|
|
|
63
63
|
}
|
|
64
64
|
catch (error) {
|
|
65
65
|
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
66
|
-
if (this.continueOnFail(
|
|
66
|
+
if (this.continueOnFail()) {
|
|
67
67
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
68
68
|
continue;
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ async function reActAgentAgentExecute(nodeVersion) {
|
|
|
31
31
|
const agentExecutor = agents_1.AgentExecutor.fromAgentAndTools({
|
|
32
32
|
agent,
|
|
33
33
|
tools,
|
|
34
|
-
returnIntermediateSteps:
|
|
34
|
+
returnIntermediateSteps: options?.returnIntermediateSteps === true,
|
|
35
35
|
});
|
|
36
36
|
const returnData = [];
|
|
37
37
|
let outputParser;
|
|
@@ -77,7 +77,7 @@ async function reActAgentAgentExecute(nodeVersion) {
|
|
|
77
77
|
}
|
|
78
78
|
catch (error) {
|
|
79
79
|
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
80
|
-
if (this.continueOnFail(
|
|
80
|
+
if (this.continueOnFail()) {
|
|
81
81
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
82
82
|
continue;
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":";;AAsBA,wDAwGC;AA9HD,+CAKsB;AAEtB,6CAA2E;AAG3E,qDAAyD;AACzD,6DAAiE;AAEjE,0DAKsC;AACtC,0DAAgE;AAChE,sEAAuE;AAEhE,KAAK,UAAU,sBAAsB,CAE3C,WAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAE3C,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,qBAAqC,CAAC,CAAC,CAEvE,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAiB,EAAC,IAAI,EAAE,WAAW,IAAI,GAAG,CAAC,CAAC;IAEhE,MAAM,aAAa,GAAG,MAAM,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAMrD,CAAC;IACF,IAAI,KAAgC,CAAC;IAErC,IAAI,IAAA,wBAAc,EAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,KAAK,GAAG,kBAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE;YAC/C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,UAAU;YAC1B,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SAClD,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,sBAAa,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE;YACnD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;SACtB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,sBAAa,CAAC,iBAAiB,CAAC;QACrD,KAAK;QACL,KAAK;QACL,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ const parseTablesString = (tablesString) => tablesString
|
|
|
15
15
|
.map((table) => table.trim())
|
|
16
16
|
.filter((table) => table.length > 0);
|
|
17
17
|
async function sqlAgentAgentExecute() {
|
|
18
|
-
var _a, _b, _c, _d, _e, _f;
|
|
19
18
|
this.logger.debug('Executing SQL Agent');
|
|
20
19
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
21
20
|
const items = this.getInputData();
|
|
@@ -41,8 +40,8 @@ async function sqlAgentAgentExecute() {
|
|
|
41
40
|
const options = this.getNodeParameter('options', i, {});
|
|
42
41
|
const selectedDataSource = this.getNodeParameter('dataSource', i, 'sqlite');
|
|
43
42
|
const includedSampleRows = options.includedSampleRows;
|
|
44
|
-
const includedTablesArray = parseTablesString(
|
|
45
|
-
const ignoredTablesArray = parseTablesString(
|
|
43
|
+
const includedTablesArray = parseTablesString(options.includedTables ?? '');
|
|
44
|
+
const ignoredTablesArray = parseTablesString(options.ignoredTables ?? '');
|
|
46
45
|
let dataSource = null;
|
|
47
46
|
if (selectedDataSource === 'sqlite') {
|
|
48
47
|
if (!item.binary) {
|
|
@@ -61,16 +60,16 @@ async function sqlAgentAgentExecute() {
|
|
|
61
60
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No data source found, please configure data source');
|
|
62
61
|
}
|
|
63
62
|
const agentOptions = {
|
|
64
|
-
topK:
|
|
65
|
-
prefix:
|
|
66
|
-
suffix:
|
|
63
|
+
topK: options.topK ?? 10,
|
|
64
|
+
prefix: options.prefixPrompt ?? prompts_1.SQL_PREFIX,
|
|
65
|
+
suffix: options.suffixPrompt ?? prompts_1.SQL_SUFFIX,
|
|
67
66
|
inputVariables: ['chatHistory', 'input', 'agent_scratchpad'],
|
|
68
67
|
};
|
|
69
68
|
const dbInstance = await sql_db_1.SqlDatabase.fromDataSourceParams({
|
|
70
69
|
appDataSource: dataSource,
|
|
71
70
|
includesTables: includedTablesArray.length > 0 ? includedTablesArray : undefined,
|
|
72
71
|
ignoreTables: ignoredTablesArray.length > 0 ? ignoredTablesArray : undefined,
|
|
73
|
-
sampleRowsInTableInfo: includedSampleRows
|
|
72
|
+
sampleRowsInTableInfo: includedSampleRows ?? 3,
|
|
74
73
|
});
|
|
75
74
|
const toolkit = new sql_1.SqlToolkit(dbInstance, model);
|
|
76
75
|
const agentExecutor = (0, sql_1.createSqlAgent)(model, toolkit, agentOptions);
|
|
@@ -90,7 +89,7 @@ async function sqlAgentAgentExecute() {
|
|
|
90
89
|
});
|
|
91
90
|
}
|
|
92
91
|
catch (error) {
|
|
93
|
-
if (
|
|
92
|
+
if (error.message?.output) {
|
|
94
93
|
response = error.message;
|
|
95
94
|
}
|
|
96
95
|
else {
|
|
@@ -100,7 +99,7 @@ async function sqlAgentAgentExecute() {
|
|
|
100
99
|
returnData.push({ json: response });
|
|
101
100
|
}
|
|
102
101
|
catch (error) {
|
|
103
|
-
if (this.continueOnFail(
|
|
102
|
+
if (this.continueOnFail()) {
|
|
104
103
|
returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
|
|
105
104
|
continue;
|
|
106
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/SqlAgent/execute.ts"],"names":[],"mappings":";;AA4BA,oDA8HC;AA1JD,+CAMsB;AAEtB,6CAA+C;AAE/C,uDAA2E;AAK3E,0DAA0F;AAC1F,0DAAgE;AAChE,oDAA8D;AAC9D,wDAAkE;AAClE,6CAAyD;AACzD,kDAA4D;AAE5D,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE,CAClD,YAAY;KACV,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;KAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAEhC,KAAK,UAAU,oBAAoB
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/SqlAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ const temp = __importStar(require("temp"));
|
|
|
30
30
|
const sqlite3 = __importStar(require("sqlite3"));
|
|
31
31
|
const typeorm_1 = require("@n8n/typeorm");
|
|
32
32
|
async function getSqliteDataSource(binary, binaryPropertyName = 'data') {
|
|
33
|
-
const binaryData = binary
|
|
33
|
+
const binaryData = binary?.[binaryPropertyName];
|
|
34
34
|
if (!binaryData) {
|
|
35
35
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No binary data received.');
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../../../../../../../nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAyCC;AAhDD,uCAAyB;AAEzB,+CAAmE;AACnE,2CAA6B;AAC7B,iDAAmC;AACnC,0CAA0C;AAEnC,KAAK,UAAU,mBAAmB,CAExC,MAAoC,EACpC,kBAAkB,GAAG,MAAM;IAE3B,MAAM,UAAU,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../../../../../../../nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAyCC;AAhDD,uCAAyB;AAEzB,+CAAmE;AACnE,2CAA6B;AAC7B,iDAAmC;AACnC,0CAA0C;AAEnC,KAAK,UAAU,mBAAmB,CAExC,MAAoC,EACpC,kBAAkB,GAAG,MAAM;IAE3B,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,kBAAkB,CAAC,CAAC;IAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,UAAU,CAAC;IACf,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;QACnB,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACzD,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACP,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,8BAAe,CAAC,CAAC;IAG9D,IAAI,CAAC,KAAK,EAAE,CAAC;IAEb,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAG3C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAmB,EAAE,EAAE;QACvE,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAC/E,CAAC;IACF,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,EAAE,CAAC;IAEf,OAAO,IAAI,oBAAU,CAAC;QACrB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,UAAU;KACpB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -6,10 +6,10 @@ const agents_1 = require("langchain/agents");
|
|
|
6
6
|
const prompts_1 = require("@langchain/core/prompts");
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const tools_1 = require("@langchain/core/tools");
|
|
9
|
-
const runnables_1 = require("@langchain/core/runnables");
|
|
10
9
|
const zod_1 = require("zod");
|
|
11
10
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
12
11
|
const messages_1 = require("@langchain/core/messages");
|
|
12
|
+
const runnables_1 = require("@langchain/core/runnables");
|
|
13
13
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
14
14
|
const prompt_1 = require("./prompt");
|
|
15
15
|
function getOutputParserSchema(outputParser) {
|
|
@@ -27,8 +27,7 @@ function getOutputParserSchema(outputParser) {
|
|
|
27
27
|
return schema;
|
|
28
28
|
}
|
|
29
29
|
async function extractBinaryMessages(ctx) {
|
|
30
|
-
|
|
31
|
-
const binaryData = (_c = (_b = (_a = ctx.getInputData(0, 'main')) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.binary) !== null && _c !== void 0 ? _c : {};
|
|
30
|
+
const binaryData = ctx.getInputData(0, 'main')?.[0]?.binary ?? {};
|
|
32
31
|
const binaryMessages = await Promise.all(Object.values(binaryData)
|
|
33
32
|
.filter((data) => data.mimeType.startsWith('image/'))
|
|
34
33
|
.map(async (data) => {
|
|
@@ -54,7 +53,6 @@ async function extractBinaryMessages(ctx) {
|
|
|
54
53
|
});
|
|
55
54
|
}
|
|
56
55
|
async function toolsAgentExecute() {
|
|
57
|
-
var _a, _b, _c, _d, _e;
|
|
58
56
|
this.logger.debug('Executing Tools Agent');
|
|
59
57
|
const model = await this.getInputConnectionData("ai_languageModel", 0);
|
|
60
58
|
if (!(0, helpers_1.isChatInstance)(model) || !model.bindTools) {
|
|
@@ -62,13 +60,31 @@ async function toolsAgentExecute() {
|
|
|
62
60
|
}
|
|
63
61
|
const memory = (await this.getInputConnectionData("ai_memory", 0));
|
|
64
62
|
const tools = (await (0, helpers_1.getConnectedTools)(this, true, false));
|
|
65
|
-
const outputParser = (
|
|
63
|
+
const outputParser = (await (0, helpers_1.getOptionalOutputParsers)(this))?.[0];
|
|
66
64
|
let structuredOutputParserTool;
|
|
65
|
+
function handleAgentFinishOutput(steps) {
|
|
66
|
+
const agentFinishSteps = steps;
|
|
67
|
+
if (agentFinishSteps.returnValues) {
|
|
68
|
+
const isMultiOutput = Array.isArray(agentFinishSteps.returnValues?.output);
|
|
69
|
+
if (isMultiOutput) {
|
|
70
|
+
const multiOutputSteps = agentFinishSteps.returnValues.output;
|
|
71
|
+
const isTextOnly = (multiOutputSteps ?? []).every((output) => 'text' in output);
|
|
72
|
+
if (isTextOnly) {
|
|
73
|
+
agentFinishSteps.returnValues.output = multiOutputSteps
|
|
74
|
+
.map((output) => output.text)
|
|
75
|
+
.join('\n')
|
|
76
|
+
.trim();
|
|
77
|
+
}
|
|
78
|
+
return agentFinishSteps;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return agentFinishSteps;
|
|
82
|
+
}
|
|
67
83
|
async function agentStepsParser(steps) {
|
|
68
84
|
if (Array.isArray(steps)) {
|
|
69
85
|
const responseParserTool = steps.find((step) => step.tool === 'format_final_response');
|
|
70
86
|
if (responseParserTool) {
|
|
71
|
-
const toolInput = responseParserTool
|
|
87
|
+
const toolInput = responseParserTool?.toolInput;
|
|
72
88
|
const returnValues = (await outputParser.parse(toolInput));
|
|
73
89
|
return {
|
|
74
90
|
returnValues,
|
|
@@ -84,7 +100,7 @@ async function toolsAgentExecute() {
|
|
|
84
100
|
log: 'Final response formatted',
|
|
85
101
|
};
|
|
86
102
|
}
|
|
87
|
-
return steps;
|
|
103
|
+
return handleAgentFinishOutput(steps);
|
|
88
104
|
}
|
|
89
105
|
if (outputParser) {
|
|
90
106
|
const schema = getOutputParserSchema(outputParser);
|
|
@@ -104,7 +120,7 @@ async function toolsAgentExecute() {
|
|
|
104
120
|
['human', '{input}'],
|
|
105
121
|
['placeholder', '{agent_scratchpad}'],
|
|
106
122
|
];
|
|
107
|
-
const hasBinaryData =
|
|
123
|
+
const hasBinaryData = this.getInputData(0, 'main')?.[0]?.binary !== undefined;
|
|
108
124
|
if (hasBinaryData && passthroughBinaryImages) {
|
|
109
125
|
const binaryMessage = await extractBinaryMessages(this);
|
|
110
126
|
messages.push(binaryMessage);
|
|
@@ -123,7 +139,7 @@ async function toolsAgentExecute() {
|
|
|
123
139
|
memory,
|
|
124
140
|
tools,
|
|
125
141
|
returnIntermediateSteps: options.returnIntermediateSteps === true,
|
|
126
|
-
maxIterations:
|
|
142
|
+
maxIterations: options.maxIterations ?? 10,
|
|
127
143
|
});
|
|
128
144
|
const returnData = [];
|
|
129
145
|
const items = this.getInputData();
|
|
@@ -136,14 +152,14 @@ async function toolsAgentExecute() {
|
|
|
136
152
|
promptTypeKey: 'promptType',
|
|
137
153
|
});
|
|
138
154
|
if (input === undefined) {
|
|
139
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'The ‘text parameter is empty.');
|
|
155
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'The ‘text‘ parameter is empty.');
|
|
140
156
|
}
|
|
141
157
|
if (model.lc_namespace.includes('openai') && tools.length === 0) {
|
|
142
158
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Please connect at least one tool. If you don't need any, try the conversational agent instead");
|
|
143
159
|
}
|
|
144
160
|
const response = await executor.invoke({
|
|
145
161
|
input,
|
|
146
|
-
system_message:
|
|
162
|
+
system_message: options.systemMessage ?? prompt_1.SYSTEM_MESSAGE,
|
|
147
163
|
formatting_instructions: 'IMPORTANT: Always call `format_final_response` to format your final response!',
|
|
148
164
|
});
|
|
149
165
|
returnData.push({
|
|
@@ -151,7 +167,7 @@ async function toolsAgentExecute() {
|
|
|
151
167
|
});
|
|
152
168
|
}
|
|
153
169
|
catch (error) {
|
|
154
|
-
if (this.continueOnFail(
|
|
170
|
+
if (this.continueOnFail()) {
|
|
155
171
|
returnData.push({
|
|
156
172
|
json: { error: error.message },
|
|
157
173
|
pairedItem: { item: itemIndex },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ToolsAgent/execute.ts"],"names":[],"mappings":";;AA6EA,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ToolsAgent/execute.ts"],"names":[],"mappings":";;AA6EA,8CA8NC;AA3SD,+CAAuF;AAIvF,6CAAyE;AAGzE,qDAA6D;AAC7D,mCAA8B;AAE9B,iDAA8D;AAE9D,6BAAwB;AAExB,6DAA8D;AAC9D,uDAAwD;AACxD,yDAA6D;AAC7D,0DAKsC;AACtC,qCAA0C;AAE1C,SAAS,qBAAqB,CAAC,YAA8B;IAC5D,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnF,IAAI,MAAqC,CAAC;IAE1C,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAEjC,MAAM,GAAI,YAAsE,CAAC,MAAM,CAAC;IACzF,CAAC;SAAM,IAAI,UAAU,KAAK,KAAK,IAAI,YAAY,YAAY,mCAAkB,EAAE,CAAC;QAE/E,MAAM,GAAI,YAAY,CAAC,MAAgE,CAAC,MAAM,CAAC;IAChG,CAAC;SAAM,CAAC;QAEP,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,GAAsB;IAC1D,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC;IAClE,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACvB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SACpD,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,IAAI,eAAe,CAAC;QAGpB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,cAAc,CACpD,MAAM,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAC1C,CAAC;YAEF,eAAe,GAAG,QAAQ,IAAI,CAAC,QAAQ,WAAW,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,8BAAe,CAAC,EAAE,CAAC;QACzG,CAAC;aAAM,CAAC;YACP,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC7C,CAAC,CAAC,IAAI,CAAC,IAAI;gBACX,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC;QAChD,CAAC;QAED,OAAO;YACN,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE;gBACV,GAAG,EAAE,eAAe;aACpB;SACD,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IACF,OAAO,IAAI,uBAAY,CAAC;QACvB,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC;KAC5B,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iBAAiB;IACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,qBAAqC,CAAC,CAAC,CAAC;IAEvF,IAAI,CAAC,IAAA,wBAAc,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,8DAA8D,CAC9D,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,cAA8B,CAAC,CAAC,CAErE,CAAC;IAEb,MAAM,KAAK,GAAG,CAAC,MAAM,IAAA,2BAAiB,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAwC,CAAC;IAClG,MAAM,YAAY,GAAG,CAAC,MAAM,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,0BAA6D,CAAC;IAgClE,SAAS,uBAAuB,CAAC,KAAkC;QAKlE,MAAM,gBAAgB,GAAG,KAA6C,CAAC;QAEvE,IAAI,gBAAgB,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE3E,IAAI,aAAa,EAAE,CAAC;gBAGnB,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,YAAY,CAAC,MAA2B,CAAC;gBAGnF,MAAM,UAAU,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;gBAEhF,IAAI,UAAU,EAAE,CAAC;oBAEhB,gBAAgB,CAAC,YAAY,CAAC,MAAM,GAAG,gBAAgB;yBACrD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;yBAC5B,IAAI,CAAC,IAAI,CAAC;yBACV,IAAI,EAAE,CAAC;gBACV,CAAC;gBACD,OAAO,gBAAgB,CAAC;YACzB,CAAC;QACF,CAAC;QAGD,OAAO,gBAAgB,CAAC;IACzB,CAAC;IACD,KAAK,UAAU,gBAAgB,CAC9B,KAAkC;QAElC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAuB,CAAC,CAAC;YACvF,IAAI,kBAAkB,EAAE,CAAC;gBACxB,MAAM,SAAS,GAAG,kBAAkB,EAAE,SAAS,CAAC;gBAChD,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,KAAK,CAAC,SAA8B,CAAC,CAG7E,CAAC;gBAEF,OAAO;oBACN,YAAY;oBACZ,GAAG,EAAE,0BAA0B;iBAC/B,CAAC;YACH,CAAC;QACF,CAAC;QAED,IAAI,YAAY,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAqB,CAAC,YAAY,EAAE,CAAC;YACtF,MAAM,aAAa,GAAI,KAAqB,CAAC,YAAY,CAAC;YAC1D,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,KAAK,CAAC,aAAkC,CAAC,CAGjF,CAAC;YAEF,OAAO;gBACN,YAAY;gBACZ,GAAG,EAAE,0BAA0B;aAC/B,CAAC;QACH,CAAC;QACD,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACnD,0BAA0B,GAAG,IAAI,6BAAqB,CAAC;YACtD,MAAM;YACN,IAAI,EAAE,uBAAuB;YAC7B,WAAW,EACV,sIAAsI;YAEvI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;SACpB,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAIrD,CAAC;IAEF,MAAM,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,CAAC,iCAAiC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAClG,MAAM,QAAQ,GAAoC;QACjD,CAAC,QAAQ,EAAE,mBAAmB,YAAY,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACpF,CAAC,aAAa,EAAE,gBAAgB,CAAC;QACjC,CAAC,OAAO,EAAE,SAAS,CAAC;QACpB,CAAC,aAAa,EAAE,oBAAoB,CAAC;KACrC,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,SAAS,CAAC;IAC9E,IAAI,aAAa,IAAI,uBAAuB,EAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACxD,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,MAAM,GAAG,4BAAkB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEzD,MAAM,KAAK,GAAG,IAAA,+BAAsB,EAAC;QACpC,GAAG,EAAE,KAAK;QACV,KAAK;QACL,MAAM;QACN,cAAc,EAAE,KAAK;KACrB,CAAC,CAAC;IACH,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;IAE7B,MAAM,aAAa,GAAG,4BAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEvE,MAAM,QAAQ,GAAG,sBAAa,CAAC,iBAAiB,CAAC;QAChD,KAAK,EAAE,aAAa;QACpB,MAAM;QACN,KAAK;QACL,uBAAuB,EAAE,OAAO,CAAC,uBAAuB,KAAK,IAAI;QACjE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,EAAE;KAC1C,CAAC,CAAC;IACH,MAAM,UAAU,GAAyB,EAAE,CAAC;IAE5C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;QAC/D,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,IAAA,8BAAoB,EAAC;gBAClC,GAAG,EAAE,IAAI;gBACT,CAAC,EAAE,SAAS;gBACZ,QAAQ,EAAE,MAAM;gBAChB,aAAa,EAAE,YAAY;aAC3B,CAAC,CAAC;YAEH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,gCAAgC,CAAC,CAAC;YAChF,CAAC;YAGD,IAAI,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,+FAA+F,CAC/F,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACtC,KAAK;gBACL,cAAc,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;gBACvD,uBAAuB,EACtB,+EAA+E;aAChF,CAAC,CAAC;YAEH,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,IAAA,aAAI,EACT,QAAQ,EACR,gBAAgB,EAChB,yBAAyB,EACzB,OAAO,EACP,cAAc,EACd,kBAAkB,CAClB;aACD,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC3B,UAAU,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;oBAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;iBAC/B,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -303,7 +303,6 @@ class OpenAiAssistant {
|
|
|
303
303
|
};
|
|
304
304
|
}
|
|
305
305
|
async execute() {
|
|
306
|
-
var _a, _b, _c, _d;
|
|
307
306
|
const nodeVersion = this.getNode().typeVersion;
|
|
308
307
|
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion > 1, false);
|
|
309
308
|
const credentials = await this.getCredentials('openAiApi');
|
|
@@ -320,13 +319,13 @@ class OpenAiAssistant {
|
|
|
320
319
|
}
|
|
321
320
|
const client = new openai_1.OpenAI({
|
|
322
321
|
apiKey: credentials.apiKey,
|
|
323
|
-
maxRetries:
|
|
324
|
-
timeout:
|
|
322
|
+
maxRetries: options.maxRetries ?? 2,
|
|
323
|
+
timeout: options.timeout ?? 10000,
|
|
325
324
|
baseURL: options.baseURL,
|
|
326
325
|
});
|
|
327
326
|
let agent;
|
|
328
327
|
const nativeToolsParsed = nativeTools.map((tool) => ({ type: tool }));
|
|
329
|
-
const transformedConnectedTools =
|
|
328
|
+
const transformedConnectedTools = tools?.map(utils_1.formatToOpenAIAssistantTool) ?? [];
|
|
330
329
|
const newTools = [...transformedConnectedTools, ...nativeToolsParsed];
|
|
331
330
|
if (assistantId) {
|
|
332
331
|
agent = new openai_assistant_1.OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
|
|
@@ -354,12 +353,12 @@ class OpenAiAssistant {
|
|
|
354
353
|
const response = await agentExecutor.withConfig((0, tracing_1.getTracingConfig)(this)).invoke({
|
|
355
354
|
content: input,
|
|
356
355
|
signal: this.getExecutionCancelSignal(),
|
|
357
|
-
timeout:
|
|
356
|
+
timeout: options.timeout ?? 10000,
|
|
358
357
|
});
|
|
359
358
|
returnData.push({ json: response });
|
|
360
359
|
}
|
|
361
360
|
catch (error) {
|
|
362
|
-
if (this.continueOnFail(
|
|
361
|
+
if (this.continueOnFail()) {
|
|
363
362
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
364
363
|
continue;
|
|
365
364
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ const sharedFields_1 = require("../../../utils/sharedFields");
|
|
|
12
12
|
const helpers_1 = require("../../../utils/helpers");
|
|
13
13
|
const tracing_1 = require("../../../utils/tracing");
|
|
14
14
|
async function getImageMessage(context, itemIndex, message) {
|
|
15
|
-
var _a, _b;
|
|
16
15
|
if (message.messageType !== 'imageBinary' && message.messageType !== 'imageUrl') {
|
|
17
16
|
throw new n8n_workflow_1.NodeOperationError(context.getNode(), 'Invalid message type. Only imageBinary and imageUrl are supported');
|
|
18
17
|
}
|
|
@@ -30,9 +29,9 @@ async function getImageMessage(context, itemIndex, message) {
|
|
|
30
29
|
],
|
|
31
30
|
});
|
|
32
31
|
}
|
|
33
|
-
const binaryDataKey =
|
|
32
|
+
const binaryDataKey = message.binaryImageDataKey ?? 'data';
|
|
34
33
|
const inputData = context.getInputData()[itemIndex];
|
|
35
|
-
const binaryData =
|
|
34
|
+
const binaryData = inputData.binary?.[binaryDataKey];
|
|
36
35
|
if (!binaryData) {
|
|
37
36
|
throw new n8n_workflow_1.NodeOperationError(context.getNode(), 'No binary data set.');
|
|
38
37
|
}
|
|
@@ -59,7 +58,7 @@ async function getChainPromptTemplate(context, itemIndex, llm, messages, formatI
|
|
|
59
58
|
partialVariables: formatInstructions ? { formatInstructions } : undefined,
|
|
60
59
|
});
|
|
61
60
|
if ((0, helpers_1.isChatInstance)(llm)) {
|
|
62
|
-
const parsedMessages = await Promise.all((messages
|
|
61
|
+
const parsedMessages = await Promise.all((messages ?? []).map(async (message) => {
|
|
63
62
|
const messageClass = [
|
|
64
63
|
prompts_1.SystemMessagePromptTemplate,
|
|
65
64
|
prompts_1.AIMessagePromptTemplate,
|
|
@@ -114,7 +113,7 @@ async function getChain(context, itemIndex, query, llm, outputParsers, messages)
|
|
|
114
113
|
return Array.isArray(response) ? response : [response];
|
|
115
114
|
}
|
|
116
115
|
function getInputs(parameters) {
|
|
117
|
-
const hasOutputParser = parameters
|
|
116
|
+
const hasOutputParser = parameters?.hasOutputParser;
|
|
118
117
|
const inputs = [
|
|
119
118
|
{ displayName: '', type: "main" },
|
|
120
119
|
{
|
|
@@ -451,7 +450,7 @@ class ChainLlm {
|
|
|
451
450
|
});
|
|
452
451
|
}
|
|
453
452
|
catch (error) {
|
|
454
|
-
if (this.continueOnFail(
|
|
453
|
+
if (this.continueOnFail()) {
|
|
455
454
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
456
455
|
continue;
|
|
457
456
|
}
|