Fixed to match new apiKey field

langchain-ai · Jun 10, 2024 · dcec704 · dcec704
1 parent 6535861
commit dcec704
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/langchain/src/chains/openai_moderation.ts b/langchain/src/chains/openai_moderation.ts
@@ -86,7 +86,9 @@ export class OpenAIModerationChain
     super(fields);
     this.throwError = fields?.throwError ?? false;
     this.openAIApiKey =
-      fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+      fields?.apiKey ??
+      fields?.openAIApiKey ?? 
+      getEnvironmentVariable("OPENAI_API_KEY");
 
     if (!this.openAIApiKey) {
       throw new Error("OpenAI API key not found");

diff --git a/libs/langchain-azure-openai/src/chat_models.ts b/libs/langchain-azure-openai/src/chat_models.ts
@@ -267,7 +267,9 @@ export class AzureChatOpenAI
       getEnvironmentVariable("AZURE_OPENAI_API_DEPLOYMENT_NAME");
 
     const openAiApiKey =
-      fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+      fields?.apiKey ??
+      fields?.openAIApiKey ?? 
+      getEnvironmentVariable("OPENAI_API_KEY");
 
     this.azureOpenAIApiKey =
       fields?.apiKey ??

diff --git a/libs/langchain-azure-openai/src/embeddings.ts b/libs/langchain-azure-openai/src/embeddings.ts
@@ -62,7 +62,9 @@ export class AzureOpenAIEmbeddings
       getEnvironmentVariable("AZURE_OPENAI_API_ENDPOINT");
 
     const openAiApiKey =
-      fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+      fields?.apiKey ??
+      fields?.openAIApiKey ?? 
+      getEnvironmentVariable("OPENAI_API_KEY");
 
     this.azureOpenAIApiKey =
       fields?.apiKey ??

diff --git a/libs/langchain-azure-openai/src/llms.ts b/libs/langchain-azure-openai/src/llms.ts
@@ -135,7 +135,9 @@ export class AzureOpenAI<
       getEnvironmentVariable("AZURE_OPENAI_API_DEPLOYMENT_NAME");
 
     const openAiApiKey =
-      fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+      fields?.apiKey ??
+      fields?.openAIApiKey ?? 
+      getEnvironmentVariable("OPENAI_API_KEY");
 
     this.azureOpenAIApiKey =
       fields?.apiKey ??

diff --git a/libs/langchain-openai/src/legacy.ts b/libs/langchain-openai/src/legacy.ts
@@ -157,7 +157,9 @@ export class OpenAIChat
     super(fields ?? {});
 
     this.openAIApiKey =
-      fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+      fields?.apiKey ??
+      fields?.openAIApiKey ?? 
+      getEnvironmentVariable("OPENAI_API_KEY");
 
     this.azureOpenAIApiKey =
       fields?.azureOpenAIApiKey ??