llm-exe 0.0.7 → 1.0.1

package/dist/parser/parsers/ListToJsonParser.d.ts

@@ -1,7 +1,7 @@
-import { BaseParserOptionsWithSchema } from "../../types";
-import { BaseParser } from "../_base";
-import { FromSchema, JSONSchema } from "json-schema-to-ts";
-export declare class ListToJsonParser<S extends JSONSchema | undefined = undefined, T = S extends JSONSchema ? FromSchema<S> : Record<string, any>> extends BaseParser<T> {
+import { BaseParserOptionsWithSchema, ParserOutput } from "../../types";
+import { BaseParserWithJson } from "../_base";
+import { JSONSchema } from "json-schema-to-ts";
+export declare class ListToJsonParser<S extends JSONSchema | undefined = undefined> extends BaseParserWithJson<S> {
     constructor(options?: BaseParserOptionsWithSchema<S>);
-    parse(text: string): T;
+    parse(text: string): ParserOutput<BaseParserWithJson<S>>;
 }

package/dist/parser/parsers/ListToJsonParser.js

@@ -4,8 +4,8 @@ exports.ListToJsonParser = void 0;
 const utils_1 = require("../../utils");
 const _base_1 = require("../_base");
 const _utils_1 = require("../_utils");
-class ListToJsonParser extends _base_1.BaseParser {
-    constructor(options) {
+class ListToJsonParser extends _base_1.BaseParserWithJson {
+    constructor(options = {}) {
         super("listToJson", options);
     }
     parse(text) {
@@ -19,7 +19,7 @@ class ListToJsonParser extends _base_1.BaseParser {
         });
         if (this.schema) {
             const parsed = (0, _utils_1.enforceParserSchema)(this.schema, output);
-            if (this?.options?.validateSchema) {
+            if (this?.validateSchema) {
                 const valid = (0, _utils_1.validateParserSchema)(this.schema, parsed);
                 if (valid && valid.length) {
                     throw new Error(valid[0].message);

package/dist/parser/parsers/ListToJsonParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListToJsonParser.js","sourceRoot":"src/","sources":["parser/parsers/ListToJsonParser.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAEpC,oCAAsC;AAEtC,sCAAsE;AAEtE,MAAa,gBAGX,SAAQ,kBAAa;IACrB,YAAY,OAAwC;QAClD,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,IAAY;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,IAAA,iBAAS,EAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACxD,IAAG,IAAI,EAAE,OAAO,EAAE,cAAc,EAAC;gBAC/B,MAAM,KAAK,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACxD,IAAG,KAAK,IAAI,KAAK,CAAC,MAAM,EAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;iBAClC;aACF;YACD,OAAO,MAAM,CAAA;SACd;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA5BD,4CA4BC"}
+{"version":3,"file":"ListToJsonParser.js","sourceRoot":"src/","sources":["parser/parsers/ListToJsonParser.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAEpC,oCAA8C;AAE9C,sCAAsE;AAEtE,MAAa,gBAEX,SAAQ,0BAAqB;IAC7B,YAAY,UAA0C,EAAE;QACtD,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,IAAY;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,IAAA,iBAAS,EAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACxD,IAAG,IAAI,EAAE,cAAc,EAAC;gBACtB,MAAM,KAAK,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACxD,IAAG,KAAK,IAAI,KAAK,CAAC,MAAM,EAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;iBAClC;aACF;YACD,OAAO,MAAM,CAAA;SACd;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA3BD,4CA2BC"}

package/dist/parser/parsers/OpenAiFunctionParser.d.ts

@@ -0,0 +1,16 @@
+import { BaseParserOptions, ParserOutput } from "../../types";
+import { BaseParser } from "../_base";
+export interface OpenAiFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
+    parser: T;
+}
+export declare class OpenAiFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | {
+    name: any;
+    arguments: any;
+}> {
+    parser: T;
+    constructor(options: OpenAiFunctionParserOptions<T>);
+    parse(text: string): ParserOutput<T> | {
+        name: any;
+        arguments: any;
+    };
+}

package/dist/parser/parsers/OpenAiFunctionParser.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenAiFunctionParser = void 0;
+const _base_1 = require("../_base");
+const utils_1 = require("../../utils");
+class OpenAiFunctionParser extends _base_1.BaseParser {
+    constructor(options) {
+        super("openAiFunction", options);
+        Object.defineProperty(this, "parser", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.parser = options.parser;
+    }
+    parse(text) {
+        const isFunctionCall = (0, utils_1.maybeParseJSON)(text);
+        if (typeof isFunctionCall === "object" &&
+            isFunctionCall?.function_call &&
+            "name" in isFunctionCall.function_call &&
+            "arguments" in isFunctionCall.function_call) {
+            return {
+                name: isFunctionCall.function_call.name,
+                arguments: (0, utils_1.maybeParseJSON)(isFunctionCall.function_call.arguments),
+            };
+        }
+        return this.parser.parse(text);
+    }
+}
+exports.OpenAiFunctionParser = OpenAiFunctionParser;
+//# sourceMappingURL=OpenAiFunctionParser.js.map

package/dist/parser/parsers/OpenAiFunctionParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OpenAiFunctionParser.js","sourceRoot":"src/","sources":["parser/parsers/OpenAiFunctionParser.ts"],"names":[],"mappings":";;;AACA,oCAAsC;AACtC,mCAAyC;AAOzC,MAAa,oBAAgD,SAAQ,kBAEpE;IAGC,YAAY,OAAuC;QACjD,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAHnC;;;;;WAAiB;QAIf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,IAAY;QAChB,MAAM,cAAc,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QAC5C,IACE,OAAO,cAAc,KAAK,QAAQ;YAClC,cAAc,EAAE,aAAa;YAC7B,MAAM,IAAI,cAAc,CAAC,aAAa;YACtC,WAAW,IAAI,cAAc,CAAC,aAAa,EAC3C;YACA,OAAO;gBACL,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,IAAI;gBACvC,SAAS,EAAE,IAAA,sBAAc,EAAC,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC;aAClE,CAAC;SACH;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAoB,CAAC;IACpD,CAAC;CACF;AAzBD,oDAyBC"}

package/dist/plugins/callable/callable.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOrExecutor, PlainObject } from "../../types";
+import { CallableExecutorCore, FunctionOrExecutor, PlainObject } from "../../types";
 import { enforceResultAttributes } from "../../utils";
 import { BaseExecutor } from "../../executor";
 /**
@@ -13,10 +13,11 @@ import { BaseExecutor } from "../../executor";
  */
 export interface CallableExecutorInput<I extends PlainObject | {
     input: string;
-}, O> {
+}, O> extends CallableExecutorCore {
     name: string;
-    key?: string;
     description: string;
+    key?: string;
+    parameters?: Record<string, any>;
     input: string;
     attributes?: Record<string, any>;
     visibilityHandler?(input: I, context: any, attributes?: Record<string, any>): boolean;
@@ -33,11 +34,10 @@ export interface CallableExecutorInput<I extends PlainObject | {
  * @property visibilityHandler - The visibility handler for the callable core function.
  * @property - The handler for the callable core function.
  */
-export interface CallableExecutor<I, O> {
-    name: string;
+export interface CallableExecutor<I, O> extends CallableExecutorCore {
     key: string;
-    description: string;
     attributes: Record<string, any>;
+    parameters: Record<string, any>;
     input: string;
     _handler: BaseExecutor<I, O>;
     visibilityHandler(input: any, attributes?: Record<string, any>): boolean;
@@ -57,6 +57,7 @@ export declare class CallableExecutor<I extends PlainObject | {
     description: string;
     input: string;
     attributes: Record<string, any>;
+    parameters: Record<string, any>;
     _handler: BaseExecutor<I, O>;
     _validateInput?(input: I, context: any): ReturnType<typeof enforceResultAttributes<boolean>> | Promise<ReturnType<typeof enforceResultAttributes<boolean>>>;
     _visibilityHandler?(input: any, context: any, attributes?: Record<string, any>): boolean;

package/dist/plugins/callable/callable.js

@@ -40,6 +40,12 @@ class CallableExecutor {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "parameters", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "_handler", {
             enumerable: true,
             configurable: true,
@@ -53,6 +59,7 @@ class CallableExecutor {
         this.key = options?.key || defaults.key;
         this.description = options.description;
         this.input = options.input;
+        this.parameters = options.parameters || {};
         this.attributes = options?.attributes || {};
         this._validateInput = options.validateInput;
         this._visibilityHandler = options?.visibilityHandler;

package/dist/plugins/callable/callable.js.map

@@ -1 +1 @@
-{"version":3,"file":"callable.js","sourceRoot":"src/","sources":["plugins/callable/callable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callable.js","sourceRoot":"src/","sources":["plugins/callable/callable.ts"],"names":[],"mappings":"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"}

package/dist/plugins/callable/index.d.ts

@@ -1,5 +1,5 @@
 import { PlainObject } from "../../types";
-import { CallableExecutor, CallableExecutorInput } from "./callable";
+import { UseExecutorsBase, CallableExecutor, CallableExecutorInput } from "./callable";
 /**
  * Creates a new CallableExecutor instance.
  * @function createCallableExecutor
@@ -9,22 +9,13 @@ import { CallableExecutor, CallableExecutorInput } from "./callable";
 export declare function createCallableExecutor<I extends PlainObject | {
     input: string;
 }, O>(options: CallableExecutorInput<I, O>): CallableExecutor<I, O>;
+export declare class UseExecutors<I extends PlainObject | {
+    input: string;
+}, O extends any> extends UseExecutorsBase<I, O> {
+    constructor(handlers: CallableExecutor<I, O>[]);
+}
 export declare function useExecutors<I extends PlainObject | {
     input: string;
 }, O extends any>(executors: [
     ...(CallableExecutor<any, any> | CallableExecutorInput<any, any>)[]
-]): {
-    handlers: CallableExecutor<I, O>[];
-    hasFunction(name: string): boolean;
-    getFunction(name: string): CallableExecutor<I, O> | undefined;
-    getFunctions(): CallableExecutor<I, O>[];
-    getVisibleFunctions(_input: any, _attributes?: any): CallableExecutor<I, O>[];
-    callFunction(name: string, input: string): Promise<{
-        result: any;
-        attributes: any;
-    }>;
-    validateFunctionInput(name: string, input: string): Promise<{
-        result: boolean;
-        attributes: any;
-    }>;
-};
+]): UseExecutors<I, O>;

package/dist/plugins/callable/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useExecutors = exports.createCallableExecutor = void 0;
+exports.useExecutors = exports.UseExecutors = exports.createCallableExecutor = void 0;
 const callable_1 = require("./callable");
 /**
  * Creates a new CallableExecutor instance.
@@ -12,12 +12,13 @@ function createCallableExecutor(options) {
     return new callable_1.CallableExecutor(options);
 }
 exports.createCallableExecutor = createCallableExecutor;
-function useExecutors(executors) {
-    class UseExecutors extends callable_1.UseExecutorsBase {
-        constructor(handlers) {
-            super(handlers);
-        }
+class UseExecutors extends callable_1.UseExecutorsBase {
+    constructor(handlers) {
+        super(handlers);
     }
+}
+exports.UseExecutors = UseExecutors;
+function useExecutors(executors) {
     return new UseExecutors(executors.map((e) => {
         if (e instanceof callable_1.CallableExecutor)
             return e;

package/dist/plugins/callable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["plugins/callable/index.ts"],"names":[],"mappings":";;;AACA,yCAIoB;AAEpB;;;;;GAKG;AACH,SAAgB,sBAAsB,CAGpC,OAAoC;IACpC,OAAO,IAAI,2BAAgB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AALD,wDAKC;AAED,SAAgB,YAAY,CAI1B,SAEC;IAED,MAAM,YAAa,SAAQ,2BAAsB;QAC/C,YAAY,QAAkC;YAC5C,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClB,CAAC;KACF;IACD,OAAO,IAAI,YAAY,CACrB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,YAAY,2BAAgB;YAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAnBD,oCAmBC"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["plugins/callable/index.ts"],"names":[],"mappings":";;;AACA,yCAIoB;AAEpB;;;;;GAKG;AACH,SAAgB,sBAAsB,CAGpC,OAAoC;IACpC,OAAO,IAAI,2BAAgB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AALD,wDAKC;AAED,MAAa,YAGX,SAAQ,2BAAsB;IAC9B,YAAY,QAAkC;QAC5C,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC;CACF;AAPD,oCAOC;AAED,SAAgB,YAAY,CAI1B,SAEC;IAED,OAAO,IAAI,YAAY,CACrB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,YAAY,2BAAgB;YAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAdD,oCAcC"}

package/dist/prompt/_base.js

@@ -111,10 +111,10 @@ class BasePrompt {
         /* istanbul ignore next */
         return this.messages
             .map((message) => {
-            return (0, utils_1.replaceTemplateString)(message.content, replacements, {
+            return message.content ? (0, utils_1.replaceTemplateString)(message.content, replacements, {
                 partials: this.partials,
                 helpers: this.helpers,
-            });
+            }) : "";
         })
             .join(separator);
     }

package/dist/prompt/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["prompt/_base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["prompt/_base.ts"],"names":[],"mappings":"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"}

package/dist/prompt/chat.d.ts

@@ -35,6 +35,8 @@ export declare class ChatPrompt<I extends Record<string, any>> extends BasePromp
     addToPrompt(content: string, role: Extract<IChatMessageRole, "assistant">, name?: undefined): ChatPrompt<I>;
     addToPrompt(content: string, role: Extract<IChatMessageRole, "system">, name?: undefined): ChatPrompt<I>;
     addToPrompt(content: string, role: Extract<IChatMessageRole, "user">, name?: string): ChatPrompt<I>;
+    addToPrompt(content: string, role: Extract<IChatMessageRole, "function">, name: string): ChatPrompt<I>;
+    addToPrompt(content: string, role: Extract<IChatMessageRole, "function_call">, name: string): ChatPrompt<I>;
     /**
      * addUserMessage Helper to add a user message to the prompt.
      * @param content The message content.
@@ -48,6 +50,21 @@ export declare class ChatPrompt<I extends Record<string, any>> extends BasePromp
      * @return ChatPrompt so it can be chained.
      */
     addAssistantMessage(content: string): ChatPrompt<I>;
+    /**
+     * addFunctionMessage Helper to add an assistant message to the prompt.
+     * @param content The message content.
+     * @return ChatPrompt so it can be chained.
+     */
+    addFunctionMessage(content: string, name: string): ChatPrompt<I>;
+    /**
+     * addFunctionCallMessage Helper to add an assistant message to the prompt.
+     * @param content The message content.
+     * @return ChatPrompt so it can be chained.
+     */
+    addFunctionCallMessage(function_call?: {
+        name: string;
+        arguments: string;
+    }): this;
     /**
      * addFromHistory Adds multiple messages at one time.
      * @param history History of chat messages.
@@ -59,7 +76,10 @@ export declare class ChatPrompt<I extends Record<string, any>> extends BasePromp
      * @param content The message content
      * @return returns ChatPrompt so it can be chained.
      */
-    addChatHistoryPlaceholder(key: keyof I): ChatPrompt<I>;
+    addChatHistoryPlaceholder(key: keyof I, options?: {
+        assistant?: string;
+        user?: string;
+    }): ChatPrompt<I>;
     /**
      * addTokenPlaceholder description
      * @param content The message content

package/dist/prompt/chat.js

@@ -52,6 +52,14 @@ class ChatPrompt extends _base_1.BasePrompt {
                 case "assistant":
                     this.addAssistantMessage(content);
                     break;
+                case "function":
+                    (0, utils_1.assert)(name, "Function message requires name");
+                    this.addFunctionMessage(content, name);
+                    break;
+                case "function_call":
+                    (0, utils_1.assert)(name, "Function message requires name");
+                    this.addFunctionCallMessage({ name: name, arguments: content });
+                    break;
             }
         }
         return this;
@@ -85,6 +93,37 @@ class ChatPrompt extends _base_1.BasePrompt {
         });
         return this;
     }
+    /**
+     * addFunctionMessage Helper to add an assistant message to the prompt.
+     * @param content The message content.
+     * @return ChatPrompt so it can be chained.
+     */
+    addFunctionMessage(content, name) {
+        this.messages.push({
+            role: "function",
+            name,
+            content,
+        });
+        return this;
+    }
+    /**
+     * addFunctionCallMessage Helper to add an assistant message to the prompt.
+     * @param content The message content.
+     * @return ChatPrompt so it can be chained.
+     */
+    addFunctionCallMessage(function_call) {
+        if (function_call) {
+            this.messages.push({
+                role: "assistant",
+                function_call: {
+                    name: function_call.name,
+                    arguments: (0, utils_1.maybeStringifyJSON)(function_call.arguments),
+                },
+                content: null,
+            });
+        }
+        return this;
+    }
     /**
      * addFromHistory Adds multiple messages at one time.
      * @param history History of chat messages.
@@ -98,11 +137,19 @@ class ChatPrompt extends _base_1.BasePrompt {
                         this.addUserMessage(message.content, message?.name);
                         break;
                     case "assistant":
-                        this.addAssistantMessage(message.content);
+                        if (message.function_call) {
+                            this.addFunctionCallMessage(message.function_call);
+                        }
+                        else if (message?.content) {
+                            this.addAssistantMessage(message?.content);
+                        }
                         break;
                     case "system":
                         this.addSystemMessage(message.content);
                         break;
+                    case "function":
+                        this.addFunctionMessage(message.content, message.name);
+                        break;
                 }
             }
         }
@@ -113,10 +160,16 @@ class ChatPrompt extends _base_1.BasePrompt {
      * @param content The message content
      * @return returns ChatPrompt so it can be chained.
      */
-    addChatHistoryPlaceholder(key) {
+    addChatHistoryPlaceholder(key, options) {
         const start = `{{> DialogueHistory `;
         const params = [`key='${String(key)}'`];
         const end = `}}`;
+        if (options?.assistant) {
+            params.push(`assistant='${options.assistant}'`);
+        }
+        if (options?.user) {
+            params.push(`user='${options.user}'`);
+        }
         this.messages.push({
             role: "placeholder",
             content: `${start}${params.join(" ")}${end}`,
@@ -163,17 +216,39 @@ class ChatPrompt extends _base_1.BasePrompt {
                 switch (token) {
                     case ">DialogueHistory": {
                         /* istanbul ignore next */
-                        const { key = "" } = data;
+                        const { key = "", user } = data;
                         const history = (0, utils_1.get)(replacements, key, []);
                         if (history && Array.isArray(history)) {
                             for (const message of history) {
                                 switch (message.role) {
-                                    case "user":
-                                        messagesOut.push((0, utils_1.pick)(message, ["role", "content", "name"]));
+                                    case "user": {
+                                        const m = (0, utils_1.pick)(message, ["role", "content", "name"]);
+                                        if (user) {
+                                            m["name"] = user;
+                                        }
+                                        messagesOut.push(m);
+                                        break;
+                                    }
+                                    case "assistant": {
+                                        if (message.function_call) {
+                                            messagesOut.push({
+                                                role: "assistant",
+                                                content: null,
+                                                function_call: message.function_call
+                                            });
+                                        }
+                                        else if (message?.content) {
+                                            messagesOut.push({
+                                                role: "assistant",
+                                                content: message.content,
+                                            });
+                                        }
                                         break;
-                                    case "assistant":
+                                    }
+                                    case "function":
                                         messagesOut.push({
-                                            role: "assistant",
+                                            role: "function",
+                                            name: message.name,
                                             content: message.content,
                                         });
                                         break;
@@ -197,7 +272,7 @@ class ChatPrompt extends _base_1.BasePrompt {
                                 content: (0, utils_1.replaceTemplateString)(content, replacements, {
                                     partials: this.partials,
                                     helpers: this.helpers,
-                                })
+                                }),
                             };
                             if (!name || role !== "user") {
                                 delete message.name;
@@ -208,13 +283,23 @@ class ChatPrompt extends _base_1.BasePrompt {
                     }
                 }
             }
+            else if (message.role === "function") {
+                messagesOut.push(Object.assign({}, message, {
+                    content: (0, utils_1.replaceTemplateString)(message.content, replacements, {
+                        partials: this.partials,
+                        helpers: this.helpers,
+                    }),
+                }));
+            }
             else {
                 if (safeToParseTemplate.includes(message.role)) {
                     messagesOut.push(Object.assign({}, message, {
-                        content: (0, utils_1.replaceTemplateString)(message.content, replacements, {
-                            partials: this.partials,
-                            helpers: this.helpers,
-                        }),
+                        content: message.content
+                            ? (0, utils_1.replaceTemplateString)(message.content, replacements, {
+                                partials: this.partials,
+                                helpers: this.helpers,
+                            })
+                            : null,
                     }));
                 }
                 else {

package/dist/prompt/chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat.js","sourceRoot":"src/","sources":["prompt/chat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat.js","sourceRoot":"src/","sources":["prompt/chat.ts"],"names":[],"mappings":"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"}

package/dist/state/_base.js

@@ -66,12 +66,16 @@ class BaseState {
     }
     serialize() {
         const dialogues = {};
-        const context = { ...this.context };
+        const context = {};
         const attributes = { ...this.attributes };
         const dialogueKeys = Object.keys(this.dialogues);
         for (const dialogueKey of dialogueKeys) {
             dialogues[dialogueKey] = this.dialogues[dialogueKey].serialize();
         }
+        const contextKeys = Object.keys(this.context);
+        for (const contextKey of contextKeys) {
+            context[contextKey] = this.context[contextKey].serialize();
+        }
         return {
             dialogues,
             context,

package/dist/state/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["state/_base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["state/_base.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AACjC,yCAAsC;AACtC,iCAAuC;AAEvC,MAAsB,SAAS;IAK7B;QAJA;;;;mBAAkD,EAAE;WAAC;QACrD;;;;mBAAyC,EAAE;WAAC;QAC5C;;;;mBAAqD,EAAE;WAAC;IAEzC,CAAC;IAEhB,cAAc,CAAC,OAAe,iBAAiB;QAC7C,IAAA,cAAM,EAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,yBAAyB,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD,WAAW,CAAC,OAAe,iBAAiB;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SAC7B;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,WAAW,CAAC,OAAe,iBAAiB;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtC,IAAA,cAAM,EAAC,QAAQ,EAAE,oBAAoB,IAAI,EAAE,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,iBAAiB,CAA+B,IAAO;QACrD,IAAA,cAAM,EACJ,IAAI,YAAY,oBAAa,EAC7B,yDAAyD,CAC1D,CAAC;QACF,IAAA,cAAM,EACJ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAC7B,QAAQ,IAAI,EAAE,MAAM,EAAE,kBAAkB,CACzC,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAQ,CAAC;IAC5C,CAAC;IAED,UAAU,CAAI,GAAW;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAqB,CAAC;IAC/C,CAAC;IAED,eAAe,CAAI,GAAW;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,GAAW,EAAE,KAAU;QAClC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,eAAe,CAAC,GAAW;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,eAAe;QACb,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,SAAS;QACP,MAAM,SAAS,GAAQ,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,MAAM,UAAU,GAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAC9B,IAAI,CAAC,SAAS,CACoB,CAAC;QACrC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;SAClE;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,IAAI,CAAC,OAAO,CACoB,CAAC;QACnC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC;SAC5D;QAED,OAAO;YACL,SAAS;YACT,OAAO;YACP,UAAU;SACX,CAAC;IACJ,CAAC;CAGF;AAtFD,8BAsFC;AAED,MAAa,YAAa,SAAQ,SAAS;IACzC;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IACD,KAAK,CAAC,SAAS;QACb,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACxD,CAAC;CACF;AAPD,oCAOC"}

package/dist/state/_functions.d.ts

@@ -4,3 +4,4 @@ import { DefaultStateItem } from "./item";
 export declare function createState(): DefaultState;
 export declare function createDialogue(name: string): Dialogue;
 export declare function createStateItem<T>(name: string, defaultValue: T): DefaultStateItem;
+export declare function createStateFrom(savedState?: any): DefaultState;

package/dist/state/_functions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStateItem = exports.createDialogue = exports.createState = void 0;
+exports.createStateFrom = exports.createStateItem = exports.createDialogue = exports.createState = void 0;
 const _1 = require(".");
 const dialogue_1 = require("./dialogue");
 const item_1 = require("./item");
@@ -16,4 +16,19 @@ function createStateItem(name, defaultValue) {
     return new item_1.DefaultStateItem(name, defaultValue);
 }
 exports.createStateItem = createStateItem;
+function createStateFrom(savedState) {
+    const state = createState();
+    const dialogues = savedState?.dialogues || {};
+    // const context = savedState?.context;
+    const attributes = savedState?.attributes || {};
+    for (const dialogue of Object.keys(dialogues)) {
+        const value = dialogues[dialogue].value;
+        state.createDialogue(dialogue).setHistory(value);
+    }
+    for (const attribute of Object.keys(attributes)) {
+        state.setAttribute(attribute, attributes[attribute]);
+    }
+    return state;
+}
+exports.createStateFrom = createStateFrom;
 //# sourceMappingURL=_functions.js.map

package/dist/state/_functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["state/_functions.ts"],"names":[],"mappings":";;;AAAA,wBAAiC;AACjC,yCAAsC;AACtC,iCAA0C;AAE1C,SAAgB,WAAW;IACzB,OAAO,IAAI,eAAY,EAAE,CAAC;AAC5B,CAAC;AAFD,kCAEC;AACD,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,mBAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe,CAAI,IAAY,EAAE,YAAe;IAC9D,OAAO,IAAI,uBAAgB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAClD,CAAC;AAFD,0CAEC"}
+{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["state/_functions.ts"],"names":[],"mappings":";;;AAAA,wBAAiC;AACjC,yCAAsC;AACtC,iCAA0C;AAE1C,SAAgB,WAAW;IACzB,OAAO,IAAI,eAAY,EAAE,CAAC;AAC5B,CAAC;AAFD,kCAEC;AACD,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,mBAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe,CAAI,IAAY,EAAE,YAAe;IAC9D,OAAO,IAAI,uBAAgB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAClD,CAAC;AAFD,0CAEC;AAED,SAAgB,eAAe,CAAC,UAAgB;IAC9C,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC;IAC9C,uCAAuC;IACvC,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;IAEhD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;QACxC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KACjD;IAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC/C,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;KACrD;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAfD,0CAeC"}

package/dist/state/dialogue.d.ts

@@ -1,4 +1,4 @@
-import { IChatMessages, IChatUserMessage } from "../types";
+import { IChatMessages } from "../types";
 import { BaseStateItem } from "./item";
 export declare class Dialogue extends BaseStateItem<IChatMessages> {
     name: string;
@@ -6,12 +6,19 @@ export declare class Dialogue extends BaseStateItem<IChatMessages> {
     setUserMessage(content: string, name?: string): this;
     setAssistantMessage(content: string): this;
     setSystemMessage(content: string): this;
+    setFunctionMessage(content: string, name: string): this;
+    setFunctionCallMessage(input: {
+        function_call: {
+            name: string;
+            arguments: string;
+        };
+    }): this;
     setMessageTurn(userMessage: string, assistantMessage: string, systemMessage?: string): this;
     setHistory(messages: IChatMessages): this;
     getHistory(): IChatMessages;
     serialize(): {
         class: string;
         name: string;
-        value: (IChatUserMessage | import("../types").IChatAssistantMessage | import("../types").IChatSystemMessage)[];
+        value: import("../types").IChatMessage[];
     };
 }