From b177644354284cf063eb8ca6f2d6c7b3e624a62d Mon Sep 17 00:00:00 2001 From: falkor Date: Tue, 26 Mar 2024 06:05:39 +0200 Subject: [PATCH] feature/fetch openaiKey via overrideConfig (vars) (#2018) * fetch openaiKey via overrideConfig (vars) * support dynamic openai credentialId via chatflowConfig * fix lint --- packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts | 3 +++ .../nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts index 09b8c5b3..290947af 100644 --- a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts +++ b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts @@ -221,6 +221,9 @@ class ChatOpenAI_ChatModels implements INode { const allowImageUploads = nodeData.inputs?.allowImageUploads as boolean const imageResolution = nodeData.inputs?.imageResolution as string + if (nodeData.inputs?.credentialId) { + nodeData.credential = nodeData.inputs?.credentialId + } const credentialData = await getCredentialData(nodeData.credential ?? '', options) const openAIApiKey = getCredentialParam('openAIApiKey', credentialData, nodeData) diff --git a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts index b34e4ae5..0e1abc57 100644 --- a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts +++ b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts @@ -89,6 +89,9 @@ class OpenAIEmbedding_Embeddings implements INode { const basePath = nodeData.inputs?.basepath as string const modelName = nodeData.inputs?.modelName as string + if (nodeData.inputs?.credentialId) { + nodeData.credential = nodeData.inputs?.credentialId + } const credentialData = await getCredentialData(nodeData.credential ?? '', options) const openAIApiKey = getCredentialParam('openAIApiKey', credentialData, nodeData)