@langchain/core 0.3.22 → 0.3.23

package/dist/singletons/index.js

@@ -1,3 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { AsyncLocalStorageProviderSingleton, _CONTEXT_VARIABLES_KEY, MockAsyncLocalStorage, } from "./async_local_storage/index.js";
-export { AsyncLocalStorageProviderSingleton, _CONTEXT_VARIABLES_KEY, MockAsyncLocalStorage, };
+import { AsyncLocalStorageProviderSingleton, MockAsyncLocalStorage, } from "./async_local_storage/index.js";
+import { _CONTEXT_VARIABLES_KEY } from "./async_local_storage/globals.js";
+export { AsyncLocalStorageProviderSingleton, MockAsyncLocalStorage, };
+export { _CONTEXT_VARIABLES_KEY };

package/dist/tools/index.cjs

@@ -60,21 +60,23 @@ class StructuredTool extends base_js_1.BaseLangChain {
     async invoke(input, config) {
         let tool_call_id;
         let toolInput;
+        let enrichedConfig = (0, config_js_1.ensureConfig)(config);
         if ((0, utils_js_1._isToolCall)(input)) {
             tool_call_id = input.id;
             toolInput = input.args;
+            enrichedConfig = {
+                ...enrichedConfig,
+                toolCall: input,
+                configurable: {
+                    ...enrichedConfig.configurable,
+                    tool_call_id,
+                },
+            };
         }
         else {
             toolInput = input;
         }
-        const ensuredConfig = (0, config_js_1.ensureConfig)(config);
-        return this.call(toolInput, {
-            ...ensuredConfig,
-            configurable: {
-                ...ensuredConfig.configurable,
-                tool_call_id,
-            },
-        });
+        return this.call(toolInput, enrichedConfig);
     }
     /**
      * @deprecated Use .invoke() instead. Will be removed in 0.3.0.
@@ -103,7 +105,7 @@ class StructuredTool extends base_js_1.BaseLangChain {
             throw new utils_js_1.ToolInputParsingException(message, JSON.stringify(arg));
         }
         const config = (0, manager_js_1.parseCallbackConfigArg)(configArg);
-        const callbackManager_ = await manager_js_1.CallbackManager.configure(config.callbacks, this.callbacks, config.tags || tags, this.tags, config.metadata, this.metadata, { verbose: this.verbose });
+        const callbackManager_ = manager_js_1.CallbackManager.configure(config.callbacks, this.callbacks, config.tags || tags, this.tags, config.metadata, this.metadata, { verbose: this.verbose });
         const runManager = await callbackManager_?.handleToolStart(this.toJSON(), typeof parsed === "string" ? parsed : JSON.stringify(parsed), config.runId, undefined, undefined, undefined, config.runName);
         delete config.runId;
         let result;
@@ -353,7 +355,7 @@ function tool(func, fields) {
 exports.tool = tool;
 function _formatToolOutput(params) {
     const { content, artifact, toolCallId } = params;
-    if (toolCallId) {
+    if (toolCallId && !(0, tool_js_1.isDirectToolOutput)(content)) {
         if (typeof content === "string" ||
             (Array.isArray(content) &&
                 content.every((item) => typeof item === "object"))) {

package/dist/tools/index.d.ts

@@ -32,6 +32,9 @@ export interface ToolParams extends BaseLangChainParams {
      */
     verboseParsingErrors?: boolean;
 }
+export type ToolRunnableConfig<ConfigurableFieldType extends Record<string, any> = Record<string, any>> = RunnableConfig<ConfigurableFieldType> & {
+    toolCall?: ToolCall;
+};
 /**
  * Schema for defining tools.
  *
@@ -94,7 +97,7 @@ export declare abstract class StructuredTool<T extends ZodObjectAny = ZodObjectA
      */
     responseFormat?: ResponseFormat;
     constructor(fields?: ToolParams);
-    protected abstract _call(arg: z.output<T>, runManager?: CallbackManagerForToolRun, parentConfig?: RunnableConfig): Promise<ToolReturnType>;
+    protected abstract _call(arg: z.output<T>, runManager?: CallbackManagerForToolRun, parentConfig?: ToolRunnableConfig): Promise<ToolReturnType>;
     /**
      * Invokes the tool with the provided input and configuration.
      * @param input The input for the tool.
@@ -113,7 +116,7 @@ export declare abstract class StructuredTool<T extends ZodObjectAny = ZodObjectA
      * @param tags Optional tags for the tool.
      * @returns A Promise that resolves with a string.
      */
-    call(arg: (z.output<T> extends string ? string : never) | z.input<T> | ToolCall, configArg?: Callbacks | RunnableConfig, 
+    call(arg: (z.output<T> extends string ? string : never) | z.input<T>, configArg?: Callbacks | ToolRunnableConfig, 
     /** @deprecated */
     tags?: string[]): Promise<ToolReturnType>;
 }
@@ -163,7 +166,7 @@ export interface BaseDynamicToolInput extends ToolParams {
  * Interface for the input parameters of the DynamicTool class.
  */
 export interface DynamicToolInput extends BaseDynamicToolInput {
-    func: (input: string, runManager?: CallbackManagerForToolRun, config?: RunnableConfig) => Promise<ToolReturnType>;
+    func: (input: string, runManager?: CallbackManagerForToolRun, config?: ToolRunnableConfig) => Promise<ToolReturnType>;
 }
 /**
  * Interface for the input parameters of the DynamicStructuredTool class.
@@ -184,9 +187,9 @@ export declare class DynamicTool extends Tool {
     /**
      * @deprecated Use .invoke() instead. Will be removed in 0.3.0.
      */
-    call(arg: string | undefined | z.input<this["schema"]> | ToolCall, configArg?: RunnableConfig | Callbacks): Promise<ToolReturnType>;
+    call(arg: string | undefined | z.input<this["schema"]> | ToolCall, configArg?: ToolRunnableConfig | Callbacks): Promise<ToolReturnType>;
     /** @ignore */
-    _call(input: string, runManager?: CallbackManagerForToolRun, parentConfig?: RunnableConfig): Promise<ToolReturnType>;
+    _call(input: string, runManager?: CallbackManagerForToolRun, parentConfig?: ToolRunnableConfig): Promise<ToolReturnType>;
 }
 /**
  * A tool that can be created dynamically from a function, name, and
@@ -272,6 +275,6 @@ interface ToolWrapperParams<RunInput extends ZodObjectAny | z.ZodString | Record
  *
  * @returns {DynamicStructuredTool<T>} A new StructuredTool instance.
  */
-export declare function tool<T extends z.ZodString>(func: RunnableFunc<z.output<T>, ToolReturnType>, fields: ToolWrapperParams<T>): DynamicTool;
-export declare function tool<T extends ZodObjectAny>(func: RunnableFunc<z.output<T>, ToolReturnType>, fields: ToolWrapperParams<T>): DynamicStructuredTool<T>;
-export declare function tool<T extends Record<string, any>>(func: RunnableFunc<T, ToolReturnType>, fields: ToolWrapperParams<T>): DynamicStructuredTool<T>;
+export declare function tool<T extends z.ZodString>(func: RunnableFunc<z.output<T>, ToolReturnType, ToolRunnableConfig>, fields: ToolWrapperParams<T>): DynamicTool;
+export declare function tool<T extends ZodObjectAny>(func: RunnableFunc<z.output<T>, ToolReturnType, ToolRunnableConfig>, fields: ToolWrapperParams<T>): DynamicStructuredTool<T>;
+export declare function tool<T extends Record<string, any>>(func: RunnableFunc<T, ToolReturnType, ToolRunnableConfig>, fields: ToolWrapperParams<T>): DynamicStructuredTool<T>;

package/dist/tools/index.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { CallbackManager, parseCallbackConfigArg, } from "../callbacks/manager.js";
 import { BaseLangChain, } from "../language_models/base.js";
 import { ensureConfig, patchConfig, pickRunnableConfigKeys, } from "../runnables/config.js";
-import { ToolMessage } from "../messages/tool.js";
+import { isDirectToolOutput, ToolMessage } from "../messages/tool.js";
 import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
 import { _isToolCall, ToolInputParsingException } from "./utils.js";
 import { isZodSchema } from "../utils/types/is_zod_schema.js";
@@ -57,21 +57,23 @@ export class StructuredTool extends BaseLangChain {
     async invoke(input, config) {
         let tool_call_id;
         let toolInput;
+        let enrichedConfig = ensureConfig(config);
         if (_isToolCall(input)) {
             tool_call_id = input.id;
             toolInput = input.args;
+            enrichedConfig = {
+                ...enrichedConfig,
+                toolCall: input,
+                configurable: {
+                    ...enrichedConfig.configurable,
+                    tool_call_id,
+                },
+            };
         }
         else {
             toolInput = input;
         }
-        const ensuredConfig = ensureConfig(config);
-        return this.call(toolInput, {
-            ...ensuredConfig,
-            configurable: {
-                ...ensuredConfig.configurable,
-                tool_call_id,
-            },
-        });
+        return this.call(toolInput, enrichedConfig);
     }
     /**
      * @deprecated Use .invoke() instead. Will be removed in 0.3.0.
@@ -100,7 +102,7 @@ export class StructuredTool extends BaseLangChain {
             throw new ToolInputParsingException(message, JSON.stringify(arg));
         }
         const config = parseCallbackConfigArg(configArg);
-        const callbackManager_ = await CallbackManager.configure(config.callbacks, this.callbacks, config.tags || tags, this.tags, config.metadata, this.metadata, { verbose: this.verbose });
+        const callbackManager_ = CallbackManager.configure(config.callbacks, this.callbacks, config.tags || tags, this.tags, config.metadata, this.metadata, { verbose: this.verbose });
         const runManager = await callbackManager_?.handleToolStart(this.toJSON(), typeof parsed === "string" ? parsed : JSON.stringify(parsed), config.runId, undefined, undefined, undefined, config.runName);
         delete config.runId;
         let result;
@@ -344,7 +346,7 @@ export function tool(func, fields) {
 }
 function _formatToolOutput(params) {
     const { content, artifact, toolCallId } = params;
-    if (toolCallId) {
+    if (toolCallId && !isDirectToolOutput(content)) {
         if (typeof content === "string" ||
             (Array.isArray(content) &&
                 content.every((item) => typeof item === "object"))) {

package/dist/utils/json_schema.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validator = exports.deepCompareStrict = void 0;
-var index_js_1 = require("./@cfworker/json-schema/index.cjs");
-Object.defineProperty(exports, "deepCompareStrict", { enumerable: true, get: function () { return index_js_1.deepCompareStrict; } });
-Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return index_js_1.Validator; } });
+var json_schema_1 = require("@cfworker/json-schema");
+Object.defineProperty(exports, "deepCompareStrict", { enumerable: true, get: function () { return json_schema_1.deepCompareStrict; } });
+Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return json_schema_1.Validator; } });

package/dist/utils/json_schema.d.ts

@@ -1 +1 @@
-export { deepCompareStrict, Validator } from "./@cfworker/json-schema/index.js";
+export { deepCompareStrict, Validator } from "@cfworker/json-schema";

package/dist/utils/json_schema.js

@@ -1 +1 @@
-export { deepCompareStrict, Validator } from "./@cfworker/json-schema/index.js";
+export { deepCompareStrict, Validator } from "@cfworker/json-schema";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/core",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "description": "Core LangChain.js abstractions and schemas",
   "type": "module",
   "engines": {
@@ -33,6 +33,7 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
+    "@cfworker/json-schema": "^4.0.2",
     "ansi-styles": "^5.0.0",
     "camelcase": "6",
     "decamelize": "1.2.0",

package/dist/utils/@cfworker/json-schema/index.cjs

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/index.cjs"), exports);

package/dist/utils/@cfworker/json-schema/index.d.ts

@@ -1 +0,0 @@
-export * from "./src/index.js";

package/dist/utils/@cfworker/json-schema/index.js

@@ -1 +0,0 @@
-export * from "./src/index.js";

package/dist/utils/@cfworker/json-schema/src/deep-compare-strict.cjs

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deepCompareStrict = void 0;
-function deepCompareStrict(a, b) {
-    const typeofa = typeof a;
-    if (typeofa !== typeof b) {
-        return false;
-    }
-    if (Array.isArray(a)) {
-        if (!Array.isArray(b)) {
-            return false;
-        }
-        const length = a.length;
-        if (length !== b.length) {
-            return false;
-        }
-        for (let i = 0; i < length; i++) {
-            if (!deepCompareStrict(a[i], b[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-    if (typeofa === "object") {
-        if (!a || !b) {
-            return a === b;
-        }
-        const aKeys = Object.keys(a);
-        const bKeys = Object.keys(b);
-        const length = aKeys.length;
-        if (length !== bKeys.length) {
-            return false;
-        }
-        for (const k of aKeys) {
-            if (!deepCompareStrict(a[k], b[k])) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b;
-}
-exports.deepCompareStrict = deepCompareStrict;

package/dist/utils/@cfworker/json-schema/src/deep-compare-strict.d.ts

@@ -1 +0,0 @@
-export declare function deepCompareStrict(a: any, b: any): boolean;

package/dist/utils/@cfworker/json-schema/src/deep-compare-strict.js

@@ -1,39 +0,0 @@
-export function deepCompareStrict(a, b) {
-    const typeofa = typeof a;
-    if (typeofa !== typeof b) {
-        return false;
-    }
-    if (Array.isArray(a)) {
-        if (!Array.isArray(b)) {
-            return false;
-        }
-        const length = a.length;
-        if (length !== b.length) {
-            return false;
-        }
-        for (let i = 0; i < length; i++) {
-            if (!deepCompareStrict(a[i], b[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-    if (typeofa === "object") {
-        if (!a || !b) {
-            return a === b;
-        }
-        const aKeys = Object.keys(a);
-        const bKeys = Object.keys(b);
-        const length = aKeys.length;
-        if (length !== bKeys.length) {
-            return false;
-        }
-        for (const k of aKeys) {
-            if (!deepCompareStrict(a[k], b[k])) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b;
-}

package/dist/utils/@cfworker/json-schema/src/dereference.cjs

@@ -1,171 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dereference = exports.initialBaseURI = exports.ignoredKeyword = exports.schemaMapKeyword = exports.schemaArrayKeyword = exports.schemaKeyword = void 0;
-const pointer_js_1 = require("./pointer.cjs");
-exports.schemaKeyword = {
-    additionalItems: true,
-    unevaluatedItems: true,
-    items: true,
-    contains: true,
-    additionalProperties: true,
-    unevaluatedProperties: true,
-    propertyNames: true,
-    not: true,
-    if: true,
-    then: true,
-    else: true,
-};
-exports.schemaArrayKeyword = {
-    prefixItems: true,
-    items: true,
-    allOf: true,
-    anyOf: true,
-    oneOf: true,
-};
-exports.schemaMapKeyword = {
-    $defs: true,
-    definitions: true,
-    properties: true,
-    patternProperties: true,
-    dependentSchemas: true,
-};
-exports.ignoredKeyword = {
-    id: true,
-    $id: true,
-    $ref: true,
-    $schema: true,
-    $anchor: true,
-    $vocabulary: true,
-    $comment: true,
-    default: true,
-    enum: true,
-    const: true,
-    required: true,
-    type: true,
-    maximum: true,
-    minimum: true,
-    exclusiveMaximum: true,
-    exclusiveMinimum: true,
-    multipleOf: true,
-    maxLength: true,
-    minLength: true,
-    pattern: true,
-    format: true,
-    maxItems: true,
-    minItems: true,
-    uniqueItems: true,
-    maxProperties: true,
-    minProperties: true,
-};
-/**
- * Default base URI for schemas without an $id.
- * https://json-schema.org/draft/2019-09/json-schema-core.html#initial-base
- * https://tools.ietf.org/html/rfc3986#section-5.1
- */
-exports.initialBaseURI = 
-// @ts-ignore
-typeof self !== "undefined" &&
-    self.location &&
-    self.location.origin !== "null"
-    ? //@ts-ignore
-        /* #__PURE__ */ new URL(self.location.origin + self.location.pathname + location.search)
-    : /* #__PURE__ */ new URL("https://github.com/cfworker");
-function dereference(schema, lookup = Object.create(null), baseURI = exports.initialBaseURI, basePointer = "") {
-    if (schema && typeof schema === "object" && !Array.isArray(schema)) {
-        const id = schema.$id || schema.id;
-        if (id) {
-            const url = new URL(id, baseURI.href);
-            if (url.hash.length > 1) {
-                lookup[url.href] = schema;
-            }
-            else {
-                url.hash = ""; // normalize hash https://url.spec.whatwg.org/#dom-url-hash
-                if (basePointer === "") {
-                    baseURI = url;
-                }
-                else {
-                    dereference(schema, lookup, baseURI);
-                }
-            }
-        }
-    }
-    else if (schema !== true && schema !== false) {
-        return lookup;
-    }
-    // compute the schema's URI and add it to the mapping.
-    const schemaURI = baseURI.href + (basePointer ? "#" + basePointer : "");
-    if (lookup[schemaURI] !== undefined) {
-        throw new Error(`Duplicate schema URI "${schemaURI}".`);
-    }
-    lookup[schemaURI] = schema;
-    // exit early if this is a boolean schema.
-    if (schema === true || schema === false) {
-        return lookup;
-    }
-    // set the schema's absolute URI.
-    if (schema.__absolute_uri__ === undefined) {
-        Object.defineProperty(schema, "__absolute_uri__", {
-            enumerable: false,
-            value: schemaURI,
-        });
-    }
-    // if a $ref is found, resolve it's absolute URI.
-    if (schema.$ref && schema.__absolute_ref__ === undefined) {
-        const url = new URL(schema.$ref, baseURI.href);
-        url.hash = url.hash; // normalize hash https://url.spec.whatwg.org/#dom-url-hash
-        Object.defineProperty(schema, "__absolute_ref__", {
-            enumerable: false,
-            value: url.href,
-        });
-    }
-    // if a $recursiveRef is found, resolve it's absolute URI.
-    if (schema.$recursiveRef && schema.__absolute_recursive_ref__ === undefined) {
-        const url = new URL(schema.$recursiveRef, baseURI.href);
-        url.hash = url.hash; // normalize hash https://url.spec.whatwg.org/#dom-url-hash
-        Object.defineProperty(schema, "__absolute_recursive_ref__", {
-            enumerable: false,
-            value: url.href,
-        });
-    }
-    // if an $anchor is found, compute it's URI and add it to the mapping.
-    if (schema.$anchor) {
-        const url = new URL("#" + schema.$anchor, baseURI.href);
-        lookup[url.href] = schema;
-    }
-    // process subschemas.
-    for (let key in schema) {
-        if (exports.ignoredKeyword[key]) {
-            continue;
-        }
-        const keyBase = `${basePointer}/${(0, pointer_js_1.encodePointer)(key)}`;
-        const subSchema = schema[key];
-        if (Array.isArray(subSchema)) {
-            if (exports.schemaArrayKeyword[key]) {
-                const length = subSchema.length;
-                for (let i = 0; i < length; i++) {
-                    dereference(subSchema[i], lookup, baseURI, `${keyBase}/${i}`);
-                }
-            }
-        }
-        else if (exports.schemaMapKeyword[key]) {
-            for (let subKey in subSchema) {
-                dereference(subSchema[subKey], lookup, baseURI, `${keyBase}/${(0, pointer_js_1.encodePointer)(subKey)}`);
-            }
-        }
-        else {
-            dereference(subSchema, lookup, baseURI, keyBase);
-        }
-    }
-    return lookup;
-}
-exports.dereference = dereference;
-// schema identification examples
-// https://json-schema.org/draft/2019-09/json-schema-core.html#rfc.appendix.A
-// $ref delegation
-// https://github.com/json-schema-org/json-schema-spec/issues/514
-// output format
-// https://json-schema.org/draft/2019-09/json-schema-core.html#output
-// JSON pointer
-// https://tools.ietf.org/html/rfc6901
-// JSON relative pointer
-// https://tools.ietf.org/html/draft-handrews-relative-json-pointer-01

package/dist/utils/@cfworker/json-schema/src/dereference.d.ts

@@ -1,12 +0,0 @@
-import { Schema } from "./types.js";
-export declare const schemaKeyword: Record<string, boolean>;
-export declare const schemaArrayKeyword: Record<string, boolean>;
-export declare const schemaMapKeyword: Record<string, boolean>;
-export declare const ignoredKeyword: Record<string, boolean>;
-/**
- * Default base URI for schemas without an $id.
- * https://json-schema.org/draft/2019-09/json-schema-core.html#initial-base
- * https://tools.ietf.org/html/rfc3986#section-5.1
- */
-export declare let initialBaseURI: URL;
-export declare function dereference(schema: Schema | boolean, lookup?: Record<string, Schema | boolean>, baseURI?: URL, basePointer?: string): Record<string, boolean | Schema>;