node-llama-cpp 2.8.4 → 3.0.0-beta.2
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/README.md +2 -2
- package/dist/ChatWrapper.d.ts +49 -0
- package/dist/ChatWrapper.js +120 -0
- package/dist/ChatWrapper.js.map +1 -0
- package/dist/chatWrappers/AlpacaChatWrapper.d.ts +12 -0
- package/dist/chatWrappers/AlpacaChatWrapper.js +21 -0
- package/dist/chatWrappers/AlpacaChatWrapper.js.map +1 -0
- package/dist/chatWrappers/ChatMLChatWrapper.d.ts +13 -0
- package/dist/chatWrappers/ChatMLChatWrapper.js +83 -0
- package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -0
- package/dist/chatWrappers/EmptyChatWrapper.d.ts +4 -0
- package/dist/chatWrappers/EmptyChatWrapper.js +5 -0
- package/dist/chatWrappers/EmptyChatWrapper.js.map +1 -0
- package/dist/chatWrappers/FalconChatWrapper.d.ts +21 -0
- package/dist/chatWrappers/FalconChatWrapper.js +104 -0
- package/dist/chatWrappers/FalconChatWrapper.js.map +1 -0
- package/dist/chatWrappers/FunctionaryChatWrapper.d.ts +41 -0
- package/dist/chatWrappers/FunctionaryChatWrapper.js +200 -0
- package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -0
- package/dist/chatWrappers/GeneralChatWrapper.d.ts +21 -0
- package/dist/chatWrappers/GeneralChatWrapper.js +112 -0
- package/dist/chatWrappers/GeneralChatWrapper.js.map +1 -0
- package/dist/chatWrappers/LlamaChatWrapper.d.ts +13 -0
- package/dist/chatWrappers/LlamaChatWrapper.js +78 -0
- package/dist/chatWrappers/LlamaChatWrapper.js.map +1 -0
- package/dist/chatWrappers/resolveChatWrapperBasedOnModel.d.ts +13 -0
- package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js +55 -0
- package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map +1 -0
- package/dist/cli/cli.js +1 -1
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/commands/ChatCommand.d.ts +2 -1
- package/dist/cli/commands/ChatCommand.js +90 -42
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +20 -12
- package/dist/index.js +19 -11
- package/dist/index.js.map +1 -1
- package/dist/llamaEvaluator/LlamaBins.d.ts +18 -4
- package/dist/llamaEvaluator/LlamaBins.js +3 -3
- package/dist/llamaEvaluator/LlamaChat/LlamaChat.d.ts +175 -0
- package/dist/llamaEvaluator/LlamaChat/LlamaChat.js +704 -0
- package/dist/llamaEvaluator/LlamaChat/LlamaChat.js.map +1 -0
- package/dist/llamaEvaluator/LlamaChat/utils/FunctionCallGrammar.d.ts +21 -0
- package/dist/llamaEvaluator/LlamaChat/utils/FunctionCallGrammar.js +120 -0
- package/dist/llamaEvaluator/LlamaChat/utils/FunctionCallGrammar.js.map +1 -0
- package/dist/llamaEvaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.d.ts +16 -0
- package/dist/llamaEvaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js +117 -0
- package/dist/llamaEvaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map +1 -0
- package/dist/llamaEvaluator/LlamaChatSession/LlamaChatSession.d.ts +146 -0
- package/dist/llamaEvaluator/LlamaChatSession/LlamaChatSession.js +211 -0
- package/dist/llamaEvaluator/LlamaChatSession/LlamaChatSession.js.map +1 -0
- package/dist/llamaEvaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +7 -0
- package/dist/llamaEvaluator/LlamaChatSession/utils/defineChatSessionFunction.js +8 -0
- package/dist/llamaEvaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -0
- package/dist/llamaEvaluator/LlamaContext/LlamaContext.d.ts +107 -0
- package/dist/llamaEvaluator/LlamaContext/LlamaContext.js +597 -0
- package/dist/llamaEvaluator/LlamaContext/LlamaContext.js.map +1 -0
- package/dist/llamaEvaluator/LlamaContext/types.d.ts +86 -0
- package/dist/llamaEvaluator/LlamaContext/types.js +2 -0
- package/dist/llamaEvaluator/LlamaContext/types.js.map +1 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.d.ts +5 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.js +16 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.js.map +1 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.d.ts +5 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.js +42 -0
- package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.js.map +1 -0
- package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.d.ts +2 -0
- package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.js +13 -0
- package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.js.map +1 -0
- package/dist/llamaEvaluator/LlamaGrammar.d.ts +9 -13
- package/dist/llamaEvaluator/LlamaGrammar.js +10 -15
- package/dist/llamaEvaluator/LlamaGrammar.js.map +1 -1
- package/dist/llamaEvaluator/LlamaGrammarEvaluationState.d.ts +6 -5
- package/dist/llamaEvaluator/LlamaGrammarEvaluationState.js +8 -7
- package/dist/llamaEvaluator/LlamaGrammarEvaluationState.js.map +1 -1
- package/dist/llamaEvaluator/LlamaJsonSchemaGrammar.js +2 -1
- package/dist/llamaEvaluator/LlamaJsonSchemaGrammar.js.map +1 -1
- package/dist/llamaEvaluator/LlamaModel.d.ts +101 -105
- package/dist/llamaEvaluator/LlamaModel.js +305 -57
- package/dist/llamaEvaluator/LlamaModel.js.map +1 -1
- package/dist/types.d.ts +44 -4
- package/dist/types.js +5 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/LlamaText.d.ts +42 -0
- package/dist/utils/LlamaText.js +207 -0
- package/dist/utils/LlamaText.js.map +1 -0
- package/dist/utils/ReplHistory.js +1 -1
- package/dist/utils/ReplHistory.js.map +1 -1
- package/dist/utils/StopGenerationDetector.d.ts +28 -0
- package/dist/utils/StopGenerationDetector.js +205 -0
- package/dist/utils/StopGenerationDetector.js.map +1 -0
- package/dist/utils/TokenStreamRegulator.d.ts +30 -0
- package/dist/utils/TokenStreamRegulator.js +96 -0
- package/dist/utils/TokenStreamRegulator.js.map +1 -0
- package/dist/utils/appendUserMessageToChatHistory.d.ts +2 -0
- package/dist/utils/appendUserMessageToChatHistory.js +18 -0
- package/dist/utils/appendUserMessageToChatHistory.js.map +1 -0
- package/dist/utils/compareTokens.d.ts +2 -0
- package/dist/utils/compareTokens.js +4 -0
- package/dist/utils/compareTokens.js.map +1 -0
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.d.ts +18 -0
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js +61 -0
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js.map +1 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.d.ts +1 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js +17 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map +1 -1
- package/dist/utils/gbnfJson/GbnfTerminal.d.ts +1 -1
- package/dist/utils/gbnfJson/GbnfTerminal.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfVerbatimText.d.ts +6 -0
- package/dist/utils/gbnfJson/terminals/GbnfVerbatimText.js +21 -0
- package/dist/utils/gbnfJson/terminals/GbnfVerbatimText.js.map +1 -0
- package/dist/utils/gbnfJson/types.d.ts +1 -1
- package/dist/utils/gbnfJson/types.js.map +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.d.ts +1 -0
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
- package/dist/utils/getBin.d.ts +71 -38
- package/dist/utils/getBin.js.map +1 -1
- package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js +1 -15
- package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/getReleaseInfo.d.ts +1 -1
- package/dist/utils/getReleaseInfo.js.map +1 -1
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.d.ts +2 -0
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js +49 -0
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -0
- package/dist/utils/parseModelFileName.d.ts +9 -0
- package/dist/utils/parseModelFileName.js +68 -0
- package/dist/utils/parseModelFileName.js.map +1 -0
- package/dist/utils/parseModelTypeDescription.d.ts +6 -0
- package/dist/utils/parseModelTypeDescription.js +9 -0
- package/dist/utils/parseModelTypeDescription.js.map +1 -0
- package/dist/utils/resolveChatWrapper.d.ts +4 -0
- package/dist/utils/resolveChatWrapper.js +16 -0
- package/dist/utils/resolveChatWrapper.js.map +1 -0
- package/dist/utils/truncateTextAndRoundToWords.d.ts +8 -0
- package/dist/utils/truncateTextAndRoundToWords.js +27 -0
- package/dist/utils/truncateTextAndRoundToWords.js.map +1 -0
- package/llama/.clang-format +10 -9
- package/llama/addon.cpp +701 -352
- package/llama/gitRelease.bundle +0 -0
- package/llamaBins/linux-arm64/llama-addon.node +0 -0
- package/llamaBins/linux-armv7l/llama-addon.node +0 -0
- package/llamaBins/linux-x64/llama-addon.node +0 -0
- package/llamaBins/mac-arm64/llama-addon.node +0 -0
- package/llamaBins/mac-x64/llama-addon.node +0 -0
- package/llamaBins/win-x64/llama-addon.node +0 -0
- package/package.json +24 -14
- package/dist/ChatPromptWrapper.d.ts +0 -11
- package/dist/ChatPromptWrapper.js +0 -20
- package/dist/ChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/ChatMLChatPromptWrapper.d.ts +0 -12
- package/dist/chatWrappers/ChatMLChatPromptWrapper.js +0 -22
- package/dist/chatWrappers/ChatMLChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/EmptyChatPromptWrapper.d.ts +0 -4
- package/dist/chatWrappers/EmptyChatPromptWrapper.js +0 -5
- package/dist/chatWrappers/EmptyChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/FalconChatPromptWrapper.d.ts +0 -19
- package/dist/chatWrappers/FalconChatPromptWrapper.js +0 -33
- package/dist/chatWrappers/FalconChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/GeneralChatPromptWrapper.d.ts +0 -19
- package/dist/chatWrappers/GeneralChatPromptWrapper.js +0 -38
- package/dist/chatWrappers/GeneralChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/LlamaChatPromptWrapper.d.ts +0 -12
- package/dist/chatWrappers/LlamaChatPromptWrapper.js +0 -23
- package/dist/chatWrappers/LlamaChatPromptWrapper.js.map +0 -1
- package/dist/chatWrappers/createChatWrapperByBos.d.ts +0 -2
- package/dist/chatWrappers/createChatWrapperByBos.js +0 -14
- package/dist/chatWrappers/createChatWrapperByBos.js.map +0 -1
- package/dist/chatWrappers/generateContextTextFromConversationHistory.d.ts +0 -23
- package/dist/chatWrappers/generateContextTextFromConversationHistory.js +0 -47
- package/dist/chatWrappers/generateContextTextFromConversationHistory.js.map +0 -1
- package/dist/llamaEvaluator/LlamaChatSession.d.ts +0 -122
- package/dist/llamaEvaluator/LlamaChatSession.js +0 -236
- package/dist/llamaEvaluator/LlamaChatSession.js.map +0 -1
- package/dist/llamaEvaluator/LlamaContext.d.ts +0 -98
- package/dist/llamaEvaluator/LlamaContext.js +0 -140
- package/dist/llamaEvaluator/LlamaContext.js.map +0 -1
- package/dist/utils/getTextCompletion.d.ts +0 -3
- package/dist/utils/getTextCompletion.js +0 -12
- package/dist/utils/getTextCompletion.js.map +0 -1
- package/dist/utils/withLock.d.ts +0 -1
- package/dist/utils/withLock.js +0 -19
- package/dist/utils/withLock.js.map +0 -1
- package/llamaBins/mac-arm64/ggml-metal.metal +0 -5820
- package/llamaBins/mac-x64/ggml-metal.metal +0 -5820
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { isChatModelResponseFunctionCall } from "../types.js";
|
|
3
|
+
import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
|
|
4
|
+
import { getTypeScriptTypeStringForGbnfJsonSchema } from "../utils/getTypeScriptTypeStringForGbnfJsonSchema.js";
|
|
5
|
+
// source: https://github.com/MeetKai/functionary/blob/main/tests/prompt_test_v2.txt
|
|
6
|
+
export class FunctionaryChatWrapper extends ChatWrapper {
|
|
7
|
+
wrapperName = "Functionary";
|
|
8
|
+
settings = {
|
|
9
|
+
functions: {
|
|
10
|
+
call: {
|
|
11
|
+
optionalPrefixSpace: true,
|
|
12
|
+
prefix: "\n\n<|from|>assistant\n<|recipient|>",
|
|
13
|
+
paramsPrefix: "\n<|content|>",
|
|
14
|
+
suffix: "\n\n"
|
|
15
|
+
},
|
|
16
|
+
result: {
|
|
17
|
+
prefix: "<|from|>{{functionName}}\n<|recipient|>all\n<|content|>",
|
|
18
|
+
suffix: "\n\n"
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
|
|
23
|
+
const hasFunctions = Object.keys(availableFunctions ?? {}).length > 0;
|
|
24
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
|
|
25
|
+
documentParams: documentFunctionParams
|
|
26
|
+
});
|
|
27
|
+
const contextText = LlamaText(new BuiltinSpecialToken("BOS"), historyWithFunctions.map((item, index) => {
|
|
28
|
+
const isFirstItem = index === 0;
|
|
29
|
+
const isLastItem = index === historyWithFunctions.length - 1;
|
|
30
|
+
if (item.type === "system") {
|
|
31
|
+
if (item.text.length === 0)
|
|
32
|
+
return "";
|
|
33
|
+
return LlamaText([
|
|
34
|
+
isFirstItem
|
|
35
|
+
? LlamaText([])
|
|
36
|
+
: "\n\n",
|
|
37
|
+
"<|from|>system\n",
|
|
38
|
+
"<|recipient|>all\n",
|
|
39
|
+
"<|content|>",
|
|
40
|
+
item.text
|
|
41
|
+
]);
|
|
42
|
+
}
|
|
43
|
+
else if (item.type === "user") {
|
|
44
|
+
return LlamaText([
|
|
45
|
+
isFirstItem
|
|
46
|
+
? LlamaText([])
|
|
47
|
+
: "\n\n",
|
|
48
|
+
"<|from|>user\n",
|
|
49
|
+
"<|recipient|>all\n",
|
|
50
|
+
"<|content|>",
|
|
51
|
+
item.text
|
|
52
|
+
]);
|
|
53
|
+
}
|
|
54
|
+
else if (item.type === "model") {
|
|
55
|
+
if (isLastItem && item.response.length === 0 && !hasFunctions)
|
|
56
|
+
return LlamaText([
|
|
57
|
+
isFirstItem
|
|
58
|
+
? LlamaText([])
|
|
59
|
+
: "\n\n",
|
|
60
|
+
"<|from|>assistant\n",
|
|
61
|
+
"<|recipient|>all\n",
|
|
62
|
+
"<|content|>"
|
|
63
|
+
]);
|
|
64
|
+
return LlamaText(item.response.map((response, index) => {
|
|
65
|
+
const isFirstResponse = index === 0;
|
|
66
|
+
const isLastResponse = index === item.response.length - 1;
|
|
67
|
+
if (typeof response === "string")
|
|
68
|
+
return LlamaText([
|
|
69
|
+
(isFirstItem && isFirstResponse)
|
|
70
|
+
? LlamaText([])
|
|
71
|
+
: "\n\n",
|
|
72
|
+
"<|from|>assistant\n",
|
|
73
|
+
"<|recipient|>all\n",
|
|
74
|
+
"<|content|>",
|
|
75
|
+
response,
|
|
76
|
+
(isLastResponse && isLastItem)
|
|
77
|
+
? ""
|
|
78
|
+
: "<|stop|>"
|
|
79
|
+
]);
|
|
80
|
+
else if (isChatModelResponseFunctionCall(response)) {
|
|
81
|
+
return LlamaText([
|
|
82
|
+
response.raw != null
|
|
83
|
+
? LlamaText(response.raw)
|
|
84
|
+
: LlamaText([
|
|
85
|
+
(isFirstItem && isFirstResponse)
|
|
86
|
+
? LlamaText([])
|
|
87
|
+
: "\n\n",
|
|
88
|
+
"<|from|>assistant\n",
|
|
89
|
+
`<|recipient|>${response.name}\n`,
|
|
90
|
+
"<|content|>",
|
|
91
|
+
response.params === undefined
|
|
92
|
+
? ""
|
|
93
|
+
: JSON.stringify(response.params),
|
|
94
|
+
"<|stop|>",
|
|
95
|
+
"\n\n",
|
|
96
|
+
`<|from|>${response.name}\n`,
|
|
97
|
+
"<|recipient|>all\n",
|
|
98
|
+
"<|content|>",
|
|
99
|
+
response.result === undefined
|
|
100
|
+
? "" // "void"
|
|
101
|
+
: JSON.stringify(response.result)
|
|
102
|
+
]),
|
|
103
|
+
hasFunctions
|
|
104
|
+
? LlamaText([])
|
|
105
|
+
: LlamaText([
|
|
106
|
+
"\n\n",
|
|
107
|
+
"<|from|>assistant\n",
|
|
108
|
+
"<|recipient|>all\n",
|
|
109
|
+
"<|content|>"
|
|
110
|
+
])
|
|
111
|
+
]);
|
|
112
|
+
}
|
|
113
|
+
void (response);
|
|
114
|
+
return "";
|
|
115
|
+
}));
|
|
116
|
+
}
|
|
117
|
+
void (item);
|
|
118
|
+
return "";
|
|
119
|
+
}));
|
|
120
|
+
if (!hasFunctions) {
|
|
121
|
+
return {
|
|
122
|
+
contextText,
|
|
123
|
+
stopGenerationTriggers: [
|
|
124
|
+
LlamaText(new BuiltinSpecialToken("EOS")),
|
|
125
|
+
LlamaText(new SpecialToken("<|stop|>")),
|
|
126
|
+
LlamaText(" <|stop|>"),
|
|
127
|
+
LlamaText("<|stop|>"),
|
|
128
|
+
LlamaText("\n\n<|from|>user"),
|
|
129
|
+
LlamaText("\n\n<|from|>assistant"),
|
|
130
|
+
LlamaText("\n\n<|from|>system")
|
|
131
|
+
]
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
contextText,
|
|
136
|
+
stopGenerationTriggers: [
|
|
137
|
+
LlamaText(new BuiltinSpecialToken("EOS")),
|
|
138
|
+
LlamaText(new SpecialToken("<|stop|>")),
|
|
139
|
+
LlamaText(" <|stop|>"),
|
|
140
|
+
LlamaText("<|stop|>"),
|
|
141
|
+
LlamaText("\n\n<|from|>user")
|
|
142
|
+
],
|
|
143
|
+
ignoreStartText: [
|
|
144
|
+
LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
|
|
145
|
+
],
|
|
146
|
+
functionCall: {
|
|
147
|
+
initiallyEngaged: true,
|
|
148
|
+
disengageInitiallyEngaged: [
|
|
149
|
+
LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
|
|
150
|
+
]
|
|
151
|
+
}
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
|
|
155
|
+
const availableFunctionNames = Object.keys(availableFunctions ?? {});
|
|
156
|
+
if (availableFunctionNames.length === 0)
|
|
157
|
+
return "";
|
|
158
|
+
return "// Supported function definitions that should be called when necessary.\n" +
|
|
159
|
+
"namespace functions {\n\n" +
|
|
160
|
+
availableFunctionNames
|
|
161
|
+
.map((functionName) => {
|
|
162
|
+
if (functionName === "all")
|
|
163
|
+
throw new Error('Function name "all" is reserved and cannot be used');
|
|
164
|
+
const functionDefinition = availableFunctions[functionName];
|
|
165
|
+
let res = "";
|
|
166
|
+
if (functionDefinition?.description != null && functionDefinition.description.trim() !== "")
|
|
167
|
+
res += "// " + functionDefinition.description.split("\n").join("\n// ") + "\n";
|
|
168
|
+
res += "type " + functionName + " = (";
|
|
169
|
+
if (documentParams && functionDefinition?.params != null)
|
|
170
|
+
res += "_: " + getTypeScriptTypeStringForGbnfJsonSchema(functionDefinition.params);
|
|
171
|
+
res += ") => any;";
|
|
172
|
+
return res;
|
|
173
|
+
})
|
|
174
|
+
.join("\n\n") +
|
|
175
|
+
"\n\n} // namespace functions";
|
|
176
|
+
}
|
|
177
|
+
addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
|
|
178
|
+
const availableFunctionNames = Object.keys(availableFunctions ?? {});
|
|
179
|
+
if (availableFunctions == null || availableFunctionNames.length === 0)
|
|
180
|
+
return history;
|
|
181
|
+
const res = history.slice();
|
|
182
|
+
const firstSystemMessageIndex = res.findIndex((item) => item.type === "system");
|
|
183
|
+
res.splice(Math.max(0, firstSystemMessageIndex), 0, {
|
|
184
|
+
type: "system",
|
|
185
|
+
text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams })
|
|
186
|
+
}, {
|
|
187
|
+
type: "system",
|
|
188
|
+
text: "The assistant calls functions with appropriate input when necessary. The assistant writes <|stop|> when finished answering."
|
|
189
|
+
});
|
|
190
|
+
return res;
|
|
191
|
+
}
|
|
192
|
+
getInternalBuiltinFunctions({ initialFunctionCallEngaged }) {
|
|
193
|
+
if (initialFunctionCallEngaged)
|
|
194
|
+
return {
|
|
195
|
+
all: {}
|
|
196
|
+
};
|
|
197
|
+
return {};
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
//# sourceMappingURL=FunctionaryChatWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FunctionaryChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/FunctionaryChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
|
|
3
|
+
import { LlamaText } from "../utils/LlamaText.js";
|
|
4
|
+
export declare class GeneralChatWrapper extends ChatWrapper {
|
|
5
|
+
readonly wrapperName: string;
|
|
6
|
+
constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle }?: {
|
|
7
|
+
userMessageTitle?: string;
|
|
8
|
+
modelResponseTitle?: string;
|
|
9
|
+
middleSystemMessageTitle?: string;
|
|
10
|
+
});
|
|
11
|
+
get userMessageTitle(): string;
|
|
12
|
+
get modelResponseTitle(): string;
|
|
13
|
+
get middleSystemMessageTitle(): string;
|
|
14
|
+
generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
|
|
15
|
+
availableFunctions?: ChatModelFunctions;
|
|
16
|
+
documentFunctionParams?: boolean;
|
|
17
|
+
}): {
|
|
18
|
+
contextText: LlamaText;
|
|
19
|
+
stopGenerationTriggers: LlamaText[];
|
|
20
|
+
};
|
|
21
|
+
}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
|
|
3
|
+
export class GeneralChatWrapper extends ChatWrapper {
|
|
4
|
+
wrapperName = "General";
|
|
5
|
+
/** @internal */ _userMessageTitle;
|
|
6
|
+
/** @internal */ _modelResponseTitle;
|
|
7
|
+
/** @internal */ _middleSystemMessageTitle;
|
|
8
|
+
constructor({ userMessageTitle = "Human", modelResponseTitle = "Assistant", middleSystemMessageTitle = "System" } = {}) {
|
|
9
|
+
super();
|
|
10
|
+
this._userMessageTitle = userMessageTitle;
|
|
11
|
+
this._modelResponseTitle = modelResponseTitle;
|
|
12
|
+
this._middleSystemMessageTitle = middleSystemMessageTitle;
|
|
13
|
+
}
|
|
14
|
+
get userMessageTitle() {
|
|
15
|
+
return this._userMessageTitle;
|
|
16
|
+
}
|
|
17
|
+
get modelResponseTitle() {
|
|
18
|
+
return this._modelResponseTitle;
|
|
19
|
+
}
|
|
20
|
+
get middleSystemMessageTitle() {
|
|
21
|
+
return this._middleSystemMessageTitle;
|
|
22
|
+
}
|
|
23
|
+
generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
|
|
24
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
|
|
25
|
+
documentParams: documentFunctionParams
|
|
26
|
+
});
|
|
27
|
+
const resultItems = [];
|
|
28
|
+
let systemTexts = [];
|
|
29
|
+
let userTexts = [];
|
|
30
|
+
let modelTexts = [];
|
|
31
|
+
let currentAggregateFocus = null;
|
|
32
|
+
function flush() {
|
|
33
|
+
if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
|
|
34
|
+
resultItems.push({
|
|
35
|
+
system: systemTexts.join("\n\n"),
|
|
36
|
+
user: userTexts.join("\n\n"),
|
|
37
|
+
model: modelTexts.join("\n\n")
|
|
38
|
+
});
|
|
39
|
+
systemTexts = [];
|
|
40
|
+
userTexts = [];
|
|
41
|
+
modelTexts = [];
|
|
42
|
+
}
|
|
43
|
+
for (const item of historyWithFunctions) {
|
|
44
|
+
if (item.type === "system") {
|
|
45
|
+
if (currentAggregateFocus !== "system")
|
|
46
|
+
flush();
|
|
47
|
+
currentAggregateFocus = "system";
|
|
48
|
+
systemTexts.push(item.text);
|
|
49
|
+
}
|
|
50
|
+
else if (item.type === "user") {
|
|
51
|
+
flush();
|
|
52
|
+
currentAggregateFocus = null;
|
|
53
|
+
userTexts.push(item.text);
|
|
54
|
+
}
|
|
55
|
+
else if (item.type === "model") {
|
|
56
|
+
flush();
|
|
57
|
+
currentAggregateFocus = null;
|
|
58
|
+
modelTexts.push(this.generateModelResponseText(item.response));
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
flush();
|
|
62
|
+
const contextText = LlamaText(new BuiltinSpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
|
|
63
|
+
const isFirstItem = index === 0;
|
|
64
|
+
const isLastItem = index === resultItems.length - 1;
|
|
65
|
+
return LlamaText([
|
|
66
|
+
(system.length === 0)
|
|
67
|
+
? LlamaText([])
|
|
68
|
+
: LlamaText([
|
|
69
|
+
isFirstItem
|
|
70
|
+
? LlamaText([])
|
|
71
|
+
: `### ${this._middleSystemMessageTitle}\n`,
|
|
72
|
+
system,
|
|
73
|
+
"\n\n"
|
|
74
|
+
]),
|
|
75
|
+
(user.length === 0)
|
|
76
|
+
? LlamaText([])
|
|
77
|
+
: LlamaText([
|
|
78
|
+
`### ${this._userMessageTitle}\n`,
|
|
79
|
+
user,
|
|
80
|
+
"\n\n"
|
|
81
|
+
]),
|
|
82
|
+
(model.length === 0 && !isLastItem)
|
|
83
|
+
? LlamaText([])
|
|
84
|
+
: LlamaText([
|
|
85
|
+
`### ${this._modelResponseTitle}\n`,
|
|
86
|
+
model,
|
|
87
|
+
isLastItem
|
|
88
|
+
? LlamaText([])
|
|
89
|
+
: "\n\n"
|
|
90
|
+
])
|
|
91
|
+
]);
|
|
92
|
+
}));
|
|
93
|
+
return {
|
|
94
|
+
contextText,
|
|
95
|
+
stopGenerationTriggers: [
|
|
96
|
+
LlamaText(new BuiltinSpecialToken("EOS")),
|
|
97
|
+
LlamaText(new SpecialToken("<end>")),
|
|
98
|
+
LlamaText("<end>"),
|
|
99
|
+
LlamaText(`### ${this._userMessageTitle}`),
|
|
100
|
+
LlamaText(`\n### ${this._userMessageTitle}`),
|
|
101
|
+
LlamaText(`\n\n### ${this._userMessageTitle}`),
|
|
102
|
+
LlamaText(`### ${this._modelResponseTitle}`),
|
|
103
|
+
LlamaText(`\n### ${this._modelResponseTitle}`),
|
|
104
|
+
LlamaText(`\n\n### ${this._modelResponseTitle}`),
|
|
105
|
+
LlamaText(`### ${this._middleSystemMessageTitle}`),
|
|
106
|
+
LlamaText(`\n### ${this._middleSystemMessageTitle}`),
|
|
107
|
+
LlamaText(`\n\n### ${this._middleSystemMessageTitle}`)
|
|
108
|
+
]
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=GeneralChatWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GeneralChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/GeneralChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnF,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IAC/B,WAAW,GAAW,SAAS,CAAC;IAEhD,gBAAgB,CAAkB,iBAAiB,CAAS;IAC5D,gBAAgB,CAAkB,mBAAmB,CAAS;IAC9D,gBAAgB,CAAkB,yBAAyB,CAAS;IAEpE,YAAmB,EACf,gBAAgB,GAAG,OAAO,EAAE,kBAAkB,GAAG,WAAW,EAAE,wBAAwB,GAAG,QAAQ,KAGjG,EAAE;QACF,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,yBAAyB,GAAG,wBAAwB,CAAC;IAC9D,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAED,IAAW,kBAAkB;QACzB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,IAAW,wBAAwB;QAC/B,OAAO,IAAI,CAAC,yBAAyB,CAAC;IAC1C,CAAC;IAEe,mBAAmB,CAAC,OAAmC,EAAE,EAAC,kBAAkB,EAAE,sBAAsB,KAGhH,EAAE;QAIF,MAAM,oBAAoB,GAAG,IAAI,CAAC,2CAA2C,CAAC,OAAO,EAAE,kBAAkB,EAAE;YACvG,cAAc,EAAE,sBAAsB;SACzC,CAAC,CAAC;QAEH,MAAM,WAAW,GAIZ,EAAE,CAAC;QAER,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,IAAI,qBAAqB,GAAoB,IAAI,CAAC;QAElD,SAAS,KAAK;YACV,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;gBACvE,WAAW,CAAC,IAAI,CAAC;oBACb,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;oBAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC5B,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;iBACjC,CAAC,CAAC;YAEP,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS,GAAG,EAAE,CAAC;YACf,UAAU,GAAG,EAAE,CAAC;QACpB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;YACrC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxB,IAAI,qBAAqB,KAAK,QAAQ;oBAClC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,QAAQ,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;gBAC7B,KAAK,EAAE,CAAC;gBAER,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC9B,KAAK,EAAE,CAAC;gBAER,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;aAClE;SACJ;QAED,KAAK,EAAE,CAAC;QAER,MAAM,WAAW,GAAG,SAAS,CACzB,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAC9B,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,WAAW,GAAG,KAAK,KAAK,CAAC,CAAC;YAChC,MAAM,UAAU,GAAG,KAAK,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAEpD,OAAO,SAAS,CAAC;gBACb,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;oBACjB,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,WAAW;4BACP,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,OAAO,IAAI,CAAC,yBAAyB,IAAI;wBAC/C,MAAM;wBACN,MAAM;qBACT,CAAC;gBAEN,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,OAAO,IAAI,CAAC,iBAAiB,IAAI;wBACjC,IAAI;wBACJ,MAAM;qBACT,CAAC;gBAEN,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC/B,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,OAAO,IAAI,CAAC,mBAAmB,IAAI;wBACnC,KAAK;wBACL,UAAU;4BACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,MAAM;qBACf,CAAC;aACT,CAAC,CAAC;QACP,CAAC,CAAC,CACL,CAAC;QAEF,OAAO;YACH,WAAW;YACX,sBAAsB,EAAE;gBACpB,SAAS,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACzC,SAAS,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;gBACpC,SAAS,CAAC,OAAO,CAAC;gBAElB,SAAS,CAAC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC1C,SAAS,CAAC,SAAS,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC5C,SAAS,CAAC,WAAW,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAE9C,SAAS,CAAC,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC5C,SAAS,CAAC,SAAS,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC9C,SAAS,CAAC,WAAW,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAEhD,SAAS,CAAC,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAClD,SAAS,CAAC,SAAS,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBACpD,SAAS,CAAC,WAAW,IAAI,CAAC,yBAAyB,EAAE,CAAC;aACzD;SACJ,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
|
|
3
|
+
import { LlamaText } from "../utils/LlamaText.js";
|
|
4
|
+
export declare class LlamaChatWrapper extends ChatWrapper {
|
|
5
|
+
readonly wrapperName: string;
|
|
6
|
+
generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
|
|
7
|
+
availableFunctions?: ChatModelFunctions;
|
|
8
|
+
documentFunctionParams?: boolean;
|
|
9
|
+
}): {
|
|
10
|
+
contextText: LlamaText;
|
|
11
|
+
stopGenerationTriggers: LlamaText[];
|
|
12
|
+
};
|
|
13
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
|
|
3
|
+
// source: https://huggingface.co/blog/llama2#how-to-prompt-llama-2
|
|
4
|
+
export class LlamaChatWrapper extends ChatWrapper {
|
|
5
|
+
wrapperName = "LlamaChat";
|
|
6
|
+
generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
|
|
7
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
|
|
8
|
+
documentParams: documentFunctionParams
|
|
9
|
+
});
|
|
10
|
+
const resultItems = [];
|
|
11
|
+
let systemTexts = [];
|
|
12
|
+
let userTexts = [];
|
|
13
|
+
let modelTexts = [];
|
|
14
|
+
let currentAggregateFocus = null;
|
|
15
|
+
function flush() {
|
|
16
|
+
if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
|
|
17
|
+
resultItems.push({
|
|
18
|
+
system: systemTexts.join("\n\n"),
|
|
19
|
+
user: userTexts.join("\n\n"),
|
|
20
|
+
model: modelTexts.join("\n\n")
|
|
21
|
+
});
|
|
22
|
+
systemTexts = [];
|
|
23
|
+
userTexts = [];
|
|
24
|
+
modelTexts = [];
|
|
25
|
+
}
|
|
26
|
+
for (const item of historyWithFunctions) {
|
|
27
|
+
if (item.type === "system") {
|
|
28
|
+
if (currentAggregateFocus !== "system")
|
|
29
|
+
flush();
|
|
30
|
+
currentAggregateFocus = "system";
|
|
31
|
+
systemTexts.push(item.text);
|
|
32
|
+
}
|
|
33
|
+
else if (item.type === "user") {
|
|
34
|
+
if (currentAggregateFocus !== "system" && currentAggregateFocus !== "user")
|
|
35
|
+
flush();
|
|
36
|
+
currentAggregateFocus = "user";
|
|
37
|
+
userTexts.push(item.text);
|
|
38
|
+
}
|
|
39
|
+
else if (item.type === "model") {
|
|
40
|
+
currentAggregateFocus = "model";
|
|
41
|
+
modelTexts.push(this.generateModelResponseText(item.response));
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
flush();
|
|
45
|
+
const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
|
|
46
|
+
const isLastItem = index === resultItems.length - 1;
|
|
47
|
+
return LlamaText([
|
|
48
|
+
new BuiltinSpecialToken("BOS"),
|
|
49
|
+
(system.length === 0 && user.length === 0)
|
|
50
|
+
? LlamaText([])
|
|
51
|
+
: LlamaText([
|
|
52
|
+
new SpecialToken("[INST] "),
|
|
53
|
+
system.length === 0
|
|
54
|
+
? LlamaText([])
|
|
55
|
+
: LlamaText([
|
|
56
|
+
new SpecialToken("<<SYS>>\n"),
|
|
57
|
+
system,
|
|
58
|
+
new SpecialToken("\n<</SYS>>\n\n")
|
|
59
|
+
]),
|
|
60
|
+
user,
|
|
61
|
+
new SpecialToken(" [/INST]\n\n")
|
|
62
|
+
]),
|
|
63
|
+
model,
|
|
64
|
+
isLastItem
|
|
65
|
+
? LlamaText([])
|
|
66
|
+
: new BuiltinSpecialToken("EOS")
|
|
67
|
+
]);
|
|
68
|
+
}));
|
|
69
|
+
return {
|
|
70
|
+
contextText,
|
|
71
|
+
stopGenerationTriggers: [
|
|
72
|
+
LlamaText(new BuiltinSpecialToken("EOS")),
|
|
73
|
+
LlamaText("</s>")
|
|
74
|
+
]
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=LlamaChatWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LlamaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/LlamaChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { LlamaChatWrapper } from "./LlamaChatWrapper.js";
|
|
2
|
+
import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
|
|
3
|
+
import { FalconChatWrapper } from "./FalconChatWrapper.js";
|
|
4
|
+
import type { ModelTypeDescription } from "../utils/getBin.js";
|
|
5
|
+
/**
|
|
6
|
+
* @param options
|
|
7
|
+
*/
|
|
8
|
+
export declare function resolveChatWrapperBasedOnModel({ bosString, filename, typeDescription }: {
|
|
9
|
+
bosString?: string | null;
|
|
10
|
+
filename?: string;
|
|
11
|
+
/** @hidden this type alias is too long in the documentation */
|
|
12
|
+
typeDescription?: ModelTypeDescription;
|
|
13
|
+
}): typeof LlamaChatWrapper | typeof GeneralChatWrapper | typeof FalconChatWrapper | null;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { parseModelFileName } from "../utils/parseModelFileName.js";
|
|
2
|
+
import { parseModelTypeDescription } from "../utils/parseModelTypeDescription.js";
|
|
3
|
+
import { LlamaChatWrapper } from "./LlamaChatWrapper.js";
|
|
4
|
+
import { ChatMLChatWrapper } from "./ChatMLChatWrapper.js";
|
|
5
|
+
import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
|
|
6
|
+
import { FalconChatWrapper } from "./FalconChatWrapper.js";
|
|
7
|
+
import { FunctionaryChatWrapper } from "./FunctionaryChatWrapper.js";
|
|
8
|
+
import { AlpacaChatWrapper } from "./AlpacaChatWrapper.js";
|
|
9
|
+
/**
|
|
10
|
+
* @param options
|
|
11
|
+
*/
|
|
12
|
+
export function resolveChatWrapperBasedOnModel({ bosString, filename, typeDescription }) {
|
|
13
|
+
if (filename != null) {
|
|
14
|
+
const { name, subType, fileType } = parseModelFileName(filename);
|
|
15
|
+
if (fileType?.toLowerCase() === "gguf") {
|
|
16
|
+
const lowercaseName = name?.toLowerCase();
|
|
17
|
+
const lowercaseSubType = subType?.toLowerCase();
|
|
18
|
+
const splitLowercaseSubType = lowercaseSubType?.split("-");
|
|
19
|
+
const firstSplitLowercaseSubType = splitLowercaseSubType?.[0];
|
|
20
|
+
if (lowercaseName === "llama")
|
|
21
|
+
return LlamaChatWrapper;
|
|
22
|
+
else if (lowercaseName === "yarn" && firstSplitLowercaseSubType === "llama")
|
|
23
|
+
return LlamaChatWrapper;
|
|
24
|
+
else if (lowercaseName === "orca")
|
|
25
|
+
return ChatMLChatWrapper;
|
|
26
|
+
else if (lowercaseName === "phind" && lowercaseSubType === "codellama")
|
|
27
|
+
return LlamaChatWrapper;
|
|
28
|
+
else if (lowercaseName === "mistral")
|
|
29
|
+
return GeneralChatWrapper;
|
|
30
|
+
else if (firstSplitLowercaseSubType === "llama")
|
|
31
|
+
return LlamaChatWrapper;
|
|
32
|
+
else if (lowercaseSubType === "alpaca")
|
|
33
|
+
return AlpacaChatWrapper;
|
|
34
|
+
else if (lowercaseName === "functionary")
|
|
35
|
+
return FunctionaryChatWrapper;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (typeDescription != null) {
|
|
39
|
+
const { arch } = parseModelTypeDescription(typeDescription);
|
|
40
|
+
if (arch === "llama")
|
|
41
|
+
return LlamaChatWrapper;
|
|
42
|
+
else if (arch === "falcon")
|
|
43
|
+
return FalconChatWrapper;
|
|
44
|
+
}
|
|
45
|
+
if (bosString === "" || bosString == null)
|
|
46
|
+
return null;
|
|
47
|
+
if ("<s>[INST] <<SYS>>\n".startsWith(bosString)) {
|
|
48
|
+
return LlamaChatWrapper;
|
|
49
|
+
}
|
|
50
|
+
else if ("<|im_start|>system\n".startsWith(bosString)) {
|
|
51
|
+
return ChatMLChatWrapper;
|
|
52
|
+
}
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=resolveChatWrapperBasedOnModel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveChatWrapperBasedOnModel.js","sourceRoot":"","sources":["../../src/chatWrappers/resolveChatWrapperBasedOnModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAIzD;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,EAC3C,SAAS,EACT,QAAQ,EACR,eAAe,EAOlB;IACG,IAAI,QAAQ,IAAI,IAAI,EAAE;QAClB,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,QAAQ,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE;YACpC,MAAM,aAAa,GAAG,IAAI,EAAE,WAAW,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,EAAE,CAAC;YAChD,MAAM,qBAAqB,GAAG,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,MAAM,0BAA0B,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE9D,IAAI,aAAa,KAAK,OAAO;gBACzB,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,MAAM,IAAI,0BAA0B,KAAK,OAAO;gBACvE,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,MAAM;gBAC7B,OAAO,iBAAiB,CAAC;iBACxB,IAAI,aAAa,KAAK,OAAO,IAAI,gBAAgB,KAAK,WAAW;gBAClE,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,SAAS;gBAChC,OAAO,kBAAkB,CAAC;iBACzB,IAAI,0BAA0B,KAAK,OAAO;gBAC3C,OAAO,gBAAgB,CAAC;iBACvB,IAAI,gBAAgB,KAAK,QAAQ;gBAClC,OAAO,iBAAiB,CAAC;iBACxB,IAAI,aAAa,KAAK,aAAa;gBACpC,OAAO,sBAAsB,CAAC;SACrC;KACJ;IAED,IAAI,eAAe,IAAI,IAAI,EAAE;QACzB,MAAM,EAAC,IAAI,EAAC,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAC;QAE1D,IAAI,IAAI,KAAK,OAAO;YAChB,OAAO,gBAAgB,CAAC;aACvB,IAAI,IAAI,KAAK,QAAQ;YACtB,OAAO,iBAAiB,CAAC;KAChC;IAED,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,IAAI,IAAI;QACrC,OAAO,IAAI,CAAC;IAEhB,IAAI,qBAAqB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7C,OAAO,gBAAgB,CAAC;KAC3B;SAAM,IAAI,sBAAsB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QACrD,OAAO,iBAAiB,CAAC;KAC5B;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}
|
package/dist/cli/cli.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { fileURLToPath } from "url";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import yargs from "yargs";
|
|
5
|
-
// eslint-disable-next-line
|
|
5
|
+
// eslint-disable-next-line n/file-extension-in-import
|
|
6
6
|
import { hideBin } from "yargs/helpers";
|
|
7
7
|
import fs from "fs-extra";
|
|
8
8
|
import { cliBinName } from "../config.js";
|
package/dist/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,sDAAsD;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;AAEtF,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1C,IAAI;KACC,UAAU,CAAC,UAAU,CAAC;KACtB,KAAK,CAAC,+BAA+B,CAAC;KACtC,OAAO,CAAC,eAAe,CAAC;KACxB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,oBAAoB,CAAC;KAC7B,iBAAiB,EAAE;KACnB,aAAa,CAAC,CAAC,CAAC;KAChB,MAAM,EAAE;KACR,cAAc,EAAE;KAChB,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC;KACrB,IAAI,CAAC,GAAG,CAAC;KACT,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KACzC,KAAK,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CommandModule } from "yargs";
|
|
2
2
|
import type { LlamaGrammar } from "../../llamaEvaluator/LlamaGrammar.js";
|
|
3
|
-
declare const modelWrappers: readonly ["auto", "general", "llamaChat", "chatML", "falconChat"];
|
|
3
|
+
declare const modelWrappers: readonly ["auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat"];
|
|
4
4
|
type ChatCommand = {
|
|
5
5
|
model: string;
|
|
6
6
|
systemInfo: boolean;
|
|
@@ -22,6 +22,7 @@ type ChatCommand = {
|
|
|
22
22
|
repeatPresencePenalty?: number;
|
|
23
23
|
maxTokens: number;
|
|
24
24
|
noHistory: boolean;
|
|
25
|
+
environmentFunctions: boolean;
|
|
25
26
|
};
|
|
26
27
|
export declare const ChatCommand: CommandModule<object, ChatCommand>;
|
|
27
28
|
export {};
|