@langchain/openai 0.4.0-rc.0 → 0.4.1

package/dist/azure/chat_models.cjs

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureChatOpenAI = void 0;
 const openai_1 = require("openai");
+const env_1 = require("@langchain/core/utils/env");
 const chat_models_js_1 = require("../chat_models.cjs");
 const azure_js_1 = require("../utils/azure.cjs");
-const env_1 = require("@langchain/core/utils/env");
 /**
  * Azure OpenAI chat model integration.
  *
@@ -257,7 +257,7 @@ const env_1 = require("@langchain/core/utils/env");
  * const Joke = z.object({
  *   setup: z.string().describe("The setup of the joke"),
  *   punchline: z.string().describe("The punchline to the joke"),
- *   rating: z.number().optional().describe("How funny the joke is, from 1 to 10")
+ *   rating: z.number().nullable().describe("How funny the joke is, from 1 to 10")
  * }).describe('Joke to tell user.');
  *
  * const structuredLlm = llm.withStructuredOutput(Joke, { name: "Joke" });
@@ -423,6 +423,7 @@ class AzureChatOpenAI extends chat_models_js_1.ChatOpenAI {
     }
     get lc_aliases() {
         return {
+            ...super.lc_aliases,
             openAIApiKey: "openai_api_key",
             openAIApiVersion: "openai_api_version",
             openAIBasePath: "openai_api_base",
@@ -433,32 +434,82 @@ class AzureChatOpenAI extends chat_models_js_1.ChatOpenAI {
             azureOpenAIApiDeploymentName: "deployment_name",
         };
     }
+    get lc_secrets() {
+        return {
+            ...super.lc_secrets,
+            azureOpenAIApiKey: "AZURE_OPENAI_API_KEY",
+        };
+    }
     constructor(fields) {
-        const newFields = fields ? { ...fields } : {};
-        newFields.azureOpenAIApiDeploymentName =
-            newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
-        newFields.azureOpenAIApiKey =
-            newFields.azureOpenAIApiKey ??
-                newFields.openAIApiKey ??
+        super(fields);
+        Object.defineProperty(this, "azureOpenAIApiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureADTokenProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIBasePath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIEndpoint", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.azureOpenAIApiKey =
+            fields?.azureOpenAIApiKey ??
+                fields?.openAIApiKey ??
+                fields?.apiKey ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_KEY");
-        newFields.azureOpenAIApiVersion =
-            newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
-        newFields.azureOpenAIApiInstanceName =
+        this.azureOpenAIApiInstanceName =
             fields?.azureOpenAIApiInstanceName ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_INSTANCE_NAME");
-        newFields.azureOpenAIApiDeploymentName =
+        this.azureOpenAIApiDeploymentName =
             fields?.azureOpenAIApiDeploymentName ??
+                fields?.deploymentName ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_DEPLOYMENT_NAME");
-        newFields.azureOpenAIApiVersion =
+        this.azureOpenAIApiVersion =
             fields?.azureOpenAIApiVersion ??
+                fields?.openAIApiVersion ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_VERSION");
-        newFields.azureOpenAIBasePath =
+        this.azureOpenAIBasePath =
             fields?.azureOpenAIBasePath ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_BASE_PATH");
-        newFields.azureOpenAIEndpoint =
+        this.azureOpenAIEndpoint =
             fields?.azureOpenAIEndpoint ??
                 (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_ENDPOINT");
-        super(newFields);
+        this.azureADTokenProvider = fields?.azureADTokenProvider;
+        if (!this.azureOpenAIApiKey && !this.apiKey && !this.azureADTokenProvider) {
+            throw new Error("Azure OpenAI API key or Token Provider not found");
+        }
     }
     getLsParams(options) {
         const params = super.getLsParams(options);
@@ -565,5 +616,15 @@ class AzureChatOpenAI extends chat_models_js_1.ChatOpenAI {
         }
         return json;
     }
+    withStructuredOutput(outputSchema, config) {
+        const ensuredConfig = { ...config };
+        // Not all Azure gpt-4o deployments models support jsonSchema yet
+        if (this.model.startsWith("gpt-4o")) {
+            if (ensuredConfig?.method === undefined) {
+                ensuredConfig.method = "functionCalling";
+            }
+        }
+        return super.withStructuredOutput(outputSchema, ensuredConfig);
+    }
 }
 exports.AzureChatOpenAI = AzureChatOpenAI;

package/dist/azure/chat_models.d.ts

@@ -1,7 +1,12 @@
 import { type ClientOptions } from "openai";
 import { LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
-import { ChatOpenAI } from "../chat_models.js";
-import { AzureOpenAIInput, LegacyOpenAIInput, OpenAIChatInput, OpenAICoreRequestOptions } from "../types.js";
+import { BaseLanguageModelInput } from "@langchain/core/language_models/base";
+import { BaseMessage } from "@langchain/core/messages";
+import { Runnable } from "@langchain/core/runnables";
+import { z } from "zod";
+import { ChatOpenAI, ChatOpenAIStructuredOutputMethodOptions } from "../chat_models.js";
+import { AzureOpenAIInput, OpenAIChatInput, OpenAICoreRequestOptions } from "../types.js";
+export type { AzureOpenAIInput };
 /**
  * Azure OpenAI chat model integration.
  *
@@ -254,7 +259,7 @@ import { AzureOpenAIInput, LegacyOpenAIInput, OpenAIChatInput, OpenAICoreRequest
  * const Joke = z.object({
  *   setup: z.string().describe("The setup of the joke"),
  *   punchline: z.string().describe("The punchline to the joke"),
- *   rating: z.number().optional().describe("How funny the joke is, from 1 to 10")
+ *   rating: z.number().nullable().describe("How funny the joke is, from 1 to 10")
  * }).describe('Joke to tell user.');
  *
  * const structuredLlm = llm.withStructuredOutput(Joke, { name: "Joke" });
@@ -415,17 +420,36 @@ import { AzureOpenAIInput, LegacyOpenAIInput, OpenAIChatInput, OpenAICoreRequest
  * </details>
  */
 export declare class AzureChatOpenAI extends ChatOpenAI {
+    azureOpenAIApiVersion?: string;
+    azureOpenAIApiKey?: string;
+    azureADTokenProvider?: () => Promise<string>;
+    azureOpenAIApiInstanceName?: string;
+    azureOpenAIApiDeploymentName?: string;
+    azureOpenAIBasePath?: string;
+    azureOpenAIEndpoint?: string;
     _llmType(): string;
     get lc_aliases(): Record<string, string>;
+    get lc_secrets(): {
+        [key: string]: string;
+    } | undefined;
     constructor(fields?: Partial<OpenAIChatInput> & Partial<AzureOpenAIInput> & {
         openAIApiKey?: string;
         openAIApiVersion?: string;
         openAIBasePath?: string;
         deploymentName?: string;
     } & BaseChatModelParams & {
-        configuration?: ClientOptions & LegacyOpenAIInput;
+        configuration?: ClientOptions;
     });
     getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
     protected _getClientOptions(options: OpenAICoreRequestOptions | undefined): OpenAICoreRequestOptions;
     toJSON(): any;
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: z.ZodType<RunOutput> | Record<string, any>, config?: ChatOpenAIStructuredOutputMethodOptions<false>): Runnable<BaseLanguageModelInput, RunOutput>;
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: z.ZodType<RunOutput> | Record<string, any>, config?: ChatOpenAIStructuredOutputMethodOptions<true>): Runnable<BaseLanguageModelInput, {
+        raw: BaseMessage;
+        parsed: RunOutput;
+    }>;
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: z.ZodType<RunOutput> | Record<string, any>, config?: ChatOpenAIStructuredOutputMethodOptions<boolean>): Runnable<BaseLanguageModelInput, RunOutput> | Runnable<BaseLanguageModelInput, {
+        raw: BaseMessage;
+        parsed: RunOutput;
+    }>;
 }

package/dist/azure/chat_models.js

@@ -1,7 +1,7 @@
 import { AzureOpenAI as AzureOpenAIClient } from "openai";
-import { ChatOpenAI } from "../chat_models.js";
-import { getEndpoint } from "../utils/azure.js";
 import { getEnvironmentVariable } from "@langchain/core/utils/env";
+import { ChatOpenAI, } from "../chat_models.js";
+import { getEndpoint } from "../utils/azure.js";
 /**
  * Azure OpenAI chat model integration.
  *
@@ -254,7 +254,7 @@ import { getEnvironmentVariable } from "@langchain/core/utils/env";
  * const Joke = z.object({
  *   setup: z.string().describe("The setup of the joke"),
  *   punchline: z.string().describe("The punchline to the joke"),
- *   rating: z.number().optional().describe("How funny the joke is, from 1 to 10")
+ *   rating: z.number().nullable().describe("How funny the joke is, from 1 to 10")
  * }).describe('Joke to tell user.');
  *
  * const structuredLlm = llm.withStructuredOutput(Joke, { name: "Joke" });
@@ -420,6 +420,7 @@ export class AzureChatOpenAI extends ChatOpenAI {
     }
     get lc_aliases() {
         return {
+            ...super.lc_aliases,
             openAIApiKey: "openai_api_key",
             openAIApiVersion: "openai_api_version",
             openAIBasePath: "openai_api_base",
@@ -430,32 +431,82 @@ export class AzureChatOpenAI extends ChatOpenAI {
             azureOpenAIApiDeploymentName: "deployment_name",
         };
     }
+    get lc_secrets() {
+        return {
+            ...super.lc_secrets,
+            azureOpenAIApiKey: "AZURE_OPENAI_API_KEY",
+        };
+    }
     constructor(fields) {
-        const newFields = fields ? { ...fields } : {};
-        newFields.azureOpenAIApiDeploymentName =
-            newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
-        newFields.azureOpenAIApiKey =
-            newFields.azureOpenAIApiKey ??
-                newFields.openAIApiKey ??
+        super(fields);
+        Object.defineProperty(this, "azureOpenAIApiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureADTokenProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIBasePath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIEndpoint", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.azureOpenAIApiKey =
+            fields?.azureOpenAIApiKey ??
+                fields?.openAIApiKey ??
+                fields?.apiKey ??
                 getEnvironmentVariable("AZURE_OPENAI_API_KEY");
-        newFields.azureOpenAIApiVersion =
-            newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
-        newFields.azureOpenAIApiInstanceName =
+        this.azureOpenAIApiInstanceName =
             fields?.azureOpenAIApiInstanceName ??
                 getEnvironmentVariable("AZURE_OPENAI_API_INSTANCE_NAME");
-        newFields.azureOpenAIApiDeploymentName =
+        this.azureOpenAIApiDeploymentName =
             fields?.azureOpenAIApiDeploymentName ??
+                fields?.deploymentName ??
                 getEnvironmentVariable("AZURE_OPENAI_API_DEPLOYMENT_NAME");
-        newFields.azureOpenAIApiVersion =
+        this.azureOpenAIApiVersion =
             fields?.azureOpenAIApiVersion ??
+                fields?.openAIApiVersion ??
                 getEnvironmentVariable("AZURE_OPENAI_API_VERSION");
-        newFields.azureOpenAIBasePath =
+        this.azureOpenAIBasePath =
             fields?.azureOpenAIBasePath ??
                 getEnvironmentVariable("AZURE_OPENAI_BASE_PATH");
-        newFields.azureOpenAIEndpoint =
+        this.azureOpenAIEndpoint =
             fields?.azureOpenAIEndpoint ??
                 getEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
-        super(newFields);
+        this.azureADTokenProvider = fields?.azureADTokenProvider;
+        if (!this.azureOpenAIApiKey && !this.apiKey && !this.azureADTokenProvider) {
+            throw new Error("Azure OpenAI API key or Token Provider not found");
+        }
     }
     getLsParams(options) {
         const params = super.getLsParams(options);
@@ -562,4 +613,14 @@ export class AzureChatOpenAI extends ChatOpenAI {
         }
         return json;
     }
+    withStructuredOutput(outputSchema, config) {
+        const ensuredConfig = { ...config };
+        // Not all Azure gpt-4o deployments models support jsonSchema yet
+        if (this.model.startsWith("gpt-4o")) {
+            if (ensuredConfig?.method === undefined) {
+                ensuredConfig.method = "functionCalling";
+            }
+        }
+        return super.withStructuredOutput(outputSchema, ensuredConfig);
+    }
 }

package/dist/azure/embeddings.cjs

@@ -2,22 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureOpenAIEmbeddings = void 0;
 const openai_1 = require("openai");
+const env_1 = require("@langchain/core/utils/env");
 const embeddings_js_1 = require("../embeddings.cjs");
 const azure_js_1 = require("../utils/azure.cjs");
 const openai_js_1 = require("../utils/openai.cjs");
 class AzureOpenAIEmbeddings extends embeddings_js_1.OpenAIEmbeddings {
-    constructor(fields, configuration) {
-        const newFields = { ...fields };
-        if (Object.entries(newFields).length) {
-            // 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);
+    constructor(fields) {
+        super(fields);
+        Object.defineProperty(this, "azureOpenAIApiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureADTokenProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIBasePath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.batchSize = fields?.batchSize ?? 1;
+        this.azureOpenAIApiKey =
+            fields?.azureOpenAIApiKey ??
+                fields?.apiKey ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_KEY");
+        this.azureOpenAIApiVersion =
+            fields?.azureOpenAIApiVersion ??
+                fields?.openAIApiVersion ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_VERSION");
+        this.azureOpenAIBasePath =
+            fields?.azureOpenAIBasePath ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_BASE_PATH");
+        this.azureOpenAIApiInstanceName =
+            fields?.azureOpenAIApiInstanceName ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_INSTANCE_NAME");
+        this.azureOpenAIApiDeploymentName =
+            (fields?.azureOpenAIApiEmbeddingsDeploymentName ||
+                fields?.azureOpenAIApiDeploymentName) ??
+                ((0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME") ||
+                    (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_DEPLOYMENT_NAME"));
+        this.azureADTokenProvider = fields?.azureADTokenProvider;
     }
     async embeddingWithRetry(request) {
         if (!this.client) {

package/dist/azure/embeddings.d.ts

@@ -1,7 +1,13 @@
 import { type ClientOptions, OpenAI as OpenAIClient } from "openai";
 import { OpenAIEmbeddings, OpenAIEmbeddingsParams } from "../embeddings.js";
-import { AzureOpenAIInput, LegacyOpenAIInput } from "../types.js";
+import { AzureOpenAIInput } from "../types.js";
 export declare class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
+    azureOpenAIApiVersion?: string;
+    azureOpenAIApiKey?: string;
+    azureADTokenProvider?: () => Promise<string>;
+    azureOpenAIApiInstanceName?: string;
+    azureOpenAIApiDeploymentName?: string;
+    azureOpenAIBasePath?: string;
     constructor(fields?: Partial<OpenAIEmbeddingsParams> & Partial<AzureOpenAIInput> & {
         verbose?: boolean;
         /** The OpenAI API key to use. */
@@ -9,7 +15,7 @@ export declare class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
         configuration?: ClientOptions;
         deploymentName?: string;
         openAIApiVersion?: string;
-    }, configuration?: ClientOptions & LegacyOpenAIInput);
+    });
     protected embeddingWithRetry(request: OpenAIClient.EmbeddingCreateParams): Promise<OpenAIClient.Embeddings.CreateEmbeddingResponse & {
         _request_id?: string | null | undefined;
     }>;

package/dist/azure/embeddings.js

@@ -1,20 +1,68 @@
 import { AzureOpenAI as AzureOpenAIClient, } from "openai";
+import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import { OpenAIEmbeddings } from "../embeddings.js";
 import { getEndpoint } from "../utils/azure.js";
 import { wrapOpenAIClientError } from "../utils/openai.js";
 export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
-    constructor(fields, configuration) {
-        const newFields = { ...fields };
-        if (Object.entries(newFields).length) {
-            // 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);
+    constructor(fields) {
+        super(fields);
+        Object.defineProperty(this, "azureOpenAIApiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureADTokenProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIBasePath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.batchSize = fields?.batchSize ?? 1;
+        this.azureOpenAIApiKey =
+            fields?.azureOpenAIApiKey ??
+                fields?.apiKey ??
+                getEnvironmentVariable("AZURE_OPENAI_API_KEY");
+        this.azureOpenAIApiVersion =
+            fields?.azureOpenAIApiVersion ??
+                fields?.openAIApiVersion ??
+                getEnvironmentVariable("AZURE_OPENAI_API_VERSION");
+        this.azureOpenAIBasePath =
+            fields?.azureOpenAIBasePath ??
+                getEnvironmentVariable("AZURE_OPENAI_BASE_PATH");
+        this.azureOpenAIApiInstanceName =
+            fields?.azureOpenAIApiInstanceName ??
+                getEnvironmentVariable("AZURE_OPENAI_API_INSTANCE_NAME");
+        this.azureOpenAIApiDeploymentName =
+            (fields?.azureOpenAIApiEmbeddingsDeploymentName ||
+                fields?.azureOpenAIApiDeploymentName) ??
+                (getEnvironmentVariable("AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME") ||
+                    getEnvironmentVariable("AZURE_OPENAI_API_DEPLOYMENT_NAME"));
+        this.azureADTokenProvider = fields?.azureADTokenProvider;
     }
     async embeddingWithRetry(request) {
         if (!this.client) {

package/dist/azure/llms.cjs

@@ -2,28 +2,100 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureOpenAI = void 0;
 const openai_1 = require("openai");
+const env_1 = require("@langchain/core/utils/env");
 const llms_js_1 = require("../llms.cjs");
 const azure_js_1 = require("../utils/azure.cjs");
 class AzureOpenAI extends llms_js_1.OpenAI {
     get lc_aliases() {
         return {
+            ...super.lc_aliases,
             openAIApiKey: "openai_api_key",
             openAIApiVersion: "openai_api_version",
             openAIBasePath: "openai_api_base",
+            deploymentName: "deployment_name",
+            azureOpenAIEndpoint: "azure_endpoint",
+            azureOpenAIApiVersion: "openai_api_version",
+            azureOpenAIBasePath: "openai_api_base",
+            azureOpenAIApiDeploymentName: "deployment_name",
+        };
+    }
+    get lc_secrets() {
+        return {
+            ...super.lc_secrets,
+            azureOpenAIApiKey: "AZURE_OPENAI_API_KEY",
         };
     }
     constructor(fields) {
-        const newFields = fields ? { ...fields } : fields;
-        if (newFields) {
-            // 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(fields);
+        Object.defineProperty(this, "azureOpenAIApiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureADTokenProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIBasePath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "azureOpenAIEndpoint", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.azureOpenAIApiDeploymentName =
+            (fields?.azureOpenAIApiCompletionsDeploymentName ||
+                fields?.azureOpenAIApiDeploymentName) ??
+                ((0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME") ||
+                    (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_DEPLOYMENT_NAME"));
+        this.azureOpenAIApiKey =
+            fields?.azureOpenAIApiKey ??
+                fields?.openAIApiKey ??
+                fields?.apiKey ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_KEY");
+        this.azureOpenAIApiInstanceName =
+            fields?.azureOpenAIApiInstanceName ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_INSTANCE_NAME");
+        this.azureOpenAIApiVersion =
+            fields?.azureOpenAIApiVersion ??
+                fields?.openAIApiVersion ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_API_VERSION");
+        this.azureOpenAIBasePath =
+            fields?.azureOpenAIBasePath ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_BASE_PATH");
+        this.azureOpenAIEndpoint =
+            fields?.azureOpenAIEndpoint ??
+                (0, env_1.getEnvironmentVariable)("AZURE_OPENAI_ENDPOINT");
+        this.azureADTokenProvider = fields?.azureADTokenProvider;
+        if (!this.azureOpenAIApiKey && !this.apiKey && !this.azureADTokenProvider) {
+            throw new Error("Azure OpenAI API key or Token Provider not found");
         }
-        super(newFields);
     }
     _getClientOptions(options) {
         if (!this.client) {

package/dist/azure/llms.d.ts

@@ -1,16 +1,26 @@
 import { type ClientOptions } from "openai";
 import { type BaseLLMParams } from "@langchain/core/language_models/llms";
 import { OpenAI } from "../llms.js";
-import type { OpenAIInput, AzureOpenAIInput, OpenAICoreRequestOptions, LegacyOpenAIInput } from "../types.js";
+import type { OpenAIInput, AzureOpenAIInput, OpenAICoreRequestOptions } from "../types.js";
 export declare class AzureOpenAI extends OpenAI {
+    azureOpenAIApiVersion?: string;
+    azureOpenAIApiKey?: string;
+    azureADTokenProvider?: () => Promise<string>;
+    azureOpenAIApiInstanceName?: string;
+    azureOpenAIApiDeploymentName?: string;
+    azureOpenAIBasePath?: string;
+    azureOpenAIEndpoint?: string;
     get lc_aliases(): Record<string, string>;
+    get lc_secrets(): {
+        [key: string]: string;
+    } | undefined;
     constructor(fields?: Partial<OpenAIInput> & {
         openAIApiKey?: string;
         openAIApiVersion?: string;
         openAIBasePath?: string;
         deploymentName?: string;
     } & Partial<AzureOpenAIInput> & BaseLLMParams & {
-        configuration?: ClientOptions & LegacyOpenAIInput;
+        configuration?: ClientOptions;
     });
     protected _getClientOptions(options: OpenAICoreRequestOptions | undefined): OpenAICoreRequestOptions;
     toJSON(): any;