langchain 0.0.108 → 0.0.109

package/dist/callbacks/handlers/tracer.d.ts

@@ -1,4 +1,4 @@
-import { KVMap, BaseRun } from "langchainplus-sdk/schemas";
+import { KVMap, BaseRun } from "langsmith/schemas";
 import { AgentAction, AgentFinish, BaseMessage, ChainValues, LLMResult } from "../../schema/index.js";
 import { Serialized } from "../../load/serializable.js";
 import { BaseCallbackHandler, BaseCallbackHandlerInput, NewTokenIndices } from "../base.js";

package/dist/callbacks/handlers/tracer_langchain.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LangChainTracer = void 0;
-const langchainplus_sdk_1 = require("langchainplus-sdk");
+const langsmith_1 = require("langsmith");
 const env_js_1 = require("../../util/env.cjs");
 const tracer_js_1 = require("./tracer.cjs");
 class LangChainTracer extends tracer_js_1.BaseTracer {
@@ -37,7 +37,7 @@ class LangChainTracer extends tracer_js_1.BaseTracer {
                 (0, env_js_1.getEnvironmentVariable)("LANGCHAIN_PROJECT") ??
                 (0, env_js_1.getEnvironmentVariable)("LANGCHAIN_SESSION");
         this.exampleId = exampleId;
-        this.client = client ?? new langchainplus_sdk_1.Client({});
+        this.client = client ?? new langsmith_1.Client({});
     }
     async _convertToCreate(run, example_id = undefined) {
         return {

package/dist/callbacks/handlers/tracer_langchain.d.ts

@@ -1,5 +1,5 @@
-import { Client } from "langchainplus-sdk";
-import { BaseRun, RunUpdate as BaseRunUpdate } from "langchainplus-sdk/schemas";
+import { Client } from "langsmith";
+import { BaseRun, RunUpdate as BaseRunUpdate } from "langsmith/schemas";
 import { BaseTracer } from "./tracer.js";
 import { BaseCallbackHandlerInput } from "../base.js";
 export interface Run extends BaseRun {

package/dist/callbacks/handlers/tracer_langchain.js

@@ -1,4 +1,4 @@
-import { Client } from "langchainplus-sdk";
+import { Client } from "langsmith";
 import { getEnvironmentVariable, getRuntimeEnvironment, } from "../../util/env.js";
 import { BaseTracer } from "./tracer.js";
 export class LangChainTracer extends BaseTracer {

package/dist/chat_models/openai.cjs

@@ -589,6 +589,9 @@ class PromptLayerChatOpenAI extends ChatOpenAI {
             else if (message._getType() === "ai") {
                 messageDict = { role: "assistant", content: message.content };
             }
+            else if (message._getType() === "function") {
+                messageDict = { role: "assistant", content: message.content };
+            }
             else if (message._getType() === "system") {
                 messageDict = { role: "system", content: message.content };
             }

package/dist/chat_models/openai.js

@@ -582,6 +582,9 @@ export class PromptLayerChatOpenAI extends ChatOpenAI {
             else if (message._getType() === "ai") {
                 messageDict = { role: "assistant", content: message.content };
             }
+            else if (message._getType() === "function") {
+                messageDict = { role: "assistant", content: message.content };
+            }
             else if (message._getType() === "system") {
                 messageDict = { role: "system", content: message.content };
             }

package/dist/client/index.cjs

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOnDataset = void 0;
-var langchainplus_js_1 = require("./langchainplus.cjs");
-Object.defineProperty(exports, "runOnDataset", { enumerable: true, get: function () { return langchainplus_js_1.runOnDataset; } });
+var langsmith_js_1 = require("./langsmith.cjs");
+Object.defineProperty(exports, "runOnDataset", { enumerable: true, get: function () { return langsmith_js_1.runOnDataset; } });

package/dist/client/index.d.ts

@@ -1 +1 @@
-export { DatasetRunResults, runOnDataset } from "./langchainplus.js";
+export { DatasetRunResults, runOnDataset } from "./langsmith.js";

package/dist/client/index.js

@@ -1 +1 @@
-export { runOnDataset } from "./langchainplus.js";
+export { runOnDataset } from "./langsmith.js";

package/dist/client/{langchainplus.cjs → langsmith.cjs}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOnDataset = exports.isChain = exports.isChatModel = exports.isLLM = void 0;
 const p_queue_1 = __importDefault(require("p-queue"));
-const langchainplus_sdk_1 = require("langchainplus-sdk");
+const langsmith_1 = require("langsmith");
 const tracer_langchain_js_1 = require("../callbacks/handlers/tracer_langchain.cjs");
 const utils_js_1 = require("../stores/message/utils.cjs");
 const stringifyError = (err) => {
@@ -86,7 +86,7 @@ const runChatModel = async (example, tracer, chatModel) => {
 const runOnDataset = async (datasetName, llmOrChainFactory, { maxConcurrency = 8, numRepetitions = 1, projectName, client, } = {}) => {
     const PQueue = "default" in p_queue_1.default ? p_queue_1.default.default : p_queue_1.default;
     const queue = new PQueue({ concurrency: maxConcurrency });
-    const client_ = client ?? new langchainplus_sdk_1.Client({});
+    const client_ = client ?? new langsmith_1.Client({});
     const examples = await client_.listExamples({ datasetName });
     let projectName_;
     if (projectName === undefined) {
@@ -98,7 +98,7 @@ const runOnDataset = async (datasetName, llmOrChainFactory, { maxConcurrency = 8
     else {
         projectName_ = projectName;
     }
-    await client_.createProject({ projectName: projectName_, mode: "eval" });
+    await client_.createProject({ projectName: projectName_ });
     const results = examples.reduce((acc, example) => ({ ...acc, [example.id]: [] }), {});
     const modelOrFactoryType = await getModelOrFactoryType(llmOrChainFactory);
     await Promise.all(Array.from({ length: numRepetitions })

package/dist/client/{langchainplus.d.ts → langsmith.d.ts}

@@ -1,4 +1,4 @@
-import { Client } from "langchainplus-sdk";
+import { Client } from "langsmith";
 import { ChainValues, LLMResult } from "../schema/index.js";
 import { BaseLanguageModel } from "../base_language/index.js";
 import { BaseChain } from "../chains/base.js";

package/dist/client/{langchainplus.js → langsmith.js}

@@ -1,5 +1,5 @@
 import PQueueMod from "p-queue";
-import { Client } from "langchainplus-sdk";
+import { Client } from "langsmith";
 import { LangChainTracer } from "../callbacks/handlers/tracer_langchain.js";
 import { mapStoredMessagesToChatMessages } from "../stores/message/utils.js";
 const stringifyError = (err) => {
@@ -89,7 +89,7 @@ export const runOnDataset = async (datasetName, llmOrChainFactory, { maxConcurre
     else {
         projectName_ = projectName;
     }
-    await client_.createProject({ projectName: projectName_, mode: "eval" });
+    await client_.createProject({ projectName: projectName_ });
     const results = examples.reduce((acc, example) => ({ ...acc, [example.id]: [] }), {});
     const modelOrFactoryType = await getModelOrFactoryType(llmOrChainFactory);
     await Promise.all(Array.from({ length: numRepetitions })

package/dist/evaluation/run_evaluators/base.d.ts

@@ -1,5 +1,5 @@
-import { Example, Run } from "langchainplus-sdk";
-import { EvaluationResult, RunEvaluator } from "langchainplus-sdk/evaluation";
+import { Example, Run } from "langsmith";
+import { EvaluationResult, RunEvaluator } from "langsmith/evaluation";
 import { BaseOutputParser } from "../../schema/output_parser.js";
 import { LLMChain } from "../../chains/llm_chain.js";
 import { BaseChain } from "../../chains/base.js";

package/dist/evaluation/run_evaluators/implementations.d.ts

@@ -1,5 +1,5 @@
-import { Example, Run } from "langchainplus-sdk";
-import { EvaluationResult } from "langchainplus-sdk/evaluation";
+import { Example, Run } from "langsmith";
+import { EvaluationResult } from "langsmith/evaluation";
 import { RunEvaluatorInputMapper, RunEvaluatorChain, RunEvaluatorOutputParser } from "./base.js";
 import { PromptTemplate } from "../../prompts/prompt.js";
 import { BaseLanguageModel } from "../../base_language/index.js";

package/dist/text_splitter.cjs

@@ -31,9 +31,16 @@ class TextSplitter extends document_js_2.BaseDocumentTransformer {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "lengthFunction", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (text) => text.length
+        });
         this.chunkSize = fields?.chunkSize ?? this.chunkSize;
         this.chunkOverlap = fields?.chunkOverlap ?? this.chunkOverlap;
         this.keepSeparator = fields?.keepSeparator ?? this.keepSeparator;
+        this.lengthFunction = fields?.lengthFunction ?? ((text) => text.length);
         if (this.chunkOverlap >= this.chunkSize) {
             throw new Error("Cannot have chunkOverlap >= chunkSize");
         }
@@ -74,7 +81,7 @@ class TextSplitter extends document_js_2.BaseDocumentTransformer {
                 let numberOfIntermediateNewLines = 0;
                 if (prevChunk) {
                     const indexChunk = text.indexOf(chunk);
-                    const indexEndPrevChunk = text.indexOf(prevChunk) + prevChunk.length;
+                    const indexEndPrevChunk = text.indexOf(prevChunk) + this.lengthFunction(prevChunk);
                     const removedNewlinesFromSplittingText = text.slice(indexEndPrevChunk, indexChunk);
                     numberOfIntermediateNewLines = (removedNewlinesFromSplittingText.match(/\n/g) || []).length;
                     if (appendChunkOverlapHeader) {
@@ -120,7 +127,7 @@ class TextSplitter extends document_js_2.BaseDocumentTransformer {
         const currentDoc = [];
         let total = 0;
         for (const d of splits) {
-            const _len = d.length;
+            const _len = this.lengthFunction(d);
             if (total + _len + (currentDoc.length > 0 ? separator.length : 0) >
                 this.chunkSize) {
                 if (total > this.chunkSize) {
@@ -137,7 +144,7 @@ which is longer than the specified ${this.chunkSize}`);
                     // - or if we still have any chunks and the length is long
                     while (total > this.chunkOverlap ||
                         (total + _len > this.chunkSize && total > 0)) {
-                        total -= currentDoc[0].length;
+                        total -= this.lengthFunction(currentDoc[0]);
                         currentDoc.shift();
                     }
                 }
@@ -224,7 +231,7 @@ class RecursiveCharacterTextSplitter extends TextSplitter {
         let goodSplits = [];
         const _separator = this.keepSeparator ? "" : separator;
         for (const s of splits) {
-            if (s.length < this.chunkSize) {
+            if (this.lengthFunction(s) < this.chunkSize) {
                 goodSplits.push(s);
             }
             else {

package/dist/text_splitter.d.ts

@@ -5,6 +5,7 @@ export interface TextSplitterParams {
     chunkSize: number;
     chunkOverlap: number;
     keepSeparator: boolean;
+    lengthFunction?: (text: string) => number;
 }
 export type TextSplitterChunkHeaderOptions = {
     chunkHeader?: string;
@@ -16,6 +17,7 @@ export declare abstract class TextSplitter extends BaseDocumentTransformer imple
     chunkSize: number;
     chunkOverlap: number;
     keepSeparator: boolean;
+    lengthFunction: (text: string) => number;
     constructor(fields?: Partial<TextSplitterParams>);
     transformDocuments(documents: Document[], chunkHeaderOptions?: TextSplitterChunkHeaderOptions): Promise<Document[]>;
     abstract splitText(text: string): Promise<string[]>;

package/dist/text_splitter.js

@@ -28,9 +28,16 @@ export class TextSplitter extends BaseDocumentTransformer {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "lengthFunction", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (text) => text.length
+        });
         this.chunkSize = fields?.chunkSize ?? this.chunkSize;
         this.chunkOverlap = fields?.chunkOverlap ?? this.chunkOverlap;
         this.keepSeparator = fields?.keepSeparator ?? this.keepSeparator;
+        this.lengthFunction = fields?.lengthFunction ?? ((text) => text.length);
         if (this.chunkOverlap >= this.chunkSize) {
             throw new Error("Cannot have chunkOverlap >= chunkSize");
         }
@@ -71,7 +78,7 @@ export class TextSplitter extends BaseDocumentTransformer {
                 let numberOfIntermediateNewLines = 0;
                 if (prevChunk) {
                     const indexChunk = text.indexOf(chunk);
-                    const indexEndPrevChunk = text.indexOf(prevChunk) + prevChunk.length;
+                    const indexEndPrevChunk = text.indexOf(prevChunk) + this.lengthFunction(prevChunk);
                     const removedNewlinesFromSplittingText = text.slice(indexEndPrevChunk, indexChunk);
                     numberOfIntermediateNewLines = (removedNewlinesFromSplittingText.match(/\n/g) || []).length;
                     if (appendChunkOverlapHeader) {
@@ -117,7 +124,7 @@ export class TextSplitter extends BaseDocumentTransformer {
         const currentDoc = [];
         let total = 0;
         for (const d of splits) {
-            const _len = d.length;
+            const _len = this.lengthFunction(d);
             if (total + _len + (currentDoc.length > 0 ? separator.length : 0) >
                 this.chunkSize) {
                 if (total > this.chunkSize) {
@@ -134,7 +141,7 @@ which is longer than the specified ${this.chunkSize}`);
                     // - or if we still have any chunks and the length is long
                     while (total > this.chunkOverlap ||
                         (total + _len > this.chunkSize && total > 0)) {
-                        total -= currentDoc[0].length;
+                        total -= this.lengthFunction(currentDoc[0]);
                         currentDoc.shift();
                     }
                 }
@@ -219,7 +226,7 @@ export class RecursiveCharacterTextSplitter extends TextSplitter {
         let goodSplits = [];
         const _separator = this.keepSeparator ? "" : separator;
         for (const s of splits) {
-            if (s.length < this.chunkSize) {
+            if (this.lengthFunction(s) < this.chunkSize) {
                 goodSplits.push(s);
             }
             else {

package/dist/tools/dataforseo_api_search.cjs

@@ -0,0 +1,279 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataForSeoAPISearch = void 0;
+const env_js_1 = require("../util/env.cjs");
+const base_js_1 = require("./base.cjs");
+/**
+ * @class DataForSeoAPISearch
+ * @extends {Tool}
+ * @description Represents a wrapper class to work with DataForSEO SERP API.
+ */
+class DataForSeoAPISearch extends base_js_1.Tool {
+    /**
+     * @constructor
+     * @param {DataForSeoApiConfig} config
+     * @description Sets up the class, throws an error if the API login/password isn't provided.
+     */
+    constructor(config = {}) {
+        super();
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "dataforseo-api-wrapper"
+        });
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "A robust Google Search API provided by DataForSeo. This tool is handy when you need information about trending topics or current events."
+        });
+        Object.defineProperty(this, "apiLogin", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apiPassword", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * @property defaultParams
+         * @type {Record<string, string | number | boolean>}
+         * @description These are the default parameters to be used when making an API request.
+         */
+        Object.defineProperty(this, "defaultParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                location_name: "United States",
+                language_code: "en",
+                depth: 10,
+                se_name: "google",
+                se_type: "organic",
+            }
+        });
+        Object.defineProperty(this, "params", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "jsonResultTypes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "jsonResultFields", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "topCount", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "useJsonOutput", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        const apiLogin = config.apiLogin ?? (0, env_js_1.getEnvironmentVariable)("DATAFORSEO_LOGIN");
+        const apiPassword = config.apiPassword ?? (0, env_js_1.getEnvironmentVariable)("DATAFORSEO_PASSWORD");
+        const params = config.params ?? {};
+        if (!apiLogin || !apiPassword) {
+            throw new Error("DataForSEO login or password not set. You can set it as DATAFORSEO_LOGIN and DATAFORSEO_PASSWORD in your .env file, or pass it to DataForSeoAPISearch.");
+        }
+        this.params = { ...this.defaultParams, ...params };
+        this.apiLogin = apiLogin;
+        this.apiPassword = apiPassword;
+        this.jsonResultTypes = config.jsonResultTypes;
+        this.jsonResultFields = config.jsonResultFields;
+        this.useJsonOutput = config.useJsonOutput ?? false;
+        this.topCount = config.topCount;
+    }
+    /**
+     * @method _call
+     * @param {string} keyword
+     * @returns {Promise<string>}
+     * @description Initiates a call to the API and processes the response.
+     */
+    async _call(keyword) {
+        return this.useJsonOutput
+            ? JSON.stringify(await this.results(keyword))
+            : this.processResponse(await this.getResponseJson(keyword));
+    }
+    /**
+     * @method results
+     * @param {string} keyword
+     * @returns {Promise<Array<any>>}
+     * @description Fetches the results from the API for the given keyword.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async results(keyword) {
+        const res = await this.getResponseJson(keyword);
+        return this.filterResults(res, this.jsonResultTypes);
+    }
+    /**
+     * @method prepareRequest
+     * @param {string} keyword
+     * @returns {{url: string; headers: HeadersInit; data: BodyInit}}
+     * @description Prepares the request details for the API call.
+     */
+    prepareRequest(keyword) {
+        if (this.apiLogin === undefined || this.apiPassword === undefined) {
+            throw new Error("api_login or api_password is not provided");
+        }
+        const credentials = Buffer.from(`${this.apiLogin}:${this.apiPassword}`, "utf-8").toString("base64");
+        const headers = {
+            Authorization: `Basic ${credentials}`,
+            "Content-Type": "application/json",
+        };
+        const params = { ...this.params };
+        params.keyword ??= keyword;
+        const data = [params];
+        return {
+            url: `https://api.dataforseo.com/v3/serp/${params.se_name}/${params.se_type}/live/advanced`,
+            headers,
+            data: JSON.stringify(data),
+        };
+    }
+    /**
+     * @method getResponseJson
+     * @param {string} keyword
+     * @returns {Promise<ApiResponse>}
+     * @description Executes a POST request to the provided URL and returns a parsed JSON response.
+     */
+    async getResponseJson(keyword) {
+        const requestDetails = this.prepareRequest(keyword);
+        const response = await fetch(requestDetails.url, {
+            method: "POST",
+            headers: requestDetails.headers,
+            body: requestDetails.data,
+        });
+        if (!response.ok) {
+            throw new Error(`Got ${response.status} error from DataForSEO: ${response.statusText}`);
+        }
+        const result = await response.json();
+        return this.checkResponse(result);
+    }
+    /**
+     * @method checkResponse
+     * @param {ApiResponse} response
+     * @returns {ApiResponse}
+     * @description Checks the response status code.
+     */
+    checkResponse(response) {
+        if (response.status_code !== 20000) {
+            throw new Error(`Got error from DataForSEO SERP API: ${response.status_message}`);
+        }
+        for (const task of response.tasks) {
+            if (task.status_code !== 20000) {
+                throw new Error(`Got error from DataForSEO SERP API: ${task.status_message}`);
+            }
+        }
+        return response;
+    }
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    /**
+     * @method filterResults
+     * @param {ApiResponse} res
+     * @param {Array<string> | undefined} types
+     * @returns {Array<any>}
+     * @description Filters the results based on the specified result types.
+     */
+    filterResults(res, types) {
+        const output = [];
+        for (const task of res.tasks || []) {
+            for (const result of task.result || []) {
+                for (const item of result.items || []) {
+                    if (types === undefined ||
+                        types.length === 0 ||
+                        types.includes(item.type)) {
+                        const newItem = this.cleanupUnnecessaryItems(item);
+                        if (Object.keys(newItem).length !== 0) {
+                            output.push(newItem);
+                        }
+                    }
+                    if (this.topCount !== undefined && output.length >= this.topCount) {
+                        break;
+                    }
+                }
+            }
+        }
+        return output;
+    }
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    /* eslint-disable no-param-reassign */
+    /**
+     * @method cleanupUnnecessaryItems
+     * @param {any} d
+     * @description Removes unnecessary items from the response.
+     */
+    cleanupUnnecessaryItems(d) {
+        if (Array.isArray(d)) {
+            return d.map((item) => this.cleanupUnnecessaryItems(item));
+        }
+        const toRemove = ["xpath", "position", "rectangle"];
+        if (typeof d === "object" && d !== null) {
+            return Object.keys(d).reduce((newObj, key) => {
+                if ((this.jsonResultFields === undefined ||
+                    this.jsonResultFields.includes(key)) &&
+                    !toRemove.includes(key)) {
+                    if (typeof d[key] === "object" && d[key] !== null) {
+                        newObj[key] = this.cleanupUnnecessaryItems(d[key]);
+                    }
+                    else {
+                        newObj[key] = d[key];
+                    }
+                }
+                return newObj;
+            }, {});
+        }
+        return d;
+    }
+    /**
+     * @method processResponse
+     * @param {ApiResponse} res
+     * @returns {string}
+     * @description Processes the response to extract meaningful data.
+     */
+    processResponse(res) {
+        let returnValue = "No good search result found";
+        for (const task of res.tasks || []) {
+            for (const result of task.result || []) {
+                const { item_types } = result;
+                const items = result.items || [];
+                if (item_types.includes("answer_box")) {
+                    returnValue = items.find((item) => item.type === "answer_box").text;
+                }
+                else if (item_types.includes("knowledge_graph")) {
+                    returnValue = items.find((item) => item.type === "knowledge_graph").description;
+                }
+                else if (item_types.includes("featured_snippet")) {
+                    returnValue = items.find((item) => item.type === "featured_snippet").description;
+                }
+                else if (item_types.includes("shopping")) {
+                    returnValue = items.find((item) => item.type === "shopping").price;
+                }
+                else if (item_types.includes("organic")) {
+                    returnValue = items.find((item) => item.type === "organic").description;
+                }
+                if (returnValue) {
+                    break;
+                }
+            }
+        }
+        return returnValue;
+    }
+}
+exports.DataForSeoAPISearch = DataForSeoAPISearch;