openai[patch]: fix #5520 (#5521)

* langchain-openai[patch]: fix #5520 * fix: don't rewrite config if they are already set in embedding and chat_model * Format --------- Co-authored-by: jeasonnow <guyf@seeyon.com> Co-authored-by: jacoblee93 <jacoblee93@gmail.com>
langchain-ai · May 27, 2024 · 6d2c228 · 6d2c228
1 parent ed1f3fb
commit 6d2c228
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/libs/langchain-openai/src/azure/chat_models.ts b/libs/langchain-openai/src/azure/chat_models.ts
@@ -38,9 +38,13 @@ export class AzureChatOpenAI extends ChatOpenAI {
   ) {
     const newFields = fields ? { ...fields } : fields;
     if (newFields) {
-      newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
-      newFields.azureOpenAIApiKey = newFields.openAIApiKey;
-      newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
+      // don't rewrite the fields if they are already set
+      newFields.azureOpenAIApiDeploymentName =
+        newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
+      newFields.azureOpenAIApiKey =
+        newFields.azureOpenAIApiKey ?? newFields.openAIApiKey;
+      newFields.azureOpenAIApiVersion =
+        newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
     }
 
     super(newFields);

diff --git a/libs/langchain-openai/src/azure/embeddings.ts b/libs/langchain-openai/src/azure/embeddings.ts
@@ -27,9 +27,13 @@ export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
   ) {
     const newFields = { ...fields };
     if (Object.entries(newFields).length) {
-      newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
-      newFields.azureOpenAIApiKey = newFields.apiKey;
-      newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
+      // don't rewrite the fields if they are already set
+      newFields.azureOpenAIApiDeploymentName =
+        newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
+      newFields.azureOpenAIApiKey =
+        newFields.azureOpenAIApiKey ?? newFields.apiKey;
+      newFields.azureOpenAIApiVersion =
+        newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
     }
 
     super(newFields, configuration);

diff --git a/libs/langchain-openai/src/azure/llms.ts b/libs/langchain-openai/src/azure/llms.ts
@@ -31,9 +31,13 @@ export class AzureOpenAI extends OpenAI {
   ) {
     const newFields = fields ? { ...fields } : fields;
     if (newFields) {
-      newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
-      newFields.azureOpenAIApiKey = newFields.openAIApiKey;
-      newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
+      // don't rewrite the fields if they are already set
+      newFields.azureOpenAIApiDeploymentName =
+        newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
+      newFields.azureOpenAIApiKey =
+        newFields.azureOpenAIApiKey ?? newFields.openAIApiKey;
+      newFields.azureOpenAIApiVersion =
+        newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
     }
 
     super(newFields);

diff --git a/libs/langchain-openai/src/utils/azure.ts b/libs/langchain-openai/src/utils/azure.ts
@@ -40,7 +40,7 @@ export function getEndpoint(config: OpenAIEndpointConfig) {
   } = config;
 
   if (
-    azureOpenAIApiKey &&
+    (azureOpenAIApiKey || azureADTokenProvider) &&
     azureOpenAIBasePath &&
     azureOpenAIApiDeploymentName
   ) {