langchain 0.2.7 → 0.2.8

package/dist/agents/openai_tools/index.d.ts

@@ -2,6 +2,7 @@ import type { StructuredToolInterface } from "@langchain/core/tools";
 import type { BaseChatModel, BaseChatModelCallOptions } from "@langchain/core/language_models/chat_models";
 import { ChatPromptTemplate } from "@langchain/core/prompts";
 import { OpenAIClient } from "@langchain/openai";
+import { ToolDefinition } from "@langchain/core/language_models/base";
 import { OpenAIToolsAgentOutputParser, type ToolsAgentStep } from "./output_parser.js";
 import { AgentRunnableSequence } from "../agent.js";
 export { OpenAIToolsAgentOutputParser, type ToolsAgentStep };
@@ -18,7 +19,7 @@ export type CreateOpenAIToolsAgentParams = {
         tools?: StructuredToolInterface[] | OpenAIClient.ChatCompletionTool[] | any[];
     }>;
     /** Tools this agent has access to. */
-    tools: StructuredToolInterface[];
+    tools: StructuredToolInterface[] | ToolDefinition[];
     /** The prompt to use, must have an input key of `agent_scratchpad`. */
     prompt: ChatPromptTemplate;
     /**

package/dist/agents/structured_chat/index.cjs

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStructuredChatAgent = exports.StructuredChatAgent = void 0;
 const zod_to_json_schema_1 = require("zod-to-json-schema");
+const base_1 = require("@langchain/core/language_models/base");
 const runnables_1 = require("@langchain/core/runnables");
 const prompts_1 = require("@langchain/core/prompts");
+const function_calling_1 = require("@langchain/core/utils/function_calling");
 const llm_chain_js_1 = require("../../chains/llm_chain.cjs");
 const agent_js_1 = require("../agent.cjs");
 const outputParser_js_1 = require("./outputParser.cjs");
@@ -215,7 +217,16 @@ async function createStructuredChatAgent({ llm, tools, prompt, streamRunnable, }
     if (missingVariables.length > 0) {
         throw new Error(`Provided prompt is missing required input variables: ${JSON.stringify(missingVariables)}`);
     }
-    const toolNames = tools.map((tool) => tool.name);
+    let toolNames = [];
+    if (tools.every(base_1.isOpenAITool)) {
+        toolNames = tools.map((tool) => tool.function.name);
+    }
+    else if (tools.every(function_calling_1.isStructuredTool)) {
+        toolNames = tools.map((tool) => tool.name);
+    }
+    else {
+        throw new Error("All tools must be either OpenAI or Structured tools, not a mix.");
+    }
     const partialedPrompt = await prompt.partial({
         tools: (0, render_js_1.renderTextDescriptionAndArgs)(tools),
         tool_names: toolNames.join(", "),

package/dist/agents/structured_chat/index.d.ts

@@ -1,5 +1,5 @@
 import type { StructuredToolInterface } from "@langchain/core/tools";
-import type { BaseLanguageModelInterface } from "@langchain/core/language_models/base";
+import { type BaseLanguageModelInterface, type ToolDefinition } from "@langchain/core/language_models/base";
 import type { BasePromptTemplate } from "@langchain/core/prompts";
 import { BaseMessagePromptTemplate, ChatPromptTemplate } from "@langchain/core/prompts";
 import { AgentStep } from "@langchain/core/agents";
@@ -99,7 +99,7 @@ export type CreateStructuredChatAgentParams = {
     /** LLM to use as the agent. */
     llm: BaseLanguageModelInterface;
     /** Tools this agent has access to. */
-    tools: StructuredToolInterface[];
+    tools: (StructuredToolInterface | ToolDefinition)[];
     /**
      * The prompt to use. Must have input keys for
      * `tools`, `tool_names`, and `agent_scratchpad`.

package/dist/agents/structured_chat/index.js

@@ -1,6 +1,8 @@
 import { zodToJsonSchema } from "zod-to-json-schema";
+import { isOpenAITool, } from "@langchain/core/language_models/base";
 import { RunnablePassthrough } from "@langchain/core/runnables";
 import { ChatPromptTemplate, HumanMessagePromptTemplate, SystemMessagePromptTemplate, PromptTemplate, } from "@langchain/core/prompts";
+import { isStructuredTool } from "@langchain/core/utils/function_calling";
 import { LLMChain } from "../../chains/llm_chain.js";
 import { Agent, AgentRunnableSequence, } from "../agent.js";
 import { StructuredChatOutputParserWithRetries } from "./outputParser.js";
@@ -211,7 +213,16 @@ export async function createStructuredChatAgent({ llm, tools, prompt, streamRunn
     if (missingVariables.length > 0) {
         throw new Error(`Provided prompt is missing required input variables: ${JSON.stringify(missingVariables)}`);
     }
-    const toolNames = tools.map((tool) => tool.name);
+    let toolNames = [];
+    if (tools.every(isOpenAITool)) {
+        toolNames = tools.map((tool) => tool.function.name);
+    }
+    else if (tools.every(isStructuredTool)) {
+        toolNames = tools.map((tool) => tool.name);
+    }
+    else {
+        throw new Error("All tools must be either OpenAI or Structured tools, not a mix.");
+    }
     const partialedPrompt = await prompt.partial({
         tools: renderTextDescriptionAndArgs(tools),
         tool_names: toolNames.join(", "),

package/dist/agents/tool_calling/index.d.ts

@@ -1,6 +1,7 @@
 import { BaseChatModel } from "@langchain/core/language_models/chat_models";
 import { ChatPromptTemplate } from "@langchain/core/prompts";
 import { StructuredToolInterface } from "@langchain/core/tools";
+import { ToolDefinition } from "@langchain/core/language_models/base";
 import { AgentRunnableSequence } from "../agent.js";
 import { ToolsAgentStep } from "./output_parser.js";
 /**
@@ -14,7 +15,7 @@ export type CreateToolCallingAgentParams = {
      */
     llm: BaseChatModel;
     /** Tools this agent has access to. */
-    tools: StructuredToolInterface[];
+    tools: StructuredToolInterface[] | ToolDefinition[];
     /** The prompt to use, must have an input key of `agent_scratchpad`. */
     prompt: ChatPromptTemplate;
     /**