llm-exe 2.2.0 → 2.3.0

package/dist/index.d.mts

@@ -31,21 +31,23 @@ interface IChatUserMessage extends IChatMessageBase {
     name?: string;
 }
 interface IChatFunctionMessage extends IChatMessageBase {
+    id?: string;
     role: Extract<IChatMessageRole, "function">;
     content: string;
     name: string;
 }
 interface IChatAssistantMessage extends IChatMessageBase {
-    role: Extract<IChatMessageRole, "assistant">;
+    role: Extract<IChatMessageRole, "assistant" | "model">;
     content: string;
     function_call?: undefined;
 }
-interface IChatAssistantFunctionCallMessage extends IChatMessageBase {
-    role: Extract<IChatMessageRole, "assistant">;
+interface IChatFunctionCallMessage extends IChatMessageBase {
+    role: Extract<IChatMessageRole, "function_call">;
     content: null;
-    function_call?: {
+    function_call: {
         name: string;
         arguments: string;
+        id?: string;
     };
 }
 interface IChatSystemMessage extends IChatMessageBase {
@@ -57,29 +59,16 @@ interface IChatMessagesPlaceholder {
     content: string;
 }
 type IPromptMessages = (IChatSystemMessage | IChatMessagesPlaceholder)[];
-type IPromptChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatAssistantFunctionCallMessage | IChatSystemMessage | IChatMessagesPlaceholder | IChatFunctionMessage)[];
-type IChatMessage = IChatUserMessage | IChatAssistantMessage | IChatAssistantFunctionCallMessage | IChatSystemMessage | IChatFunctionMessage;
+type IPromptChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatFunctionCallMessage | IChatSystemMessage | IChatMessagesPlaceholder | IChatFunctionMessage)[];
+type IChatMessage = IChatUserMessage | IChatAssistantMessage | IChatFunctionCallMessage | IChatSystemMessage | IChatFunctionMessage;
 type IChatMessages = IChatMessage[];
 
 type OpenAIChatModelName = "gpt-3.5-turbo" | "gpt-3.5-turbo-0613" | "gpt-3.5-turbo-16k" | "gpt-4-0613" | "gpt-4" | "gpt-4o" | "gpt-4o-mini" | "gpt-4-0613" | "gpt-4-32k-0613" | `gpt-4${string}` | `gpt-3.5-turbo-${string}`;
 type OpenAIConversationModelName = "davinci" | "text-curie-001" | "text-babbage-001" | "text-ada-001";
 type OpenAIEmbeddingModelName = "text-embedding-ada-002";
 type OpenAIModelName = OpenAIChatModelName | OpenAIConversationModelName | OpenAIEmbeddingModelName;
-interface LlmExecutorExecuteOptions {
-    functions?: CallableExecutorCore[];
-    functionCall?: any;
-    jsonSchema?: Record<string, any>;
-}
-type GenericFunctionCall = "auto" | "none" | "any" | {
-    name: string;
-};
-interface OpenAiLlmExecutorOptions<T extends GenericFunctionCall = "auto"> extends LlmExecutorExecuteOptions {
-    functions?: CallableExecutorCore[];
-    functionCall?: T;
-    functionCallStrictInput?: boolean;
-    jsonSchema?: Record<string, any>;
-}
 
+type ParserInput = string | OutputResult;
 /**
  * BaseParser is an abstract class for parsing text and enforcing JSON schema on the parsed data.
  */
@@ -100,7 +89,7 @@ declare abstract class BaseParser<T = any> {
      * @param [attributes] - Optional attributes to use during parsing.
      * @returns The parsed data.
      */
-    abstract parse(text: string | OutputResultContent[], attributes?: Record<string, any>): T;
+    abstract parse(text: ParserInput, attributes?: Record<string, any>): T;
 }
 declare abstract class BaseParserWithJson<S extends JSONSchema | undefined = undefined, T = S extends JSONSchema ? FromSchema<S> : Record<string, any>> extends BaseParser<T> {
     schema: S;
@@ -113,26 +102,11 @@ declare abstract class BaseParserWithJson<S extends JSONSchema | undefined = und
     constructor(name: string, options: BaseParserOptionsWithSchema<S>);
 }
 
-interface OpenAiFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
-    parser: T;
-}
-declare class OpenAiFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | {
-    name: any;
-    arguments: any;
-}> {
-    parser: T;
-    constructor(options: OpenAiFunctionParserOptions<T>);
-    parse(text: OutputResultContent[], _options?: Record<string, any>): ParserOutput<T> | {
-        name: string;
-        arguments: any;
-    };
-}
-
 interface StringParserOptions extends BaseParserOptions {
 }
 declare class StringParser extends BaseParser<string> {
     constructor(options?: StringParserOptions);
-    parse(text: string | OutputResultContent[], _options?: Record<string, any>): string;
+    parse(text: string | OutputResult, _options?: Record<string, any>): string;
 }
 
 interface BooleanParserOptions extends BaseParserOptions {
@@ -330,6 +304,36 @@ declare function createParser<T extends Extract<CreateParserType, "json">, S ext
 declare function createParser<T extends CreateParserType, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptionsWithSchema<S> | BaseParserOptions): JsonParser<S> | ListToJsonParser<S> | StringParser | NumberParser | BooleanParser | ListToArrayParser | ListToKeyValueParser | ReplaceStringTemplateParser | MarkdownCodeBlockParser | MarkdownCodeBlocksParser | StringExtractParser;
 declare function createCustomParser<O>(name: string, parserFn: (text: string, inputValues: ExecutorContext<any, any>) => O): CustomParser<ReturnType<typeof parserFn>>;
 
+declare class LlmFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | OutputResultContent[]> {
+    parser: T;
+    constructor(options: LlmNativeFunctionParserOptions<T>);
+    parse(text: OutputResult, _options?: Record<string, any>): OutputResultContent[] | ParserOutput<T>;
+}
+interface LlmNativeFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
+    parser: T;
+}
+interface LlmNativeFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
+    parser: T;
+}
+/**
+ * @deprecated Use `LlmFunctionParser` instead.
+ */
+declare class LlmNativeFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | {
+    name: any;
+    arguments: any;
+}> {
+    parser: T;
+    constructor(options: LlmNativeFunctionParserOptions<T>);
+    parse(text: OutputResult, _options?: Record<string, any>): ParserOutput<T> | {
+        name: string;
+        arguments: any;
+    };
+}
+/**
+ * @deprecated Use `LlmExecutorWithFunctions` instead.
+ */
+declare const OpenAiFunctionParser: typeof LlmNativeFunctionParser;
+
 declare function replaceTemplateString(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): string;
 
 declare function replaceTemplateStringAsync(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): Promise<string>;
@@ -445,7 +449,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
      * @param name (optional) The name of the user. Only accepted if role is `user`.
      * @return instance of ChatPrompt.
      */
-    addToPrompt(content: string, role: Extract<IChatMessageRole, "assistant">, name?: undefined): ChatPrompt<I>;
+    addToPrompt(content: string, role: Extract<IChatMessageRole, "assistant" | "model">, 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>;
@@ -468,7 +472,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
      * @param content The message content.
      * @return ChatPrompt so it can be chained.
      */
-    addFunctionMessage(content: string, name: string): ChatPrompt<I>;
+    addFunctionMessage(content: string, name: string, id?: string): ChatPrompt<I>;
     /**
      * addFunctionCallMessage Helper to add an assistant message to the prompt.
      * @param content The message content.
@@ -477,6 +481,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
     addFunctionCallMessage(function_call?: {
         name: string;
         arguments: string;
+        id?: string;
     }): this;
     /**
      * addFromHistory Adds multiple messages at one time.
@@ -667,13 +672,27 @@ declare class Dialogue extends BaseStateItem<IChatMessages> {
     name: string;
     constructor(name: string);
     setUserMessage(content: string | IChatMessageContentDetailed[], name?: string): this;
-    setAssistantMessage(content: string): this;
+    setAssistantMessage(content: string | OutputResultsText): this;
     setSystemMessage(content: string): this;
-    setFunctionMessage(content: string, name: string): this;
+    setToolMessage(content: string, name: string, id?: string): void;
+    setFunctionMessage(content: string, name: string, id?: string): this;
+    /**
+     * Set
+     */
+    setToolCallMessage(input: {
+        name: string;
+        arguments: string;
+        id?: string;
+    }): void;
     setFunctionCallMessage(input: {
+        name: string;
+        arguments: string;
+        id?: string;
+    } | {
         function_call: {
             name: string;
             arguments: string;
+            id?: string;
         };
     }): this;
     setMessageTurn(userMessage: string, assistantMessage: string, systemMessage?: string): this;
@@ -684,6 +703,13 @@ declare class Dialogue extends BaseStateItem<IChatMessages> {
         name: string;
         value: IChatMessage[];
     };
+    /**
+     * Add LLM output to dialogue history in the order it was returned
+     *
+     * @param output - The LLM output result from llm.call()
+     * @returns this for chaining
+     */
+    addFromOutput(output: OutputResult | BaseLlCall): this;
 }
 
 declare abstract class BaseState {
@@ -740,9 +766,19 @@ declare class LlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<Re
 /**
  * Core Executor With LLM
  */
-declare class LlmExecutorOpenAiFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends LlmExecutor<Llm, Prompt, Parser, State> {
+declare class LlmExecutorWithFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState = BaseState> extends LlmExecutor<Llm, Prompt, LlmFunctionParser<Parser>, State> {
     constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
-    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: OpenAiLlmExecutorOptions<T>): Promise<ParserOutput<Parser>>;
+    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: LlmExecutorWithFunctionsOptions<T>): Promise<OutputResultContent[] | ParserOutput<Parser>>;
+}
+/**
+ * @deprecated Use `LlmExecutorWithFunctions` instead.
+ */
+declare class LlmExecutorOpenAiFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState = BaseState> extends LlmExecutor<Llm, Prompt, LlmNativeFunctionParser<Parser>, State> {
+    constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
+    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: LlmExecutorWithFunctionsOptions<T>): Promise<ParserOutput<Parser> | {
+        name: string;
+        arguments: any;
+    }>;
 }
 
 /**
@@ -763,6 +799,7 @@ declare function createCoreExecutor<I extends PlainObject, O>(handler: (input: I
  * @returns  - A new LlmExecutor instance.
  */
 declare function createLlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<any>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>): LlmExecutor<Llm, Prompt, Parser, State>;
+declare function createLlmFunctionExecutor<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>): LlmExecutorWithFunctions<Llm, Prompt, Parser, State>;
 
 declare const hookOnComplete = "onComplete";
 declare const hookOnError = "onError";
@@ -829,6 +866,20 @@ interface CallableExecutorCore {
     description: string;
     parameters?: Record<string, any>;
 }
+interface LlmExecutorExecuteOptions {
+    functions?: CallableExecutorCore[];
+    functionCall?: any;
+    jsonSchema?: Record<string, any>;
+}
+type GenericFunctionCall = "auto" | "none" | "any" | {
+    name: string;
+};
+interface LlmExecutorWithFunctionsOptions<T extends GenericFunctionCall = "auto"> extends LlmExecutorExecuteOptions {
+    functions?: CallableExecutorCore[];
+    functionCall?: T;
+    functionCallStrictInput?: boolean;
+    jsonSchema?: Record<string, any>;
+}
 
 type CreateParserType = "json" | "string" | "boolean" | "number" | "stringExtract" | "listToArray" | "listToJson" | "listToKeyValue" | "replaceStringTemplate" | "markdownCodeBlocks" | "markdownCodeBlock";
 interface BaseParserOptions {
@@ -838,6 +889,9 @@ interface BaseParserOptionsWithSchema<S extends JSONSchema | undefined = undefin
     validateSchema?: boolean;
 }
 
+/**
+ * Internal Formats
+ */
 interface OutputResultsBase {
     type: "text" | "function_use";
     text?: string;
@@ -850,6 +904,7 @@ interface OutputResultsFunction extends OutputResultsBase {
     type: "function_use";
     name: string;
     input: Record<string, any>;
+    functionId: string;
 }
 type OutputResultContent = OutputResultsText | OutputResultsFunction;
 interface OutputResult {
@@ -1231,6 +1286,35 @@ declare namespace index {
   export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_guessProviderFromModel as guessProviderFromModel, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
 }
 
+declare function isOutputResult(obj: any): obj is OutputResult;
+declare function isOutputResultContentText(obj: any): obj is OutputResultsText;
+/**
+ * Does a llm response have a tool/function call?
+ */
+declare function isFunctionCall(result: any): result is OutputResultsFunction;
+declare function isToolCall(result: any): result is OutputResultsFunction;
+/**
+ * Is it a tool/function Call
+ */
+declare function hasFunctionCall(results: any): boolean;
+declare function hasToolCall(results: any): boolean;
+declare function isUserMessage(message: IChatMessage): message is IChatUserMessage;
+declare function isAssistantMessage(message: IChatMessage): message is IChatAssistantMessage;
+declare function isSystemMessage(message: IChatMessage): message is IChatSystemMessage;
+
+declare const guards_hasFunctionCall: typeof hasFunctionCall;
+declare const guards_hasToolCall: typeof hasToolCall;
+declare const guards_isAssistantMessage: typeof isAssistantMessage;
+declare const guards_isFunctionCall: typeof isFunctionCall;
+declare const guards_isOutputResult: typeof isOutputResult;
+declare const guards_isOutputResultContentText: typeof isOutputResultContentText;
+declare const guards_isSystemMessage: typeof isSystemMessage;
+declare const guards_isToolCall: typeof isToolCall;
+declare const guards_isUserMessage: typeof isUserMessage;
+declare namespace guards {
+  export { guards_hasFunctionCall as hasFunctionCall, guards_hasToolCall as hasToolCall, guards_isAssistantMessage as isAssistantMessage, guards_isFunctionCall as isFunctionCall, guards_isOutputResult as isOutputResult, guards_isOutputResultContentText as isOutputResultContentText, guards_isSystemMessage as isSystemMessage, guards_isToolCall as isToolCall, guards_isUserMessage as isUserMessage };
+}
+
 declare const configs: {
     "deepseek.chat.v1": Config<keyof AllLlm>;
     "deepseek.chat": Config<keyof AllLlm>;
@@ -1260,11 +1344,7 @@ declare const configs: {
 };
 
 declare function useLlm<T extends keyof typeof configs>(provider: T, options?: AllUseLlmOptions[T]["input"]): {
-    call: (messages: string | IChatMessages, options?: OpenAiLlmExecutorOptions) => Promise<{
-        getResultContent: (index?: number) => OutputResultContent[];
-        getResultText: () => string;
-        getResult: () => OutputResult;
-    }>;
+    call: (messages: string | IChatMessages, options?: LlmExecutorWithFunctionsOptions) => Promise<BaseLlCall>;
     getTraceId: () => string | null;
     withTraceId: (id: string) => void;
     getMetadata: () => {
@@ -1280,7 +1360,7 @@ declare function useLlm<T extends keyof typeof configs>(provider: T, options?: A
 };
 
 declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, options: AllEmbedding[T]["input"]): {
-    call: (messages: string | string[], options?: OpenAiLlmExecutorOptions) => Promise<{
+    call: (messages: string | string[], options?: LlmExecutorWithFunctionsOptions) => Promise<{
         getEmbedding: (index?: number) => number[];
         getResult: () => EmbeddingOutputResult;
     }>;
@@ -1298,4 +1378,4 @@ declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, op
     };
 };
 
-export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type EmbeddingProviderKey, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type LlmProviderKey, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, type UseLlmKey, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, defineSchema, registerHelpers, registerPartials, useExecutors, useLlm, index as utils };
+export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type EmbeddingProviderKey, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, LlmExecutorWithFunctions, LlmNativeFunctionParser, type LlmProvider, type LlmProviderKey, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, type UseLlmKey, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createLlmFunctionExecutor, createParser, createPrompt, createState, createStateItem, defineSchema, guards, registerHelpers, registerPartials, useExecutors, useLlm, index as utils };

package/dist/index.d.ts

@@ -31,21 +31,23 @@ interface IChatUserMessage extends IChatMessageBase {
     name?: string;
 }
 interface IChatFunctionMessage extends IChatMessageBase {
+    id?: string;
     role: Extract<IChatMessageRole, "function">;
     content: string;
     name: string;
 }
 interface IChatAssistantMessage extends IChatMessageBase {
-    role: Extract<IChatMessageRole, "assistant">;
+    role: Extract<IChatMessageRole, "assistant" | "model">;
     content: string;
     function_call?: undefined;
 }
-interface IChatAssistantFunctionCallMessage extends IChatMessageBase {
-    role: Extract<IChatMessageRole, "assistant">;
+interface IChatFunctionCallMessage extends IChatMessageBase {
+    role: Extract<IChatMessageRole, "function_call">;
     content: null;
-    function_call?: {
+    function_call: {
         name: string;
         arguments: string;
+        id?: string;
     };
 }
 interface IChatSystemMessage extends IChatMessageBase {
@@ -57,29 +59,16 @@ interface IChatMessagesPlaceholder {
     content: string;
 }
 type IPromptMessages = (IChatSystemMessage | IChatMessagesPlaceholder)[];
-type IPromptChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatAssistantFunctionCallMessage | IChatSystemMessage | IChatMessagesPlaceholder | IChatFunctionMessage)[];
-type IChatMessage = IChatUserMessage | IChatAssistantMessage | IChatAssistantFunctionCallMessage | IChatSystemMessage | IChatFunctionMessage;
+type IPromptChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatFunctionCallMessage | IChatSystemMessage | IChatMessagesPlaceholder | IChatFunctionMessage)[];
+type IChatMessage = IChatUserMessage | IChatAssistantMessage | IChatFunctionCallMessage | IChatSystemMessage | IChatFunctionMessage;
 type IChatMessages = IChatMessage[];
 
 type OpenAIChatModelName = "gpt-3.5-turbo" | "gpt-3.5-turbo-0613" | "gpt-3.5-turbo-16k" | "gpt-4-0613" | "gpt-4" | "gpt-4o" | "gpt-4o-mini" | "gpt-4-0613" | "gpt-4-32k-0613" | `gpt-4${string}` | `gpt-3.5-turbo-${string}`;
 type OpenAIConversationModelName = "davinci" | "text-curie-001" | "text-babbage-001" | "text-ada-001";
 type OpenAIEmbeddingModelName = "text-embedding-ada-002";
 type OpenAIModelName = OpenAIChatModelName | OpenAIConversationModelName | OpenAIEmbeddingModelName;
-interface LlmExecutorExecuteOptions {
-    functions?: CallableExecutorCore[];
-    functionCall?: any;
-    jsonSchema?: Record<string, any>;
-}
-type GenericFunctionCall = "auto" | "none" | "any" | {
-    name: string;
-};
-interface OpenAiLlmExecutorOptions<T extends GenericFunctionCall = "auto"> extends LlmExecutorExecuteOptions {
-    functions?: CallableExecutorCore[];
-    functionCall?: T;
-    functionCallStrictInput?: boolean;
-    jsonSchema?: Record<string, any>;
-}
 
+type ParserInput = string | OutputResult;
 /**
  * BaseParser is an abstract class for parsing text and enforcing JSON schema on the parsed data.
  */
@@ -100,7 +89,7 @@ declare abstract class BaseParser<T = any> {
      * @param [attributes] - Optional attributes to use during parsing.
      * @returns The parsed data.
      */
-    abstract parse(text: string | OutputResultContent[], attributes?: Record<string, any>): T;
+    abstract parse(text: ParserInput, attributes?: Record<string, any>): T;
 }
 declare abstract class BaseParserWithJson<S extends JSONSchema | undefined = undefined, T = S extends JSONSchema ? FromSchema<S> : Record<string, any>> extends BaseParser<T> {
     schema: S;
@@ -113,26 +102,11 @@ declare abstract class BaseParserWithJson<S extends JSONSchema | undefined = und
     constructor(name: string, options: BaseParserOptionsWithSchema<S>);
 }
 
-interface OpenAiFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
-    parser: T;
-}
-declare class OpenAiFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | {
-    name: any;
-    arguments: any;
-}> {
-    parser: T;
-    constructor(options: OpenAiFunctionParserOptions<T>);
-    parse(text: OutputResultContent[], _options?: Record<string, any>): ParserOutput<T> | {
-        name: string;
-        arguments: any;
-    };
-}
-
 interface StringParserOptions extends BaseParserOptions {
 }
 declare class StringParser extends BaseParser<string> {
     constructor(options?: StringParserOptions);
-    parse(text: string | OutputResultContent[], _options?: Record<string, any>): string;
+    parse(text: string | OutputResult, _options?: Record<string, any>): string;
 }
 
 interface BooleanParserOptions extends BaseParserOptions {
@@ -330,6 +304,36 @@ declare function createParser<T extends Extract<CreateParserType, "json">, S ext
 declare function createParser<T extends CreateParserType, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptionsWithSchema<S> | BaseParserOptions): JsonParser<S> | ListToJsonParser<S> | StringParser | NumberParser | BooleanParser | ListToArrayParser | ListToKeyValueParser | ReplaceStringTemplateParser | MarkdownCodeBlockParser | MarkdownCodeBlocksParser | StringExtractParser;
 declare function createCustomParser<O>(name: string, parserFn: (text: string, inputValues: ExecutorContext<any, any>) => O): CustomParser<ReturnType<typeof parserFn>>;
 
+declare class LlmFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | OutputResultContent[]> {
+    parser: T;
+    constructor(options: LlmNativeFunctionParserOptions<T>);
+    parse(text: OutputResult, _options?: Record<string, any>): OutputResultContent[] | ParserOutput<T>;
+}
+interface LlmNativeFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
+    parser: T;
+}
+interface LlmNativeFunctionParserOptions<T extends BaseParser<any>> extends BaseParserOptions {
+    parser: T;
+}
+/**
+ * @deprecated Use `LlmFunctionParser` instead.
+ */
+declare class LlmNativeFunctionParser<T extends BaseParser<any>> extends BaseParser<ParserOutput<T> | {
+    name: any;
+    arguments: any;
+}> {
+    parser: T;
+    constructor(options: LlmNativeFunctionParserOptions<T>);
+    parse(text: OutputResult, _options?: Record<string, any>): ParserOutput<T> | {
+        name: string;
+        arguments: any;
+    };
+}
+/**
+ * @deprecated Use `LlmExecutorWithFunctions` instead.
+ */
+declare const OpenAiFunctionParser: typeof LlmNativeFunctionParser;
+
 declare function replaceTemplateString(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): string;
 
 declare function replaceTemplateStringAsync(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): Promise<string>;
@@ -445,7 +449,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
      * @param name (optional) The name of the user. Only accepted if role is `user`.
      * @return instance of ChatPrompt.
      */
-    addToPrompt(content: string, role: Extract<IChatMessageRole, "assistant">, name?: undefined): ChatPrompt<I>;
+    addToPrompt(content: string, role: Extract<IChatMessageRole, "assistant" | "model">, 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>;
@@ -468,7 +472,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
      * @param content The message content.
      * @return ChatPrompt so it can be chained.
      */
-    addFunctionMessage(content: string, name: string): ChatPrompt<I>;
+    addFunctionMessage(content: string, name: string, id?: string): ChatPrompt<I>;
     /**
      * addFunctionCallMessage Helper to add an assistant message to the prompt.
      * @param content The message content.
@@ -477,6 +481,7 @@ declare class ChatPrompt<I extends Record<string, any>> extends BasePrompt<I> {
     addFunctionCallMessage(function_call?: {
         name: string;
         arguments: string;
+        id?: string;
     }): this;
     /**
      * addFromHistory Adds multiple messages at one time.
@@ -667,13 +672,27 @@ declare class Dialogue extends BaseStateItem<IChatMessages> {
     name: string;
     constructor(name: string);
     setUserMessage(content: string | IChatMessageContentDetailed[], name?: string): this;
-    setAssistantMessage(content: string): this;
+    setAssistantMessage(content: string | OutputResultsText): this;
     setSystemMessage(content: string): this;
-    setFunctionMessage(content: string, name: string): this;
+    setToolMessage(content: string, name: string, id?: string): void;
+    setFunctionMessage(content: string, name: string, id?: string): this;
+    /**
+     * Set
+     */
+    setToolCallMessage(input: {
+        name: string;
+        arguments: string;
+        id?: string;
+    }): void;
     setFunctionCallMessage(input: {
+        name: string;
+        arguments: string;
+        id?: string;
+    } | {
         function_call: {
             name: string;
             arguments: string;
+            id?: string;
         };
     }): this;
     setMessageTurn(userMessage: string, assistantMessage: string, systemMessage?: string): this;
@@ -684,6 +703,13 @@ declare class Dialogue extends BaseStateItem<IChatMessages> {
         name: string;
         value: IChatMessage[];
     };
+    /**
+     * Add LLM output to dialogue history in the order it was returned
+     *
+     * @param output - The LLM output result from llm.call()
+     * @returns this for chaining
+     */
+    addFromOutput(output: OutputResult | BaseLlCall): this;
 }
 
 declare abstract class BaseState {
@@ -740,9 +766,19 @@ declare class LlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<Re
 /**
  * Core Executor With LLM
  */
-declare class LlmExecutorOpenAiFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends LlmExecutor<Llm, Prompt, Parser, State> {
+declare class LlmExecutorWithFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState = BaseState> extends LlmExecutor<Llm, Prompt, LlmFunctionParser<Parser>, State> {
     constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
-    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: OpenAiLlmExecutorOptions<T>): Promise<ParserOutput<Parser>>;
+    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: LlmExecutorWithFunctionsOptions<T>): Promise<OutputResultContent[] | ParserOutput<Parser>>;
+}
+/**
+ * @deprecated Use `LlmExecutorWithFunctions` instead.
+ */
+declare class LlmExecutorOpenAiFunctions<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState = BaseState> extends LlmExecutor<Llm, Prompt, LlmNativeFunctionParser<Parser>, State> {
+    constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
+    execute<T extends GenericFunctionCall>(_input: PromptInput<Prompt>, _options: LlmExecutorWithFunctionsOptions<T>): Promise<ParserOutput<Parser> | {
+        name: string;
+        arguments: any;
+    }>;
 }
 
 /**
@@ -763,6 +799,7 @@ declare function createCoreExecutor<I extends PlainObject, O>(handler: (input: I
  * @returns  - A new LlmExecutor instance.
  */
 declare function createLlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<any>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>): LlmExecutor<Llm, Prompt, Parser, State>;
+declare function createLlmFunctionExecutor<Llm extends BaseLlm, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>): LlmExecutorWithFunctions<Llm, Prompt, Parser, State>;
 
 declare const hookOnComplete = "onComplete";
 declare const hookOnError = "onError";
@@ -829,6 +866,20 @@ interface CallableExecutorCore {
     description: string;
     parameters?: Record<string, any>;
 }
+interface LlmExecutorExecuteOptions {
+    functions?: CallableExecutorCore[];
+    functionCall?: any;
+    jsonSchema?: Record<string, any>;
+}
+type GenericFunctionCall = "auto" | "none" | "any" | {
+    name: string;
+};
+interface LlmExecutorWithFunctionsOptions<T extends GenericFunctionCall = "auto"> extends LlmExecutorExecuteOptions {
+    functions?: CallableExecutorCore[];
+    functionCall?: T;
+    functionCallStrictInput?: boolean;
+    jsonSchema?: Record<string, any>;
+}
 
 type CreateParserType = "json" | "string" | "boolean" | "number" | "stringExtract" | "listToArray" | "listToJson" | "listToKeyValue" | "replaceStringTemplate" | "markdownCodeBlocks" | "markdownCodeBlock";
 interface BaseParserOptions {
@@ -838,6 +889,9 @@ interface BaseParserOptionsWithSchema<S extends JSONSchema | undefined = undefin
     validateSchema?: boolean;
 }
 
+/**
+ * Internal Formats
+ */
 interface OutputResultsBase {
     type: "text" | "function_use";
     text?: string;
@@ -850,6 +904,7 @@ interface OutputResultsFunction extends OutputResultsBase {
     type: "function_use";
     name: string;
     input: Record<string, any>;
+    functionId: string;
 }
 type OutputResultContent = OutputResultsText | OutputResultsFunction;
 interface OutputResult {
@@ -1231,6 +1286,35 @@ declare namespace index {
   export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_guessProviderFromModel as guessProviderFromModel, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
 }
 
+declare function isOutputResult(obj: any): obj is OutputResult;
+declare function isOutputResultContentText(obj: any): obj is OutputResultsText;
+/**
+ * Does a llm response have a tool/function call?
+ */
+declare function isFunctionCall(result: any): result is OutputResultsFunction;
+declare function isToolCall(result: any): result is OutputResultsFunction;
+/**
+ * Is it a tool/function Call
+ */
+declare function hasFunctionCall(results: any): boolean;
+declare function hasToolCall(results: any): boolean;
+declare function isUserMessage(message: IChatMessage): message is IChatUserMessage;
+declare function isAssistantMessage(message: IChatMessage): message is IChatAssistantMessage;
+declare function isSystemMessage(message: IChatMessage): message is IChatSystemMessage;
+
+declare const guards_hasFunctionCall: typeof hasFunctionCall;
+declare const guards_hasToolCall: typeof hasToolCall;
+declare const guards_isAssistantMessage: typeof isAssistantMessage;
+declare const guards_isFunctionCall: typeof isFunctionCall;
+declare const guards_isOutputResult: typeof isOutputResult;
+declare const guards_isOutputResultContentText: typeof isOutputResultContentText;
+declare const guards_isSystemMessage: typeof isSystemMessage;
+declare const guards_isToolCall: typeof isToolCall;
+declare const guards_isUserMessage: typeof isUserMessage;
+declare namespace guards {
+  export { guards_hasFunctionCall as hasFunctionCall, guards_hasToolCall as hasToolCall, guards_isAssistantMessage as isAssistantMessage, guards_isFunctionCall as isFunctionCall, guards_isOutputResult as isOutputResult, guards_isOutputResultContentText as isOutputResultContentText, guards_isSystemMessage as isSystemMessage, guards_isToolCall as isToolCall, guards_isUserMessage as isUserMessage };
+}
+
 declare const configs: {
     "deepseek.chat.v1": Config<keyof AllLlm>;
     "deepseek.chat": Config<keyof AllLlm>;
@@ -1260,11 +1344,7 @@ declare const configs: {
 };
 
 declare function useLlm<T extends keyof typeof configs>(provider: T, options?: AllUseLlmOptions[T]["input"]): {
-    call: (messages: string | IChatMessages, options?: OpenAiLlmExecutorOptions) => Promise<{
-        getResultContent: (index?: number) => OutputResultContent[];
-        getResultText: () => string;
-        getResult: () => OutputResult;
-    }>;
+    call: (messages: string | IChatMessages, options?: LlmExecutorWithFunctionsOptions) => Promise<BaseLlCall>;
     getTraceId: () => string | null;
     withTraceId: (id: string) => void;
     getMetadata: () => {
@@ -1280,7 +1360,7 @@ declare function useLlm<T extends keyof typeof configs>(provider: T, options?: A
 };
 
 declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, options: AllEmbedding[T]["input"]): {
-    call: (messages: string | string[], options?: OpenAiLlmExecutorOptions) => Promise<{
+    call: (messages: string | string[], options?: LlmExecutorWithFunctionsOptions) => Promise<{
         getEmbedding: (index?: number) => number[];
         getResult: () => EmbeddingOutputResult;
     }>;
@@ -1298,4 +1378,4 @@ declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, op
     };
 };
 
-export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type EmbeddingProviderKey, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type LlmProviderKey, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, type UseLlmKey, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, defineSchema, registerHelpers, registerPartials, useExecutors, useLlm, index as utils };
+export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type EmbeddingProviderKey, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, LlmExecutorWithFunctions, LlmNativeFunctionParser, type LlmProvider, type LlmProviderKey, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, type UseLlmKey, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createLlmFunctionExecutor, createParser, createPrompt, createState, createStateItem, defineSchema, guards, registerHelpers, registerPartials, useExecutors, useLlm, index as utils };