node-llama-cpp 3.2.0 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bindings/AddonTypes.d.ts +4 -3
- package/dist/bindings/Llama.d.ts +1 -1
- package/dist/bindings/Llama.js +17 -2
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +4 -1
- package/dist/bindings/getLlama.js +42 -2
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.d.ts +1 -1
- package/dist/bindings/utils/compileLLamaCpp.js +41 -2
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/testBindingBinary.d.ts +2 -1
- package/dist/bindings/utils/testBindingBinary.js +122 -37
- package/dist/bindings/utils/testBindingBinary.js.map +1 -1
- package/dist/chatWrappers/Llama3_1ChatWrapper.js +3 -2
- package/dist/chatWrappers/Llama3_1ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.d.ts +35 -0
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js +253 -0
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js.map +1 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.d.ts +13 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js +30 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js.map +1 -1
- package/dist/chatWrappers/utils/getModelLinageNames.d.ts +2 -0
- package/dist/chatWrappers/utils/getModelLinageNames.js +18 -0
- package/dist/chatWrappers/utils/getModelLinageNames.js.map +1 -0
- package/dist/chatWrappers/utils/isLlama3_2LightweightModel.d.ts +2 -0
- package/dist/chatWrappers/utils/isLlama3_2LightweightModel.js +9 -0
- package/dist/chatWrappers/utils/isLlama3_2LightweightModel.js.map +1 -0
- package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +4 -2
- package/dist/chatWrappers/utils/resolveChatWrapper.js +9 -31
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/commands/ChatCommand.js +1 -1
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/InitCommand.d.ts +2 -1
- package/dist/cli/commands/InitCommand.js +32 -13
- package/dist/cli/commands/InitCommand.js.map +1 -1
- package/dist/cli/recommendedModels.js +11 -0
- package/dist/cli/recommendedModels.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.js +25 -12
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +140 -132
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +1 -1
- package/dist/evaluator/LlamaGrammar.js +7 -0
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaJsonSchemaGrammar.d.ts +3 -2
- package/dist/evaluator/LlamaJsonSchemaGrammar.js +3 -0
- package/dist/evaluator/LlamaJsonSchemaGrammar.js.map +1 -1
- package/dist/gguf/fileReaders/GgufFileReader.d.ts +1 -1
- package/dist/gguf/fileReaders/GgufFsFileReader.d.ts +1 -1
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.d.ts +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +2 -2
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.d.ts +5 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js +15 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map +1 -1
- package/dist/utils/gbnfJson/GbnfTerminal.d.ts +3 -0
- package/dist/utils/gbnfJson/GbnfTerminal.js +25 -3
- package/dist/utils/gbnfJson/GbnfTerminal.js.map +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.d.ts +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfAnyJson.d.ts +9 -0
- package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js +53 -0
- package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js.map +1 -0
- package/dist/utils/gbnfJson/terminals/GbnfArray.d.ts +11 -2
- package/dist/utils/gbnfJson/terminals/GbnfArray.js +64 -15
- package/dist/utils/gbnfJson/terminals/GbnfArray.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfBoolean.d.ts +3 -2
- package/dist/utils/gbnfJson/terminals/GbnfBoolean.js +13 -7
- package/dist/utils/gbnfJson/terminals/GbnfBoolean.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.d.ts +11 -0
- package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js +28 -0
- package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js.map +1 -0
- package/dist/utils/gbnfJson/terminals/GbnfFormatString.d.ts +11 -0
- package/dist/utils/gbnfJson/terminals/GbnfFormatString.js +90 -0
- package/dist/utils/gbnfJson/terminals/GbnfFormatString.js.map +1 -0
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.d.ts +4 -1
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.js +8 -1
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.d.ts +5 -0
- package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js +24 -0
- package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js.map +1 -0
- package/dist/utils/gbnfJson/terminals/GbnfNumber.js +4 -3
- package/dist/utils/gbnfJson/terminals/GbnfNumber.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.d.ts +3 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js +8 -2
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfObjectMap.d.ts +14 -5
- package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js +67 -9
- package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.d.ts +2 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.js +6 -2
- package/dist/utils/gbnfJson/terminals/GbnfOr.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfRepetition.d.ts +7 -1
- package/dist/utils/gbnfJson/terminals/GbnfRepetition.js +69 -20
- package/dist/utils/gbnfJson/terminals/GbnfRepetition.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfString.d.ts +8 -1
- package/dist/utils/gbnfJson/terminals/GbnfString.js +31 -21
- package/dist/utils/gbnfJson/terminals/GbnfString.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfStringValue.d.ts +2 -0
- package/dist/utils/gbnfJson/terminals/GbnfStringValue.js +7 -4
- package/dist/utils/gbnfJson/terminals/GbnfStringValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.d.ts +2 -1
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js +24 -5
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/gbnfConsts.d.ts +16 -1
- package/dist/utils/gbnfJson/terminals/gbnfConsts.js +47 -1
- package/dist/utils/gbnfJson/terminals/gbnfConsts.js.map +1 -1
- package/dist/utils/gbnfJson/types.d.ts +164 -17
- package/dist/utils/gbnfJson/types.js +6 -0
- package/dist/utils/gbnfJson/types.js.map +1 -1
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js +61 -9
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js +99 -8
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js +125 -16
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/includesText.d.ts +1 -0
- package/dist/utils/includesText.js +12 -0
- package/dist/utils/includesText.js.map +1 -0
- package/dist/utils/wrapAbortSignal.d.ts +1 -1
- package/dist/utils/wrapAbortSignal.js +9 -4
- package/dist/utils/wrapAbortSignal.js.map +1 -1
- package/llama/CMakeLists.txt +10 -90
- package/llama/addon/AddonGrammar.cpp +49 -1
- package/llama/addon/AddonGrammar.h +3 -0
- package/llama/addon/addon.cpp +17 -0
- package/llama/addon/globals/getGpuInfo.cpp +54 -52
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/gpuInfo/vulkan-gpu-info.cpp +0 -8
- package/llama/gpuInfo/vulkan-gpu-info.h +0 -1
- package/llama/grammars/README.md +1 -1
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +49 -45
- package/templates/README.md +6 -0
- package/templates/packed/electron-typescript-react.json +1 -1
- package/templates/packed/node-typescript.json +1 -1
- package/llama/gpuInfo/cuda-gpu-info.cu +0 -120
- package/llama/gpuInfo/cuda-gpu-info.h +0 -10
- package/llama/gpuInfo/metal-gpu-info.h +0 -8
- package/llama/gpuInfo/metal-gpu-info.mm +0 -37
|
@@ -3,11 +3,12 @@ import { fileURLToPath } from "url";
|
|
|
3
3
|
import { createRequire } from "module";
|
|
4
4
|
import path from "path";
|
|
5
5
|
import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
|
|
6
|
+
import { runningInElectron } from "../../utils/runtime.js";
|
|
6
7
|
const require = createRequire(import.meta.url);
|
|
7
8
|
const __filename = fileURLToPath(import.meta.url);
|
|
8
9
|
const detectedFileName = path.basename(__filename);
|
|
9
10
|
const expectedFileName = "testBindingBinary";
|
|
10
|
-
export function testBindingBinary(bindingBinaryPath, testTimeout = 1000 * 60 * 5) {
|
|
11
|
+
export async function testBindingBinary(bindingBinaryPath, gpu, testTimeout = 1000 * 60 * 5) {
|
|
11
12
|
if (!detectedFileName.startsWith(expectedFileName)) {
|
|
12
13
|
console.warn(getConsoleLogPrefix() +
|
|
13
14
|
`"${expectedFileName}.js" file is not independent, so testing a binding binary with the current system` +
|
|
@@ -16,26 +17,94 @@ export function testBindingBinary(bindingBinaryPath, testTimeout = 1000 * 60 * 5
|
|
|
16
17
|
"Assuming the test passed with the risk that the process may crash due to an incompatible binary.\n" +
|
|
17
18
|
getConsoleLogPrefix() +
|
|
18
19
|
'To resolve this issue, make sure that "node-llama-cpp" is not bundled together with other code and is imported as an external module with its original file structure.');
|
|
19
|
-
return
|
|
20
|
+
return true;
|
|
20
21
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
async function getForkFunction() {
|
|
23
|
+
if (runningInElectron) {
|
|
24
|
+
try {
|
|
25
|
+
const { utilityProcess } = await import("electron");
|
|
26
|
+
return {
|
|
27
|
+
type: "electron",
|
|
28
|
+
fork: utilityProcess.fork.bind(utilityProcess)
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
catch (err) {
|
|
32
|
+
// do nothing
|
|
33
|
+
}
|
|
26
34
|
}
|
|
27
|
-
|
|
35
|
+
return {
|
|
36
|
+
type: "node",
|
|
37
|
+
fork
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
const forkFunction = await getForkFunction();
|
|
41
|
+
function createTestProcess({ onMessage, onExit }) {
|
|
42
|
+
if (forkFunction.type === "electron") {
|
|
43
|
+
let exited = false;
|
|
44
|
+
const subProcess = forkFunction.fork(__filename, [], {
|
|
45
|
+
env: {
|
|
46
|
+
...process.env,
|
|
47
|
+
TEST_BINDING_CP: "true"
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
function cleanupElectronFork() {
|
|
51
|
+
if (subProcess.pid != null || !exited) {
|
|
52
|
+
subProcess.kill();
|
|
53
|
+
exited = true;
|
|
54
|
+
}
|
|
55
|
+
process.off("exit", cleanupElectronFork);
|
|
56
|
+
}
|
|
57
|
+
process.on("exit", cleanupElectronFork);
|
|
58
|
+
subProcess.on("message", onMessage);
|
|
59
|
+
subProcess.on("exit", (code) => {
|
|
60
|
+
exited = true;
|
|
61
|
+
cleanupElectronFork();
|
|
62
|
+
onExit(code);
|
|
63
|
+
});
|
|
64
|
+
return {
|
|
65
|
+
sendMessage: (message) => subProcess.postMessage(message),
|
|
66
|
+
killProcess: cleanupElectronFork
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
const subProcess = forkFunction.fork(__filename, [], {
|
|
70
|
+
detached: false,
|
|
71
|
+
silent: true,
|
|
72
|
+
env: {
|
|
73
|
+
...process.env,
|
|
74
|
+
TEST_BINDING_CP: "true"
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
function cleanupNodeFork() {
|
|
78
|
+
if (subProcess.exitCode == null)
|
|
79
|
+
subProcess.kill("SIGKILL");
|
|
80
|
+
process.off("exit", cleanupNodeFork);
|
|
81
|
+
}
|
|
82
|
+
process.on("exit", cleanupNodeFork);
|
|
83
|
+
subProcess.on("message", onMessage);
|
|
84
|
+
subProcess.on("exit", (code) => {
|
|
85
|
+
cleanupNodeFork();
|
|
86
|
+
onExit(code ?? -1);
|
|
87
|
+
});
|
|
88
|
+
if (subProcess.killed || subProcess.exitCode != null) {
|
|
89
|
+
cleanupNodeFork();
|
|
90
|
+
onExit(subProcess.exitCode ?? -1);
|
|
91
|
+
}
|
|
92
|
+
return {
|
|
93
|
+
sendMessage: (message) => subProcess.send(message),
|
|
94
|
+
killProcess: cleanupNodeFork
|
|
95
|
+
};
|
|
96
|
+
}
|
|
28
97
|
let testPassed = false;
|
|
29
98
|
let forkSucceeded = false;
|
|
30
99
|
let timeoutHandle = null;
|
|
100
|
+
let subProcess = undefined;
|
|
101
|
+
let testFinished = false;
|
|
31
102
|
function cleanup() {
|
|
32
|
-
|
|
33
|
-
subProcess.kill("SIGKILL");
|
|
103
|
+
testFinished = true;
|
|
34
104
|
if (timeoutHandle != null)
|
|
35
105
|
clearTimeout(timeoutHandle);
|
|
36
|
-
|
|
106
|
+
subProcess?.killProcess();
|
|
37
107
|
}
|
|
38
|
-
process.on("exit", cleanup);
|
|
39
108
|
return Promise.race([
|
|
40
109
|
new Promise((_, reject) => {
|
|
41
110
|
timeoutHandle = setTimeout(() => {
|
|
@@ -51,40 +120,52 @@ export function testBindingBinary(bindingBinaryPath, testTimeout = 1000 * 60 * 5
|
|
|
51
120
|
resolve(testPassed);
|
|
52
121
|
cleanup();
|
|
53
122
|
}
|
|
54
|
-
subProcess
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
123
|
+
subProcess = createTestProcess({
|
|
124
|
+
onMessage(message) {
|
|
125
|
+
if (message.type === "ready") {
|
|
126
|
+
forkSucceeded = true;
|
|
127
|
+
subProcess.sendMessage({
|
|
128
|
+
type: "start",
|
|
129
|
+
bindingBinaryPath,
|
|
130
|
+
gpu
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
else if (message.type === "done") {
|
|
134
|
+
testPassed = true;
|
|
135
|
+
subProcess.sendMessage({ type: "exit" });
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
onExit(code) {
|
|
139
|
+
if (code !== 0)
|
|
140
|
+
testPassed = false;
|
|
141
|
+
done();
|
|
58
142
|
}
|
|
59
|
-
else if (message.type === "done") {
|
|
60
|
-
testPassed = true;
|
|
61
|
-
subProcess.send({ type: "exit" });
|
|
62
|
-
}
|
|
63
|
-
});
|
|
64
|
-
subProcess.on("exit", (code) => {
|
|
65
|
-
if (code !== 0)
|
|
66
|
-
testPassed = false;
|
|
67
|
-
done();
|
|
68
143
|
});
|
|
69
|
-
if (
|
|
70
|
-
|
|
71
|
-
testPassed = false;
|
|
72
|
-
done();
|
|
73
|
-
}
|
|
144
|
+
if (testFinished)
|
|
145
|
+
subProcess.killProcess();
|
|
74
146
|
})
|
|
75
147
|
]);
|
|
76
148
|
}
|
|
77
|
-
if (process.env.TEST_BINDING_CP === "true" && process.send != null) {
|
|
78
|
-
process.
|
|
149
|
+
if (process.env.TEST_BINDING_CP === "true" && (process.parentPort != null || process.send != null)) {
|
|
150
|
+
const sendMessage = process.parentPort != null
|
|
151
|
+
? (message) => process.parentPort.postMessage(message)
|
|
152
|
+
: (message) => process.send(message);
|
|
153
|
+
const onMessage = async (message) => {
|
|
79
154
|
if (message.type === "start") {
|
|
80
|
-
if (process.send == null)
|
|
81
|
-
process.exit(1);
|
|
82
155
|
try {
|
|
83
156
|
const binding = require(message.bindingBinaryPath);
|
|
157
|
+
binding.loadBackends();
|
|
158
|
+
const loadedGpu = binding.getGpuType();
|
|
159
|
+
if (loadedGpu == null || (loadedGpu === false && message.gpu !== false))
|
|
160
|
+
binding.loadBackends(true);
|
|
84
161
|
await binding.init();
|
|
85
162
|
binding.getGpuVramInfo();
|
|
86
163
|
binding.getGpuDeviceInfo();
|
|
87
|
-
|
|
164
|
+
const gpuType = binding.getGpuType();
|
|
165
|
+
void gpuType;
|
|
166
|
+
if (gpuType !== message.gpu)
|
|
167
|
+
throw new Error(`Binary GPU type mismatch. Expected: ${message.gpu}, got: ${gpuType}`);
|
|
168
|
+
sendMessage({ type: "done" });
|
|
88
169
|
}
|
|
89
170
|
catch (err) {
|
|
90
171
|
console.error(err);
|
|
@@ -94,7 +175,11 @@ if (process.env.TEST_BINDING_CP === "true" && process.send != null) {
|
|
|
94
175
|
else if (message.type === "exit") {
|
|
95
176
|
process.exit(0);
|
|
96
177
|
}
|
|
97
|
-
}
|
|
98
|
-
process.
|
|
178
|
+
};
|
|
179
|
+
if (process.parentPort != null)
|
|
180
|
+
process.parentPort.on("message", (message) => onMessage(message.data));
|
|
181
|
+
else
|
|
182
|
+
process.on("message", onMessage);
|
|
183
|
+
sendMessage({ type: "ready" });
|
|
99
184
|
}
|
|
100
185
|
//# sourceMappingURL=testBindingBinary.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testBindingBinary.js","sourceRoot":"","sources":["../../../src/bindings/utils/testBindingBinary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"testBindingBinary.js","sourceRoot":"","sources":["../../../src/bindings/utils/testBindingBinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { ChatWrapper } from "../ChatWrapper.js";
|
|
|
2
2
|
import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
|
|
3
3
|
import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
|
|
4
4
|
import { jsonDumps } from "./utils/jsonDumps.js";
|
|
5
|
+
import { isLlama3_2LightweightModel } from "./utils/isLlama3_2LightweightModel.js";
|
|
5
6
|
// source: https://llama.meta.com/docs/model-cards-and-prompt-formats/llama3_1
|
|
6
7
|
export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
7
8
|
wrapperName = "Llama 3.1";
|
|
@@ -233,9 +234,9 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
233
234
|
static _checkModelCompatibility(options) {
|
|
234
235
|
if (options.tokenizer != null) {
|
|
235
236
|
const tokens = options.tokenizer("<|eom_id|>", true, "trimLeadingSpace");
|
|
236
|
-
return tokens.length === 1 && options.tokenizer.isSpecialToken(tokens[0]);
|
|
237
|
+
return tokens.length === 1 && options.tokenizer.isSpecialToken(tokens[0]) && !isLlama3_2LightweightModel(options);
|
|
237
238
|
}
|
|
238
|
-
return
|
|
239
|
+
return !isLlama3_2LightweightModel(options);
|
|
239
240
|
}
|
|
240
241
|
/** @internal */
|
|
241
242
|
static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Llama3_1ChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_1ChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAqC,MAAM,mBAAmB,CAAC;AAKlF,OAAO,EAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAC,wCAAwC,EAAC,MAAM,qDAAqD,CAAC;AAC7G,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"Llama3_1ChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_1ChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { ChatHistoryItem, ChatModelFunctions, ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperSettings } from "../types.js";
|
|
3
|
+
export declare class Llama3_2LightweightChatWrapper extends ChatWrapper {
|
|
4
|
+
readonly wrapperName: string;
|
|
5
|
+
readonly cuttingKnowledgeDate?: Date | (() => Date) | null;
|
|
6
|
+
readonly todayDate: Date | (() => Date) | null;
|
|
7
|
+
readonly noToolInstructions: boolean;
|
|
8
|
+
readonly settings: ChatWrapperSettings;
|
|
9
|
+
/**
|
|
10
|
+
* @param options
|
|
11
|
+
*/
|
|
12
|
+
constructor(options?: {
|
|
13
|
+
/**
|
|
14
|
+
* Set to `null` to disable
|
|
15
|
+
*
|
|
16
|
+
* Defaults to December 2023
|
|
17
|
+
*/
|
|
18
|
+
cuttingKnowledgeDate?: Date | (() => Date) | number | string | null;
|
|
19
|
+
/**
|
|
20
|
+
* Set to `null` to disable
|
|
21
|
+
*
|
|
22
|
+
* Defaults to current date
|
|
23
|
+
*/
|
|
24
|
+
todayDate?: Date | (() => Date) | number | string | null;
|
|
25
|
+
noToolInstructions?: boolean;
|
|
26
|
+
});
|
|
27
|
+
addAvailableFunctionsSystemMessageToHistory(history: readonly ChatHistoryItem[], availableFunctions?: ChatModelFunctions, { documentParams }?: {
|
|
28
|
+
documentParams?: boolean;
|
|
29
|
+
}): readonly ChatHistoryItem[];
|
|
30
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState;
|
|
31
|
+
generateAvailableFunctionsSystemText(availableFunctions: ChatModelFunctions, { documentParams }: {
|
|
32
|
+
documentParams?: boolean;
|
|
33
|
+
}): import("../utils/LlamaText.js")._LlamaText;
|
|
34
|
+
prependPreambleToChatHistory(chatHistory: readonly ChatHistoryItem[]): readonly ChatHistoryItem[];
|
|
35
|
+
}
|
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
|
|
3
|
+
import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
|
|
4
|
+
import { isLlama3_2LightweightModel } from "./utils/isLlama3_2LightweightModel.js";
|
|
5
|
+
// source: https://llama.meta.com/docs/model-cards-and-prompt-formats/llama3_2/
|
|
6
|
+
export class Llama3_2LightweightChatWrapper extends ChatWrapper {
|
|
7
|
+
wrapperName = "Llama 3.2 lightweight";
|
|
8
|
+
cuttingKnowledgeDate;
|
|
9
|
+
todayDate;
|
|
10
|
+
noToolInstructions;
|
|
11
|
+
/** @internal */ _specialTokensTextForPreamble;
|
|
12
|
+
settings = {
|
|
13
|
+
supportsSystemMessages: true,
|
|
14
|
+
functions: {
|
|
15
|
+
call: {
|
|
16
|
+
optionalPrefixSpace: true,
|
|
17
|
+
prefix: '{"name": "',
|
|
18
|
+
paramsPrefix: '", "parameters": ',
|
|
19
|
+
suffix: LlamaText("}", new SpecialToken("EOT"))
|
|
20
|
+
},
|
|
21
|
+
result: {
|
|
22
|
+
prefix: LlamaText(new SpecialToken("EOT"), new SpecialTokensText("<|start_header_id|>ipython<|end_header_id|>\n\n")),
|
|
23
|
+
suffix: LlamaText(new SpecialToken("EOT"), new SpecialTokensText("<|start_header_id|>assistant<|end_header_id|>\n\n"))
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* @param options
|
|
29
|
+
*/
|
|
30
|
+
constructor(options = {}) {
|
|
31
|
+
super();
|
|
32
|
+
const { cuttingKnowledgeDate = new Date("2023-12-01T00:00:00Z"), todayDate = () => new Date(), noToolInstructions = false, _specialTokensTextForPreamble = false } = options;
|
|
33
|
+
this.cuttingKnowledgeDate = cuttingKnowledgeDate == null
|
|
34
|
+
? null
|
|
35
|
+
: cuttingKnowledgeDate instanceof Function
|
|
36
|
+
? cuttingKnowledgeDate
|
|
37
|
+
: new Date(cuttingKnowledgeDate);
|
|
38
|
+
this.todayDate = todayDate == null
|
|
39
|
+
? null
|
|
40
|
+
: todayDate instanceof Function
|
|
41
|
+
? todayDate
|
|
42
|
+
: new Date(todayDate);
|
|
43
|
+
this.noToolInstructions = noToolInstructions;
|
|
44
|
+
this._specialTokensTextForPreamble = _specialTokensTextForPreamble;
|
|
45
|
+
}
|
|
46
|
+
addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
|
|
47
|
+
const availableFunctionNames = Object.keys(availableFunctions ?? {});
|
|
48
|
+
if (availableFunctions == null || availableFunctionNames.length === 0)
|
|
49
|
+
return history;
|
|
50
|
+
const res = history.slice();
|
|
51
|
+
const functionsSystemMessage = {
|
|
52
|
+
type: "system",
|
|
53
|
+
text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams }).toJSON()
|
|
54
|
+
};
|
|
55
|
+
if (res.length >= 2 && res[0].type === "system" && res[1].type === "system")
|
|
56
|
+
res.splice(1, 0, functionsSystemMessage);
|
|
57
|
+
else
|
|
58
|
+
res.unshift({
|
|
59
|
+
type: "system",
|
|
60
|
+
text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams }).toJSON()
|
|
61
|
+
});
|
|
62
|
+
return res;
|
|
63
|
+
}
|
|
64
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
|
|
65
|
+
const chatHistoryWithPreamble = this.prependPreambleToChatHistory(chatHistory);
|
|
66
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistoryWithPreamble, availableFunctions, {
|
|
67
|
+
documentParams: documentFunctionParams
|
|
68
|
+
});
|
|
69
|
+
const resultItems = [];
|
|
70
|
+
let systemTexts = [];
|
|
71
|
+
let userTexts = [];
|
|
72
|
+
let modelTexts = [];
|
|
73
|
+
let currentAggregateFocus = null;
|
|
74
|
+
const flush = () => {
|
|
75
|
+
if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
|
|
76
|
+
resultItems.push({
|
|
77
|
+
system: systemTexts.length === 0
|
|
78
|
+
? null
|
|
79
|
+
: LlamaText.joinValues(resultItems.length === 0 && this._specialTokensTextForPreamble
|
|
80
|
+
? LlamaText(new SpecialTokensText("\n\n"))
|
|
81
|
+
: "\n\n", systemTexts),
|
|
82
|
+
user: userTexts.length === 0
|
|
83
|
+
? null
|
|
84
|
+
: LlamaText.joinValues("\n\n", userTexts),
|
|
85
|
+
model: modelTexts.length === 0
|
|
86
|
+
? null
|
|
87
|
+
: LlamaText.joinValues("\n\n", modelTexts)
|
|
88
|
+
});
|
|
89
|
+
systemTexts = [];
|
|
90
|
+
userTexts = [];
|
|
91
|
+
modelTexts = [];
|
|
92
|
+
};
|
|
93
|
+
for (const item of historyWithFunctions) {
|
|
94
|
+
if (item.type === "system") {
|
|
95
|
+
if (currentAggregateFocus !== "system")
|
|
96
|
+
flush();
|
|
97
|
+
currentAggregateFocus = "system";
|
|
98
|
+
systemTexts.push(LlamaText.fromJSON(item.text));
|
|
99
|
+
}
|
|
100
|
+
else if (item.type === "user") {
|
|
101
|
+
if (currentAggregateFocus !== "user")
|
|
102
|
+
flush();
|
|
103
|
+
currentAggregateFocus = "user";
|
|
104
|
+
userTexts.push(LlamaText(item.text));
|
|
105
|
+
}
|
|
106
|
+
else if (item.type === "model") {
|
|
107
|
+
if (currentAggregateFocus !== "model")
|
|
108
|
+
flush();
|
|
109
|
+
currentAggregateFocus = "model";
|
|
110
|
+
modelTexts.push(this.generateModelResponseText(item.response));
|
|
111
|
+
}
|
|
112
|
+
else
|
|
113
|
+
void item;
|
|
114
|
+
}
|
|
115
|
+
flush();
|
|
116
|
+
const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map((item, index) => {
|
|
117
|
+
const isLastItem = index === resultItems.length - 1;
|
|
118
|
+
const res = [];
|
|
119
|
+
if (item.system != null) {
|
|
120
|
+
res.push(LlamaText([
|
|
121
|
+
new SpecialTokensText("<|start_header_id|>system<|end_header_id|>\n\n"),
|
|
122
|
+
item.system,
|
|
123
|
+
new SpecialToken("EOT")
|
|
124
|
+
]));
|
|
125
|
+
}
|
|
126
|
+
if (item.user != null) {
|
|
127
|
+
res.push(LlamaText([
|
|
128
|
+
new SpecialTokensText("<|start_header_id|>user<|end_header_id|>\n\n"),
|
|
129
|
+
item.user,
|
|
130
|
+
new SpecialToken("EOT")
|
|
131
|
+
]));
|
|
132
|
+
}
|
|
133
|
+
if (item.model != null) {
|
|
134
|
+
res.push(LlamaText([
|
|
135
|
+
new SpecialTokensText("<|start_header_id|>assistant<|end_header_id|>\n\n"),
|
|
136
|
+
item.model,
|
|
137
|
+
isLastItem
|
|
138
|
+
? LlamaText([])
|
|
139
|
+
: new SpecialToken("EOT")
|
|
140
|
+
]));
|
|
141
|
+
}
|
|
142
|
+
return LlamaText(res);
|
|
143
|
+
}));
|
|
144
|
+
return {
|
|
145
|
+
contextText,
|
|
146
|
+
stopGenerationTriggers: [
|
|
147
|
+
LlamaText(new SpecialToken("EOS")),
|
|
148
|
+
LlamaText(new SpecialToken("EOT")),
|
|
149
|
+
LlamaText(new SpecialTokensText("<|eot_id|>")),
|
|
150
|
+
LlamaText(new SpecialTokensText("<|end_of_text|>")),
|
|
151
|
+
LlamaText("<|eot_id|>"),
|
|
152
|
+
LlamaText("<|end_of_text|>")
|
|
153
|
+
]
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
|
|
157
|
+
const functionsDocumentationGenerator = new ChatModelFunctionsDocumentationGenerator(availableFunctions);
|
|
158
|
+
if (!functionsDocumentationGenerator.hasAnyFunctions)
|
|
159
|
+
return LlamaText([]);
|
|
160
|
+
return LlamaText.joinValues("\n", [
|
|
161
|
+
"You have access to the following functions. To call a function, please respond with JSON for a function call.",
|
|
162
|
+
'Respond in the format {"name": function name, "parameters": function call parameters}.',
|
|
163
|
+
"Do not use variables.",
|
|
164
|
+
"",
|
|
165
|
+
functionsDocumentationGenerator.getLlama3_2LightweightFunctionSignatures({ documentParams }),
|
|
166
|
+
"",
|
|
167
|
+
"After calling a function, the result will appear afterwards and is only visible to you.",
|
|
168
|
+
"To make information visible to the user, you must include it in your response.",
|
|
169
|
+
"Do not tell the user about the functions your are using.",
|
|
170
|
+
"Only call functions when needed."
|
|
171
|
+
]);
|
|
172
|
+
}
|
|
173
|
+
prependPreambleToChatHistory(chatHistory) {
|
|
174
|
+
const res = chatHistory.slice();
|
|
175
|
+
const formatMonthDate = (date, timezone) => {
|
|
176
|
+
const today = this.todayDate instanceof Function
|
|
177
|
+
? this.todayDate()
|
|
178
|
+
: (this.todayDate ?? new Date());
|
|
179
|
+
if (today.getUTCMonth() === date.getUTCMonth() && today.getUTCFullYear() === date.getUTCFullYear())
|
|
180
|
+
return formatDate(date, timezone);
|
|
181
|
+
const month = date.toLocaleDateString("en-US", { month: "long", timeZone: timezone });
|
|
182
|
+
const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: timezone });
|
|
183
|
+
return `${month} ${year}`;
|
|
184
|
+
};
|
|
185
|
+
const lines = [];
|
|
186
|
+
if (this.cuttingKnowledgeDate != null) {
|
|
187
|
+
const date = this.cuttingKnowledgeDate instanceof Function
|
|
188
|
+
? this.cuttingKnowledgeDate()
|
|
189
|
+
: this.cuttingKnowledgeDate;
|
|
190
|
+
lines.push(`Cutting Knowledge Date: ${formatMonthDate(date, "UTC")}`);
|
|
191
|
+
}
|
|
192
|
+
if (this.todayDate != null) {
|
|
193
|
+
const date = this.todayDate instanceof Function
|
|
194
|
+
? this.todayDate()
|
|
195
|
+
: this.todayDate;
|
|
196
|
+
lines.push(`Today Date: ${formatDate(date, undefined)}`);
|
|
197
|
+
}
|
|
198
|
+
if (lines.length > 0)
|
|
199
|
+
res.unshift({
|
|
200
|
+
type: "system",
|
|
201
|
+
text: this._specialTokensTextForPreamble
|
|
202
|
+
? LlamaText(new SpecialTokensText(lines.join("\n"))).toJSON()
|
|
203
|
+
: LlamaText.joinValues("\n", lines).toJSON()
|
|
204
|
+
});
|
|
205
|
+
return res;
|
|
206
|
+
}
|
|
207
|
+
/** @internal */
|
|
208
|
+
static _checkModelCompatibility(options) {
|
|
209
|
+
if (options.tokenizer != null) {
|
|
210
|
+
const tokens = options.tokenizer("<|eom_id|>", true, "trimLeadingSpace");
|
|
211
|
+
return tokens.length === 1 && options.tokenizer.isSpecialToken(tokens[0]) && isLlama3_2LightweightModel(options);
|
|
212
|
+
}
|
|
213
|
+
return isLlama3_2LightweightModel(options);
|
|
214
|
+
}
|
|
215
|
+
/** @internal */
|
|
216
|
+
static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
|
|
217
|
+
return [
|
|
218
|
+
{},
|
|
219
|
+
[{ todayDate: null }, {}],
|
|
220
|
+
[{ cuttingKnowledgeDate: null }, {}],
|
|
221
|
+
[{ noToolInstructions: true }, {}],
|
|
222
|
+
[{ todayDate: null, cuttingKnowledgeDate: null }, {}],
|
|
223
|
+
[{ todayDate: null, cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
|
|
224
|
+
[{ todayDate: new Date("2024-07-26T00:00:00"), cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
|
|
225
|
+
[
|
|
226
|
+
{
|
|
227
|
+
todayDate: new Date("2024-07-26T00:00:00"),
|
|
228
|
+
cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z"),
|
|
229
|
+
noToolInstructions: true
|
|
230
|
+
},
|
|
231
|
+
{ cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
|
|
232
|
+
{ "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
|
|
233
|
+
],
|
|
234
|
+
[
|
|
235
|
+
{
|
|
236
|
+
todayDate: new Date("2024-07-26T00:00:00"),
|
|
237
|
+
cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z"),
|
|
238
|
+
noToolInstructions: true,
|
|
239
|
+
_specialTokensTextForPreamble: true
|
|
240
|
+
},
|
|
241
|
+
{ cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
|
|
242
|
+
{ "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
|
|
243
|
+
]
|
|
244
|
+
];
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
function formatDate(date, timezone) {
|
|
248
|
+
const day = date.toLocaleDateString("en-US", { day: "numeric", timeZone: timezone });
|
|
249
|
+
const month = date.toLocaleDateString("en-US", { month: "short", timeZone: timezone });
|
|
250
|
+
const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: timezone });
|
|
251
|
+
return `${day} ${month} ${year}`;
|
|
252
|
+
}
|
|
253
|
+
//# sourceMappingURL=Llama3_2LightweightChatWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Llama3_2LightweightChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_2LightweightChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,4 +54,17 @@ export declare class ChatModelFunctionsDocumentationGenerator {
|
|
|
54
54
|
getLlama3_1FunctionSignatures({ documentParams }?: {
|
|
55
55
|
documentParams?: boolean;
|
|
56
56
|
}): string;
|
|
57
|
+
/**
|
|
58
|
+
* Example:
|
|
59
|
+
* ```
|
|
60
|
+
* {"name": "getDate", "description": "Retrieve the current date"}
|
|
61
|
+
*
|
|
62
|
+
* {"name": "getTime", "description": "Retrieve the current time", "parameters": {"type": "object", "properties": {"hours": {"enum": ["24", "12"]}, "seconds": {"type": "boolean"}}}}
|
|
63
|
+
* ```
|
|
64
|
+
* @param options
|
|
65
|
+
* @param [options.documentParams] - Whether to document the parameters of the functions
|
|
66
|
+
*/
|
|
67
|
+
getLlama3_2LightweightFunctionSignatures({ documentParams }?: {
|
|
68
|
+
documentParams?: boolean;
|
|
69
|
+
}): string;
|
|
57
70
|
}
|