node-llama-cpp - npm Package Compare versions

Comparing version 1.1.1 to 1.2.0

dist/cli/commands/ChatCommand.d.ts

@@ -6,4 +6,5 @@ import { CommandModule } from "yargs";
     systemPrompt: string;
+    wrapper: string;
 };
 export declare const ChatCommand: CommandModule<object, ChatCommand>;
 export {};

dist/cli/commands/ChatCommand.js

@@ -7,2 +7,3 @@ import * as readline from "readline/promises";
 import { LlamaChatPromptWrapper } from "../../chatWrappers/LlamaChatPromptWrapper.js";
+import { GeneralChatPromptWrapper } from "../../chatWrappers/GeneralChatPromptWrapper.js";
 export const ChatCommand = {
@@ -32,7 +33,14 @@ command: "chat",
             group: "Optional:"
+        })
+            .option("wrapper", {
+            type: "string",
+            default: "general",
+            choices: ["general", "llama"],
+            description: "Chat wrapper to use",
+            group: "Optional:"
         });
     },
-    async handler({ model, systemInfo, systemPrompt }) {
+    async handler({ model, systemInfo, systemPrompt, wrapper }) {
         try {
-            await RunChat({ model, systemInfo, systemPrompt });
+            await RunChat({ model, systemInfo, systemPrompt, wrapper });
         }
@@ -45,5 +53,5 @@ catch (err) {
 };
-async function RunChat({ model: modelArg, systemInfo, systemPrompt }) {
-    const { LlamaChatSession } = await import("../../LlamaChatSession.js");
-    const { LlamaModel } = await import("../../LlamaModel.js");
+async function RunChat({ model: modelArg, systemInfo, systemPrompt, wrapper }) {
+    const { LlamaChatSession } = await import("../../llamaEvaluator/LlamaChatSession.js");
+    const { LlamaModel } = await import("../../llamaEvaluator/LlamaModel.js");
     const model = new LlamaModel({
@@ -53,6 +61,6 @@ modelPath: modelArg
     const session = new LlamaChatSession({
-        model,
+        context: model.createContext(),
         printLLamaSystemInfo: systemInfo,
         systemPrompt,
-        promptWrapper: new LlamaChatPromptWrapper()
+        promptWrapper: createChatWrapper(wrapper)
     });
@@ -81,3 +89,3 @@ await withOra({
         await session.prompt(input, (chunk) => {
-            process.stdout.write(model.decode(Uint32Array.from([chunk])));
+            process.stdout.write(session.context.decode(Uint32Array.from(chunk)));
         });
@@ -88,2 +96,11 @@ process.stdout.write(endColor);
 }
+function createChatWrapper(wrapper) {
+    switch (wrapper) {
+        case "general":
+            return new GeneralChatPromptWrapper();
+        case "llama":
+            return new LlamaChatPromptWrapper();
+    }
+    throw new Error("Unknown wrapper: " + wrapper);
+}
 //# sourceMappingURL=ChatCommand.js.map

dist/index.d.ts

@@ -1,3 +0,3 @@
-import { LlamaChatSession } from "./LlamaChatSession.js";
-import { LlamaModel } from "./LlamaModel.js";
+import { LlamaChatSession } from "./llamaEvaluator/LlamaChatSession.js";
+import { LlamaModel } from "./llamaEvaluator/LlamaModel.js";
 import { AbortError } from "./AbortError.js";
@@ -7,2 +7,4 @@ import { ChatPromptWrapper } from "./ChatPromptWrapper.js";
 import { LlamaChatPromptWrapper } from "./chatWrappers/LlamaChatPromptWrapper.js";
-export { LlamaModel, LlamaChatSession, AbortError, ChatPromptWrapper, EmptyChatPromptWrapper, LlamaChatPromptWrapper };
+import { GeneralChatPromptWrapper } from "./chatWrappers/GeneralChatPromptWrapper.js";
+import { LlamaContext } from "./llamaEvaluator/LlamaContext.js";
+export { LlamaModel, LlamaContext, LlamaChatSession, AbortError, ChatPromptWrapper, EmptyChatPromptWrapper, LlamaChatPromptWrapper, GeneralChatPromptWrapper };

dist/index.js

@@ -1,3 +0,3 @@
-import { LlamaChatSession } from "./LlamaChatSession.js";
-import { LlamaModel } from "./LlamaModel.js";
+import { LlamaChatSession } from "./llamaEvaluator/LlamaChatSession.js";
+import { LlamaModel } from "./llamaEvaluator/LlamaModel.js";
 import { AbortError } from "./AbortError.js";
@@ -7,3 +7,5 @@ import { ChatPromptWrapper } from "./ChatPromptWrapper.js";
 import { LlamaChatPromptWrapper } from "./chatWrappers/LlamaChatPromptWrapper.js";
-export { LlamaModel, LlamaChatSession, AbortError, ChatPromptWrapper, EmptyChatPromptWrapper, LlamaChatPromptWrapper };
+import { GeneralChatPromptWrapper } from "./chatWrappers/GeneralChatPromptWrapper.js";
+import { LlamaContext } from "./llamaEvaluator/LlamaContext.js";
+export { LlamaModel, LlamaContext, LlamaChatSession, AbortError, ChatPromptWrapper, EmptyChatPromptWrapper, LlamaChatPromptWrapper, GeneralChatPromptWrapper };
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "node-llama-cpp",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "node.js bindings for llama.cpp",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

25184211

0.03%

Number of package files

120

8.11%

Lines of code

1067

8.77%

No dependency changes