@langchain/openai 0.0.33 → 0.1.0

package/dist/azure/chat_models.cjs

@@ -18,9 +18,13 @@ class AzureChatOpenAI extends chat_models_js_1.ChatOpenAI {
     constructor(fields) {
         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);
     }

package/dist/azure/chat_models.js

@@ -15,9 +15,13 @@ export class AzureChatOpenAI extends ChatOpenAI {
     constructor(fields) {
         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);
     }

package/dist/azure/embeddings.cjs

@@ -9,9 +9,13 @@ class AzureOpenAIEmbeddings extends embeddings_js_1.OpenAIEmbeddings {
     constructor(fields, configuration) {
         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);
     }

package/dist/azure/embeddings.js

@@ -6,9 +6,13 @@ export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
     constructor(fields, configuration) {
         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);
     }

package/dist/azure/llms.cjs

@@ -15,9 +15,13 @@ class AzureOpenAI extends llms_js_1.OpenAI {
     constructor(fields) {
         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);
     }

package/dist/azure/llms.js

@@ -12,9 +12,13 @@ export class AzureOpenAI extends OpenAI {
     constructor(fields) {
         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);
     }

package/dist/chat_models.cjs

@@ -529,6 +529,9 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
             tool_choice: options?.tool_choice,
             response_format: options?.response_format,
             seed: options?.seed,
+            ...(options?.stream_options !== undefined
+                ? { stream_options: options.stream_options }
+                : {}),
             ...this.modelKwargs,
         };
         return params;
@@ -550,8 +553,12 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
         };
         let defaultRole;
         const streamIterable = await this.completionWithRetry(params, options);
+        let usage;
         for await (const data of streamIterable) {
             const choice = data?.choices[0];
+            if (data.usage) {
+                usage = data.usage;
+            }
             if (!choice) {
                 continue;
             }
@@ -586,6 +593,20 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
             // eslint-disable-next-line no-void
             void runManager?.handleLLMNewToken(generationChunk.text ?? "", newTokenIndices, undefined, undefined, undefined, { chunk: generationChunk });
         }
+        if (usage) {
+            const generationChunk = new outputs_1.ChatGenerationChunk({
+                message: new messages_1.AIMessageChunk({
+                    content: "",
+                    usage_metadata: {
+                        input_tokens: usage.prompt_tokens,
+                        output_tokens: usage.completion_tokens,
+                        total_tokens: usage.total_tokens,
+                    },
+                }),
+                text: "",
+            });
+            yield generationChunk;
+        }
         if (options.signal?.aborted) {
             throw new Error("AbortError");
         }

package/dist/chat_models.d.ts

@@ -27,6 +27,9 @@ export interface ChatOpenAICallOptions extends OpenAICallOptions, BaseFunctionCa
         type: "json_object";
     };
     seed?: number;
+    stream_options?: {
+        include_usage: boolean;
+    };
 }
 /**
  * Wrapper around OpenAI large language models that use the Chat endpoint.

package/dist/chat_models.js

@@ -525,6 +525,9 @@ export class ChatOpenAI extends BaseChatModel {
             tool_choice: options?.tool_choice,
             response_format: options?.response_format,
             seed: options?.seed,
+            ...(options?.stream_options !== undefined
+                ? { stream_options: options.stream_options }
+                : {}),
             ...this.modelKwargs,
         };
         return params;
@@ -546,8 +549,12 @@ export class ChatOpenAI extends BaseChatModel {
         };
         let defaultRole;
         const streamIterable = await this.completionWithRetry(params, options);
+        let usage;
         for await (const data of streamIterable) {
             const choice = data?.choices[0];
+            if (data.usage) {
+                usage = data.usage;
+            }
             if (!choice) {
                 continue;
             }
@@ -582,6 +589,20 @@ export class ChatOpenAI extends BaseChatModel {
             // eslint-disable-next-line no-void
             void runManager?.handleLLMNewToken(generationChunk.text ?? "", newTokenIndices, undefined, undefined, undefined, { chunk: generationChunk });
         }
+        if (usage) {
+            const generationChunk = new ChatGenerationChunk({
+                message: new AIMessageChunk({
+                    content: "",
+                    usage_metadata: {
+                        input_tokens: usage.prompt_tokens,
+                        output_tokens: usage.completion_tokens,
+                        total_tokens: usage.total_tokens,
+                    },
+                }),
+                text: "",
+            });
+            yield generationChunk;
+        }
         if (options.signal?.aborted) {
             throw new Error("AbortError");
         }

package/dist/utils/azure.cjs

@@ -25,7 +25,7 @@ exports.getEndpoint = void 0;
  */
 function getEndpoint(config) {
     const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, baseURL, azureADTokenProvider, } = config;
-    if (azureOpenAIApiKey &&
+    if ((azureOpenAIApiKey || azureADTokenProvider) &&
         azureOpenAIBasePath &&
         azureOpenAIApiDeploymentName) {
         return `${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`;

package/dist/utils/azure.js

@@ -22,7 +22,7 @@
  */
 export function getEndpoint(config) {
     const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, baseURL, azureADTokenProvider, } = config;
-    if (azureOpenAIApiKey &&
+    if ((azureOpenAIApiKey || azureADTokenProvider) &&
         azureOpenAIBasePath &&
         azureOpenAIApiDeploymentName) {
         return `${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/openai",
-  "version": "0.0.33",
+  "version": "0.1.0",
   "description": "OpenAI integrations for LangChain.js",
   "type": "module",
   "engines": {
@@ -14,7 +14,8 @@
   },
   "homepage": "https://github.com/langchain-ai/langchainjs/tree/main/libs/langchain-openai/",
   "scripts": {
-    "build": "yarn run build:deps && yarn clean && yarn build:esm && yarn build:cjs && yarn build:scripts",
+    "build": "yarn turbo:command build:internal --filter=@langchain/openai",
+    "build:internal": "yarn lc-build:v2 --create-entrypoints --pre --tree-shaking",
     "build:deps": "yarn run turbo:command build --filter=@langchain/core",
     "build:esm": "NODE_OPTIONS=--max-old-space-size=4096 tsc --outDir dist/",
     "build:cjs": "NODE_OPTIONS=--max-old-space-size=4096 tsc --outDir dist-cjs/ -p tsconfig.cjs.json && yarn move-cjs-to-dist && rimraf dist-cjs",
@@ -24,7 +25,7 @@
     "lint:dpdm": "dpdm --exit-code circular:1 --no-warning --no-tree src/*.ts src/**/*.ts",
     "lint": "yarn lint:eslint && yarn lint:dpdm",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:dpdm",
-    "clean": "rimraf .turbo/ dist/ && NODE_OPTIONS=--max-old-space-size=4096 yarn lc-build --config ./langchain.config.js --create-entrypoints --pre",
+    "clean": "rm -rf .turbo dist/",
     "prepack": "yarn build",
     "test": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules jest --testPathIgnorePatterns=\\.int\\.test.ts --testTimeout 30000 --maxWorkers=50%",
     "test:watch": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules jest --watch --testPathIgnorePatterns=\\.int\\.test.ts",
@@ -39,7 +40,7 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@langchain/core": ">0.1.56 <0.3.0",
+    "@langchain/core": ">=0.2.5 <0.3.0",
     "js-tiktoken": "^1.0.12",
     "openai": "^4.41.1",
     "zod": "^3.22.4",
@@ -48,7 +49,7 @@
   "devDependencies": {
     "@azure/identity": "^4.2.0",
     "@jest/globals": "^29.5.0",
-    "@langchain/scripts": "~0.0",
+    "@langchain/scripts": "~0.0.14",
     "@swc/core": "^1.3.90",
     "@swc/jest": "^0.2.29",
     "dpdm": "^3.12.0",

package/dist/tests/azure/chat_models.int.test.d.ts

@@ -1 +0,0 @@
-export {};