node-llama-cpp 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/evaluator/LlamaChat/LlamaChat.d.ts

@@ -5,7 +5,7 @@ import { LlamaContextSequence } from "../LlamaContext/LlamaContext.js";
 import { ChatHistoryItem, ChatModelFunctions, LLamaContextualRepeatPenalty, Token } from "../../types.js";
 import { GbnfJsonSchemaToType } from "../../utils/gbnfJson/types.js";
 import { LlamaGrammar } from "../LlamaGrammar.js";
-import { LlamaText } from "../../utils/LlamaText.js";
+import { LlamaText, LlamaTextJSON } from "../../utils/LlamaText.js";
 import { EvaluationPriority } from "../LlamaContext/types.js";
 import { TokenBias } from "../TokenBias.js";
 export type LlamaChatOptions = {
@@ -67,7 +67,8 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
     topP?: number;
     /**
      * Trim whitespace from the end of the generated text
-     * Disabled by default.
+     *
+     * Defaults to `false`.
      */
     trimWhitespaceSuffix?: boolean;
     repeatPenalty?: false | LLamaContextualRepeatPenalty;
@@ -85,7 +86,7 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
     /**
      * Custom stop triggers to stop the generation of the response when any of the provided triggers are found.
      */
-    customStopTriggers?: (LlamaText | string | (string | Token)[])[];
+    customStopTriggers?: readonly (LlamaText | string | readonly (string | Token)[])[];
     /**
      * The evaluation context window returned from the last evaluation.
      * This is an optimization to utilize existing context sequence state better when possible.
@@ -97,6 +98,8 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
          * Minimum overlap percentage with existing context sequence state to use the last evaluation context window.
          * If the last evaluation context window is not used, a new context will be generated based on the full history,
          * which will decrease the likelihood of another context shift happening so soon.
+         *
+         * A number between `0` (exclusive) and `1` (inclusive).
          */
         minimumOverlapPercentageToPreventContextShift?: number;
     };
@@ -104,11 +107,59 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
     grammar?: LlamaGrammar;
     functions?: never;
     documentFunctionParams?: never;
+    maxParallelFunctionCalls?: never;
+    onFunctionCall?: never;
 } | {
     grammar?: never;
     functions?: Functions | ChatModelFunctions;
     documentFunctionParams?: boolean;
+    maxParallelFunctionCalls?: number;
+    onFunctionCall?: (functionCall: LlamaChatResponseFunctionCall<Functions extends ChatModelFunctions ? Functions : ChatModelFunctions>) => void;
 });
+export type LLamaChatLoadAndCompleteUserMessageOptions<Functions extends ChatModelFunctions | undefined = undefined> = {
+    /**
+     * Complete the given user prompt without adding it or the completion to the returned context window.
+     */
+    initialUserPrompt?: string;
+    /**
+     * When a completion already started being generated and then the signal is aborted,
+     * the generation will stop and the completion will be returned as is instead of throwing an error.
+     *
+     * Defaults to `false`.
+     */
+    stopOnAbortSignal?: boolean;
+    onToken?: LLamaChatGenerateResponseOptions<Functions>["onToken"];
+    signal?: LLamaChatGenerateResponseOptions<Functions>["signal"];
+    maxTokens?: LLamaChatGenerateResponseOptions<Functions>["maxTokens"];
+    temperature?: LLamaChatGenerateResponseOptions<Functions>["temperature"];
+    minP?: LLamaChatGenerateResponseOptions<Functions>["minP"];
+    topK?: LLamaChatGenerateResponseOptions<Functions>["topK"];
+    topP?: LLamaChatGenerateResponseOptions<Functions>["topP"];
+    trimWhitespaceSuffix?: LLamaChatGenerateResponseOptions<Functions>["trimWhitespaceSuffix"];
+    repeatPenalty?: LLamaChatGenerateResponseOptions<Functions>["repeatPenalty"];
+    tokenBias?: LLamaChatGenerateResponseOptions<Functions>["tokenBias"];
+    evaluationPriority?: LLamaChatGenerateResponseOptions<Functions>["evaluationPriority"];
+    contextShift?: LLamaChatGenerateResponseOptions<Functions>["contextShift"];
+    customStopTriggers?: LLamaChatGenerateResponseOptions<Functions>["customStopTriggers"];
+    lastEvaluationContextWindow?: LLamaChatGenerateResponseOptions<Functions>["lastEvaluationContextWindow"];
+    grammar?: LlamaGrammar;
+    /**
+     * Functions are not used by the model here,
+     * but are used for keeping the instructions given to the model about the functions in the current context state,
+     * to avoid context shifts.
+     *
+     * It's best to provide the same functions that were used for the previous prompt here.
+     */
+    functions?: Functions | ChatModelFunctions;
+    /**
+     * Functions are not used by the model here,
+     * but are used for keeping the instructions given to the model about the functions in the current context state,
+     * to avoid context shifts.
+     *
+     * It's best to provide the same value that was used for the previous prompt here.
+     */
+    documentFunctionParams?: boolean;
+};
 export type LLamaChatContextShiftOptions = {
     /**
      * The number of tokens to delete from the context window to make space for new ones.
@@ -150,12 +201,13 @@ export declare class LlamaChat {
     get chatWrapper(): ChatWrapper;
     get sequence(): LlamaContextSequence;
     get context(): import("../LlamaContext/LlamaContext.js").LlamaContext;
-    get model(): import("../LlamaModel.js").LlamaModel;
-    generateResponse<const Functions extends ChatModelFunctions | undefined = undefined>(history: ChatHistoryItem[], { onToken, signal, stopOnAbortSignal, maxTokens, temperature, minP, topK, topP, grammar, trimWhitespaceSuffix, repeatPenalty, tokenBias, evaluationPriority, functions, documentFunctionParams, contextShift, customStopTriggers, lastEvaluationContextWindow: { history: lastEvaluationContextWindowHistory, minimumOverlapPercentageToPreventContextShift } }?: LLamaChatGenerateResponseOptions<Functions>): Promise<LlamaChatResponse<Functions>>;
+    get model(): import("../LlamaModel/LlamaModel.js").LlamaModel;
+    generateResponse<const Functions extends ChatModelFunctions | undefined = undefined>(history: ChatHistoryItem[], options?: LLamaChatGenerateResponseOptions<Functions>): Promise<LlamaChatResponse<Functions>>;
+    loadChatAndCompleteUserMessage<const Functions extends ChatModelFunctions | undefined = undefined>(history: ChatHistoryItem[], options?: LLamaChatLoadAndCompleteUserMessageOptions<Functions>): Promise<LlamaChatLoadAndCompleteUserResponse>;
 }
 export type LlamaChatResponse<Functions extends ChatModelFunctions | undefined = undefined> = {
     response: string;
-    functionCall?: Functions extends ChatModelFunctions ? LlamaChatResponseFunctionCall<Functions> : never;
+    functionCalls?: Functions extends ChatModelFunctions ? LlamaChatResponseFunctionCall<Functions>[] : never;
     lastEvaluation: {
         cleanHistory: ChatHistoryItem[];
         contextWindow: ChatHistoryItem[];
@@ -163,7 +215,7 @@ export type LlamaChatResponse<Functions extends ChatModelFunctions | undefined =
     };
     metadata: {
         remainingGenerationAfterStop?: string | Token[];
-        stopReason: "eogToken" | "stopGenerationTrigger" | "functionCall" | "maxTokens" | "abort";
+        stopReason: "eogToken" | "stopGenerationTrigger" | "functionCalls" | "maxTokens" | "abort";
     } | {
         remainingGenerationAfterStop?: string | Token[];
         stopReason: "customStopTrigger";
@@ -173,5 +225,24 @@ export type LlamaChatResponse<Functions extends ChatModelFunctions | undefined =
 export type LlamaChatResponseFunctionCall<Functions extends ChatModelFunctions, FunctionCallName extends keyof Functions & string = string & keyof Functions, Params = Functions[FunctionCallName]["params"] extends undefined | null | void ? undefined : GbnfJsonSchemaToType<Functions[FunctionCallName]["params"]>> = {
     functionName: FunctionCallName;
     params: Params;
-    raw: string;
+    raw: LlamaTextJSON;
+};
+export type LlamaChatLoadAndCompleteUserResponse = {
+    completion: string;
+    lastEvaluation: {
+        /**
+         * The completion and initial user prompt are not added to this context window result,
+         * but are loaded to the current context sequence state as tokens
+         */
+        contextWindow: ChatHistoryItem[];
+        contextShiftMetadata: any;
+    };
+    metadata: {
+        remainingGenerationAfterStop?: string | Token[];
+        stopReason: "eogToken" | "stopGenerationTrigger" | "maxTokens" | "abort";
+    } | {
+        remainingGenerationAfterStop?: string | Token[];
+        stopReason: "customStopTrigger";
+        customStopTrigger: (string | Token)[];
+    };
 };