langchain 0.0.140 → 0.0.142

package/dist/types/openai-types.d.ts

@@ -1,5 +1,4 @@
-import { AxiosRequestConfig } from "axios";
-import { ChatCompletionRequestMessage } from "openai";
+import type { OpenAI as OpenAIClient } from "openai";
 import { BaseLanguageModelCallOptions } from "../base_language/index.js";
 export declare interface OpenAIBaseInput {
     /** Sampling temperature to use */
@@ -42,11 +41,23 @@ export declare interface OpenAIBaseInput {
      */
     openAIApiKey?: string;
 }
+export type OpenAICoreRequestOptions<Req extends object = Record<string, unknown>> = {
+    path?: string;
+    query?: Req | undefined;
+    body?: Req | undefined;
+    headers?: Record<string, string | null | undefined> | undefined;
+    maxRetries?: number;
+    stream?: boolean | undefined;
+    timeout?: number;
+    httpAgent?: any;
+    signal?: AbortSignal | undefined | null;
+    idempotencyKey?: string;
+};
 export interface OpenAICallOptions extends BaseLanguageModelCallOptions {
     /**
      * Additional options to pass to the underlying axios request.
      */
-    options?: AxiosRequestConfig;
+    options?: OpenAICoreRequestOptions;
 }
 /**
  * Input to OpenAI class.
@@ -57,9 +68,21 @@ export declare interface OpenAIInput extends OpenAIBaseInput {
     /** Batch size to use when passing multiple documents to generate */
     batchSize: number;
 }
+/**
+ * @deprecated Use "baseURL", "defaultHeaders", and "defaultParams" instead.
+ */
+export interface LegacyOpenAIInput {
+    /** @deprecated Use baseURL instead */
+    basePath?: string;
+    /** @deprecated Use defaultHeaders and defaultQuery instead */
+    baseOptions?: {
+        headers?: Record<string, string>;
+        params?: Record<string, string>;
+    };
+}
 export interface OpenAIChatInput extends OpenAIBaseInput {
     /** ChatGPT messages to pass as a prefix to the prompt */
-    prefixMessages?: ChatCompletionRequestMessage[];
+    prefixMessages?: OpenAIClient.Chat.CreateChatCompletionRequestMessage[];
 }
 export declare interface AzureOpenAIInput {
     /**

package/dist/util/async_caller.cjs

@@ -9,6 +9,7 @@ const p_queue_1 = __importDefault(require("p-queue"));
 const STATUS_NO_RETRY = [
     400,
     401,
+    402,
     403,
     404,
     405,
@@ -69,24 +70,26 @@ class AsyncCaller {
             onFailedAttempt(error) {
                 if (error.message.startsWith("Cancel") ||
                     error.message.startsWith("TimeoutError") ||
-                    error.message.startsWith("AbortError")) {
+                    error.name === "TimeoutError" ||
+                    error.message.startsWith("AbortError") ||
+                    error.name === "AbortError") {
                     throw error;
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (error?.code === "ECONNABORTED") {
                     throw error;
                 }
+                const status = 
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const status = error?.response?.status;
+                error?.response?.status ?? error?.status;
                 if (status && STATUS_NO_RETRY.includes(+status)) {
                     throw error;
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const data = error?.response?.data;
-                if (data?.error?.code === "insufficient_quota") {
-                    const error = new Error(data?.error?.message);
-                    error.name = "InsufficientQuotaError";
-                    throw error;
+                if (error?.error?.code === "insufficient_quota") {
+                    const err = new Error(error?.message);
+                    err.name = "InsufficientQuotaError";
+                    throw err;
                 }
             },
             retries: this.maxRetries,

package/dist/util/async_caller.js

@@ -3,6 +3,7 @@ import PQueueMod from "p-queue";
 const STATUS_NO_RETRY = [
     400,
     401,
+    402,
     403,
     404,
     405,
@@ -63,24 +64,26 @@ export class AsyncCaller {
             onFailedAttempt(error) {
                 if (error.message.startsWith("Cancel") ||
                     error.message.startsWith("TimeoutError") ||
-                    error.message.startsWith("AbortError")) {
+                    error.name === "TimeoutError" ||
+                    error.message.startsWith("AbortError") ||
+                    error.name === "AbortError") {
                     throw error;
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (error?.code === "ECONNABORTED") {
                     throw error;
                 }
+                const status = 
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const status = error?.response?.status;
+                error?.response?.status ?? error?.status;
                 if (status && STATUS_NO_RETRY.includes(+status)) {
                     throw error;
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const data = error?.response?.data;
-                if (data?.error?.code === "insufficient_quota") {
-                    const error = new Error(data?.error?.message);
-                    error.name = "InsufficientQuotaError";
-                    throw error;
+                if (error?.error?.code === "insufficient_quota") {
+                    const err = new Error(error?.message);
+                    err.name = "InsufficientQuotaError";
+                    throw err;
                 }
             },
             retries: this.maxRetries,

package/dist/util/azure.cjs

@@ -11,12 +11,12 @@ exports.getEndpoint = void 0;
  * @property {string} config.azureOpenAIApiInstanceName - The instance name of Azure OpenAI.
  * @property {string} config.azureOpenAIApiKey - The API Key for Azure OpenAI.
  * @property {string} config.azureOpenAIBasePath - The base path for Azure OpenAI.
- * @property {string} config.basePath - Some other custom base path URL.
+ * @property {string} config.baseURL - Some other custom base path URL.
  *
  * The function operates as follows:
  * - If both `azureOpenAIBasePath` and `azureOpenAIApiDeploymentName` (plus `azureOpenAIApiKey`) are provided, it returns an URL combining these two parameters (`${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`).
  * - If `azureOpenAIApiKey` is provided, it checks for `azureOpenAIApiInstanceName` and `azureOpenAIApiDeploymentName` and throws an error if any of these is missing. If both are provided, it generates an URL incorporating these parameters.
- * - If none of the above conditions are met, return any custom `basePath`.
+ * - If none of the above conditions are met, return any custom `baseURL`.
  * - The function returns the generated URL as a string, or undefined if no custom paths are specified.
  *
  * @throws Will throw an error if the necessary parameters for generating the URL are missing.
@@ -24,7 +24,7 @@ exports.getEndpoint = void 0;
  * @returns {string | undefined} The generated (Azure) OpenAI endpoint URL.
  */
 function getEndpoint(config) {
-    const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, basePath, } = config;
+    const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, baseURL, } = config;
     if (azureOpenAIApiKey &&
         azureOpenAIBasePath &&
         azureOpenAIApiDeploymentName) {
@@ -39,6 +39,6 @@ function getEndpoint(config) {
         }
         return `https://${azureOpenAIApiInstanceName}.openai.azure.com/openai/deployments/${azureOpenAIApiDeploymentName}`;
     }
-    return basePath;
+    return baseURL;
 }
 exports.getEndpoint = getEndpoint;

package/dist/util/azure.d.ts

@@ -3,7 +3,7 @@ export interface OpenAIEndpointConfig {
     azureOpenAIApiInstanceName?: string;
     azureOpenAIApiKey?: string;
     azureOpenAIBasePath?: string;
-    basePath?: string;
+    baseURL?: string;
 }
 /**
  * This function generates an endpoint URL for (Azure) OpenAI
@@ -15,12 +15,12 @@ export interface OpenAIEndpointConfig {
  * @property {string} config.azureOpenAIApiInstanceName - The instance name of Azure OpenAI.
  * @property {string} config.azureOpenAIApiKey - The API Key for Azure OpenAI.
  * @property {string} config.azureOpenAIBasePath - The base path for Azure OpenAI.
- * @property {string} config.basePath - Some other custom base path URL.
+ * @property {string} config.baseURL - Some other custom base path URL.
  *
  * The function operates as follows:
  * - If both `azureOpenAIBasePath` and `azureOpenAIApiDeploymentName` (plus `azureOpenAIApiKey`) are provided, it returns an URL combining these two parameters (`${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`).
  * - If `azureOpenAIApiKey` is provided, it checks for `azureOpenAIApiInstanceName` and `azureOpenAIApiDeploymentName` and throws an error if any of these is missing. If both are provided, it generates an URL incorporating these parameters.
- * - If none of the above conditions are met, return any custom `basePath`.
+ * - If none of the above conditions are met, return any custom `baseURL`.
  * - The function returns the generated URL as a string, or undefined if no custom paths are specified.
  *
  * @throws Will throw an error if the necessary parameters for generating the URL are missing.

package/dist/util/azure.js

@@ -8,12 +8,12 @@
  * @property {string} config.azureOpenAIApiInstanceName - The instance name of Azure OpenAI.
  * @property {string} config.azureOpenAIApiKey - The API Key for Azure OpenAI.
  * @property {string} config.azureOpenAIBasePath - The base path for Azure OpenAI.
- * @property {string} config.basePath - Some other custom base path URL.
+ * @property {string} config.baseURL - Some other custom base path URL.
  *
  * The function operates as follows:
  * - If both `azureOpenAIBasePath` and `azureOpenAIApiDeploymentName` (plus `azureOpenAIApiKey`) are provided, it returns an URL combining these two parameters (`${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`).
  * - If `azureOpenAIApiKey` is provided, it checks for `azureOpenAIApiInstanceName` and `azureOpenAIApiDeploymentName` and throws an error if any of these is missing. If both are provided, it generates an URL incorporating these parameters.
- * - If none of the above conditions are met, return any custom `basePath`.
+ * - If none of the above conditions are met, return any custom `baseURL`.
  * - The function returns the generated URL as a string, or undefined if no custom paths are specified.
  *
  * @throws Will throw an error if the necessary parameters for generating the URL are missing.
@@ -21,7 +21,7 @@
  * @returns {string | undefined} The generated (Azure) OpenAI endpoint URL.
  */
 export function getEndpoint(config) {
-    const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, basePath, } = config;
+    const { azureOpenAIApiDeploymentName, azureOpenAIApiInstanceName, azureOpenAIApiKey, azureOpenAIBasePath, baseURL, } = config;
     if (azureOpenAIApiKey &&
         azureOpenAIBasePath &&
         azureOpenAIApiDeploymentName) {
@@ -36,5 +36,5 @@ export function getEndpoint(config) {
         }
         return `https://${azureOpenAIApiInstanceName}.openai.azure.com/openai/deployments/${azureOpenAIApiDeploymentName}`;
     }
-    return basePath;
+    return baseURL;
 }

package/dist/util/openai.cjs

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapOpenAIClientError = void 0;
+const openai_1 = require("openai");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function wrapOpenAIClientError(e) {
+    let error;
+    if (e.constructor.name === openai_1.APIConnectionTimeoutError.name) {
+        error = new Error(e.message);
+        error.name = "TimeoutError";
+    }
+    else if (e.constructor.name === openai_1.APIUserAbortError.name) {
+        error = new Error(e.message);
+        error.name = "AbortError";
+    }
+    else {
+        error = e;
+    }
+    return error;
+}
+exports.wrapOpenAIClientError = wrapOpenAIClientError;

package/dist/util/openai.d.ts

@@ -0,0 +1 @@
+export declare function wrapOpenAIClientError(e: any): any;

package/dist/util/openai.js

@@ -0,0 +1,17 @@
+import { APIConnectionTimeoutError, APIUserAbortError } from "openai";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function wrapOpenAIClientError(e) {
+    let error;
+    if (e.constructor.name === APIConnectionTimeoutError.name) {
+        error = new Error(e.message);
+        error.name = "TimeoutError";
+    }
+    else if (e.constructor.name === APIUserAbortError.name) {
+        error = new Error(e.message);
+        error.name = "AbortError";
+    }
+    else {
+        error = e;
+    }
+    return error;
+}

package/dist/util/prompt-layer.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptLayerTrackRequest = void 0;
-const promptLayerTrackRequest = async (callerFunc, functionName, prompt, kwargs, plTags, 
+const promptLayerTrackRequest = async (callerFunc, functionName, kwargs, plTags, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 requestResponse, startTime, endTime, apiKey) => {
     // https://github.com/MagnivOrg/promptlayer-js-helper
@@ -14,7 +14,6 @@ requestResponse, startTime, endTime, apiKey) => {
         body: JSON.stringify({
             function_name: functionName,
             provider: "langchain",
-            args: prompt,
             kwargs,
             tags: plTags,
             request_response: requestResponse,

package/dist/util/prompt-layer.d.ts

@@ -1,3 +1,3 @@
-import { CreateCompletionRequestPrompt, CreateCompletionRequest } from "openai";
+import type { OpenAI as OpenAIClient } from "openai";
 import { AsyncCaller } from "../util/async_caller.js";
-export declare const promptLayerTrackRequest: (callerFunc: AsyncCaller, functionName: string, prompt: CreateCompletionRequestPrompt, kwargs: CreateCompletionRequest, plTags: string[] | undefined, requestResponse: any, startTime: number, endTime: number, apiKey: string | undefined) => Promise<any>;
+export declare const promptLayerTrackRequest: (callerFunc: AsyncCaller, functionName: string, kwargs: OpenAIClient.CompletionCreateParams | OpenAIClient.Chat.CompletionCreateParams, plTags: string[] | undefined, requestResponse: any, startTime: number, endTime: number, apiKey: string | undefined) => Promise<any>;

package/dist/util/prompt-layer.js

@@ -1,4 +1,4 @@
-export const promptLayerTrackRequest = async (callerFunc, functionName, prompt, kwargs, plTags, 
+export const promptLayerTrackRequest = async (callerFunc, functionName, kwargs, plTags, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 requestResponse, startTime, endTime, apiKey) => {
     // https://github.com/MagnivOrg/promptlayer-js-helper
@@ -11,7 +11,6 @@ requestResponse, startTime, endTime, apiKey) => {
         body: JSON.stringify({
             function_name: functionName,
             provider: "langchain",
-            args: prompt,
             kwargs,
             tags: plTags,
             request_response: requestResponse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langchain",
-  "version": "0.0.140",
+  "version": "0.0.142",
   "description": "Typescript bindings for langchain",
   "type": "module",
   "engines": {
@@ -403,6 +403,9 @@
     "schema.cjs",
     "schema.js",
     "schema.d.ts",
+    "schema/document.cjs",
+    "schema/document.js",
+    "schema/document.d.ts",
     "schema/output_parser.cjs",
     "schema/output_parser.js",
     "schema/output_parser.d.ts",
@@ -1057,7 +1060,7 @@
     "langsmith": "~0.0.31",
     "ml-distance": "^4.0.0",
     "object-hash": "^3.0.0",
-    "openai": "^3.3.0",
+    "openai": "^4.4.0",
     "openapi-types": "^12.1.3",
     "p-queue": "^6.6.2",
     "p-retry": "4",
@@ -1754,6 +1757,11 @@
       "import": "./schema.js",
       "require": "./schema.cjs"
     },
+    "./schema/document": {
+      "types": "./schema/document.d.ts",
+      "import": "./schema/document.js",
+      "require": "./schema/document.cjs"
+    },
     "./schema/output_parser": {
       "types": "./schema/output_parser.d.ts",
       "import": "./schema/output_parser.js",

package/schema/document.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/schema/document.cjs');

package/schema/document.d.ts

@@ -0,0 +1 @@
+export * from '../dist/schema/document.js'

package/schema/document.js

@@ -0,0 +1 @@
+export * from '../dist/schema/document.js'