node-llama-cpp 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/cli/commands/DownloadCommand.d.ts

@@ -8,7 +8,8 @@ type DownloadCommandArgs = {
     cuda?: boolean;
     skipBuild?: boolean;
     noBundle?: boolean;
+    noUsageExample?: boolean;
 };
 export declare const DownloadCommand: CommandModule<object, DownloadCommandArgs>;
-export declare function DownloadLlamaCppCommand({ repo, release, arch, nodeTarget, metal, cuda, skipBuild, noBundle, updateBinariesReleaseMetadataAndSaveGitBundle }: DownloadCommandArgs): Promise<void>;
+export declare function DownloadLlamaCppCommand({ repo, release, arch, nodeTarget, metal, cuda, skipBuild, noBundle, noUsageExample, updateBinariesReleaseMetadataAndSaveGitBundle }: DownloadCommandArgs): Promise<void>;
 export {};

package/dist/cli/commands/DownloadCommand.js

@@ -1,17 +1,20 @@
 import process from "process";
-import { Octokit } from "octokit";
 import fs from "fs-extra";
 import chalk from "chalk";
-import { defaultLlamaCppCudaSupport, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, isCI, llamaCppDirectory, llamaCppDirectoryTagFilePath } from "../../config.js";
-import { compileLlamaCpp } from "../../utils/compileLLamaCpp.js";
+import { defaultLlamaCppCudaSupport, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, isCI, llamaCppDirectory, llamaCppDirectoryInfoFilePath } from "../../config.js";
+import { compileLlamaCpp } from "../../bindings/utils/compileLLamaCpp.js";
 import withOra from "../../utils/withOra.js";
 import { clearTempFolder } from "../../utils/clearTempFolder.js";
-import { setBinariesGithubRelease } from "../../utils/binariesGithubRelease.js";
+import { setBinariesGithubRelease } from "../../bindings/utils/binariesGithubRelease.js";
 import { downloadCmakeIfNeeded } from "../../utils/cmake.js";
 import withStatusLogs from "../../utils/withStatusLogs.js";
 import { getIsInDocumentationMode } from "../../state.js";
 import { getGitBundlePathForRelease, unshallowAndSquashCurrentRepoAndSaveItAsReleaseBundle } from "../../utils/gitReleaseBundles.js";
-import { cloneLlamaCppRepo } from "../../utils/cloneLlamaCppRepo.js";
+import { cloneLlamaCppRepo } from "../../bindings/utils/cloneLlamaCppRepo.js";
+import { getPlatform } from "../../bindings/utils/getPlatform.js";
+import { resolveCustomCmakeOptions } from "../../bindings/utils/resolveCustomCmakeOptions.js";
+import { logBinaryUsageExampleToConsole } from "../../bindings/utils/logBinaryUsageExampleToConsole.js";
+import { resolveGithubRelease } from "../../utils/resolveGithubRelease.js";
 export const DownloadCommand = {
     command: "download",
     describe: "Download a release of llama.cpp and compile it",
@@ -60,6 +63,12 @@ export const DownloadCommand = {
             type: "boolean",
             default: false,
             description: "Download a llama.cpp release only from GitHub, even if a local git bundle exists for the release"
+        })
+            .option("noUsageExample", {
+            alias: "nu",
+            type: "boolean",
+            default: false,
+            description: "Don't print code usage example after building"
         })
             .option("updateBinariesReleaseMetadataAndSaveGitBundle", {
             type: "boolean",
@@ -70,14 +79,16 @@ export const DownloadCommand = {
     },
     handler: DownloadLlamaCppCommand
 };
-export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo, release = defaultLlamaCppRelease, arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, skipBuild = false, noBundle = false, updateBinariesReleaseMetadataAndSaveGitBundle = false }) {
+// TODO: clear the builds folder
+export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo, release = defaultLlamaCppRelease, arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, skipBuild = false, noBundle = false, noUsageExample = false, updateBinariesReleaseMetadataAndSaveGitBundle = false }) {
     const useBundle = noBundle != true;
-    const octokit = new Octokit();
+    const platform = getPlatform();
+    const customCmakeOptions = resolveCustomCmakeOptions();
     const [githubOwner, githubRepo] = repo.split("/");
     console.log(`${chalk.yellow("Repo:")} ${repo}`);
     console.log(`${chalk.yellow("Release:")} ${release}`);
     if (!skipBuild) {
-        if (metal && process.platform === "darwin") {
+        if (metal && platform === "mac") {
             console.log(`${chalk.yellow("Metal:")} enabled`);
         }
         if (cuda) {
@@ -94,32 +105,7 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
             success: chalk.blue("Fetched llama.cpp info"),
             fail: chalk.blue("Failed to fetch llama.cpp info")
         }, async () => {
-            let githubRelease = null;
-            try {
-                if (release === "latest") {
-                    githubRelease = await octokit.rest.repos.getLatestRelease({
-                        owner: githubOwner,
-                        repo: githubRepo
-                    });
-                }
-                else {
-                    githubRelease = await octokit.rest.repos.getReleaseByTag({
-                        owner: githubOwner,
-                        repo: githubRepo,
-                        tag: release
-                    });
-                }
-            }
-            catch (err) {
-                console.error("Failed to fetch llama.cpp release info", err);
-            }
-            if (githubRelease == null) {
-                throw new Error(`Failed to find release "${release}" of "${repo}"`);
-            }
-            if (githubRelease.data.tag_name == null) {
-                throw new Error(`Failed to find tag of release "${release}" of "${repo}"`);
-            }
-            githubReleaseTag = githubRelease.data.tag_name;
+            githubReleaseTag = await resolveGithubRelease(githubOwner, githubRepo, release);
         });
     await clearTempFolder();
     await withOra({
@@ -128,10 +114,26 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
         fail: chalk.blue("Failed to remove existing llama.cpp directory")
     }, async () => {
         await fs.remove(llamaCppDirectory);
-        await fs.remove(llamaCppDirectoryTagFilePath);
+        await fs.remove(llamaCppDirectoryInfoFilePath);
     });
     console.log(chalk.blue("Cloning llama.cpp"));
     await cloneLlamaCppRepo(githubOwner, githubRepo, githubReleaseTag, useBundle);
+    const buildOptions = {
+        customCmakeOptions,
+        progressLogs: true,
+        platform,
+        arch: arch
+            ? arch
+            : process.arch,
+        computeLayers: {
+            metal,
+            cuda
+        },
+        llamaCpp: {
+            repo,
+            release: githubReleaseTag
+        }
+    };
     if (!skipBuild) {
         await downloadCmakeIfNeeded(true);
         await withStatusLogs({
@@ -139,12 +141,12 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
             success: chalk.blue("Compiled llama.cpp"),
             fail: chalk.blue("Failed to compile llama.cpp")
         }, async () => {
-            await compileLlamaCpp({
-                arch: arch ? arch : undefined,
+            await compileLlamaCpp(buildOptions, {
                 nodeTarget: nodeTarget ? nodeTarget : undefined,
-                setUsedBinFlag: true,
-                metal,
-                cuda
+                updateLastBuildInfo: true,
+                downloadCmakeIfNeeded: false,
+                ensureLlamaCppRepoIsCloned: false,
+                includeBuildOptionsInBinaryFolderName: true
             });
         });
     }
@@ -152,6 +154,11 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
         await setBinariesGithubRelease(githubReleaseTag);
         await unshallowAndSquashCurrentRepoAndSaveItAsReleaseBundle();
     }
+    if (!noUsageExample) {
+        console.log();
+        console.log();
+        logBinaryUsageExampleToConsole(buildOptions, true);
+    }
     console.log();
     console.log();
     console.log(`${chalk.yellow("Repo:")} ${repo}`);

package/dist/cli/commands/DownloadCommand.js.map

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

package/dist/cli/commands/OnPostInstallCommand.js

@@ -1,20 +1,14 @@
-import { defaultLlamaCppCudaSupport, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, defaultSkipDownload } from "../../config.js";
-import { getPrebuildBinPath } from "../../utils/getBin.js";
-import { DownloadLlamaCppCommand } from "./DownloadCommand.js";
+import { defaultSkipDownload } from "../../config.js";
+import { getLlama } from "../../bindings/getLlama.js";
 export const OnPostInstallCommand = {
     command: "postinstall",
     describe: false,
     async handler() {
         if (defaultSkipDownload)
             return;
-        if (await getPrebuildBinPath() != null)
-            return;
         try {
-            await DownloadLlamaCppCommand({
-                repo: defaultLlamaCppGitHubRepo,
-                release: defaultLlamaCppRelease,
-                metal: defaultLlamaCppMetalSupport,
-                cuda: defaultLlamaCppCudaSupport
+            await getLlama({
+                progressLogs: true
             });
         }
         catch (err) {

package/dist/cli/commands/OnPostInstallCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"OnPostInstallCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/OnPostInstallCommand.ts"],"names":[],"mappings":"AACA,OAAO,EACH,0BAA0B,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,mBAAmB,EAClI,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,uBAAuB,EAAC,MAAM,sBAAsB,CAAC;AAI7D,MAAM,CAAC,MAAM,oBAAoB,GAAgD;IAC7E,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,KAAK;IACf,KAAK,CAAC,OAAO;QACT,IAAI,mBAAmB;YACnB,OAAO;QAEX,IAAI,MAAM,kBAAkB,EAAE,IAAI,IAAI;YAClC,OAAO;QAEX,IAAI;YACA,MAAM,uBAAuB,CAAC;gBAC1B,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,sBAAsB;gBAC/B,KAAK,EAAE,2BAA2B;gBAClC,IAAI,EAAE,0BAA0B;aACnC,CAAC,CAAC;SACN;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;IACL,CAAC;CACJ,CAAC"}
+{"version":3,"file":"OnPostInstallCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/OnPostInstallCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,4BAA4B,CAAC;AAIpD,MAAM,CAAC,MAAM,oBAAoB,GAAgD;IAC7E,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,KAAK;IACf,KAAK,CAAC,OAAO;QACT,IAAI,mBAAmB;YACnB,OAAO;QAEX,IAAI;YACA,MAAM,QAAQ,CAAC;gBACX,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;SACN;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;IACL,CAAC;CACJ,CAAC"}

package/dist/config.d.ts

@@ -1,24 +1,30 @@
+import { LlamaLogLevel } from "./bindings/types.js";
 export declare const llamaDirectory: string;
 export declare const llamaToolchainsDirectory: string;
-export declare const llamaBinsDirectory: string;
+export declare const llamaPrebuiltBinsDirectory: string;
+export declare const llamaLocalBuildBinsDirectory: string;
 export declare const llamaBinsGrammarsDirectory: string;
 export declare const llamaCppDirectory: string;
 export declare const llamaCppGrammarsDirectory: string;
 export declare const tempDownloadDirectory: string;
 export declare const chatCommandHistoryFilePath: string;
-export declare const usedBinFlagJsonPath: string;
+export declare const lastBuildInfoJsonPath: string;
 export declare const binariesGithubReleasePath: string;
-export declare const llamaCppDirectoryTagFilePath: string;
+export declare const llamaCppDirectoryInfoFilePath: string;
 export declare const currentReleaseGitBundlePath: string;
 export declare const xpackDirectory: string;
 export declare const localXpacksStoreDirectory: string;
 export declare const localXpacksCacheDirectory: string;
+export declare const buildMetadataFileName = ".buildMetadata.json";
 export declare const xpmVersion = "^0.16.3";
+export declare const builtinLlamaCppGitHubRepo = "ggerganov/llama.cpp";
+export declare const builtinLlamaCppRelease: string;
 export declare const isCI: boolean;
 export declare const defaultLlamaCppGitHubRepo: string;
 export declare const defaultLlamaCppRelease: string;
 export declare const defaultLlamaCppMetalSupport: boolean;
 export declare const defaultLlamaCppCudaSupport: boolean;
+export declare const defaultLlamaCppDebugLogs: LlamaLogLevel;
 export declare const defaultSkipDownload: boolean;
 export declare const defaultXpacksStoreDirectory: string;
 export declare const defaultXpacksCacheDirectory: string;

package/dist/config.js

@@ -4,33 +4,38 @@ import * as os from "os";
 import process from "process";
 import envVar from "env-var";
 import * as uuid from "uuid";
-import { getBinariesGithubRelease } from "./utils/binariesGithubRelease.js";
+import { getBinariesGithubRelease } from "./bindings/utils/binariesGithubRelease.js";
+import { LlamaLogLevel, LlamaLogLevelValues } from "./bindings/types.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const env = envVar.from(process.env);
 export const llamaDirectory = path.join(__dirname, "..", "llama");
 export const llamaToolchainsDirectory = path.join(llamaDirectory, "toolchains");
-export const llamaBinsDirectory = path.join(__dirname, "..", "llamaBins");
+export const llamaPrebuiltBinsDirectory = path.join(__dirname, "..", "llamaBins");
+export const llamaLocalBuildBinsDirectory = path.join(llamaDirectory, "localBuilds");
 export const llamaBinsGrammarsDirectory = path.join(__dirname, "..", "llama", "grammars");
 export const llamaCppDirectory = path.join(llamaDirectory, "llama.cpp");
 export const llamaCppGrammarsDirectory = path.join(llamaDirectory, "llama.cpp", "grammars");
 export const tempDownloadDirectory = path.join(os.tmpdir(), "node-llama-cpp", uuid.v4());
 export const chatCommandHistoryFilePath = path.join(os.homedir(), ".node-llama-cpp.chat_repl_history");
-export const usedBinFlagJsonPath = path.join(llamaDirectory, "usedBin.json");
+export const lastBuildInfoJsonPath = path.join(llamaDirectory, "lastBuild.json");
 export const binariesGithubReleasePath = path.join(llamaDirectory, "binariesGithubRelease.json");
-export const llamaCppDirectoryTagFilePath = path.join(llamaDirectory, "llama.cpp.tag.json");
+export const llamaCppDirectoryInfoFilePath = path.join(llamaDirectory, "llama.cpp.info.json");
 export const currentReleaseGitBundlePath = path.join(llamaDirectory, "gitRelease.bundle");
 export const xpackDirectory = path.join(llamaDirectory, "xpack");
 export const localXpacksStoreDirectory = path.join(xpackDirectory, "store");
 export const localXpacksCacheDirectory = path.join(xpackDirectory, "cache");
+export const buildMetadataFileName = ".buildMetadata.json";
 export const xpmVersion = "^0.16.3";
+export const builtinLlamaCppGitHubRepo = "ggerganov/llama.cpp";
+export const builtinLlamaCppRelease = await getBinariesGithubRelease();
 export const isCI = env.get("CI")
     .default("false")
     .asBool();
 export const defaultLlamaCppGitHubRepo = env.get("NODE_LLAMA_CPP_REPO")
-    .default("ggerganov/llama.cpp")
+    .default(builtinLlamaCppGitHubRepo)
     .asString();
 export const defaultLlamaCppRelease = env.get("NODE_LLAMA_CPP_REPO_RELEASE")
-    .default(await getBinariesGithubRelease())
+    .default(builtinLlamaCppRelease)
     .asString();
 export const defaultLlamaCppMetalSupport = env.get("NODE_LLAMA_CPP_METAL")
     .default((process.platform === "darwin" && process.arch !== "x64") ? "true" : "false")
@@ -38,6 +43,9 @@ export const defaultLlamaCppMetalSupport = env.get("NODE_LLAMA_CPP_METAL")
 export const defaultLlamaCppCudaSupport = env.get("NODE_LLAMA_CPP_CUDA")
     .default("false")
     .asBool();
+export const defaultLlamaCppDebugLogs = env.get("NODE_LLAMA_CPP_LOG_LEVEL")
+    .default(LlamaLogLevel.debug)
+    .asEnum(LlamaLogLevelValues);
 export const defaultSkipDownload = env.get("NODE_LLAMA_CPP_SKIP_DOWNLOAD")
     .default("false")
     .asBool();

package/dist/config.js.map

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

package/dist/{llamaEvaluator → evaluator}/LlamaChat/LlamaChat.js

@@ -99,7 +99,7 @@ export class LlamaChat {
             ? new LlamaGrammarEvaluationState({ grammar })
             : undefined;
         let functionsGrammar = functionsEnabled
-            ? new FunctionCallGrammar(functions, this._chatWrapper, false)
+            ? new FunctionCallGrammar(model._llama, functions, this._chatWrapper, false)
             : undefined;
         let functionsEvaluationState = (functionsEnabled && functionsGrammar != null)
             ? new LlamaGrammarEvaluationState({
@@ -226,7 +226,7 @@ export class LlamaChat {
                         .map((stopTrigger) => disengageInitiallyEngagedFunctionMode.addStopTrigger(stopTrigger));
                     if (initiallyEngagedFunctionMode) {
                         inFunctionEvaluationMode = true;
-                        functionsGrammar = new FunctionCallGrammar(functions, this._chatWrapper, true);
+                        functionsGrammar = new FunctionCallGrammar(model._llama, functions, this._chatWrapper, true);
                         functionsEvaluationState = new LlamaGrammarEvaluationState({
                             grammar: functionsGrammar
                         });
@@ -310,7 +310,7 @@ export class LlamaChat {
                     }
                     if (shouldStopFunctionEvaluationMode) {
                         inFunctionEvaluationMode = false;
-                        functionsGrammar = new FunctionCallGrammar(functions, this._chatWrapper, false);
+                        functionsGrammar = new FunctionCallGrammar(model._llama, functions, this._chatWrapper, false);
                         functionsEvaluationState = new LlamaGrammarEvaluationState({
                             grammar: functionsGrammar
                         });
@@ -530,7 +530,8 @@ async function compressHistoryToFitContextSize({ history, contextShiftSize, cont
         lastShiftMetadata: contextShiftLastEvaluationMetadata
     });
     if (!checkIfHistoryFitsContext(chatHistory))
-        throw new Error("The default context shift strategy did not return a history that fits the context size");
+        throw new Error("The default context shift strategy did not return a history that fits the context size. " +
+            "This may happen due to the system prompt being too long");
     return {
         compressedHistory: chatHistory,
         metadata

package/dist/evaluator/LlamaChat/LlamaChat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LlamaChat.js","sourceRoot":"","sources":["../../../src/evaluator/LlamaChat/LlamaChat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE7E,OAAO,EAAC,kBAAkB,EAAC,MAAM,mCAAmC,CAAC;AAKrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAC,sBAAsB,EAAC,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAyB,oBAAoB,EAAC,MAAM,qCAAqC,CAAC;AAEjG,OAAO,EACH,4DAA4D,EAC/D,MAAM,gGAAgG,CAAC;AACxG,OAAO,EAAC,mBAAmB,EAAE,gCAAgC,EAAC,MAAM,gCAAgC,CAAC;AAsHrG,MAAM,0BAA0B,GAA2C;IACvE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IAC9E,QAAQ,EAAE,sCAAsC;IAChD,sBAAsB,EAAE,IAAI;CAC/B,CAAC;AAuCF,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAGtC,MAAM,OAAO,SAAS;IAClB,gBAAgB,CAAkB,YAAY,CAAc;IAC5D,gBAAgB,CAAkB,kBAAkB,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC/E,gBAAgB,CAAkB,oBAAoB,CAAU;IAChE,gBAAgB,CAAS,SAAS,CAA8B;IAChD,SAAS,GAAG,IAAI,UAAU,EAAQ,CAAC;IAEnD,YAAmB,EACf,eAAe,EACf,WAAW,GAAG,MAAM,EACpB,mBAAmB,GAAG,IAAI,EACX;QACf,IAAI,eAAe,IAAI,IAAI;YACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEtD,IAAI,eAAe,CAAC,QAAQ;YACxB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC;QACjC,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;QAEhD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CACvB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE;YACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CACL,CAAC;QACF,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAE1D,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IAC/E,CAAC;IAEM,OAAO,CAAC,EAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,KAAiC,EAAE;QAC1F,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO;QAEX,IAAI,eAAe;YACf,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAE7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAED,cAAc;IACP,CAAC,MAAM,CAAC,OAAO,CAAC;QACnB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;IAClC,CAAC;IAED,IAAW,WAAW;QAClB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAW,QAAQ;QACf,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CACzB,OAA0B,EAC1B,EACI,OAAO,EACP,MAAM,EACN,SAAS,EACT,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,KAAK,EAC5B,aAAa,GAAG,EAAE,EAClB,kBAAkB,GAAG,CAAC,EACtB,SAAS,EACT,sBAAsB,EACtB,YAAY,GAAG,0BAA0B,EACzC,2BAA2B,EAAE,EACzB,OAAO,EAAE,kCAAkC,EAC3C,6CAA6C,GAAG,GAAG,EACtD,GAAG,EAAE,KACuC,EAAE;QAEnD,MAAM,gBAAgB,GAAG,CAAC,SAAS,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAElF,IAAI,OAAO,IAAI,IAAI,IAAI,gBAAgB;YACnC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAE7E,IAAI,MAAM,EAAE,OAAO;YACf,MAAM,IAAI,UAAU,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,IAAI,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB;YACjD,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE;YACjB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QAE5C,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;YAC5F,eAAe,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,EAAE;aACf,CAAC,CAAC;QAEP,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;QAClC,MAAM,oBAAoB,GAAG;YACzB,GAAG,0BAA0B;YAC7B,GAAG,gBAAgB,CAAC,YAAY,CAAC;SACpC,CAAC;QACF,MAAM,EACF,UAAU,EAAE,uBAAuB,GAAG,EAAE,EACxC,kBAAkB,EAClB,eAAe,EACf,OAAO,EACP,gBAAgB,EAChB,eAAe,EAClB,GAA2B,aAAa,KAAK,KAAK;YAC/C,CAAC,CAAC,EAAC,UAAU,EAAE,CAAC,EAAC;YACjB,CAAC,CAAC,aAAa,CAAC;QACpB,MAAM,iBAAiB,GAAG,uCAAuC,CAAC,eAAe,CAAC,CAAC;QAEnF,MAAM,GAAG,GAAY,EAAE,CAAC;QACxB,MAAM,aAAa,GAAY,EAAE,CAAC;QAClC,IAAI,sBAAsB,GAAY,EAAE,CAAC;QACzC,MAAM,kBAAkB,GAAY,EAAE,CAAC;QACvC,MAAM,oBAAoB,GAAG,uBAAuB,GAAG,CAAC,CAAC;QACzD,MAAM,sBAAsB,GAAG,OAAO,IAAI,IAAI;YAC1C,CAAC,CAAC,IAAI,2BAA2B,CAAC,EAAC,OAAO,EAAC,CAAC;YAC5C,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,gBAAgB,GAAG,gBAAgB;YACnC,CAAC,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAmC,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC;YACtG,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,wBAAwB,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,IAAI,IAAI,CAAC;YACzE,CAAC,CAAC,IAAI,2BAA2B,CAAC;gBAC9B,OAAO,EAAE,gBAAgB;aAC5B,CAAC;YACF,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,eAAe,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACnD,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC5D,MAAM,2BAA2B,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACjE,MAAM,yBAAyB,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC/D,MAAM,qCAAqC,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC3E,MAAM,uBAAuB,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC7D,MAAM,+BAA+B,GAA6B,EAAE,CAAC;QACrE,MAAM,4BAA4B,GAA6B,EAAE,CAAC;QAElE,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,iBAAiB,GAAG,IAAI,CAAC;QAC7B,IAAI,wBAAwB,GAAG,KAAK,CAAC;QACrC,IAAI,4BAA4B,GAAG,KAAK,CAAC;QACzC,IAAI,wBAAwB,GAAsB,eAAe,CAAC;QAClE,IAAI,8BAA8B,GAA8B,oBAAoB,CAAC,sBAAsB,CAAC;QAE5G,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC1B,IAAI,MAAM,EAAE,OAAO;gBACf,MAAM,IAAI,UAAU,EAAE,CAAC;YAE3B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;gBACtB,MAAM,IAAI,aAAa,EAAE,CAAC;QAClC,CAAC,CAAC;QAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC1B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;gBACtB,MAAM,IAAI,aAAa,EAAE,CAAC;YAE9B,IAAI,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,uBAAuB,CAAC,CAAC;YAEvD,IAAI,kBAAkB,IAAI,IAAI;gBAC1B,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAEpD,IAAI,CAAC,eAAe,EAAE;gBAClB,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAEhC,IAAI,OAAO,IAAI,IAAI;oBACf,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;aACtE;YAED,OAAO,YAAY,CAAC;QACxB,CAAC,CAAC;QAEF,MAAM,0CAA0C,GAAG,GAAG,EAAE;YACpD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAChB,OAAO,eAAe,CAAC;YAE3B,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAE1C,IAAI,OAAO,EAAE,oBAAoB,IAAI,oBAAoB;gBACrD,aAAa,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;YAE5C,IAAI,aAAa,KAAK,EAAE;gBACpB,OAAO,eAAe,CAAC;YAE3B,OAAO,qCAAqC,CACxC,eAAe,EACf,iBAAiB,GAAG,aAAa,CACpC,CAAC;QACN,CAAC,CAAC;QAEF,MAAM,4CAA4C,GAAG,GAAG,EAAE;YACtD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9C,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;gBAC/C,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;gBAE9C,IAAI,4BAA4B,GAAwE,IAAI,CAAC;gBAE7G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC3C,uBAAuB,CAAC,gBAAgB,CAAC;wBACrC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC1C,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;wBAC1B,cAAc,EAAE,CAAC,KAAK,CAAC;qBAC1B,CAAC,CAAC;oBAEH,IAAI,uBAAuB,CAAC,iBAAiB,EAAE;wBAC3C,4BAA4B,GAAG,uBAAuB,CAAC,iBAAiB,EAAE,CAAC;wBAC3E,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;qBACjD;yBAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB;wBAClD,MAAM;iBACb;gBAED,IAAI,4BAA4B,IAAI,IAAI,EAAE;oBACtC,MAAM,CAAC,2BAA2B,CAAC,GAAG,4BAA4B,CAAC;oBAEnE,IAAI,2BAA2B,IAAI,IAAI,EAAE;wBACrC,sBAAsB,GAAG,2BAA2B,CAAC,WAAW;6BAC3D,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;4BACjB,IAAI,OAAO,WAAW,KAAK,QAAQ;gCAC/B,OAAO,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;gCAEnC,OAAO,CAAC,WAAW,CAAC,CAAC;wBAC7B,CAAC,CAAC;6BACD,IAAI,CAAC,CAAC,CAAC,CAAC;wBAEb,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,oBAAoB;6BACpE,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;4BAChB,IAAI,OAAO,UAAU,KAAK,QAAQ;gCAC9B,OAAO,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;;gCAElC,OAAO,UAAU,CAAC;wBAC1B,CAAC,CAAC;6BACD,IAAI,CAAC,CAAC,CAAC,CAAC;wBACb,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;wBACzB,aAAa,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;qBAC3C;iBACJ;aACJ;QACL,CAAC,CAAC;QAEF,IAAI,OAAO,IAAI,IAAI;YACf,sBAAsB,CAAC,mBAAmB,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,CAAC;iBACrF,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,sBAAsB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QAElF,IAAI,SAAS,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;YACtD,2BAA2B,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnG,iDAAiD;QACjD,OAAO,IAAI,EAAE;YACT,gBAAgB,EAAE,CAAC;YAEnB,IAAI,kBAAkB,GAAG,KAAK,CAAC;YAC/B,MAAM,iBAAiB,GAAG,eAAe,CAAC,uBAAuB,EAAE,CAAC;YACpE,MAAM,EACF,OAAO,EAAE,oBAAoB,EAC7B,sBAAsB,EACtB,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAClB,6BAA6B,EAC7B,eAAe,EACf,4BAA4B,EAC5B,qCAAqC,EACxC,GAAG,MAAM,gBAAgB,CAAC;gBACvB,eAAe,EAAE,0CAA0C,EAAE;gBAC7D,oBAAoB;gBACpB,8BAA8B;gBAC9B,kBAAkB,EAAE,aAAa,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM;gBACnE,iBAAiB;gBACjB,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,kCAAkC;gBAClC,6CAA6C;gBAC7C,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,oBAAoB,EAAE,CAAC;gBACvB,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBACnD,sBAAsB;aACzB,CAAC,CAAC;YACH,gBAAgB,EAAE,CAAC;YAEnB,IAAI,eAAe,KAAK,CAAC,EAAE;gBACvB,sBAAsB,CAAC,mBAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC;qBACtE,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,uBAAuB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;gBAE/E,IAAI,gBAAgB,EAAE;oBAClB,4BAA4B,GAAG,4BAA4B,CAAC;oBAC5D,sBAAsB,CAAC,mBAAmB,CAAC,qCAAqC,EAAE,KAAK,CAAC,QAAQ,CAAC;yBAC5F,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,qCAAqC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;oBAE7F,IAAI,4BAA4B,EAAE;wBAC9B,wBAAwB,GAAG,IAAI,CAAC;wBAChC,gBAAgB,GAAG,IAAI,mBAAmB,CACtC,KAAK,CAAC,MAAM,EACZ,SAAmC,EACnC,IAAI,CAAC,YAAY,EACjB,IAAI,CACP,CAAC;wBACF,wBAAwB,GAAG,IAAI,2BAA2B,CAAC;4BACvD,OAAO,EAAE,gBAAgB;yBAC5B,CAAC,CAAC;qBACN;iBACJ;aACJ;YAED,MAAM,MAAM,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,sBAAsB,EAAE,GAAG,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC;YAC3G,eAAe,GAAG,kBAAkB,CAAC;YACrC,8BAA8B,GAAG,6BAA6B,CAAC;YAC/D,wBAAwB,GAAG,oBAAoB,CAAC;YAChD,MAAM,8BAA8B,GAAG,uCAAuC,CAAC,oBAAoB,CAAC,CAAC;YACrG,MAAM,iBAAiB,GAAY,EAAE,CAAC;YAEtC,sBAAsB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,CAAC;iBAC7E,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,sBAAsB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;YAE9E,IAAI,gBAAgB,IAAI,IAAI;gBACxB,sBAAsB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,CAAC;qBAC9F,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,yBAAyB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;YAErF,IAAI,EAAC,mBAAmB,EAAC,GAAG,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAExE,8DAA8D;YAC9D,IAAI,mBAAmB,KAAK,MAAM,CAAC,MAAM,IAAI,mBAAmB,GAAG,CAAC;gBAChE,mBAAmB,IAAI,CAAC,CAAC;YAE7B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;YAEtC,IAAI,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;gBACrD,MAAM,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;wBAC1C,KAAK,EAAE,mBAAmB;wBAC1B,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc;qBACrC,CAAC,CAAC,CAAC;gBACJ,gBAAgB,EAAE,CAAC;aACtB;YAGD,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;gBACxE,WAAW,EAAE,IAAI,EAAE,IAAI;gBACvB,sBAAsB,EAAE,GAAG,EAAE;oBACzB,IAAI,wBAAwB;wBACxB,OAAO,wBAAwB,CAAC;oBAEpC,OAAO,sBAAsB,CAAC;gBAClC,CAAC;gBACD,aAAa,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oBAC/C,YAAY,EAAE,gBAAgB;oBAC9B,OAAO;oBACP,gBAAgB;oBAChB,eAAe;iBAClB;gBACD,kBAAkB;gBAClB,aAAa,EAAE,IAAI;aACtB,CAAC,CAAC,CAAC;YAEJ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,kBAAkB,EAAE;gBAC1C,gBAAgB,EAAE,CAAC;gBACnB,eAAe,EAAE,CAAC;gBAElB,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACvC,MAAM,kBAAkB,GAAG,eAAe,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;gBAEpE,IAAI,4BAA4B;oBAC5B,qCAAqC,CAAC,gBAAgB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,KAAK,CAAC,EAAC,CAAC,CAAC;gBAElH,IAAI,IAAI,KAAK,oBAAoB,IAAI,CACjC,CAAC,OAAO,EAAE,oBAAoB,IAAI,oBAAoB,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAChF,EAAE;oBACC,+BAA+B,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnF;qBAAM;oBACH,OAAO,+BAA+B,CAAC,MAAM,GAAG,CAAC;wBAC7C,+BAA+B,CAAC,KAAK,EAAG,CAAC,OAAO,EAAE,CAAC;iBAC1D;gBAED,2BAA2B,CAAC,gBAAgB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAC,CAAC,CAAC;gBAEjF,IAAI,4BAA4B,IAAI,qCAAqC,CAAC,iBAAiB,EAAE;oBACzF,4BAA4B,GAAG,KAAK,CAAC;oBAErC,IAAI,gCAAgC,GAAG,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;oBAEtF,IAAI,CAAC,gCAAgC,IAAI,gBAAgB,IAAI,gBAAgB,IAAI,IAAI,EAAE;wBACnF,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;wBAE9E,IAAI;4BACA,MAAM,YAAY,GAAG,gBAAgB,CAAC,gCAAgC,CAAC,gBAAgB,EAAE;gCACrF,8BAA8B,EAAE,IAAI;gCACpC,0BAA0B,EAAE,IAAI;6BACnC,CAAC,CAAC;4BAEH,MAAM,wBAAwB,GAC1B,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,EAAC,0BAA0B,EAAE,IAAI,EAAC,CAAC,CAAC;4BACtF,IAAI,wBAAwB,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;gCAChD,gCAAgC,GAAG,IAAI,CAAC;6BAC3C;yBACJ;wBAAC,OAAO,GAAG,EAAE;4BACV,IAAI,CAAC,CAAC,GAAG,YAAY,gCAAgC,CAAC;gCAClD,MAAM,GAAG,CAAC;yBACjB;qBACJ;oBAED,IAAI,gCAAgC,EAAE;wBAClC,wBAAwB,GAAG,KAAK,CAAC;wBACjC,gBAAgB,GAAG,IAAI,mBAAmB,CACtC,KAAK,CAAC,MAAM,EACZ,SAAmC,EACnC,IAAI,CAAC,YAAY,EAAE,KAAK,CAC3B,CAAC;wBACF,wBAAwB,GAAG,IAAI,2BAA2B,CAAC;4BACvD,OAAO,EAAE,gBAAgB;yBAC5B,CAAC,CAAC;wBAEH,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;wBAE9B,OAAO,4BAA4B,CAAC,MAAM,GAAG,CAAC;4BAC1C,4BAA4B,CAAC,KAAK,EAAG,CAAC,OAAO,EAAE,CAAC;wBAEpD,2BAA2B,CAAC,oBAAoB,EAAE,CAAC;wBACnD,2BAA2B,CAAC,mBAAmB,EAAE,CAAC;wBAElD,yBAAyB,CAAC,oBAAoB,EAAE,CAAC;wBACjD,yBAAyB,CAAC,mBAAmB,EAAE,CAAC;qBACnD;iBACJ;gBAED,IAAI,CAAC,wBAAwB,IAAI,gBAAgB,IAAI,gBAAgB,IAAI,IAAI;oBACzE,2BAA2B,CAAC,iBAAiB,IAAI,wBAAwB,IAAI,IAAI,EACnF;oBACE,wBAAwB,GAAG,IAAI,CAAC;oBAChC,4BAA4B,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE7E,sBAAsB,CAAC,mBAAmB,EAAE,CAAC;oBAC7C,sBAAsB,CAAC,oBAAoB,EAAE,CAAC;oBAE9C,aAAa,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC;oBAE5D,MAAM,cAAc,GAAI,2BAA2B,CAAC,iBAAiB,EAAE,CAAC;oBACxE,MAAM,mBAAmB,GAAG,eAAe,CAAC,qBAAqB,EAAE,CAAC;oBAEpE,MAAM,6BAA6B,GAAG,gCAAgC,CAClE,cAAc,EACd,mBAAmB,EACnB,KAAK,CAAC,QAAQ,CACjB,CAAC;oBACF,aAAa,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,CAAC;oBAErD,MAAM,CAAC,iCAAiC,CAAC,GAAG,cAAc;yBACrD,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC;yBACtD,MAAM,CAAC,CAAC,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;yBACjE,IAAI,CAAC,CAAC,CAAC,CAAC;oBAEb,MAAM,sBAAsB,GACxB,CAAC,iCAAiC,IAAI,IAAI,IAAI,iCAAiC,CAAC,MAAM,KAAK,CAAC,CAAC;wBACzF,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,OAAO,iCAAiC,KAAK,QAAQ;4BACnD,CAAC,CAAC,iCAAiC;4BACnC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC;oBAElE,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC;oBAEtH,KAAK,MAAM,iBAAiB,IAAI,kBAAkB;wBAC9C,OAAO,CAAC,oCAAoC,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC;iBACjG;qBAAM,IAAI,wBAAwB,EAAE;oBACjC,kBAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;oBACnC,4BAA4B,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7E,yBAAyB,CAAC,gBAAgB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAC,CAAC,CAAC;iBAClF;gBAED,IAAI,wBAAwB,IAAI,yBAAyB,CAAC,iBAAiB,IAAI,gBAAgB,IAAI,IAAI,EAAE;oBACrG,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;oBAC9D,MAAM,YAAY,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;oBAE1E,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC1C,IAAI,0BAA0B,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;oBAErE,IAAI,OAAO,EAAE,oBAAoB,IAAI,oBAAoB,EAAE;wBACvD,aAAa,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;wBACxC,0BAA0B,GAAG,0BAA0B,CAAC,OAAO,EAAE,CAAC;qBACrE;oBAED,OAAO;wBACH,QAAQ,EAAE,aAAa;wBACvB,cAAc,EAAE;4BACZ,aAAa,EAAE,qCAAqC,CAChD,wBAAwB,EACxB,8BAA8B,GAAG,0BAA0B,CAC9D;4BACD,YAAY,EAAE,qCAAqC,CAC/C,eAAe,EACf,iBAAiB,GAAG,aAAa,CACpC;4BACD,oBAAoB,EAAE,8BAA8B;yBACvD;wBAED,yCAAyC;wBACzC,YAAY,EAAE,YAAmF;wBAEjG,QAAQ,EAAE;4BACN,UAAU,EAAE,cAAc;yBAC7B;qBACJ,CAAC;iBACL;gBAED,IAAI,CAAC,wBAAwB;oBACzB,sBAAsB,CAAC,gBAAgB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAC,CAAC,CAAC;gBAEhF,aAAa,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC;gBAE5D,4CAA4C,EAAE,CAAC;gBAE/C,IAAI,sBAAsB,CAAC,iBAAiB,IAAI,KAAK,KAAK,QAAQ,EAAE;oBAChE,MAAM,cAAc,GAAI,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;oBACnE,MAAM,mBAAmB,GAAG,eAAe,CAAC,qBAAqB,EAAE,CAAC;oBAEpE,MAAM,6BAA6B,GAAG,gCAAgC,CAClE,cAAc,EACd,mBAAmB,EACnB,KAAK,CAAC,QAAQ,CACjB,CAAC;oBACF,aAAa,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,CAAC;oBAErD,MAAM,CAAC,iCAAiC,CAAC,GAAG,cAAc;yBACrD,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC;yBACtD,MAAM,CAAC,CAAC,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;yBACjE,IAAI,CAAC,CAAC,CAAC,CAAC;oBAEb,4CAA4C,EAAE,CAAC;oBAE/C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;wBACxB,OAAO,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;oBAErC,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;oBAC3B,iBAAiB,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;oBACzC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;oBAEzB,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC1C,IAAI,0BAA0B,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;oBAErE,IAAI,OAAO,EAAE,oBAAoB,IAAI,oBAAoB,EAAE;wBACvD,aAAa,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;wBACxC,0BAA0B,GAAG,0BAA0B,CAAC,OAAO,EAAE,CAAC;qBACrE;oBAED,OAAO;wBACH,QAAQ,EAAE,aAAa;wBACvB,cAAc,EAAE;4BACZ,aAAa,EAAE,qCAAqC,CAChD,wBAAwB,EACxB,8BAA8B,GAAG,0BAA0B,CAC9D;4BACD,YAAY,EAAE,qCAAqC,CAC/C,eAAe,EACf,iBAAiB,GAAG,aAAa,CACpC;4BACD,oBAAoB,EAAE,8BAA8B;yBACvD;wBACD,QAAQ,EAAE;4BACN,4BAA4B,EAAE,iCAAiC;4BAC/D,UAAU,EAAE,KAAK,KAAK,QAAQ;gCAC1B,CAAC,CAAC,UAAU;gCACZ,CAAC,CAAC,uBAAuB;yBAChC;qBACJ,CAAC;iBACL;gBAED,MAAM,kBAAkB,GAAG,SAAS,IAAI,IAAI,IAAI,SAAS,GAAG,CAAC,IAAI,eAAe,IAAI,SAAS,CAAC;gBAE9F,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;oBAClB,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;oBAC/C,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;oBAE9C,uBAAuB,CAAC,gBAAgB,CAAC;wBACrC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC;wBACrC,MAAM,EAAE,aAAa;qBACxB,CAAC,CAAC;iBACN;gBAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,EAAE;oBACjG,4CAA4C,EAAE,CAAC;oBAE/C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC1B,OAAO,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;wBACjC,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;wBAC3B,iBAAiB,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;wBACzC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;qBAC5B;iBACJ;gBAED,IAAI,kBAAkB,EAAE;oBACpB,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC1C,IAAI,0BAA0B,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;oBAErE,IAAI,OAAO,EAAE,oBAAoB,IAAI,oBAAoB,EAAE;wBACvD,aAAa,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;wBACxC,0BAA0B,GAAG,0BAA0B,CAAC,OAAO,EAAE,CAAC;qBACrE;oBAED,OAAO;wBACH,QAAQ,EAAE,aAAa;wBACvB,cAAc,EAAE;4BACZ,aAAa,EAAE,qCAAqC,CAChD,wBAAwB,EACxB,8BAA8B,GAAG,0BAA0B,CAC9D;4BACD,YAAY,EAAE,qCAAqC,CAC/C,eAAe,EACf,iBAAiB,GAAG,aAAa,CACpC;4BACD,oBAAoB,EAAE,8BAA8B;yBACvD;wBACD,QAAQ,EAAE;4BACN,UAAU,EAAE,WAAW;yBAC1B;qBACJ,CAAC;iBACL;gBAED,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,IAAI,OAAO,CAAC,WAAW,EAAE;oBACtD,kBAAkB,GAAG,IAAI,CAAC;oBAC1B,MAAM;iBACT;aACJ;YAED,iBAAiB,GAAG,KAAK,CAAC;YAE1B,IAAI,kBAAkB;gBAClB,SAAS;YAEb,MAAM;SACT;QAED,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC5E,CAAC;CACJ;AA8BD,SAAS,wBAAwB,CAA+B,WAAiB;IAC7E,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE;QAC9B,MAAM,cAAc,GAAsB,EAAC,GAAG,WAAW,EAAC,CAAC;QAC3D,cAAc,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3D,IAAI,OAAO,IAAI,KAAK,QAAQ;gBACxB,OAAO,IAAI,CAAC;;gBAEZ,OAAO;oBACH,GAAG,IAAI;oBACP,GAAG,EAAE,SAAS;iBACjB,CAAC;QACV,CAAC,CAAC,CAAC;QAEH,OAAO,cAAsB,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,+BAA+B,CAAC,EAC3C,OAAO,EACP,gBAAgB,EAChB,oBAAoB,EACpB,kCAAkC,EAClC,WAAW,EACX,SAAS,EACT,WAAW,EACX,SAAS,EACT,sBAAsB,EAWzB;IAIG,SAAS,yBAAyB,CAAC,OAA0B;QACzD,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE;YAC3D,kBAAkB,EAAE,SAAS;YAC7B,sBAAsB;SACzB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE/C,OAAO,MAAM,CAAC,MAAM,IAAI,WAAW,GAAG,gBAAgB,CAAC;IAC3D,CAAC;IAED,IAAI,WAAW,GAAG,gBAAgB,IAAI,CAAC;QACnC,MAAM,IAAI,KAAK,CACX,qBAAqB,WAAW,iDAAiD,gBAAgB,GAAG,CACvG,CAAC;IAEN,IAAI,yBAAyB,CAAC,OAAO,CAAC;QAClC,OAAO;YACH,iBAAiB,EAAE,OAAO;YAC1B,QAAQ,EAAE,IAAI;SACjB,CAAC;IAEN,IAAI,oBAAoB,YAAY,QAAQ,EAAE;QAC1C,IAAI;YACA,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,MAAM,oBAAoB,CAAC;gBACvD,WAAW,EAAE,OAAO;gBACpB,cAAc,EAAE,WAAW,GAAG,gBAAgB;gBAC9C,SAAS;gBACT,WAAW;gBACX,iBAAiB,EAAE,kCAAkC;aACxD,CAAC,CAAC;YAEH,IAAI,yBAAyB,CAAC,WAAW,CAAC;gBACtC,OAAO;oBACH,iBAAiB,EAAE,WAAW;oBAC9B,QAAQ;iBACX,CAAC;YAEN,OAAO,CAAC,IAAI,CACR,2FAA2F;gBAC3F,qCAAqC,CACxC,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CACT,sDAAsD;gBACtD,qCAAqC,EACrC,GAAG,CACN,CAAC;SACL;KACJ;SAAM,IAAI,oBAAoB,KAAK,sCAAsC;QACtE,OAAO,CAAC,IAAI,CACR,mCAAmC,oBAAoB,KAAK;YAC5D,qCAAqC,CACxC,CAAC;IAEN,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,MAAM,4DAA4D,CAAC;QAC/F,WAAW,EAAE,OAAO;QACpB,cAAc,EAAE,WAAW,GAAG,gBAAgB;QAC9C,SAAS;QACT,WAAW;QACX,iBAAiB,EAAE,kCAAkC;KACxD,CAAC,CAAC;IAEH,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC;QACvC,MAAM,IAAI,KAAK,CACX,0FAA0F;YAC1F,yDAAyD,CAC5D,CAAC;IAEN,OAAO;QACH,iBAAiB,EAAE,WAAW;QAC9B,QAAQ;KACX,CAAC;AACN,CAAC;AAED,SAAS,gCAAgC,CACrC,cAA2F,EAC3F,mBAGC,EACD,SAAoB;IAEpB,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QAChF,OAAO,EAAE,CAAC;SACT,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QACrF,OAAO,mBAAmB,CAAC,MAAM,CAAC;SACjC,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QACrF,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,gCAAgC,GAAG,cAAc,CAAC,SAAS,CAC7D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,QAAQ,CAC5F,CAAC;IACF,MAAM,+BAA+B,GAAG,cAAc,CAAC,SAAS,CAC5D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,QAAQ,CAC5F,CAAC;IAEF,IAAI,+BAA+B,GAAG,CAAC,IAAI,gCAAgC,GAAG,CAAC;QAC3E,OAAO,mBAAmB,CAAC,MAAM,CAAC;SACjC,IAAI,gCAAgC,GAAG,CAAC,IAAI,+BAA+B,GAAG,CAAC;QAChF,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,YAAY,CAAC,MAAM,KAAK,mBAAmB,CAAC,MAAM,CAAC,MAAM;QACzD,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjF,OAAO,YAAY,CAAC;SACnB,IAAI,gCAAgC,GAAG,+BAA+B;QACvE,OAAO,YAAY,CAAC;IAExB,OAAO,mBAAmB,CAAC,MAAM,CAAC;AACtC,CAAC;AAED,SAAS,uCAAuC,CAAC,WAA8B;IAC3E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;QAChF,OAAO,EAAE,CAAC;IAEd,MAAM,qBAAqB,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAsB,CAAC;IACvF,MAAM,aAAa,GAAG,qBAAqB,CAAC,QAAQ,CAAC;IAErD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ;QACvF,OAAO,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IAE7D,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,qCAAqC,CAAC,WAA8B,EAAE,YAAoB;IAC/F,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;QACzF,cAAc,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,EAAE;SACf,CAAC,CAAC;IAEP,MAAM,qBAAqB,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAsB,CAAC;IAC7F,MAAM,wBAAwB,GAAG,EAAC,GAAG,qBAAqB,EAAC,CAAC;IAC5D,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,wBAAwB,CAAC;IAErE,MAAM,aAAa,GAAG,wBAAwB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAChE,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC;IAElD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ,EAAE;QACzF,IAAI,YAAY,KAAK,EAAE;YACnB,aAAa,CAAC,GAAG,EAAE,CAAC;;YAEpB,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC;KAC9D;SAAM,IAAI,YAAY,KAAK,EAAE;QAC1B,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAErC,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,EAC5B,eAAe,EAAE,oBAAoB,EACrC,8BAA8B,EAAE,kBAAkB,GAAG,CAAC,EAAE,iBAAiB,EACzE,WAAW,EAAE,kCAAkC,EAAE,6CAA6C,EAC9F,QAAQ,EAAE,oBAAoB,GAAG,CAAC,EAAE,SAAS,EAAE,sBAAsB,EAOxE;IAMG,IAAI,QAAQ,IAAI,IAAI;QAChB,MAAM,IAAI,aAAa,EAAE,CAAC;IAE9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAEjC,IAAI,iBAAiB,IAAI,kCAAkC,IAAI,IAAI,IAAI,QAAQ,CAAC,gBAAgB,EAAE;QAC9F,MAAM,gBAAgB,GAAG,kCAAkC,CAAC,KAAK,EAAE,CAAC;QAEpE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;YAC/F,gBAAgB,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,EAAE;aACf,CAAC,CAAC;QAEP,MAAM,EAAC,WAAW,EAAE,sBAAsB,EAAE,eAAe,EAAE,YAAY,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YAC3H,kBAAkB,EAAE,SAAS;YAC7B,sBAAsB;SACzB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,MAAM,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,OAAO,CAAC,WAAW,EAAE;YACjF,MAAM,EAAC,mBAAmB,EAAC,GAAG,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAEpE,MAAM,4BAA4B,GAAG,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;YAEzE,IAAI,4BAA4B,IAAI,6CAA6C;gBAC7E,OAAO;oBACH,OAAO,EAAE,gBAAgB;oBACzB,sBAAsB;oBACtB,MAAM;oBACN,kBAAkB,EAAE,eAAe;oBACnC,6BAA6B,EAAE,8BAA8B;oBAC7D,eAAe,EAAE,eAAe,IAAI,EAAE;oBACtC,4BAA4B,EAAE,YAAY,EAAE,gBAAgB,IAAI,KAAK;oBACrE,qCAAqC,EAAE,YAAY,EAAE,yBAAyB,IAAI,EAAE;iBACvF,CAAC;SACT;KACJ;IAED,eAAe,GAAG,QAAQ,CAAC,gBAAgB;QACvC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE;QACzB,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAEpD,IAAI,oBAAoB,CAAC,sBAAsB,IAAI,IAAI,EAAE;QACrD,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,YAAY,QAAQ;YAClE,CAAC,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC3C,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC;QAEhC,MAAM,EAAC,iBAAiB,EAAE,QAAQ,EAAC,GAAG,MAAM,+BAA+B,CAAC;YACxE,OAAO,EAAE,eAAe;YACxB,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,GAAG,kBAAkB;YACvF,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ;YACnD,kCAAkC,EAAE,oBAAoB,CAAC,sBAAsB;YAC/E,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,SAAS,EAAE,KAAK,CAAC,QAAQ;YACzB,WAAW,EAAE,WAAW;YACxB,SAAS;YACT,sBAAsB;SACzB,CAAC,CAAC;QAEH,MAAM,EAAC,WAAW,EAAE,sBAAsB,EAAE,eAAe,EAAE,YAAY,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,EAAE;YAC5H,kBAAkB,EAAE,SAAS;YAC7B,sBAAsB;SACzB,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE,iBAAiB;YAC1B,sBAAsB;YACtB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC5C,kBAAkB,EAAE,eAAe;YACnC,6BAA6B,EAAE,QAAQ;YACvC,eAAe,EAAE,eAAe,IAAI,EAAE;YACtC,4BAA4B,EAAE,YAAY,EAAE,gBAAgB,IAAI,KAAK;YACrE,qCAAqC,EAAE,YAAY,EAAE,yBAAyB,IAAI,EAAE;SACvF,CAAC;KACL;IAED;QACI,MAAM,EAAC,WAAW,EAAE,sBAAsB,EAAE,eAAe,EAAE,YAAY,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,eAAe,EAAE;YAC1H,kBAAkB,EAAE,SAAS;YAC7B,sBAAsB;SACzB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEpD,IAAI,MAAM,CAAC,MAAM,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,OAAO,CAAC,WAAW;YAC/E,OAAO;gBACH,OAAO,EAAE,eAAe;gBACxB,sBAAsB;gBACtB,MAAM;gBACN,kBAAkB,EAAE,eAAe;gBACnC,6BAA6B,EAAE,8BAA8B;gBAC7D,eAAe,EAAE,eAAe,IAAI,EAAE;gBACtC,4BAA4B,EAAE,YAAY,EAAE,gBAAgB,IAAI,KAAK;gBACrE,qCAAqC,EAAE,YAAY,EAAE,yBAAyB,IAAI,EAAE;aACvF,CAAC;KACT;IAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,YAAY,QAAQ;QAClE,CAAC,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC3C,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC;IAEhC,MAAM,EAAC,iBAAiB,EAAE,QAAQ,EAAC,GAAG,MAAM,+BAA+B,CAAC;QACxE,OAAO,EAAE,eAAe;QACxB,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,GAAG,kBAAkB;QACvF,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ;QACnD,kCAAkC,EAAE,oBAAoB,CAAC,sBAAsB;QAC/E,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE,KAAK,CAAC,QAAQ;QACzB,WAAW,EAAE,WAAW;QACxB,SAAS;QACT,sBAAsB;KACzB,CAAC,CAAC;IAEH,MAAM,EAAC,WAAW,EAAE,sBAAsB,EAAE,eAAe,EAAE,YAAY,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,EAAE;QAC5H,kBAAkB,EAAE,SAAS;QAC7B,sBAAsB;KACzB,CAAC,CAAC;IAEH,OAAO;QACH,OAAO,EAAE,iBAAiB;QAC1B,sBAAsB;QACtB,MAAM,EAAE,WAAW,CAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC7C,kBAAkB,EAAE,eAAe;QACnC,6BAA6B,EAAE,QAAQ;QACvC,eAAe,EAAE,eAAe,IAAI,EAAE;QACtC,4BAA4B,EAAE,YAAY,EAAE,gBAAgB,IAAI,KAAK;QACrE,qCAAqC,EAAE,YAAY,EAAE,yBAAyB,IAAI,EAAE;KACvF,CAAC;AACN,CAAC"}

package/dist/{llamaEvaluator → evaluator}/LlamaChat/utils/FunctionCallGrammar.d.ts

@@ -2,10 +2,11 @@ import { LlamaGrammar } from "../../LlamaGrammar.js";
 import { ChatModelFunctions } from "../../../types.js";
 import { ChatWrapper } from "../../../ChatWrapper.js";
 import { LlamaChatResponseFunctionCall } from "../LlamaChat.js";
+import { Llama } from "../../../bindings/Llama.js";
 export declare class FunctionCallGrammar<const Functions extends ChatModelFunctions> extends LlamaGrammar {
     private readonly _functions;
     private readonly _chatWrapper;
-    constructor(functions: Functions, chatWrapper: ChatWrapper, initialFunctionCallEngaged: boolean);
+    constructor(llama: Llama, functions: Functions, chatWrapper: ChatWrapper, initialFunctionCallEngaged: boolean);
     parseFunctionCall(callText: string): LlamaChatResponseFunctionCall<Functions>;
     parseFunctionNameFromPartialCall(callText: string, { enableInternalBuiltinFunctions, initialFunctionCallEngaged }?: {
         enableInternalBuiltinFunctions?: boolean;

package/dist/{llamaEvaluator → evaluator}/LlamaChat/utils/FunctionCallGrammar.js

@@ -9,9 +9,10 @@ import { GbnfVerbatimText } from "../../../utils/gbnfJson/terminals/GbnfVerbatim
 export class FunctionCallGrammar extends LlamaGrammar {
     _functions;
     _chatWrapper;
-    constructor(functions, chatWrapper, initialFunctionCallEngaged) {
+    constructor(llama, functions, chatWrapper, initialFunctionCallEngaged) {
         const grammar = getGbnfGrammarForFunctionCalls(functions, chatWrapper, initialFunctionCallEngaged);
         super({
+            llama,
             grammar,
             stopGenerationTriggers: [LlamaText(chatWrapper.settings.functions.call.suffix, "\n".repeat(4))],
             trimWhitespaceSuffix: true

package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.js.map

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

package/dist/{llamaEvaluator → evaluator}/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js

@@ -96,10 +96,28 @@ export async function eraseFirstResponseAndKeepFirstSystemChatContextShiftStrate
                     }
                 }
             }
+            function compressLastModelResponse(minCharactersToKeep = 20) {
+                const lastHistoryItem = res[res.length - 1];
+                if (lastHistoryItem == null || lastHistoryItem.type !== "model")
+                    return;
+                const lastResponseItem = lastHistoryItem.response[lastHistoryItem.response.length - 1];
+                if (lastResponseItem == null || typeof lastResponseItem !== "string")
+                    return;
+                const nextTextLength = lastResponseItem.length - charactersLeftToRemove;
+                const charactersToRemoveFromText = charactersLeftToRemove + Math.max(0, nextTextLength - minCharactersToKeep);
+                const newText = truncateTextAndRoundToWords(lastResponseItem, charactersToRemoveFromText);
+                if (newText.length < lastResponseItem.length) {
+                    lastHistoryItem.response[lastHistoryItem.response.length - 1] = newText;
+                    charactersLeftToRemove -= lastResponseItem.length - newText.length;
+                }
+            }
             compressFunctionCalls();
             if (charactersLeftToRemove <= 0)
                 return res;
             compressFirstModelResponse();
+            if (charactersLeftToRemove <= 0)
+                return res;
+            compressLastModelResponse();
             return res;
         }
     });

package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js","sourceRoot":"","sources":["../../../../../src/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.ts"],"names":[],"mappings":"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"}

package/dist/{llamaEvaluator → evaluator}/LlamaChatSession/LlamaChatSession.js

@@ -78,6 +78,8 @@ export class LlamaChatSession {
      */
     async promptWithMeta(prompt, { functions, documentFunctionParams, onToken, signal, maxTokens, temperature, topK, topP, grammar, trimWhitespaceSuffix = false, repeatPenalty, evaluationPriority } = {}) {
         this._ensureNotDisposed();
+        if (grammar != null && grammar._llama !== this.model._llama)
+            throw new Error("The LlamaGrammar used by passed to this function was created with a different Llama instance than the one used by this sequence's model. Make sure you use the same Llama instance for both the model and the grammar.");
         return await withLock(this, "prompt", async () => {
             this._ensureNotDisposed();
             if (this._chat == null)

package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LlamaChatSession.js","sourceRoot":"","sources":["../../../src/evaluator/LlamaChatSession/LlamaChatSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACvF,OAAO,EAAC,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EAAC,8BAA8B,EAAC,MAAM,+CAA+C,CAAC;AAG7F,OAAO,EAAC,SAAS,EAAkD,MAAM,2BAA2B,CAAC;AAgIrG,MAAM,OAAO,gBAAgB;IACzB,gBAAgB,CAAkB,kBAAkB,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC/E,gBAAgB,CAAkB,oBAAoB,CAAU;IAChE,gBAAgB,CAAkB,aAAa,CAAuC;IACtF,gBAAgB,CAAS,YAAY,CAAoB;IACzD,gBAAgB,CAAS,eAAe,CAAuC;IAC/E,gBAAgB,CAAS,KAAK,CAAmB;IAEjC,SAAS,GAAG,IAAI,UAAU,EAAQ,CAAC;IAEnD;;OAEG;IACH,YAAmB,EACf,eAAe,EACf,WAAW,GAAG,MAAM,EACpB,YAAY,GAAG,uBAAuB,EACtC,mBAAmB,GAAG,IAAI,EAC1B,YAAY,EACU;QACtB,IAAI,eAAe,IAAI,IAAI;YACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEtD,IAAI,eAAe,CAAC,QAAQ;YACxB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,CAAC;gBACjB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,YAAY;aACrB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC;YACvB,mBAAmB;YACnB,WAAW;YACX,eAAe;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;QAEhD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CACvB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CACL,CAAC;QACF,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC9D,CAAC;IAEM,OAAO,CAAC,EAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,KAAiC,EAAE;QAC1F,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;YAClB,OAAO;QAEX,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAC,eAAe,EAAC,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAED,cAAc;IACP,CAAC,MAAM,CAAC,OAAO,CAAC;QACnB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IACrD,CAAC;IAED,IAAW,QAAQ;QACf,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;YAClB,MAAM,IAAI,aAAa,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAA4E,MAAc,EAAE,EAC3G,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,MAAM,EACN,SAAS,EACT,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,KAAK,EAC5B,aAAa,KACsB,EAAE;QACrC,MAAM,EAAC,YAAY,EAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAY,MAAM,EAAE;YAChE,uEAAuE;YACvE,SAAS,EAAE,SAAsB;YACjC,sBAAsB,EAAE,sBAAmC;YAE3D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,aAAa;SACpG,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,cAAc,CAA4E,MAAc,EAAE,EACnH,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,MAAM,EACN,SAAS,EACT,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,KAAK,EAC5B,aAAa,EACb,kBAAkB,KACiB,EAAE;QACrC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YACvD,MAAM,IAAI,KAAK,CAAC,wNAAwN,CAAC,CAAC;QAE9O,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC7C,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE1B,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;gBAClB,MAAM,IAAI,aAAa,EAAE,CAAC;YAE9B,IAAI,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;YAC1C,IAAI,cAAc,GAAG,8BAA8B,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC/E,IAAI,2BAA2B,GAAG,cAAc,EAAE,aAAa,IAAI,IAAI;gBACnE,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,8BAA8B,CAAC,cAAc,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;YAE5E,cAAc,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,IAAI,2BAA2B,IAAI,IAAI;gBACnC,2BAA2B,CAAC,IAAI,CAAC;oBAC7B,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,EAAE;iBACf,CAAC,CAAC;YAEP,iDAAiD;YACjD,OAAO,IAAI,EAAE;gBACT,MAAM,EACF,YAAY,EACZ,cAAc,EAAE,qBAAqB,EACrC,QAAQ,EACX,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAY,cAAc,EAAE;oBAC7D,SAAS;oBACT,sBAAsB;oBACtB,OAAO,EAAE,OAAoB;oBAC7B,OAAO;oBACP,MAAM;oBACN,aAAa;oBACb,IAAI;oBACJ,IAAI;oBACJ,SAAS;oBACT,WAAW;oBACX,oBAAoB;oBACpB,YAAY,EAAE;wBACV,GAAG,IAAI,CAAC,aAAa;wBACrB,sBAAsB,EAAE,cAAc,EAAE,oBAAoB;qBAC/D;oBACD,kBAAkB;oBAClB,2BAA2B,EAAE;wBACzB,OAAO,EAAE,2BAA2B;wBACpC,6CAA6C,EAAE,IAAI;qBACtD;iBACJ,CAAC,CAAC;gBACH,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAE1B,cAAc,GAAG,qBAAqB,CAAC;gBACvC,cAAc,GAAG,cAAc,CAAC,YAAY,CAAC;gBAE7C,IAAI,YAAY,IAAI,IAAI,EAAE;oBACtB,MAAM,kBAAkB,GAAG,SAAS,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAElE,IAAI,kBAAkB,IAAI,IAAI;wBAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,YAAY,CAAC,YAAY,wBAAwB,CAAC,CAAC;oBAE5G,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACjF,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAE1B,cAAc,GAAG,4BAA4B,CAAC;wBAC1C,WAAW,EAAE,cAAc;wBAC3B,YAAY,EAAE,YAAY,CAAC,YAAY;wBACvC,mBAAmB,EAAE,kBAAkB,CAAC,WAAW;wBACnD,UAAU,EAAE,YAAY,CAAC,MAAM;wBAC/B,UAAU,EAAE,kBAAkB;wBAC9B,GAAG,EAAE,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,0BAA0B,CACrE,YAAY,CAAC,YAAY,EACzB,YAAY,CAAC,MAAM,EACnB,kBAAkB,CACrB;qBACJ,CAAC,CAAC;oBAEH,2BAA2B,GAAG,4BAA4B,CAAC;wBACvD,WAAW,EAAE,cAAc,CAAC,aAAa;wBACzC,YAAY,EAAE,YAAY,CAAC,YAAY;wBACvC,mBAAmB,EAAE,kBAAkB,CAAC,WAAW;wBACnD,UAAU,EAAE,YAAY,CAAC,MAAM;wBAC/B,UAAU,EAAE,kBAAkB;wBAC9B,GAAG,EAAE,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,0BAA0B,CACrE,YAAY,CAAC,YAAY,EACzB,YAAY,CAAC,MAAM,EACnB,kBAAkB,CACrB;qBACJ,CAAC,CAAC;oBACH,cAAc,CAAC,YAAY,GAAG,cAAc,CAAC;oBAC7C,cAAc,CAAC,aAAa,GAAG,2BAA2B,CAAC;oBAE3D,SAAS;iBACZ;gBAED,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;gBACtC,IAAI,CAAC,YAAY,GAAG,cAAc,CAAC;gBAEnC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;gBAEvE,OAAO;oBACH,QAAQ,EAAE,qBAAqB,CAAC,QAAQ;oBACxC,YAAY,EAAE,qBAAqB,CAAC,QAAQ;yBACvC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;yBAC1D,IAAI,CAAC,EAAE,CAAC;oBACb,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,4BAA4B,EAAE,QAAQ,CAAC,4BAA4B;iBACtE,CAAC;aACL;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,cAAc;QACjB,OAAO,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAEM,8BAA8B;QACjC,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI;YAC5B,OAAO,IAAI,CAAC;QAEhB,OAAO,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAChE,CAAC;IAEM,cAAc,CAAC,WAA8B;QAChD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;IACrC,CAAC;IAED,gBAAgB;IACR,kBAAkB;QACtB,IAAI,IAAI,CAAC,QAAQ;YACb,MAAM,IAAI,aAAa,EAAE,CAAC;IAClC,CAAC;CACJ;AAED,SAAS,4BAA4B,CAAC,EAClC,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,UAAU,EACV,GAAG,EAQN;IACG,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;QACzF,cAAc,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,EAAE;SACf,CAAC,CAAC;IAEP,MAAM,qBAAqB,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAsB,CAAC;IAC7F,MAAM,wBAAwB,GAAG,EAAC,GAAG,qBAAqB,EAAC,CAAC;IAC5D,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,wBAAwB,CAAC;IAErE,MAAM,aAAa,GAAG,wBAAwB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAChE,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC;IAElD,aAAa,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,mBAAmB;QAChC,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,UAAU;QAClB,GAAG;KACN,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,SAAS,wBAAwB,CAAC,WAA8B;IAC5D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;QAChF,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAE1E,OAAO,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAsB,CAAC;AACpE,CAAC"}

package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineChatSessionFunction.js","sourceRoot":"","sources":["../../../../src/evaluator/LlamaChatSession/utils/defineChatSessionFunction.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,yBAAyB,CAAkD,EACvF,WAAW,EACX,MAAM,EACN,OAAO,EAKV;IACG,OAAO;QACH,WAAW;QACX,MAAM;QACN,OAAO;KACV,CAAC;AACN,CAAC"}

package/dist/{llamaEvaluator → evaluator}/LlamaContext/LlamaContext.js

@@ -1,9 +1,9 @@
 import { DisposeAggregator, EventRelay, withLock, DisposedError } from "lifecycle-utils";
 import { removeNullFields } from "../../utils/removeNullFields.js";
-import { AddonContext } from "../LlamaBins.js";
 import { compareTokens } from "../../utils/compareTokens.js";
 import { resolveBatchItemsPrioritizingStrategy } from "./utils/resolveBatchItemsPrioritizingStrategy.js";
 export class LlamaContext {
+    /** @internal */ _llama;
     /** @internal */ _ctx;
     /** @internal */ _onReclaimUnusedSequenceId = new EventRelay();
     /** @internal */ _model;
@@ -28,11 +28,12 @@ export class LlamaContext {
     constructor({ model, sequences = 1, seed = null, contextSize = model.trainContextSize, batchSize = contextSize, threads = 6, batching: { dispatchSchedule: batchingDispatchSchedule = "nextTick", itemsPrioritizingStrategy: batchingItemsPrioritizingStrategy = "maximumParallelism" } = {}, _embedding, _noSeed }) {
         if (model.disposed)
             throw new DisposedError();
+        this._llama = model._llama;
         this._model = model;
         this._totalSequences = Math.max(1, Math.floor(sequences));
         this._contextSize = Math.max(2, contextSize);
         this._batchSize = Math.max(batchSize, this._totalSequences);
-        this._ctx = new AddonContext(this._model._model, removeNullFields({
+        this._ctx = new this._llama._bindings.AddonContext(this._model._model, removeNullFields({
             seed: seed != null ? Math.max(-1, Math.floor(seed)) : undefined,
             contextSize: contextSize * this._totalSequences,
             batchSize: this._batchSize,
@@ -489,6 +490,8 @@ export class LlamaContextSequence {
                 const resolvedGrammarEvaluationState = grammarEvaluationState instanceof Function
                     ? grammarEvaluationState()
                     : grammarEvaluationState;
+                if (resolvedGrammarEvaluationState != null && resolvedGrammarEvaluationState._llama !== this.model._llama)
+                    throw new Error("The LlamaGrammar used by passed to this function was created with a different Llama instance than the one used by this sequence's model. Make sure you use the same Llama instance for both the model and the grammar.");
                 return this._context._ctx.sampleToken(batchLogitIndex, removeNullFields({
                     temperature,
                     topK,