langchain 0.0.198 → 0.0.199

package/dist/agents/index.d.ts

@@ -6,7 +6,7 @@ export { ChatAgentOutputParser } from "./chat/outputParser.js";
 export { ChatConversationalAgent, type ChatConversationalAgentInput, type ChatConversationalCreatePromptArgs, } from "./chat_convo/index.js";
 export { ChatConversationalAgentOutputParser, type ChatConversationalAgentOutputParserArgs, ChatConversationalAgentOutputParserWithRetries, type ChatConversationalAgentOutputParserFormatInstructionsOptions, } from "./chat_convo/outputParser.js";
 export { AgentExecutor, type AgentExecutorInput } from "./executor.js";
-export { initializeAgentExecutor, initializeAgentExecutorWithOptions, type InitializeAgentExecutorOptions, } from "./initialize.js";
+export { initializeAgentExecutor, initializeAgentExecutorWithOptions, type InitializeAgentExecutorOptions, type InitializeAgentExecutorOptionsStructured, } from "./initialize.js";
 export { ZeroShotAgent, type ZeroShotAgentInput, type ZeroShotCreatePromptArgs, } from "./mrkl/index.js";
 export { ZeroShotAgentOutputParser } from "./mrkl/outputParser.js";
 export { AgentActionOutputParser, type AgentInput, type SerializedAgent, type SerializedAgentT, type SerializedZeroShotAgent, type StoppingMethod, } from "./types.js";

package/dist/chains/conversational_retrieval_chain.cjs

@@ -94,12 +94,20 @@ class ConversationalRetrievalQAChain extends base_js_1.BaseChain {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "returnGeneratedQuestion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.retriever = fields.retriever;
         this.combineDocumentsChain = fields.combineDocumentsChain;
         this.questionGeneratorChain = fields.questionGeneratorChain;
         this.inputKey = fields.inputKey ?? this.inputKey;
         this.returnSourceDocuments =
             fields.returnSourceDocuments ?? this.returnSourceDocuments;
+        this.returnGeneratedQuestion =
+            fields.returnGeneratedQuestion ?? this.returnGeneratedQuestion;
     }
     /**
      * Static method to convert the chat history input into a formatted
@@ -172,13 +180,19 @@ class ConversationalRetrievalQAChain extends base_js_1.BaseChain {
             input_documents: docs,
             chat_history: chatHistory,
         };
-        const result = await this.combineDocumentsChain.call(inputs, runManager?.getChild("combine_documents"));
+        let result = await this.combineDocumentsChain.call(inputs, runManager?.getChild("combine_documents"));
         if (this.returnSourceDocuments) {
-            return {
+            result = {
                 ...result,
                 sourceDocuments: docs,
             };
         }
+        if (this.returnGeneratedQuestion) {
+            result = {
+                ...result,
+                generatedQuestion: newQuestion,
+            };
+        }
         return result;
     }
     _chainType() {

package/dist/chains/conversational_retrieval_chain.d.ts

@@ -16,6 +16,7 @@ export interface ConversationalRetrievalQAChainInput extends ChainInputs {
     combineDocumentsChain: BaseChain;
     questionGeneratorChain: LLMChain;
     returnSourceDocuments?: boolean;
+    returnGeneratedQuestion?: boolean;
     inputKey?: string;
 }
 /**
@@ -62,6 +63,7 @@ export declare class ConversationalRetrievalQAChain extends BaseChain implements
     combineDocumentsChain: BaseChain;
     questionGeneratorChain: LLMChain;
     returnSourceDocuments: boolean;
+    returnGeneratedQuestion: boolean;
     constructor(fields: ConversationalRetrievalQAChainInput);
     /**
      * Static method to convert the chat history input into a formatted

package/dist/chains/conversational_retrieval_chain.js

@@ -91,12 +91,20 @@ export class ConversationalRetrievalQAChain extends BaseChain {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "returnGeneratedQuestion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.retriever = fields.retriever;
         this.combineDocumentsChain = fields.combineDocumentsChain;
         this.questionGeneratorChain = fields.questionGeneratorChain;
         this.inputKey = fields.inputKey ?? this.inputKey;
         this.returnSourceDocuments =
             fields.returnSourceDocuments ?? this.returnSourceDocuments;
+        this.returnGeneratedQuestion =
+            fields.returnGeneratedQuestion ?? this.returnGeneratedQuestion;
     }
     /**
      * Static method to convert the chat history input into a formatted
@@ -169,13 +177,19 @@ export class ConversationalRetrievalQAChain extends BaseChain {
             input_documents: docs,
             chat_history: chatHistory,
         };
-        const result = await this.combineDocumentsChain.call(inputs, runManager?.getChild("combine_documents"));
+        let result = await this.combineDocumentsChain.call(inputs, runManager?.getChild("combine_documents"));
         if (this.returnSourceDocuments) {
-            return {
+            result = {
                 ...result,
                 sourceDocuments: docs,
             };
         }
+        if (this.returnGeneratedQuestion) {
+            result = {
+                ...result,
+                generatedQuestion: newQuestion,
+            };
+        }
         return result;
     }
     _chainType() {

package/dist/chat_models/llama_cpp.cjs

@@ -141,26 +141,22 @@ class ChatLlamaCpp extends base_js_1.SimpleChatModel {
         }
     }
     async *_streamResponseChunks(input, _options, runManager) {
-        if (input.length !== 1) {
-            throw new Error("Only one human message should be provided.");
-        }
-        else {
-            const promptOptions = {
-                temperature: this?.temperature,
-                topK: this?.topK,
-                topP: this?.topP,
-            };
-            const stream = await this.caller.call(async () => this._context.evaluate(this._context.encode(`${input[0].content}`), promptOptions));
-            for await (const chunk of stream) {
-                yield new index_js_1.ChatGenerationChunk({
-                    text: this._context.decode([chunk]),
-                    message: new index_js_1.AIMessageChunk({
-                        content: this._context.decode([chunk]),
-                    }),
-                    generationInfo: {},
-                });
-                await runManager?.handleLLMNewToken(this._context.decode([chunk]) ?? "");
-            }
+        const promptOptions = {
+            temperature: this?.temperature,
+            topK: this?.topK,
+            topP: this?.topP,
+        };
+        const prompt = this._buildPrompt(input);
+        const stream = await this.caller.call(async () => this._context.evaluate(this._context.encode(prompt), promptOptions));
+        for await (const chunk of stream) {
+            yield new index_js_1.ChatGenerationChunk({
+                text: this._context.decode([chunk]),
+                message: new index_js_1.AIMessageChunk({
+                    content: this._context.decode([chunk]),
+                }),
+                generationInfo: {},
+            });
+            await runManager?.handleLLMNewToken(this._context.decode([chunk]) ?? "");
         }
     }
     // This constructs a new session if we need to adding in any sys messages or previous chats
@@ -251,5 +247,30 @@ class ChatLlamaCpp extends base_js_1.SimpleChatModel {
         }
         return result;
     }
+    _buildPrompt(input) {
+        const prompt = input
+            .map((message) => {
+            let messageText;
+            if (message._getType() === "human") {
+                messageText = `[INST] ${message.content} [/INST]`;
+            }
+            else if (message._getType() === "ai") {
+                messageText = message.content;
+            }
+            else if (message._getType() === "system") {
+                messageText = `<<SYS>> ${message.content} <</SYS>>`;
+            }
+            else if (index_js_1.ChatMessage.isInstance(message)) {
+                messageText = `\n\n${message.role[0].toUpperCase()}${message.role.slice(1)}: ${message.content}`;
+            }
+            else {
+                console.warn(`Unsupported message type passed to llama_cpp: "${message._getType()}"`);
+                messageText = "";
+            }
+            return messageText;
+        })
+            .join("\n");
+        return prompt;
+    }
 }
 exports.ChatLlamaCpp = ChatLlamaCpp;

package/dist/chat_models/llama_cpp.d.ts

@@ -67,4 +67,5 @@ export declare class ChatLlamaCpp extends SimpleChatModel<LlamaCppCallOptions> {
     _streamResponseChunks(input: BaseMessage[], _options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): AsyncGenerator<ChatGenerationChunk>;
     protected _buildSession(messages: BaseMessage[]): string;
     protected _convertMessagesToInteractions(messages: BaseMessage[]): ConversationInteraction[];
+    protected _buildPrompt(input: BaseMessage[]): string;
 }

package/dist/chat_models/llama_cpp.js

@@ -1,7 +1,7 @@
 import { LlamaChatSession, } from "node-llama-cpp";
 import { SimpleChatModel } from "./base.js";
 import { createLlamaModel, createLlamaContext, } from "../util/llama_cpp.js";
-import { ChatGenerationChunk, AIMessageChunk, } from "../schema/index.js";
+import { ChatGenerationChunk, AIMessageChunk, ChatMessage, } from "../schema/index.js";
 /**
  *  To use this model you need to have the `node-llama-cpp` module installed.
  *  This can be installed using `npm install -S node-llama-cpp` and the minimum
@@ -138,26 +138,22 @@ export class ChatLlamaCpp extends SimpleChatModel {
         }
     }
     async *_streamResponseChunks(input, _options, runManager) {
-        if (input.length !== 1) {
-            throw new Error("Only one human message should be provided.");
-        }
-        else {
-            const promptOptions = {
-                temperature: this?.temperature,
-                topK: this?.topK,
-                topP: this?.topP,
-            };
-            const stream = await this.caller.call(async () => this._context.evaluate(this._context.encode(`${input[0].content}`), promptOptions));
-            for await (const chunk of stream) {
-                yield new ChatGenerationChunk({
-                    text: this._context.decode([chunk]),
-                    message: new AIMessageChunk({
-                        content: this._context.decode([chunk]),
-                    }),
-                    generationInfo: {},
-                });
-                await runManager?.handleLLMNewToken(this._context.decode([chunk]) ?? "");
-            }
+        const promptOptions = {
+            temperature: this?.temperature,
+            topK: this?.topK,
+            topP: this?.topP,
+        };
+        const prompt = this._buildPrompt(input);
+        const stream = await this.caller.call(async () => this._context.evaluate(this._context.encode(prompt), promptOptions));
+        for await (const chunk of stream) {
+            yield new ChatGenerationChunk({
+                text: this._context.decode([chunk]),
+                message: new AIMessageChunk({
+                    content: this._context.decode([chunk]),
+                }),
+                generationInfo: {},
+            });
+            await runManager?.handleLLMNewToken(this._context.decode([chunk]) ?? "");
         }
     }
     // This constructs a new session if we need to adding in any sys messages or previous chats
@@ -248,4 +244,29 @@ export class ChatLlamaCpp extends SimpleChatModel {
         }
         return result;
     }
+    _buildPrompt(input) {
+        const prompt = input
+            .map((message) => {
+            let messageText;
+            if (message._getType() === "human") {
+                messageText = `[INST] ${message.content} [/INST]`;
+            }
+            else if (message._getType() === "ai") {
+                messageText = message.content;
+            }
+            else if (message._getType() === "system") {
+                messageText = `<<SYS>> ${message.content} <</SYS>>`;
+            }
+            else if (ChatMessage.isInstance(message)) {
+                messageText = `\n\n${message.role[0].toUpperCase()}${message.role.slice(1)}: ${message.content}`;
+            }
+            else {
+                console.warn(`Unsupported message type passed to llama_cpp: "${message._getType()}"`);
+                messageText = "";
+            }
+            return messageText;
+        })
+            .join("\n");
+        return prompt;
+    }
 }

package/dist/document_loaders/fs/chatgpt.cjs

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatGPTLoader = void 0;
+const text_js_1 = require("./text.cjs");
+const document_js_1 = require("../../document.cjs");
+function concatenateRows(message, title) {
+    /**
+     * Combine message information in a readable format ready to be used.
+     * @param {ChatGPTMessage} message - Message to be concatenated
+     * @param {string} title - Title of the conversation
+     *
+     * @returns {string} Concatenated message
+     */
+    if (!message) {
+        return "";
+    }
+    const sender = message.author ? message.author.role : "unknown";
+    const text = message.content.parts[0];
+    const date = new Date(message.create_time * 1000)
+        .toISOString()
+        .slice(0, 19)
+        .replace("T", " ");
+    return `${title} - ${sender} on ${date}: ${text}\n\n`;
+}
+class ChatGPTLoader extends text_js_1.TextLoader {
+    constructor(filePathOrBlob, numLogs = 0) {
+        super(filePathOrBlob);
+        Object.defineProperty(this, "numLogs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.numLogs = numLogs;
+    }
+    async parse(raw) {
+        let data;
+        try {
+            data = JSON.parse(raw);
+        }
+        catch (e) {
+            console.error(e);
+            throw new Error("Failed to parse JSON");
+        }
+        const truncatedData = this.numLogs > 0 ? data.slice(0, this.numLogs) : data;
+        return truncatedData.map((d) => Object.values(d.mapping)
+            .filter((msg, idx) => !(idx === 0 && msg.message.author.role === "system"))
+            .map((msg) => concatenateRows(msg.message, d.title))
+            .join(""));
+    }
+    async load() {
+        let text;
+        let metadata;
+        if (typeof this.filePathOrBlob === "string") {
+            const { readFile } = await text_js_1.TextLoader.imports();
+            try {
+                text = await readFile(this.filePathOrBlob, "utf8");
+            }
+            catch (e) {
+                console.error(e);
+                throw new Error("Failed to read file");
+            }
+            metadata = { source: this.filePathOrBlob };
+        }
+        else {
+            try {
+                text = await this.filePathOrBlob.text();
+            }
+            catch (e) {
+                console.error(e);
+                throw new Error("Failed to read blob");
+            }
+            metadata = { source: "blob", blobType: this.filePathOrBlob.type };
+        }
+        const parsed = await this.parse(text);
+        return parsed.map((pageContent, i) => new document_js_1.Document({
+            pageContent,
+            metadata: {
+                ...metadata,
+                logIndex: i + 1,
+            },
+        }));
+    }
+}
+exports.ChatGPTLoader = ChatGPTLoader;

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

@@ -0,0 +1,8 @@
+import { TextLoader } from "./text.js";
+import { Document } from "../../document.js";
+export declare class ChatGPTLoader extends TextLoader {
+    numLogs: number;
+    constructor(filePathOrBlob: string | Blob, numLogs?: number);
+    protected parse(raw: string): Promise<string[]>;
+    load(): Promise<Document[]>;
+}

package/dist/document_loaders/fs/chatgpt.js

@@ -0,0 +1,81 @@
+import { TextLoader } from "./text.js";
+import { Document } from "../../document.js";
+function concatenateRows(message, title) {
+    /**
+     * Combine message information in a readable format ready to be used.
+     * @param {ChatGPTMessage} message - Message to be concatenated
+     * @param {string} title - Title of the conversation
+     *
+     * @returns {string} Concatenated message
+     */
+    if (!message) {
+        return "";
+    }
+    const sender = message.author ? message.author.role : "unknown";
+    const text = message.content.parts[0];
+    const date = new Date(message.create_time * 1000)
+        .toISOString()
+        .slice(0, 19)
+        .replace("T", " ");
+    return `${title} - ${sender} on ${date}: ${text}\n\n`;
+}
+export class ChatGPTLoader extends TextLoader {
+    constructor(filePathOrBlob, numLogs = 0) {
+        super(filePathOrBlob);
+        Object.defineProperty(this, "numLogs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.numLogs = numLogs;
+    }
+    async parse(raw) {
+        let data;
+        try {
+            data = JSON.parse(raw);
+        }
+        catch (e) {
+            console.error(e);
+            throw new Error("Failed to parse JSON");
+        }
+        const truncatedData = this.numLogs > 0 ? data.slice(0, this.numLogs) : data;
+        return truncatedData.map((d) => Object.values(d.mapping)
+            .filter((msg, idx) => !(idx === 0 && msg.message.author.role === "system"))
+            .map((msg) => concatenateRows(msg.message, d.title))
+            .join(""));
+    }
+    async load() {
+        let text;
+        let metadata;
+        if (typeof this.filePathOrBlob === "string") {
+            const { readFile } = await TextLoader.imports();
+            try {
+                text = await readFile(this.filePathOrBlob, "utf8");
+            }
+            catch (e) {
+                console.error(e);
+                throw new Error("Failed to read file");
+            }
+            metadata = { source: this.filePathOrBlob };
+        }
+        else {
+            try {
+                text = await this.filePathOrBlob.text();
+            }
+            catch (e) {
+                console.error(e);
+                throw new Error("Failed to read blob");
+            }
+            metadata = { source: "blob", blobType: this.filePathOrBlob.type };
+        }
+        const parsed = await this.parse(text);
+        return parsed.map((pageContent, i) => new Document({
+            pageContent,
+            metadata: {
+                ...metadata,
+                logIndex: i + 1,
+            },
+        }));
+    }
+}

package/dist/document_loaders/web/confluence.cjs

@@ -19,7 +19,7 @@ const base_js_1 = require("../base.cjs");
  * ```
  */
 class ConfluencePagesLoader extends base_js_1.BaseDocumentLoader {
-    constructor({ baseUrl, spaceKey, username, accessToken, limit = 25, }) {
+    constructor({ baseUrl, spaceKey, username, accessToken, limit = 25, personalAccessToken, }) {
         super();
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
@@ -51,11 +51,32 @@ class ConfluencePagesLoader extends base_js_1.BaseDocumentLoader {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "personalAccessToken", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.baseUrl = baseUrl;
         this.spaceKey = spaceKey;
         this.username = username;
         this.accessToken = accessToken;
         this.limit = limit;
+        this.personalAccessToken = personalAccessToken;
+    }
+    /**
+     * Returns the authorization header for the request.
+     * @returns The authorization header as a string, or undefined if no credentials were provided.
+     */
+    get authorizationHeader() {
+        if (this.personalAccessToken) {
+            return `Bearer ${this.personalAccessToken}`;
+        }
+        else if (this.username && this.accessToken) {
+            const authToken = Buffer.from(`${this.username}:${this.accessToken}`).toString("base64");
+            return `Basic ${authToken}`;
+        }
+        return undefined;
     }
     /**
      * Fetches all the pages in the specified space and converts each page to
@@ -79,13 +100,16 @@ class ConfluencePagesLoader extends base_js_1.BaseDocumentLoader {
      */
     async fetchConfluenceData(url) {
         try {
-            const authToken = Buffer.from(`${this.username}:${this.accessToken}`).toString("base64");
+            const initialHeaders = {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            };
+            const authHeader = this.authorizationHeader;
+            if (authHeader) {
+                initialHeaders.Authorization = authHeader;
+            }
             const response = await fetch(url, {
-                headers: {
-                    Authorization: `Basic ${authToken}`,
-                    "Content-Type": "application/json",
-                    Accept: "application/json",
-                },
+                headers: initialHeaders,
             });
             if (!response.ok) {
                 throw new Error(`Failed to fetch ${url} from Confluence: ${response.status}`);

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

@@ -7,8 +7,9 @@ import { BaseDocumentLoader } from "../base.js";
 export interface ConfluencePagesLoaderParams {
     baseUrl: string;
     spaceKey: string;
-    username: string;
-    accessToken: string;
+    username?: string;
+    accessToken?: string;
+    personalAccessToken?: string;
     limit?: number;
 }
 /**
@@ -47,10 +48,16 @@ export interface ConfluenceAPIResponse {
 export declare class ConfluencePagesLoader extends BaseDocumentLoader {
     readonly baseUrl: string;
     readonly spaceKey: string;
-    readonly username: string;
-    readonly accessToken: string;
+    readonly username?: string;
+    readonly accessToken?: string;
     readonly limit: number;
-    constructor({ baseUrl, spaceKey, username, accessToken, limit, }: ConfluencePagesLoaderParams);
+    readonly personalAccessToken?: string;
+    constructor({ baseUrl, spaceKey, username, accessToken, limit, personalAccessToken, }: ConfluencePagesLoaderParams);
+    /**
+     * Returns the authorization header for the request.
+     * @returns The authorization header as a string, or undefined if no credentials were provided.
+     */
+    private get authorizationHeader();
     /**
      * Fetches all the pages in the specified space and converts each page to
      * a Document instance.

package/dist/document_loaders/web/confluence.js

@@ -16,7 +16,7 @@ import { BaseDocumentLoader } from "../base.js";
  * ```
  */
 export class ConfluencePagesLoader extends BaseDocumentLoader {
-    constructor({ baseUrl, spaceKey, username, accessToken, limit = 25, }) {
+    constructor({ baseUrl, spaceKey, username, accessToken, limit = 25, personalAccessToken, }) {
         super();
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
@@ -48,11 +48,32 @@ export class ConfluencePagesLoader extends BaseDocumentLoader {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "personalAccessToken", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.baseUrl = baseUrl;
         this.spaceKey = spaceKey;
         this.username = username;
         this.accessToken = accessToken;
         this.limit = limit;
+        this.personalAccessToken = personalAccessToken;
+    }
+    /**
+     * Returns the authorization header for the request.
+     * @returns The authorization header as a string, or undefined if no credentials were provided.
+     */
+    get authorizationHeader() {
+        if (this.personalAccessToken) {
+            return `Bearer ${this.personalAccessToken}`;
+        }
+        else if (this.username && this.accessToken) {
+            const authToken = Buffer.from(`${this.username}:${this.accessToken}`).toString("base64");
+            return `Basic ${authToken}`;
+        }
+        return undefined;
     }
     /**
      * Fetches all the pages in the specified space and converts each page to
@@ -76,13 +97,16 @@ export class ConfluencePagesLoader extends BaseDocumentLoader {
      */
     async fetchConfluenceData(url) {
         try {
-            const authToken = Buffer.from(`${this.username}:${this.accessToken}`).toString("base64");
+            const initialHeaders = {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            };
+            const authHeader = this.authorizationHeader;
+            if (authHeader) {
+                initialHeaders.Authorization = authHeader;
+            }
             const response = await fetch(url, {
-                headers: {
-                    Authorization: `Basic ${authToken}`,
-                    "Content-Type": "application/json",
-                    Accept: "application/json",
-                },
+                headers: initialHeaders,
             });
             if (!response.ok) {
                 throw new Error(`Failed to fetch ${url} from Confluence: ${response.status}`);