langchain 0.0.78 → 0.0.79

package/dist/client/langchainplus.js

@@ -1,4 +1,4 @@
-import { LangChainTracer } from "../callbacks/handlers/tracer_langchain.js";
+import { LangChainTracer, } from "../callbacks/handlers/tracer_langchain.js";
 import { mapStoredMessagesToChatMessages } from "../stores/message/utils.js";
 import { AsyncCaller } from "../util/async_caller.js";
 // utility functions
@@ -7,7 +7,7 @@ const isLocalhost = (url) => {
     const hostname = strippedUrl.split("/")[0].split(":")[0];
     return (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1");
 };
-const getSeededTenantId = async (apiUrl, apiKey, callerOptions = undefined) => {
+const getSeededTenantId = async (apiUrl, { apiKey, callerOptions, }) => {
     // Get the tenant ID from the seeded tenant
     const caller = new AsyncCaller(callerOptions ?? {});
     const url = `${apiUrl}/tenants`;
@@ -15,7 +15,7 @@ const getSeededTenantId = async (apiUrl, apiKey, callerOptions = undefined) => {
     try {
         response = await caller.call(fetch, url, {
             method: "GET",
-            headers: apiKey ? { authorization: `Bearer ${apiKey}` } : undefined,
+            headers: apiKey ? { "x-api-key": apiKey } : undefined,
         });
     }
     catch (err) {
@@ -76,18 +76,24 @@ async function getModelOrFactoryType(llm) {
     throw new Error("Unknown model or factory type");
 }
 export class LangChainPlusClient {
-    constructor(apiUrl, tenantId, apiKey, callerOptions) {
+    constructor(config) {
         Object.defineProperty(this, "apiKey", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_API_KEY
+                : undefined
         });
         Object.defineProperty(this, "apiUrl", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: (typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_ENDPOINT
+                : undefined) || "http://localhost:8000"
         });
         Object.defineProperty(this, "tenantId", {
             enumerable: true,
@@ -101,15 +107,45 @@ export class LangChainPlusClient {
             writable: true,
             value: void 0
         });
-        this.apiUrl = apiUrl;
-        this.apiKey = apiKey;
-        this.tenantId = tenantId;
+        this.apiUrl = config.apiUrl ?? this.apiUrl;
+        this.apiKey = config.apiKey;
+        const tenantId = config.tenantId ??
+            (typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_TENANT_ID
+                : undefined);
+        if (tenantId === undefined) {
+            throw new Error("No tenant ID provided and no LANGCHAIN_TENANT_ID env var");
+        }
+        else {
+            this.tenantId = tenantId;
+        }
         this.validateApiKeyIfHosted();
-        this.caller = new AsyncCaller(callerOptions ?? {});
+        this.caller = new AsyncCaller(config.callerOptions ?? {});
     }
-    static async create(apiUrl, apiKey = undefined) {
-        const tenantId = await getSeededTenantId(apiUrl, apiKey);
-        return new LangChainPlusClient(apiUrl, tenantId, apiKey);
+    static async create(config = {}) {
+        const apiUrl_ = config.apiUrl ??
+            ((typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_ENDPOINT
+                : undefined) ||
+                "http://localhost:8000");
+        const apiKey_ = config.apiKey ??
+            (typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_API_KEY
+                : undefined);
+        const tenantId_ = config.tenantId ??
+            ((typeof process !== "undefined"
+                ? // eslint-disable-next-line no-process-env
+                    process.env?.LANGCHAIN_TENANT_ID
+                : undefined) ||
+                (await getSeededTenantId(apiUrl_, { apiKey: apiKey_ })));
+        return new LangChainPlusClient({
+            tenantId: tenantId_,
+            apiKey: apiKey_,
+            apiUrl: apiUrl_,
+        });
     }
     validateApiKeyIfHosted() {
         const isLocal = isLocalhost(this.apiUrl);
@@ -120,24 +156,21 @@ export class LangChainPlusClient {
     get headers() {
         const headers = {};
         if (this.apiKey) {
-            headers.authorization = `Bearer ${this.apiKey}`;
+            headers["x-api-key"] = `${this.apiKey}`;
         }
         return headers;
     }
     get queryParams() {
-        return { tenant_id: this.tenantId };
-    }
-    async _get(path, queryParams = {}) {
-        const params = { ...this.queryParams, ...queryParams };
-        let queryString = "";
-        for (const key in params) {
-            if (Object.prototype.hasOwnProperty.call(params, key)) {
-                queryString = queryString
-                    ? `${queryString}&${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`
-                    : `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`;
-            }
+        return new URLSearchParams({ tenant_id: this.tenantId });
+    }
+    async _get(path, queryParams) {
+        const params = this.queryParams;
+        if (queryParams) {
+            queryParams.forEach((value, key) => {
+                params.append(key, value);
+            });
         }
-        const url = `${this.apiUrl}${path}${queryString ? `?${queryString}` : ""}`;
+        const url = `${this.apiUrl}${path}?${params.toString()}`;
         const response = await this.caller.call(fetch, url, {
             method: "GET",
             headers: this.headers,
@@ -147,14 +180,73 @@ export class LangChainPlusClient {
         }
         return response.json();
     }
-    async uploadCsv(csvFile, fileName, description, inputKeys, outputKeys) {
+    async readRun(runId) {
+        return await this._get(`/runs/${runId}`);
+    }
+    async listRuns({ sessionId, sessionName, executionOrder = 1, runType, error, }) {
+        const queryParams = new URLSearchParams();
+        let sessionId_ = sessionId;
+        if (sessionName) {
+            if (sessionId) {
+                throw new Error("Only one of session_id or session_name may be given");
+            }
+            sessionId_ = (await this.readSession({ sessionName })).id;
+        }
+        if (sessionId_) {
+            queryParams.append("session", sessionId_);
+        }
+        if (executionOrder) {
+            queryParams.append("execution_order", executionOrder.toString());
+        }
+        if (runType) {
+            queryParams.append("run_type", runType);
+        }
+        if (error !== undefined) {
+            queryParams.append("error", error.toString());
+        }
+        return this._get("/runs", queryParams);
+    }
+    async readSession({ sessionId, sessionName, }) {
+        let path = "/sessions";
+        const params = new URLSearchParams();
+        if (sessionId !== undefined && sessionName !== undefined) {
+            throw new Error("Must provide either sessionName or sessionId, not both");
+        }
+        else if (sessionId !== undefined) {
+            path += `/${sessionId}`;
+        }
+        else if (sessionName !== undefined) {
+            params.append("name", sessionName);
+        }
+        else {
+            throw new Error("Must provide sessionName or sessionId");
+        }
+        const response = await this._get(path, params);
+        let result;
+        if (Array.isArray(response)) {
+            if (response.length === 0) {
+                throw new Error(`Session[id=${sessionId}, name=${sessionName}] not found`);
+            }
+            result = response[0];
+        }
+        else {
+            result = response;
+        }
+        return result;
+    }
+    async listSessions() {
+        return this._get("/sessions");
+    }
+    async uploadCsv({ csvFile, fileName, inputKeys, outputKeys, description, }) {
         const url = `${this.apiUrl}/datasets/upload`;
         const formData = new FormData();
         formData.append("file", csvFile, fileName);
         formData.append("input_keys", inputKeys.join(","));
         formData.append("output_keys", outputKeys.join(","));
-        formData.append("description", description);
         formData.append("tenant_id", this.tenantId);
+        if (description) {
+            formData.append("description", description);
+        }
         const response = await this.caller.call(fetch, url, {
             method: "POST",
             headers: this.headers,
@@ -170,7 +262,7 @@ export class LangChainPlusClient {
         const result = await response.json();
         return result;
     }
-    async createDataset(name, description) {
+    async createDataset(name, { description }) {
         const response = await this.caller.call(fetch, `${this.apiUrl}/datasets`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
@@ -190,10 +282,10 @@ export class LangChainPlusClient {
         const result = await response.json();
         return result;
     }
-    async readDataset(datasetId, datasetName) {
+    async readDataset({ datasetId, datasetName, }) {
         let path = "/datasets";
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const params = { limit: 1 };
+        // limit to 1 result
+        const params = new URLSearchParams({ limit: "1" });
         if (datasetId !== undefined && datasetName !== undefined) {
             throw new Error("Must provide either datasetName or datasetId, not both");
         }
@@ -201,7 +293,7 @@ export class LangChainPlusClient {
             path += `/${datasetId}`;
         }
         else if (datasetName !== undefined) {
-            params.name = datasetName;
+            params.append("name", datasetName);
         }
         else {
             throw new Error("Must provide datasetName or datasetId");
@@ -219,24 +311,23 @@ export class LangChainPlusClient {
         }
         return result;
     }
-    async listDatasets(limit = 100) {
+    async listDatasets({ limit = 100, } = {}) {
         const path = "/datasets";
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const params = { limit };
+        const params = new URLSearchParams({ limit: limit.toString() });
         const response = await this._get(path, params);
         if (!Array.isArray(response)) {
             throw new Error(`Expected ${path} to return an array, but got ${response}`);
         }
         return response;
     }
-    async deleteDataset(datasetId, datasetName) {
+    async deleteDataset({ datasetId, datasetName, }) {
         let path = "/datasets";
         let datasetId_ = datasetId;
         if (datasetId !== undefined && datasetName !== undefined) {
             throw new Error("Must provide either datasetName or datasetId, not both");
         }
         else if (datasetName !== undefined) {
-            const dataset = await this.readDataset(undefined, datasetName);
+            const dataset = await this.readDataset({ datasetName });
             datasetId_ = dataset.id;
         }
         if (datasetId_ !== undefined) {
@@ -255,7 +346,7 @@ export class LangChainPlusClient {
         const results = await response.json();
         return results;
     }
-    async createExample(inputs, outputs = {}, datasetId = undefined, datasetName = undefined, createdAt = undefined) {
+    async createExample(inputs, outputs, { datasetId, datasetName, createdAt, }) {
         let datasetId_ = datasetId;
         if (datasetId_ === undefined && datasetName === undefined) {
             throw new Error("Must provide either datasetName or datasetId");
@@ -264,7 +355,7 @@ export class LangChainPlusClient {
             throw new Error("Must provide either datasetName or datasetId, not both");
         }
         else if (datasetId_ === undefined) {
-            const dataset = await this.readDataset(undefined, datasetName);
+            const dataset = await this.readDataset({ datasetName });
             datasetId_ = dataset.id;
         }
         const createdAt_ = createdAt || new Date();
@@ -289,7 +380,7 @@ export class LangChainPlusClient {
         const path = `/examples/${exampleId}`;
         return await this._get(path);
     }
-    async listExamples(datasetId = undefined, datasetName = undefined) {
+    async listExamples({ datasetId, datasetName, } = {}) {
         let datasetId_;
         if (datasetId !== undefined && datasetName !== undefined) {
             throw new Error("Must provide either datasetName or datasetId, not both");
@@ -298,15 +389,13 @@ export class LangChainPlusClient {
             datasetId_ = datasetId;
         }
         else if (datasetName !== undefined) {
-            const dataset = await this.readDataset(undefined, datasetName);
+            const dataset = await this.readDataset({ datasetName });
             datasetId_ = dataset.id;
         }
         else {
             throw new Error("Must provide a datasetName or datasetId");
         }
-        const response = await this._get("/examples", {
-            dataset: datasetId_,
-        });
+        const response = await this._get("/examples", new URLSearchParams({ dataset: datasetId_ }));
         if (!Array.isArray(response)) {
             throw new Error(`Expected /examples to return an array, but got ${response}`);
         }
@@ -324,7 +413,7 @@ export class LangChainPlusClient {
         const result = await response.json();
         return result;
     }
-    async runLLM(example, tracer, llm, numRepetitions = 1) {
+    async runLLM(example, tracer, llm, { numRepetitions = 1 }) {
         const results = await Promise.all(Array.from({ length: numRepetitions }).map(async () => {
             try {
                 const prompt = example.inputs.prompt;
@@ -337,7 +426,7 @@ export class LangChainPlusClient {
         }));
         return results;
     }
-    async runChain(example, tracer, chainFactory, numRepetitions = 1) {
+    async runChain(example, tracer, chainFactory, { numRepetitions = 1, }) {
         const results = await Promise.all(Array.from({ length: numRepetitions }).map(async () => {
             try {
                 const chain = await chainFactory();
@@ -350,7 +439,7 @@ export class LangChainPlusClient {
         }));
         return results;
     }
-    async runChatModel(example, tracer, chatModel, numRepetitions = 1) {
+    async runChatModel(example, tracer, chatModel, { numRepetitions = 1, }) {
         const results = await Promise.all(Array.from({ length: numRepetitions }).map(async () => {
             try {
                 const messages = example.inputs.messages;
@@ -363,8 +452,8 @@ export class LangChainPlusClient {
         }));
         return results;
     }
-    async runOnDataset(datasetName, llmOrChainFactory, numRepetitions = 1, sessionName = undefined) {
-        const examples = await this.listExamples(undefined, datasetName);
+    async runOnDataset(datasetName, llmOrChainFactory, { numRepetitions = 1, sessionName, } = {}) {
+        const examples = await this.listExamples({ datasetName });
         let sessionName_;
         if (sessionName === undefined) {
             const currentTime = new Date().toISOString();
@@ -382,17 +471,19 @@ export class LangChainPlusClient {
             });
             if (modelOrFactoryType === "llm") {
                 const llm = llmOrChainFactory;
-                const llmResult = await this.runLLM(example, tracer, llm, numRepetitions);
+                const llmResult = await this.runLLM(example, tracer, llm, {
+                    numRepetitions,
+                });
                 results[example.id] = llmResult;
             }
             else if (modelOrFactoryType === "chainFactory") {
                 const chainFactory = llmOrChainFactory;
-                const chainResult = await this.runChain(example, tracer, chainFactory, numRepetitions);
+                const chainResult = await this.runChain(example, tracer, chainFactory, { numRepetitions });
                 results[example.id] = chainResult;
             }
             else if (modelOrFactoryType === "chatModel") {
                 const chatModel = llmOrChainFactory;
-                const chatModelResult = await this.runChatModel(example, tracer, chatModel, numRepetitions);
+                const chatModelResult = await this.runChatModel(example, tracer, chatModel, { numRepetitions });
                 results[example.id] = chatModelResult;
             }
             else {

package/dist/prompts/selectors/conditional.cjs

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isChatModel = exports.isLLM = exports.ConditionalPromptSelector = exports.BasePromptSelector = void 0;
 class BasePromptSelector {
+    async getPromptAsync(llm, options) {
+        const prompt = this.getPrompt(llm);
+        return prompt.partial(options?.partialVariables ?? {});
+    }
 }
 exports.BasePromptSelector = BasePromptSelector;
 class ConditionalPromptSelector extends BasePromptSelector {

package/dist/prompts/selectors/conditional.d.ts

@@ -2,8 +2,13 @@ import { BaseChatModel } from "../../chat_models/base.js";
 import { BasePromptTemplate } from "../base.js";
 import { BaseLanguageModel } from "../../base_language/index.js";
 import { BaseLLM } from "../../llms/base.js";
+import { PartialValues } from "../../schema/index.js";
+export type BaseGetPromptAsyncOptions = {
+    partialVariables?: PartialValues;
+};
 export declare abstract class BasePromptSelector {
     abstract getPrompt(llm: BaseLanguageModel): BasePromptTemplate;
+    getPromptAsync(llm: BaseLanguageModel, options?: BaseGetPromptAsyncOptions): Promise<BasePromptTemplate>;
 }
 export declare class ConditionalPromptSelector extends BasePromptSelector {
     defaultPrompt: BasePromptTemplate;

package/dist/prompts/selectors/conditional.js

@@ -1,4 +1,8 @@
 export class BasePromptSelector {
+    async getPromptAsync(llm, options) {
+        const prompt = this.getPrompt(llm);
+        return prompt.partial(options?.partialVariables ?? {});
+    }
 }
 export class ConditionalPromptSelector extends BasePromptSelector {
     constructor(default_prompt, conditionals = []) {

package/dist/retrievers/metal.d.ts

@@ -1,7 +1,8 @@
+import Metal from "@getmetal/metal-sdk";
 import { BaseRetriever } from "../schema/index.js";
 import { Document } from "../document.js";
 export interface MetalRetrieverFields {
-    client: import("@getmetal/metal-sdk").default;
+    client: Metal;
 }
 export declare class MetalRetriever extends BaseRetriever {
     private client;

package/dist/stores/message/redis.cjs

@@ -42,16 +42,7 @@ class RedisChatMessageHistory extends index_js_1.BaseListChatMessageHistory {
         const orderedMessages = rawStoredMessages
             .reverse()
             .map((message) => JSON.parse(message));
-        const previousMessages = orderedMessages
-            .map((item) => ({
-            type: item.type,
-            data: {
-                role: item.role,
-                content: item.text,
-            },
-        }))
-            .filter((x) => x.type !== undefined && x.data.content !== undefined);
-        return (0, utils_js_1.mapStoredMessagesToChatMessages)(previousMessages);
+        return (0, utils_js_1.mapStoredMessagesToChatMessages)(orderedMessages);
     }
     async addMessage(message) {
         await this.ensureReadiness();

package/dist/stores/message/redis.js

@@ -39,16 +39,7 @@ export class RedisChatMessageHistory extends BaseListChatMessageHistory {
         const orderedMessages = rawStoredMessages
             .reverse()
             .map((message) => JSON.parse(message));
-        const previousMessages = orderedMessages
-            .map((item) => ({
-            type: item.type,
-            data: {
-                role: item.role,
-                content: item.text,
-            },
-        }))
-            .filter((x) => x.type !== undefined && x.data.content !== undefined);
-        return mapStoredMessagesToChatMessages(previousMessages);
+        return mapStoredMessagesToChatMessages(orderedMessages);
     }
     async addMessage(message) {
         await this.ensureReadiness();

package/dist/vectorstores/milvus.cjs

@@ -85,24 +85,6 @@ class Milvus extends base_js_1.VectorStore {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "colMgr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "idxMgr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "dataMgr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "indexParams", {
             enumerable: true,
             configurable: true,
@@ -149,9 +131,6 @@ class Milvus extends base_js_1.VectorStore {
             throw new Error("Milvus URL address is not provided.");
         }
         this.client = new milvus2_sdk_node_1.MilvusClient(url, args.ssl, args.username, args.password);
-        this.colMgr = this.client.collectionManager;
-        this.idxMgr = this.client.indexManager;
-        this.dataMgr = this.client.dataManager;
     }
     async addDocuments(documents) {
         const texts = documents.map(({ pageContent }) => pageContent);
@@ -202,17 +181,17 @@ class Milvus extends base_js_1.VectorStore {
             });
             insertDatas.push(data);
         }
-        const insertResp = await this.dataMgr.insert({
+        const insertResp = await this.client.insert({
             collection_name: this.collectionName,
             fields_data: insertDatas,
         });
         if (insertResp.status.error_code !== types_js_1.ErrorCode.SUCCESS) {
             throw new Error(`Error inserting data: ${JSON.stringify(insertResp)}`);
         }
-        await this.dataMgr.flushSync({ collection_names: [this.collectionName] });
+        await this.client.flushSync({ collection_names: [this.collectionName] });
     }
     async similaritySearchVectorWithScore(query, k) {
-        const hasColResp = await this.colMgr.hasCollection({
+        const hasColResp = await this.client.hasCollection({
             collection_name: this.collectionName,
         });
         if (hasColResp.status.error_code !== types_js_1.ErrorCode.SUCCESS) {
@@ -222,7 +201,7 @@ class Milvus extends base_js_1.VectorStore {
             throw new Error(`Collection not found: ${this.collectionName}, please create collection before search.`);
         }
         await this.grabCollectionFields();
-        const loadResp = await this.colMgr.loadCollectionSync({
+        const loadResp = await this.client.loadCollectionSync({
             collection_name: this.collectionName,
         });
         if (loadResp.error_code !== types_js_1.ErrorCode.SUCCESS) {
@@ -230,7 +209,7 @@ class Milvus extends base_js_1.VectorStore {
         }
         // clone this.field and remove vectorField
         const outputFields = this.fields.filter((field) => field !== this.vectorField);
-        const searchResp = await this.dataMgr.search({
+        const searchResp = await this.client.search({
             collection_name: this.collectionName,
             search_params: {
                 anns_field: this.vectorField,
@@ -269,7 +248,7 @@ class Milvus extends base_js_1.VectorStore {
         return results;
     }
     async ensureCollection(vectors, documents) {
-        const hasColResp = await this.colMgr.hasCollection({
+        const hasColResp = await this.client.hasCollection({
             collection_name: this.collectionName,
         });
         if (hasColResp.status.error_code !== types_js_1.ErrorCode.SUCCESS) {
@@ -314,7 +293,7 @@ class Milvus extends base_js_1.VectorStore {
                 this.fields.push(field.name);
             }
         });
-        const createRes = await this.colMgr.createCollection({
+        const createRes = await this.client.createCollection({
             collection_name: this.collectionName,
             fields: fieldList,
         });
@@ -322,7 +301,7 @@ class Milvus extends base_js_1.VectorStore {
             console.log(createRes);
             throw new Error(`Failed to create collection: ${createRes}`);
         }
-        await this.idxMgr.createIndex({
+        await this.client.createIndex({
             collection_name: this.collectionName,
             field_name: this.vectorField,
             extra_params: this.indexCreateParams,
@@ -338,7 +317,7 @@ class Milvus extends base_js_1.VectorStore {
             this.fields.length > 0) {
             return;
         }
-        const desc = await this.colMgr.describeCollection({
+        const desc = await this.client.describeCollection({
             collection_name: this.collectionName,
         });
         desc.schema.fields.forEach((field) => {

package/dist/vectorstores/milvus.d.ts

@@ -29,9 +29,6 @@ export declare class Milvus extends VectorStore {
     textField: string;
     fields: string[];
     client: MilvusClient;
-    colMgr: MilvusClient["collectionManager"];
-    idxMgr: MilvusClient["indexManager"];
-    dataMgr: MilvusClient["dataManager"];
     indexParams: Record<IndexType, IndexParam>;
     indexCreateParams: {
         index_type: string;