langchain 0.0.184 → 0.0.186

package/dist/chat_models/ollama.cjs

@@ -213,6 +213,12 @@ class ChatOllama extends base_js_1.SimpleChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -247,6 +253,7 @@ class ChatOllama extends base_js_1.SimpleChatModel {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -260,6 +267,7 @@ class ChatOllama extends base_js_1.SimpleChatModel {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/chat_models/ollama.d.ts

@@ -3,6 +3,7 @@ import { BaseLanguageModelCallOptions } from "../base_language/index.js";
 import { OllamaInput } from "../util/ollama.js";
 import { CallbackManagerForLLMRun } from "../callbacks/manager.js";
 import { BaseMessage, ChatGenerationChunk } from "../schema/index.js";
+import type { StringWithAutocomplete } from "../util/types.js";
 /**
  * An interface defining the options for an Ollama API call. It extends
  * the BaseLanguageModelCallOptions interface.
@@ -49,6 +50,7 @@ export declare class ChatOllama extends SimpleChatModel<OllamaCallOptions> imple
     useMLock?: boolean;
     useMMap?: boolean;
     vocabOnly?: boolean;
+    format?: StringWithAutocomplete<"json">;
     constructor(fields: OllamaInput & BaseChatModelParams);
     _llmType(): string;
     /**
@@ -59,6 +61,7 @@ export declare class ChatOllama extends SimpleChatModel<OllamaCallOptions> imple
      */
     invocationParams(options?: this["ParsedCallOptions"]): {
         model: string;
+        format: StringWithAutocomplete<"json"> | undefined;
         options: {
             embedding_only: boolean | undefined;
             f16_kv: boolean | undefined;

package/dist/chat_models/ollama.js

@@ -210,6 +210,12 @@ export class ChatOllama extends SimpleChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -244,6 +250,7 @@ export class ChatOllama extends SimpleChatModel {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -257,6 +264,7 @@ export class ChatOllama extends SimpleChatModel {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/chat_models/openai.cjs

@@ -421,6 +421,9 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
                 continue;
             }
             const { delta } = choice;
+            if (!delta) {
+                continue;
+            }
             const chunk = _convertDeltaToMessageChunk(delta, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {

package/dist/chat_models/openai.js

@@ -418,6 +418,9 @@ export class ChatOpenAI extends BaseChatModel {
                 continue;
             }
             const { delta } = choice;
+            if (!delta) {
+                continue;
+            }
             const chunk = _convertDeltaToMessageChunk(delta, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {

package/dist/document_loaders/fs/pdf.cjs

@@ -59,9 +59,23 @@ class PDFLoader extends buffer_js_1.BufferLoader {
             if (content.items.length === 0) {
                 continue;
             }
-            const text = content.items
-                .map((item) => item.str)
-                .join("\n");
+            // Eliminate excessive newlines
+            // Source: https://github.com/albertcui/pdf-parse/blob/7086fc1cc9058545cdf41dd0646d6ae5832c7107/lib/pdf-parse.js#L16
+            let lastY;
+            const textItems = [];
+            for (const item of content.items) {
+                if ("str" in item) {
+                    if (lastY === item.transform[5] || !lastY) {
+                        textItems.push(item.str);
+                    }
+                    else {
+                        textItems.push(`\n${item.str}`);
+                    }
+                    // eslint-disable-next-line prefer-destructuring
+                    lastY = item.transform[5];
+                }
+            }
+            const text = textItems.join(" ");
             documents.push(new document_js_1.Document({
                 pageContent: text,
                 metadata: {

package/dist/document_loaders/fs/pdf.js

@@ -56,9 +56,23 @@ export class PDFLoader extends BufferLoader {
             if (content.items.length === 0) {
                 continue;
             }
-            const text = content.items
-                .map((item) => item.str)
-                .join("\n");
+            // Eliminate excessive newlines
+            // Source: https://github.com/albertcui/pdf-parse/blob/7086fc1cc9058545cdf41dd0646d6ae5832c7107/lib/pdf-parse.js#L16
+            let lastY;
+            const textItems = [];
+            for (const item of content.items) {
+                if ("str" in item) {
+                    if (lastY === item.transform[5] || !lastY) {
+                        textItems.push(item.str);
+                    }
+                    else {
+                        textItems.push(`\n${item.str}`);
+                    }
+                    // eslint-disable-next-line prefer-destructuring
+                    lastY = item.transform[5];
+                }
+            }
+            const text = textItems.join(" ");
             documents.push(new Document({
                 pageContent: text,
                 metadata: {

package/dist/document_loaders/fs/unstructured.d.ts

@@ -5,6 +5,7 @@ import type { readFile as ReadFileT } from "node:fs/promises";
 import { DirectoryLoader, UnknownHandling } from "./directory.js";
 import { Document } from "../../document.js";
 import { BaseDocumentLoader } from "../base.js";
+import type { StringWithAutocomplete } from "../../util/types.js";
 /**
  * Represents an element returned by the Unstructured API. It has
  * properties for the element type, text content, and metadata.
@@ -40,11 +41,6 @@ export type SkipInferTableTypes = "txt" | "text" | "pdf" | "docx" | "doc" | "jpg
  * Set the chunking_strategy to chunk text into larger or smaller elements. Defaults to None with optional arg of by_title
  */
 type ChunkingStrategy = "None" | "by_title";
-/**
- * Represents a string value with autocomplete suggestions. It is used for
- * the `strategy` property in the UnstructuredLoaderOptions.
- */
-type StringWithAutocomplete<T> = T | (string & Record<never, never>);
 export type UnstructuredLoaderOptions = {
     apiKey?: string;
     apiUrl?: string;

package/dist/document_loaders/web/apify_dataset.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApifyDatasetLoader = void 0;
 const apify_client_1 = require("apify-client");
+const async_caller_js_1 = require("../../util/async_caller.cjs");
 const base_js_1 = require("../base.cjs");
 const env_js_1 = require("../../util/env.cjs");
 /**
@@ -31,13 +32,18 @@ class ApifyDatasetLoader extends base_js_1.BaseDocumentLoader {
             writable: true,
             value: void 0
         });
-        const apifyApiToken = ApifyDatasetLoader._getApifyApiToken(config.clientOptions);
-        this.apifyClient = new apify_client_1.ApifyClient({
-            ...config.clientOptions,
-            token: apifyApiToken,
+        Object.defineProperty(this, "caller", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
         });
+        const { clientOptions, datasetMappingFunction, ...asyncCallerParams } = config;
+        const token = ApifyDatasetLoader._getApifyApiToken(clientOptions);
+        this.apifyClient = new apify_client_1.ApifyClient({ ...clientOptions, token });
         this.datasetId = datasetId;
-        this.datasetMappingFunction = config.datasetMappingFunction;
+        this.datasetMappingFunction = datasetMappingFunction;
+        this.caller = new async_caller_js_1.AsyncCaller(asyncCallerParams);
     }
     static _getApifyApiToken(config) {
         return config?.token ?? (0, env_js_1.getEnvironmentVariable)("APIFY_API_TOKEN");
@@ -50,7 +56,7 @@ class ApifyDatasetLoader extends base_js_1.BaseDocumentLoader {
      */
     async load() {
         const datasetItems = (await this.apifyClient.dataset(this.datasetId).listItems({ clean: true })).items;
-        return datasetItems.map(this.datasetMappingFunction);
+        return await Promise.all(datasetItems.map((item) => this.caller.call(async () => this.datasetMappingFunction(item))));
     }
     /**
      * Create an ApifyDatasetLoader by calling an Actor on the Apify platform and waiting for its results to be ready.

package/dist/document_loaders/web/apify_dataset.d.ts

@@ -1,11 +1,16 @@
 import { ActorCallOptions, ApifyClient, ApifyClientOptions, TaskCallOptions } from "apify-client";
+import { AsyncCaller, AsyncCallerParams } from "../../util/async_caller.js";
 import { BaseDocumentLoader, DocumentLoader } from "../base.js";
 import { Document } from "../../document.js";
 /**
  * A type that represents a function that takes a single object (an Apify
  * dataset item) and converts it to an instance of the Document class.
  */
-export type ApifyDatasetMappingFunction<Metadata extends Record<string, any>> = (item: Record<string | number, unknown>) => Document<Metadata>;
+export type ApifyDatasetMappingFunction<Metadata extends Record<string, any>> = (item: Record<string | number, unknown>) => Document<Metadata> | Promise<Document<Metadata>>;
+export interface ApifyDatasetLoaderConfig<Metadata extends Record<string, any>> extends AsyncCallerParams {
+    datasetMappingFunction: ApifyDatasetMappingFunction<Metadata>;
+    clientOptions?: ApifyClientOptions;
+}
 /**
  * A class that extends the BaseDocumentLoader and implements the
  * DocumentLoader interface. It represents a document loader that loads
@@ -14,11 +19,9 @@ export type ApifyDatasetMappingFunction<Metadata extends Record<string, any>> =
 export declare class ApifyDatasetLoader<Metadata extends Record<string, any>> extends BaseDocumentLoader implements DocumentLoader {
     protected apifyClient: ApifyClient;
     protected datasetId: string;
-    protected datasetMappingFunction: (item: Record<string | number, unknown>) => Document<Metadata>;
-    constructor(datasetId: string, config: {
-        datasetMappingFunction: ApifyDatasetMappingFunction<Metadata>;
-        clientOptions?: ApifyClientOptions;
-    });
+    protected datasetMappingFunction: ApifyDatasetMappingFunction<Metadata>;
+    protected caller: AsyncCaller;
+    constructor(datasetId: string, config: ApifyDatasetLoaderConfig<Metadata>);
     private static _getApifyApiToken;
     /**
      * Retrieves the dataset items from the Apify platform and applies the

package/dist/document_loaders/web/apify_dataset.js

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { ApifyClient, } from "apify-client";
+import { AsyncCaller } from "../../util/async_caller.js";
 import { BaseDocumentLoader } from "../base.js";
 import { getEnvironmentVariable } from "../../util/env.js";
 /**
@@ -28,13 +29,18 @@ export class ApifyDatasetLoader extends BaseDocumentLoader {
             writable: true,
             value: void 0
         });
-        const apifyApiToken = ApifyDatasetLoader._getApifyApiToken(config.clientOptions);
-        this.apifyClient = new ApifyClient({
-            ...config.clientOptions,
-            token: apifyApiToken,
+        Object.defineProperty(this, "caller", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
         });
+        const { clientOptions, datasetMappingFunction, ...asyncCallerParams } = config;
+        const token = ApifyDatasetLoader._getApifyApiToken(clientOptions);
+        this.apifyClient = new ApifyClient({ ...clientOptions, token });
         this.datasetId = datasetId;
-        this.datasetMappingFunction = config.datasetMappingFunction;
+        this.datasetMappingFunction = datasetMappingFunction;
+        this.caller = new AsyncCaller(asyncCallerParams);
     }
     static _getApifyApiToken(config) {
         return config?.token ?? getEnvironmentVariable("APIFY_API_TOKEN");
@@ -47,7 +53,7 @@ export class ApifyDatasetLoader extends BaseDocumentLoader {
      */
     async load() {
         const datasetItems = (await this.apifyClient.dataset(this.datasetId).listItems({ clean: true })).items;
-        return datasetItems.map(this.datasetMappingFunction);
+        return await Promise.all(datasetItems.map((item) => this.caller.call(async () => this.datasetMappingFunction(item))));
     }
     /**
      * Create an ApifyDatasetLoader by calling an Actor on the Apify platform and waiting for its results to be ready.

package/dist/document_loaders/web/pdf.cjs

@@ -52,9 +52,23 @@ class WebPDFLoader extends base_js_1.BaseDocumentLoader {
             if (content.items.length === 0) {
                 continue;
             }
-            const text = content.items
-                .map((item) => item.str)
-                .join("\n");
+            // Eliminate excessive newlines
+            // Source: https://github.com/albertcui/pdf-parse/blob/7086fc1cc9058545cdf41dd0646d6ae5832c7107/lib/pdf-parse.js#L16
+            let lastY;
+            const textItems = [];
+            for (const item of content.items) {
+                if ("str" in item) {
+                    if (lastY === item.transform[5] || !lastY) {
+                        textItems.push(item.str);
+                    }
+                    else {
+                        textItems.push(`\n${item.str}`);
+                    }
+                    // eslint-disable-next-line prefer-destructuring
+                    lastY = item.transform[5];
+                }
+            }
+            const text = textItems.join(" ");
             documents.push(new document_js_1.Document({
                 pageContent: text,
                 metadata: {

package/dist/document_loaders/web/pdf.js

@@ -49,9 +49,23 @@ export class WebPDFLoader extends BaseDocumentLoader {
             if (content.items.length === 0) {
                 continue;
             }
-            const text = content.items
-                .map((item) => item.str)
-                .join("\n");
+            // Eliminate excessive newlines
+            // Source: https://github.com/albertcui/pdf-parse/blob/7086fc1cc9058545cdf41dd0646d6ae5832c7107/lib/pdf-parse.js#L16
+            let lastY;
+            const textItems = [];
+            for (const item of content.items) {
+                if ("str" in item) {
+                    if (lastY === item.transform[5] || !lastY) {
+                        textItems.push(item.str);
+                    }
+                    else {
+                        textItems.push(`\n${item.str}`);
+                    }
+                    // eslint-disable-next-line prefer-destructuring
+                    lastY = item.transform[5];
+                }
+            }
+            const text = textItems.join(" ");
             documents.push(new Document({
                 pageContent: text,
                 metadata: {

package/dist/document_loaders/web/puppeteer.cjs

@@ -63,6 +63,43 @@ class PuppeteerWebBaseLoader extends base_js_1.BaseDocumentLoader {
         const metadata = { source: this.webPath };
         return [new document_js_1.Document({ pageContent: text, metadata })];
     }
+    /**
+     * Static class method used to screenshot a web page and return
+     * it as a {@link Document} object where  the pageContent property
+     * is the screenshot encoded in base64.
+     *
+     * @param {string} url
+     * @param {PuppeteerWebBaseLoaderOptions} options
+     * @returns {Document} A document object containing the screenshot of the page encoded in base64.
+     */
+    static async _screenshot(url, options) {
+        const { launch } = await PuppeteerWebBaseLoader.imports();
+        const browser = await launch({
+            headless: true,
+            defaultViewport: null,
+            ignoreDefaultArgs: ["--disable-extensions"],
+            ...options?.launchOptions,
+        });
+        const page = await browser.newPage();
+        await page.goto(url, {
+            timeout: 180000,
+            waitUntil: "domcontentloaded",
+            ...options?.gotoOptions,
+        });
+        const screenshot = await page.screenshot();
+        const base64 = screenshot.toString("base64");
+        const metadata = { source: url };
+        return new document_js_1.Document({ pageContent: base64, metadata });
+    }
+    /**
+     * Screenshot a web page and return it as a {@link Document} object where
+     * the pageContent property is the screenshot encoded in base64.
+     *
+     * @returns {Promise<Document>} A document object containing the screenshot of the page encoded in base64.
+     */
+    async screenshot() {
+        return PuppeteerWebBaseLoader._screenshot(this.webPath, this.options);
+    }
     /**
      * Static method that imports the necessary Puppeteer modules. It returns
      * a Promise that resolves to an object containing the imported modules.

package/dist/document_loaders/web/puppeteer.d.ts

@@ -40,6 +40,23 @@ export declare class PuppeteerWebBaseLoader extends BaseDocumentLoader implement
      * @returns Promise that resolves to an array of Document objects.
      */
     load(): Promise<Document[]>;
+    /**
+     * Static class method used to screenshot a web page and return
+     * it as a {@link Document} object where  the pageContent property
+     * is the screenshot encoded in base64.
+     *
+     * @param {string} url
+     * @param {PuppeteerWebBaseLoaderOptions} options
+     * @returns {Document} A document object containing the screenshot of the page encoded in base64.
+     */
+    static _screenshot(url: string, options?: PuppeteerWebBaseLoaderOptions): Promise<Document>;
+    /**
+     * Screenshot a web page and return it as a {@link Document} object where
+     * the pageContent property is the screenshot encoded in base64.
+     *
+     * @returns {Promise<Document>} A document object containing the screenshot of the page encoded in base64.
+     */
+    screenshot(): Promise<Document>;
     /**
      * Static method that imports the necessary Puppeteer modules. It returns
      * a Promise that resolves to an object containing the imported modules.

package/dist/document_loaders/web/puppeteer.js

@@ -60,6 +60,43 @@ export class PuppeteerWebBaseLoader extends BaseDocumentLoader {
         const metadata = { source: this.webPath };
         return [new Document({ pageContent: text, metadata })];
     }
+    /**
+     * Static class method used to screenshot a web page and return
+     * it as a {@link Document} object where  the pageContent property
+     * is the screenshot encoded in base64.
+     *
+     * @param {string} url
+     * @param {PuppeteerWebBaseLoaderOptions} options
+     * @returns {Document} A document object containing the screenshot of the page encoded in base64.
+     */
+    static async _screenshot(url, options) {
+        const { launch } = await PuppeteerWebBaseLoader.imports();
+        const browser = await launch({
+            headless: true,
+            defaultViewport: null,
+            ignoreDefaultArgs: ["--disable-extensions"],
+            ...options?.launchOptions,
+        });
+        const page = await browser.newPage();
+        await page.goto(url, {
+            timeout: 180000,
+            waitUntil: "domcontentloaded",
+            ...options?.gotoOptions,
+        });
+        const screenshot = await page.screenshot();
+        const base64 = screenshot.toString("base64");
+        const metadata = { source: url };
+        return new Document({ pageContent: base64, metadata });
+    }
+    /**
+     * Screenshot a web page and return it as a {@link Document} object where
+     * the pageContent property is the screenshot encoded in base64.
+     *
+     * @returns {Promise<Document>} A document object containing the screenshot of the page encoded in base64.
+     */
+    async screenshot() {
+        return PuppeteerWebBaseLoader._screenshot(this.webPath, this.options);
+    }
     /**
      * Static method that imports the necessary Puppeteer modules. It returns
      * a Promise that resolves to an object containing the imported modules.

package/dist/embeddings/ollama.d.ts

@@ -1,6 +1,6 @@
 import { OllamaInput, OllamaRequestParams } from "../util/ollama.js";
 import { Embeddings, EmbeddingsParams } from "./base.js";
-type CamelCasedRequestOptions = Omit<OllamaInput, "baseUrl" | "model">;
+type CamelCasedRequestOptions = Omit<OllamaInput, "baseUrl" | "model" | "format">;
 /**
  * Interface for OllamaEmbeddings parameters. Extends EmbeddingsParams and
  * defines additional parameters specific to the OllamaEmbeddings class.

package/dist/experimental/plan_and_execute/agent_executor.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlanAndExecuteAgentExecutor = void 0;
+exports.PlanAndExecuteAgentExecutor = exports.isDynamicStructuredTool = void 0;
 const base_js_1 = require("../../chains/base.cjs");
 const base_js_2 = require("./base.cjs");
 const executor_js_1 = require("../../agents/executor.cjs");
@@ -8,6 +8,21 @@ const prompt_js_1 = require("./prompt.cjs");
 const llm_chain_js_1 = require("../../chains/llm_chain.cjs");
 const outputParser_js_1 = require("./outputParser.cjs");
 const index_js_1 = require("../../agents/chat/index.cjs");
+const index_js_2 = require("../../agents/index.cjs");
+/**
+ * A utility function to distiguish a dynamicstructuredtool over other tools.
+ * @param tool the tool to test
+ * @returns bool
+ */
+function isDynamicStructuredTool(tool) {
+    // We check for the existence of the static lc_name method in the object's constructor
+    return (
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    typeof tool.constructor.lc_name === "function" &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        tool.constructor.lc_name() === "DynamicStructuredTool");
+}
+exports.isDynamicStructuredTool = isDynamicStructuredTool;
 /**
  * Class representing a plan-and-execute agent executor. This agent
  * decides on the full sequence of actions upfront, then executes them all
@@ -86,7 +101,18 @@ class PlanAndExecuteAgentExecutor extends base_js_1.BaseChain {
      * @returns A new ChainStepExecutor instance.
      */
     static getDefaultStepExecutor({ llm, tools, humanMessageTemplate = prompt_js_1.DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE, }) {
-        const agent = index_js_1.ChatAgent.fromLLMAndTools(llm, tools, {
+        let agent;
+        if (isDynamicStructuredTool(tools[0])) {
+            agent = index_js_2.StructuredChatAgent.fromLLMAndTools(llm, tools, {
+                humanMessageTemplate,
+                inputVariables: ["previous_steps", "current_step", "agent_scratchpad"],
+            });
+            return new base_js_2.ChainStepExecutor(executor_js_1.AgentExecutor.fromAgentAndTools({
+                agent,
+                tools,
+            }));
+        }
+        agent = index_js_1.ChatAgent.fromLLMAndTools(llm, tools, {
             humanMessageTemplate,
         });
         return new base_js_2.ChainStepExecutor(executor_js_1.AgentExecutor.fromAgentAndTools({

package/dist/experimental/plan_and_execute/agent_executor.d.ts

@@ -4,7 +4,14 @@ import { ChainValues } from "../../schema/index.js";
 import { BaseLanguageModel } from "../../base_language/index.js";
 import { CallbackManagerForChainRun } from "../../callbacks/manager.js";
 import { Tool } from "../../tools/base.js";
+import { DynamicStructuredTool } from "../../tools/dynamic.js";
 import { SerializedLLMChain } from "../../chains/serde.js";
+/**
+ * A utility function to distiguish a dynamicstructuredtool over other tools.
+ * @param tool the tool to test
+ * @returns bool
+ */
+export declare function isDynamicStructuredTool(tool: Tool | DynamicStructuredTool): tool is DynamicStructuredTool;
 /**
  * Interface for the input to the PlanAndExecuteAgentExecutor class. It
  * extends ChainInputs and includes additional properties for the planner,
@@ -42,7 +49,7 @@ export declare class PlanAndExecuteAgentExecutor extends BaseChain {
      */
     static getDefaultPlanner({ llm, tools, }: {
         llm: BaseLanguageModel;
-        tools: Tool[];
+        tools: Tool[] | DynamicStructuredTool[];
     }): Promise<LLMPlanner>;
     /**
      * Static method that returns a default step executor for the agent. It
@@ -55,7 +62,7 @@ export declare class PlanAndExecuteAgentExecutor extends BaseChain {
      */
     static getDefaultStepExecutor({ llm, tools, humanMessageTemplate, }: {
         llm: BaseLanguageModel;
-        tools: Tool[];
+        tools: Tool[] | DynamicStructuredTool[];
         humanMessageTemplate?: string;
     }): ChainStepExecutor;
     /**
@@ -70,7 +77,7 @@ export declare class PlanAndExecuteAgentExecutor extends BaseChain {
      */
     static fromLLMAndTools({ llm, tools, humanMessageTemplate, }: {
         llm: BaseLanguageModel;
-        tools: Tool[];
+        tools: Tool[] | DynamicStructuredTool[];
         humanMessageTemplate?: string;
     } & Omit<PlanAndExecuteAgentExecutorInput, "planner" | "stepExecutor">): Promise<PlanAndExecuteAgentExecutor>;
     /** @ignore */

package/dist/experimental/plan_and_execute/agent_executor.js

@@ -5,6 +5,20 @@ import { DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE, getPlannerChatPrompt
 import { LLMChain } from "../../chains/llm_chain.js";
 import { PlanOutputParser } from "./outputParser.js";
 import { ChatAgent } from "../../agents/chat/index.js";
+import { StructuredChatAgent } from "../../agents/index.js";
+/**
+ * A utility function to distiguish a dynamicstructuredtool over other tools.
+ * @param tool the tool to test
+ * @returns bool
+ */
+export function isDynamicStructuredTool(tool) {
+    // We check for the existence of the static lc_name method in the object's constructor
+    return (
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    typeof tool.constructor.lc_name === "function" &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        tool.constructor.lc_name() === "DynamicStructuredTool");
+}
 /**
  * Class representing a plan-and-execute agent executor. This agent
  * decides on the full sequence of actions upfront, then executes them all
@@ -83,7 +97,18 @@ export class PlanAndExecuteAgentExecutor extends BaseChain {
      * @returns A new ChainStepExecutor instance.
      */
     static getDefaultStepExecutor({ llm, tools, humanMessageTemplate = DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE, }) {
-        const agent = ChatAgent.fromLLMAndTools(llm, tools, {
+        let agent;
+        if (isDynamicStructuredTool(tools[0])) {
+            agent = StructuredChatAgent.fromLLMAndTools(llm, tools, {
+                humanMessageTemplate,
+                inputVariables: ["previous_steps", "current_step", "agent_scratchpad"],
+            });
+            return new ChainStepExecutor(AgentExecutor.fromAgentAndTools({
+                agent,
+                tools,
+            }));
+        }
+        agent = ChatAgent.fromLLMAndTools(llm, tools, {
             humanMessageTemplate,
         });
         return new ChainStepExecutor(AgentExecutor.fromAgentAndTools({

package/dist/experimental/plan_and_execute/prompt.d.ts

@@ -1,5 +1,6 @@
 import { ChatPromptTemplate } from "../../prompts/chat.js";
 import { Tool } from "../../tools/base.js";
+import { DynamicStructuredTool } from "../../tools/dynamic.js";
 export declare const PLANNER_SYSTEM_PROMPT_MESSAGE_TEMPLATE: string;
 export declare const DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE = "Previous steps: {previous_steps}\n\nCurrent objective: {current_step}\n\n{agent_scratchpad}\n\nYou may extract and combine relevant data from your previous steps when responding to me.";
 /**
@@ -9,4 +10,4 @@ export declare const DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE = "Previo
  * @param tools the tools available to the `planner`
  * @returns
  */
-export declare const getPlannerChatPrompt: (tools: Tool[]) => Promise<ChatPromptTemplate<import("../../schema/index.js").InputValues<string>, any>>;
+export declare const getPlannerChatPrompt: (tools: Tool[] | DynamicStructuredTool[]) => Promise<ChatPromptTemplate<import("../../schema/index.js").InputValues<string>, any>>;

package/dist/llms/ollama.cjs

@@ -212,6 +212,12 @@ class Ollama extends base_js_1.LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -246,6 +252,7 @@ class Ollama extends base_js_1.LLM {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -253,6 +260,7 @@ class Ollama extends base_js_1.LLM {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,