node-llama-cpp 3.0.0-beta.12 → 3.0.0-beta.14

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.
Files changed (235) hide show
  1. package/dist/ChatWrapper.d.ts +1 -0
  2. package/dist/ChatWrapper.js +2 -1
  3. package/dist/ChatWrapper.js.map +1 -1
  4. package/dist/TemplateChatWrapper.d.ts +68 -0
  5. package/dist/TemplateChatWrapper.js +239 -0
  6. package/dist/TemplateChatWrapper.js.map +1 -0
  7. package/dist/bindings/AddonTypes.d.ts +15 -5
  8. package/dist/bindings/Llama.d.ts +9 -3
  9. package/dist/bindings/Llama.js +61 -19
  10. package/dist/bindings/Llama.js.map +1 -1
  11. package/dist/bindings/consts.d.ts +2 -0
  12. package/dist/bindings/consts.js +11 -0
  13. package/dist/bindings/consts.js.map +1 -0
  14. package/dist/bindings/getLlama.d.ts +14 -18
  15. package/dist/bindings/getLlama.js +210 -78
  16. package/dist/bindings/getLlama.js.map +1 -1
  17. package/dist/bindings/types.d.ts +11 -5
  18. package/dist/bindings/types.js +22 -0
  19. package/dist/bindings/types.js.map +1 -1
  20. package/dist/bindings/utils/asyncEvery.d.ts +5 -0
  21. package/dist/bindings/utils/asyncEvery.js +15 -0
  22. package/dist/bindings/utils/asyncEvery.js.map +1 -0
  23. package/dist/bindings/utils/asyncSome.d.ts +5 -0
  24. package/dist/bindings/utils/asyncSome.js +27 -0
  25. package/dist/bindings/utils/asyncSome.js.map +1 -0
  26. package/dist/bindings/utils/cloneLlamaCppRepo.js +13 -3
  27. package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
  28. package/dist/bindings/utils/compileLLamaCpp.d.ts +4 -1
  29. package/dist/bindings/utils/compileLLamaCpp.js +136 -74
  30. package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
  31. package/dist/bindings/utils/detectAvailableComputeLayers.d.ts +14 -0
  32. package/dist/bindings/utils/detectAvailableComputeLayers.js +300 -0
  33. package/dist/bindings/utils/detectAvailableComputeLayers.js.map +1 -0
  34. package/dist/bindings/utils/detectGlibc.d.ts +4 -0
  35. package/dist/bindings/utils/detectGlibc.js +36 -0
  36. package/dist/bindings/utils/detectGlibc.js.map +1 -0
  37. package/dist/bindings/utils/getBestComputeLayersAvailable.d.ts +9 -0
  38. package/dist/bindings/utils/getBestComputeLayersAvailable.js +29 -0
  39. package/dist/bindings/utils/getBestComputeLayersAvailable.js.map +1 -0
  40. package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js +12 -6
  41. package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js.map +1 -1
  42. package/dist/bindings/utils/getGpuTypesToUseForOption.d.ts +11 -0
  43. package/dist/bindings/utils/getGpuTypesToUseForOption.js +30 -0
  44. package/dist/bindings/utils/getGpuTypesToUseForOption.js.map +1 -0
  45. package/dist/bindings/utils/getLinuxDistroInfo.d.ts +9 -0
  46. package/dist/bindings/utils/getLinuxDistroInfo.js +46 -0
  47. package/dist/bindings/utils/getLinuxDistroInfo.js.map +1 -0
  48. package/dist/bindings/utils/getPlatformInfo.d.ts +5 -0
  49. package/dist/bindings/utils/getPlatformInfo.js +28 -0
  50. package/dist/bindings/utils/getPlatformInfo.js.map +1 -0
  51. package/dist/bindings/utils/hasFileInPath.d.ts +2 -0
  52. package/dist/bindings/utils/hasFileInPath.js +34 -0
  53. package/dist/bindings/utils/hasFileInPath.js.map +1 -0
  54. package/dist/bindings/utils/logBinaryUsageExampleToConsole.d.ts +1 -1
  55. package/dist/bindings/utils/logBinaryUsageExampleToConsole.js +3 -9
  56. package/dist/bindings/utils/logBinaryUsageExampleToConsole.js.map +1 -1
  57. package/dist/bindings/utils/logDistroInstallInstruction.d.ts +14 -0
  58. package/dist/bindings/utils/logDistroInstallInstruction.js +48 -0
  59. package/dist/bindings/utils/logDistroInstallInstruction.js.map +1 -0
  60. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.d.ts +9 -2
  61. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js +10 -4
  62. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js.map +1 -1
  63. package/dist/bindings/utils/testBindingBinary.d.ts +1 -0
  64. package/dist/bindings/utils/testBindingBinary.js +98 -0
  65. package/dist/bindings/utils/testBindingBinary.js.map +1 -0
  66. package/dist/bindings/utils/testCmakeBinary.d.ts +5 -0
  67. package/dist/bindings/utils/testCmakeBinary.js +32 -0
  68. package/dist/bindings/utils/testCmakeBinary.js.map +1 -0
  69. package/dist/chatWrappers/ChatMLChatWrapper.js +1 -1
  70. package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -1
  71. package/dist/chatWrappers/GemmaChatWrapper.d.ts +18 -0
  72. package/dist/chatWrappers/GemmaChatWrapper.js +86 -0
  73. package/dist/chatWrappers/GemmaChatWrapper.js.map +1 -0
  74. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js +3 -0
  75. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map +1 -1
  76. package/dist/cli/cli.js +2 -0
  77. package/dist/cli/cli.js.map +1 -1
  78. package/dist/cli/commands/BuildCommand.d.ts +5 -5
  79. package/dist/cli/commands/BuildCommand.js +78 -60
  80. package/dist/cli/commands/BuildCommand.js.map +1 -1
  81. package/dist/cli/commands/ChatCommand.js +31 -14
  82. package/dist/cli/commands/ChatCommand.js.map +1 -1
  83. package/dist/cli/commands/CompleteCommand.js +30 -13
  84. package/dist/cli/commands/CompleteCommand.js.map +1 -1
  85. package/dist/cli/commands/DebugCommand.js +3 -9
  86. package/dist/cli/commands/DebugCommand.js.map +1 -1
  87. package/dist/cli/commands/DownloadCommand.d.ts +5 -5
  88. package/dist/cli/commands/DownloadCommand.js +97 -56
  89. package/dist/cli/commands/DownloadCommand.js.map +1 -1
  90. package/dist/cli/commands/InfillCommand.js +30 -13
  91. package/dist/cli/commands/InfillCommand.js.map +1 -1
  92. package/dist/cli/commands/InspectCommand.d.ts +7 -0
  93. package/dist/cli/commands/InspectCommand.js +113 -0
  94. package/dist/cli/commands/InspectCommand.js.map +1 -0
  95. package/dist/cli/commands/OnPostInstallCommand.js +2 -0
  96. package/dist/cli/commands/OnPostInstallCommand.js.map +1 -1
  97. package/dist/cli/utils/logUsedGpuTypeOption.d.ts +2 -0
  98. package/dist/cli/utils/logUsedGpuTypeOption.js +9 -0
  99. package/dist/cli/utils/logUsedGpuTypeOption.js.map +1 -0
  100. package/dist/config.d.ts +4 -4
  101. package/dist/config.js +11 -12
  102. package/dist/config.js.map +1 -1
  103. package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +3 -0
  104. package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js +3 -0
  105. package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -1
  106. package/dist/evaluator/LlamaContext/LlamaContext.d.ts +5 -8
  107. package/dist/evaluator/LlamaContext/LlamaContext.js +111 -65
  108. package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
  109. package/dist/evaluator/LlamaContext/types.d.ts +13 -6
  110. package/dist/evaluator/LlamaEmbeddingContext.d.ts +6 -5
  111. package/dist/evaluator/LlamaEmbeddingContext.js +32 -22
  112. package/dist/evaluator/LlamaEmbeddingContext.js.map +1 -1
  113. package/dist/evaluator/LlamaGrammar.js +1 -0
  114. package/dist/evaluator/LlamaGrammar.js.map +1 -1
  115. package/dist/evaluator/LlamaModel.d.ts +16 -16
  116. package/dist/evaluator/LlamaModel.js +95 -20
  117. package/dist/evaluator/LlamaModel.js.map +1 -1
  118. package/dist/gguf/GGUFInsights.d.ts +28 -0
  119. package/dist/gguf/GGUFInsights.js +58 -0
  120. package/dist/gguf/GGUFInsights.js.map +1 -0
  121. package/dist/gguf/GGUFMetadata.d.ts +19 -0
  122. package/dist/gguf/GGUFMetadata.js +38 -0
  123. package/dist/gguf/GGUFMetadata.js.map +1 -0
  124. package/dist/gguf/errors/InvalidGGUFMagicError.d.ts +3 -0
  125. package/dist/gguf/errors/InvalidGGUFMagicError.js +6 -0
  126. package/dist/gguf/errors/InvalidGGUFMagicError.js.map +1 -0
  127. package/dist/gguf/errors/MetadataNotParsedYetError.d.ts +3 -0
  128. package/dist/gguf/errors/MetadataNotParsedYetError.js +6 -0
  129. package/dist/gguf/errors/MetadataNotParsedYetError.js.map +1 -0
  130. package/dist/gguf/errors/MissingNodeLlamaError.d.ts +3 -0
  131. package/dist/gguf/errors/MissingNodeLlamaError.js +6 -0
  132. package/dist/gguf/errors/MissingNodeLlamaError.js.map +1 -0
  133. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.d.ts +5 -0
  134. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js +11 -0
  135. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js.map +1 -0
  136. package/dist/gguf/errors/UnsupportedMetadataTypeError.d.ts +4 -0
  137. package/dist/gguf/errors/UnsupportedMetadataTypeError.js +8 -0
  138. package/dist/gguf/errors/UnsupportedMetadataTypeError.js.map +1 -0
  139. package/dist/gguf/ggufParser/GGUFParser.d.ts +18 -0
  140. package/dist/gguf/ggufParser/GGUFParser.js +123 -0
  141. package/dist/gguf/ggufParser/GGUFParser.js.map +1 -0
  142. package/dist/gguf/ggufParser/GGUFTypes.d.ts +257 -0
  143. package/dist/gguf/ggufParser/GGUFTypes.js +2 -0
  144. package/dist/gguf/ggufParser/GGUFTypes.js.map +1 -0
  145. package/dist/gguf/ggufParser/checkArchitecture.d.ts +14 -0
  146. package/dist/gguf/ggufParser/checkArchitecture.js +74 -0
  147. package/dist/gguf/ggufParser/checkArchitecture.js.map +1 -0
  148. package/dist/gguf/ggufParser/stream/GGUFBaseStream.d.ts +38 -0
  149. package/dist/gguf/ggufParser/stream/GGUFBaseStream.js +83 -0
  150. package/dist/gguf/ggufParser/stream/GGUFBaseStream.js.map +1 -0
  151. package/dist/gguf/ggufParser/stream/GGUFFetchStream.d.ts +14 -0
  152. package/dist/gguf/ggufParser/stream/GGUFFetchStream.js +35 -0
  153. package/dist/gguf/ggufParser/stream/GGUFFetchStream.js.map +1 -0
  154. package/dist/gguf/ggufParser/stream/GGUFReadStream.d.ts +15 -0
  155. package/dist/gguf/ggufParser/stream/GGUFReadStream.js +40 -0
  156. package/dist/gguf/ggufParser/stream/GGUFReadStream.js.map +1 -0
  157. package/dist/index.d.ts +3 -1
  158. package/dist/index.js +3 -1
  159. package/dist/index.js.map +1 -1
  160. package/dist/state.d.ts +2 -0
  161. package/dist/state.js +7 -0
  162. package/dist/state.js.map +1 -1
  163. package/dist/utils/DisposeGuard.d.ts +13 -0
  164. package/dist/utils/DisposeGuard.js +120 -0
  165. package/dist/utils/DisposeGuard.js.map +1 -0
  166. package/dist/utils/LlamaText.js +2 -2
  167. package/dist/utils/LlamaText.js.map +1 -1
  168. package/dist/utils/cmake.js +23 -10
  169. package/dist/utils/cmake.js.map +1 -1
  170. package/dist/utils/getBuildDefaults.d.ts +1 -3
  171. package/dist/utils/getBuildDefaults.js +2 -4
  172. package/dist/utils/getBuildDefaults.js.map +1 -1
  173. package/dist/utils/getConsoleLogPrefix.d.ts +1 -1
  174. package/dist/utils/getConsoleLogPrefix.js +5 -4
  175. package/dist/utils/getConsoleLogPrefix.js.map +1 -1
  176. package/dist/utils/mergeUnionTypes.d.ts +6 -0
  177. package/dist/utils/mergeUnionTypes.js +2 -0
  178. package/dist/utils/mergeUnionTypes.js.map +1 -0
  179. package/dist/utils/parseTextTemplate.d.ts +66 -0
  180. package/dist/utils/parseTextTemplate.js +116 -0
  181. package/dist/utils/parseTextTemplate.js.map +1 -0
  182. package/dist/utils/removeNullFields.d.ts +2 -2
  183. package/dist/utils/removeNullFields.js.map +1 -1
  184. package/dist/utils/spawnCommand.d.ts +11 -1
  185. package/dist/utils/spawnCommand.js +55 -7
  186. package/dist/utils/spawnCommand.js.map +1 -1
  187. package/llama/CMakeLists.txt +11 -5
  188. package/llama/addon.cpp +700 -83
  189. package/llama/binariesGithubRelease.json +1 -1
  190. package/llama/gitRelease.bundle +0 -0
  191. package/llama/grammars/json.gbnf +1 -1
  192. package/llama/grammars/json_arr.gbnf +1 -1
  193. package/llama/llama.cpp.info.json +1 -1
  194. package/llamaBins/linux-arm64/_nlcBuildMetadata.json +1 -0
  195. package/llamaBins/linux-arm64/llama-addon.node +0 -0
  196. package/llamaBins/linux-armv7l/_nlcBuildMetadata.json +1 -0
  197. package/llamaBins/linux-armv7l/llama-addon.node +0 -0
  198. package/llamaBins/linux-x64/_nlcBuildMetadata.json +1 -0
  199. package/llamaBins/linux-x64/llama-addon.node +0 -0
  200. package/llamaBins/linux-x64-cuda/_nlcBuildMetadata.json +1 -0
  201. package/llamaBins/linux-x64-cuda/llama-addon.node +0 -0
  202. package/llamaBins/linux-x64-vulkan/_nlcBuildMetadata.json +1 -0
  203. package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
  204. package/llamaBins/mac-arm64-metal/_nlcBuildMetadata.json +1 -0
  205. package/llamaBins/mac-arm64-metal/default.metallib +0 -0
  206. package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
  207. package/llamaBins/mac-x64/_nlcBuildMetadata.json +1 -0
  208. package/llamaBins/mac-x64/llama-addon.node +0 -0
  209. package/llamaBins/win-x64/_nlcBuildMetadata.json +1 -0
  210. package/llamaBins/win-x64/llama-addon.exp +0 -0
  211. package/llamaBins/win-x64/llama-addon.lib +0 -0
  212. package/llamaBins/win-x64/llama-addon.node +0 -0
  213. package/llamaBins/win-x64-cuda/_nlcBuildMetadata.json +1 -0
  214. package/llamaBins/win-x64-cuda/llama-addon.exp +0 -0
  215. package/llamaBins/win-x64-cuda/llama-addon.lib +0 -0
  216. package/llamaBins/win-x64-cuda/llama-addon.node +0 -0
  217. package/llamaBins/win-x64-vulkan/_nlcBuildMetadata.json +1 -0
  218. package/llamaBins/win-x64-vulkan/llama-addon.exp +0 -0
  219. package/llamaBins/win-x64-vulkan/llama-addon.lib +0 -0
  220. package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
  221. package/package.json +14 -9
  222. package/dist/cli/utils/logEnabledComputeLayers.d.ts +0 -8
  223. package/dist/cli/utils/logEnabledComputeLayers.js +0 -11
  224. package/dist/cli/utils/logEnabledComputeLayers.js.map +0 -1
  225. package/llamaBins/linux-arm64/.buildMetadata.json +0 -1
  226. package/llamaBins/linux-armv7l/.buildMetadata.json +0 -1
  227. package/llamaBins/linux-x64/.buildMetadata.json +0 -1
  228. package/llamaBins/linux-x64-cuda/.buildMetadata.json +0 -1
  229. package/llamaBins/linux-x64-vulkan/.buildMetadata.json +0 -1
  230. package/llamaBins/mac-arm64-metal/.buildMetadata.json +0 -1
  231. package/llamaBins/mac-arm64-metal/ggml-metal.metal +0 -7022
  232. package/llamaBins/mac-x64/.buildMetadata.json +0 -1
  233. package/llamaBins/win-x64/.buildMetadata.json +0 -1
  234. package/llamaBins/win-x64-cuda/.buildMetadata.json +0 -1
  235. package/llamaBins/win-x64-vulkan/.buildMetadata.json +0 -1
@@ -0,0 +1,34 @@
1
+ import path from "path";
2
+ import fs from "fs-extra";
3
+ import { asyncSome } from "./asyncSome.js";
4
+ export async function hasFileInPath(fileToSearch, additionalSearchPaths = []) {
5
+ const searchPaths = resolveSearchPaths(additionalSearchPaths);
6
+ return await asyncSome(searchPaths.map(async (searchPath) => {
7
+ return fs.pathExists(path.join(searchPath, fileToSearch));
8
+ }));
9
+ }
10
+ export async function resolveFileLocationInPath(fileToSearch, additionalSearchPaths = []) {
11
+ const searchPaths = resolveSearchPaths(additionalSearchPaths);
12
+ const foundPaths = await Promise.all(searchPaths.map(async (searchPath) => {
13
+ const filePath = path.join(searchPath, fileToSearch);
14
+ if (await fs.pathExists(filePath))
15
+ return filePath;
16
+ return null;
17
+ }));
18
+ return foundPaths.filter((filePath) => filePath != null);
19
+ }
20
+ function resolveSearchPaths(additionalSearchPaths) {
21
+ return [
22
+ // Windows checks the cwd before the path
23
+ ...(process.platform === "win32"
24
+ ? [process.cwd()]
25
+ : []),
26
+ ...((process.env.PATH || "").split(path.delimiter)),
27
+ ...(additionalSearchPaths.flatMap((searchPath) => (searchPath || "").split(path.delimiter)))
28
+ ]
29
+ .map((pathPart) => ((pathPart.length >= 2 && pathPart.startsWith('"') && pathPart.endsWith('"'))
30
+ ? pathPart.slice(1, -1)
31
+ : pathPart))
32
+ .filter((pathPart) => pathPart.length > 0);
33
+ }
34
+ //# sourceMappingURL=hasFileInPath.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hasFileInPath.js","sourceRoot":"","sources":["../../../src/bindings/utils/hasFileInPath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,YAAoB,EAAE,wBAAuD,EAAE;IAC/G,MAAM,WAAW,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;IAE9D,OAAO,MAAM,SAAS,CAClB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,YAAoB,EAAE,wBAAuD,EAAE;IAC3H,MAAM,WAAW,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACrD,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC7B,OAAO,QAAQ,CAAC;QAEpB,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAsB,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC;AACjF,CAAC;AAGD,SAAS,kBAAkB,CAAC,qBAAoD;IAC5E,OAAO;QACH,yCAAyC;QACzC,GAAG,CACC,OAAO,CAAC,QAAQ,KAAK,OAAO;YACxB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,CAAC,CAAC,EAAE,CACX;QACD,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnD,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;KAC/F;SACI,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACf,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,CAAC,CAAC,QAAQ,CACjB,CAAC;SACD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACnD,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import { BuildOptions } from "../types.js";
2
- export declare function logBinaryUsageExampleToConsole(buildOptions: BuildOptions, showLatestBuildUsageExample?: boolean): void;
2
+ export declare function logBinaryUsageExampleToConsole(buildOptions: BuildOptions, specifyGpuType: boolean, showLatestBuildUsageExample?: boolean): void;
@@ -1,16 +1,10 @@
1
- import process from "process";
2
1
  import { removeUndefinedFields } from "../../utils/removeNullFields.js";
3
2
  import { getExampleUsageCodeOfGetLlama } from "./getExampleUsageCodeOfGetLlama.js";
4
- export function logBinaryUsageExampleToConsole(buildOptions, showLatestBuildUsageExample = true) {
3
+ export function logBinaryUsageExampleToConsole(buildOptions, specifyGpuType, showLatestBuildUsageExample = true) {
5
4
  console.log("To use the binary you've just built, use this code:");
6
5
  const llamaOptions = removeUndefinedFields({
7
- metal: buildOptions.platform !== "mac"
8
- ? undefined
9
- : ((process.arch === "arm64" && buildOptions.computeLayers.metal) || (process.arch === "x64" && !buildOptions.computeLayers.metal))
10
- ? undefined
11
- : buildOptions.computeLayers.metal,
12
- cuda: buildOptions.computeLayers.cuda
13
- ? true
6
+ gpu: specifyGpuType
7
+ ? buildOptions.gpu
14
8
  : undefined,
15
9
  cmakeOptions: buildOptions.customCmakeOptions.size === 0
16
10
  ? undefined
@@ -1 +1 @@
1
- {"version":3,"file":"logBinaryUsageExampleToConsole.js","sourceRoot":"","sources":["../../../src/bindings/utils/logBinaryUsageExampleToConsole.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,qBAAqB,EAAC,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAC;AAEjF,MAAM,UAAU,8BAA8B,CAAC,YAA0B,EAAE,8BAAuC,IAAI;IAClH,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,MAAM,YAAY,GAAiB,qBAAqB,CAAC;QACrD,KAAK,EAAE,YAAY,CAAC,QAAQ,KAAK,KAAK;YAClC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC/H,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK;QAC1C,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,IAAI;YACjC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,SAAS;QACf,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,IAAI,KAAK,CAAC;YACpD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,CAAC,GAAG,YAAY,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CACpG;KACR,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CACP,6BAA6B,CACzB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC;QAClC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,YAAY,CACrB,CACJ,CAAC;IAEF,IAAI,2BAA2B,EAAE;QAC7B,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,+EAA+E,CAAC,CAAC;QAC7F,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAC;KAC3D;AACL,CAAC"}
1
+ {"version":3,"file":"logBinaryUsageExampleToConsole.js","sourceRoot":"","sources":["../../../src/bindings/utils/logBinaryUsageExampleToConsole.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,qBAAqB,EAAC,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAC;AAEjF,MAAM,UAAU,8BAA8B,CAC1C,YAA0B,EAAE,cAAuB,EAAE,8BAAuC,IAAI;IAEhG,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,MAAM,YAAY,GAAiB,qBAAqB,CAAC;QACrD,GAAG,EAAE,cAAc;YACf,CAAC,CAAC,YAAY,CAAC,GAAG;YAClB,CAAC,CAAC,SAAS;QACf,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,IAAI,KAAK,CAAC;YACpD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,CAAC,GAAG,YAAY,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CACpG;KACR,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CACP,6BAA6B,CACzB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC;QAClC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,YAAY,CACrB,CACJ,CAAC;IAEF,IAAI,2BAA2B,EAAE;QAC7B,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,+EAA+E,CAAC,CAAC;QAC7F,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAC;KAC3D;AACL,CAAC"}
@@ -0,0 +1,14 @@
1
+ type DistroPackages = {
2
+ linuxPackages?: {
3
+ apt?: string[];
4
+ apk?: string[];
5
+ };
6
+ macOsPackages?: {
7
+ brew?: string[];
8
+ };
9
+ };
10
+ export declare function logDistroInstallInstruction(prefixText: string, distroPackages: DistroPackages, { forceLogPrefix }?: {
11
+ forceLogPrefix?: boolean;
12
+ }): Promise<void>;
13
+ export declare function getDistroInstallInstruction({ linuxPackages, macOsPackages }: DistroPackages): Promise<string | null>;
14
+ export {};
@@ -0,0 +1,48 @@
1
+ import which from "which";
2
+ import chalk from "chalk";
3
+ import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
4
+ import { getPlatform } from "./getPlatform.js";
5
+ export async function logDistroInstallInstruction(prefixText, distroPackages, { forceLogPrefix = false } = {}) {
6
+ const instruction = await getDistroInstallInstruction(distroPackages);
7
+ if (instruction == null)
8
+ return;
9
+ console.info(getConsoleLogPrefix(forceLogPrefix) + chalk.yellow(prefixText + instruction));
10
+ }
11
+ export async function getDistroInstallInstruction({ linuxPackages, macOsPackages }) {
12
+ const platform = getPlatform();
13
+ if (platform === "linux") {
14
+ if (linuxPackages == null)
15
+ return null;
16
+ if (linuxPackages.apt != null && linuxPackages.apt.length > 0) {
17
+ const [sudoPath, aptPath] = await Promise.all([
18
+ which("sudo", { nothrow: true }),
19
+ which("apt", { nothrow: true })
20
+ ]);
21
+ if (aptPath != null) {
22
+ const aptCommand = (sudoPath != null ? "sudo " : "") + "apt";
23
+ return 'you can run "' + aptCommand + " update && " + aptCommand + " install -y " + linuxPackages.apt.join(" ") + '"';
24
+ }
25
+ }
26
+ if (linuxPackages.apk != null && linuxPackages.apk.length > 0) {
27
+ const [sudoPath, apkPath] = await Promise.all([
28
+ which("sudo", { nothrow: true }),
29
+ which("apk", { nothrow: true })
30
+ ]);
31
+ if (apkPath != null)
32
+ return 'you can run "' + (sudoPath != null ? "sudo " : "") + "apk add " + linuxPackages.apk.join(" ") + '"';
33
+ }
34
+ return null;
35
+ }
36
+ else if (platform === "mac") {
37
+ if (macOsPackages == null)
38
+ return null;
39
+ if (macOsPackages.brew != null && macOsPackages.brew.length > 0) {
40
+ const brewPath = await which("brew", { nothrow: true });
41
+ if (brewPath != null)
42
+ return 'you can run "brew install ' + macOsPackages.brew.join(" ") + '"';
43
+ }
44
+ return null;
45
+ }
46
+ return null;
47
+ }
48
+ //# sourceMappingURL=logDistroInstallInstruction.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logDistroInstallInstruction.js","sourceRoot":"","sources":["../../../src/bindings/utils/logDistroInstallInstruction.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,8 @@ import { AlpacaChatWrapper } from "../../chatWrappers/AlpacaChatWrapper.js";
5
5
  import { FunctionaryChatWrapper } from "../../chatWrappers/FunctionaryChatWrapper.js";
6
6
  import { ChatMLChatWrapper } from "../../chatWrappers/ChatMLChatWrapper.js";
7
7
  import { FalconChatWrapper } from "../../chatWrappers/FalconChatWrapper.js";
8
- export declare const chatWrapperTypeNames: readonly ["auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat"];
8
+ import { GemmaChatWrapper } from "../../chatWrappers/GemmaChatWrapper.js";
9
+ export declare const chatWrapperTypeNames: readonly ["auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"];
9
10
  export type ChatWrapperTypeName = (typeof chatWrapperTypeNames)[number];
10
11
  declare const chatWrappers: {
11
12
  readonly general: typeof GeneralChatWrapper;
@@ -14,13 +15,19 @@ declare const chatWrappers: {
14
15
  readonly functionary: typeof FunctionaryChatWrapper;
15
16
  readonly chatML: typeof ChatMLChatWrapper;
16
17
  readonly falconChat: typeof FalconChatWrapper;
18
+ readonly gemma: typeof GemmaChatWrapper;
17
19
  };
20
+ /**
21
+ * @param configType
22
+ * @param options
23
+ */
18
24
  export declare function resolveChatWrapperBasedOnWrapperTypeName(configType: ChatWrapperTypeName, { bosString, filename, typeDescription, customWrapperSettings }?: {
19
25
  bosString?: string | null;
20
26
  filename?: string;
27
+ /** @hidden this type alias is too long in the documentation */
21
28
  typeDescription?: ModelTypeDescription;
22
29
  customWrapperSettings?: {
23
30
  [wrapper in keyof typeof chatWrappers]?: ConstructorParameters<(typeof chatWrappers)[wrapper]>[0];
24
31
  };
25
- }): LlamaChatWrapper | ChatMLChatWrapper | GeneralChatWrapper | FalconChatWrapper | FunctionaryChatWrapper;
32
+ }): LlamaChatWrapper | ChatMLChatWrapper | GeneralChatWrapper | FalconChatWrapper | FunctionaryChatWrapper | GemmaChatWrapper;
26
33
  export {};
@@ -5,18 +5,24 @@ import { FunctionaryChatWrapper } from "../../chatWrappers/FunctionaryChatWrappe
5
5
  import { ChatMLChatWrapper } from "../../chatWrappers/ChatMLChatWrapper.js";
6
6
  import { FalconChatWrapper } from "../../chatWrappers/FalconChatWrapper.js";
7
7
  import { resolveChatWrapperBasedOnModel } from "../../chatWrappers/resolveChatWrapperBasedOnModel.js";
8
- export const chatWrapperTypeNames = [
9
- "auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat"
10
- ];
8
+ import { GemmaChatWrapper } from "../../chatWrappers/GemmaChatWrapper.js";
9
+ export const chatWrapperTypeNames = Object.freeze([
10
+ "auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"
11
+ ]);
11
12
  const chatWrappers = {
12
13
  "general": GeneralChatWrapper,
13
14
  "llamaChat": LlamaChatWrapper,
14
15
  "alpacaChat": AlpacaChatWrapper,
15
16
  "functionary": FunctionaryChatWrapper,
16
17
  "chatML": ChatMLChatWrapper,
17
- "falconChat": FalconChatWrapper
18
+ "falconChat": FalconChatWrapper,
19
+ "gemma": GemmaChatWrapper
18
20
  };
19
21
  const chatWrapperToConfigType = new Map(Object.entries(chatWrappers).map(([configType, Wrapper]) => [Wrapper, configType]));
22
+ /**
23
+ * @param configType
24
+ * @param options
25
+ */
20
26
  export function resolveChatWrapperBasedOnWrapperTypeName(configType, { bosString, filename, typeDescription, customWrapperSettings } = {}) {
21
27
  if (Object.hasOwn(chatWrappers, configType)) {
22
28
  const Wrapper = chatWrappers[configType];
@@ -1 +1 @@
1
- {"version":3,"file":"resolveChatWrapperBasedOnWrapperTypeName.js","sourceRoot":"","sources":["../../../src/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAC,gBAAgB,EAAC,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,sBAAsB,EAAC,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,8BAA8B,EAAC,MAAM,sDAAsD,CAAC;AAEpG,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY;CAC7E,CAAC;AAGX,MAAM,YAAY,GAAG;IACjB,SAAS,EAAE,kBAAkB;IAC7B,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,sBAAsB;IACrC,QAAQ,EAAE,iBAAiB;IAC3B,YAAY,EAAE,iBAAiB;CACmC,CAAC;AACvE,MAAM,uBAAuB,GAAG,IAAI,GAAG,CACnC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CACrF,CAAC;AAEF,MAAM,UAAU,wCAAwC,CAAC,UAA+B,EAAE,EACtF,SAAS,EACT,QAAQ,EACR,eAAe,EACf,qBAAqB,KAQrB,EAAE;IACF,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE;QACzC,MAAM,OAAO,GAAG,YAAY,CAAC,UAAuC,CAAC,CAAC;QACtE,MAAM,eAAe,GACjB,qBAAqB,EAAE,CAAC,UAAuC,CAAC,CAAC;QAErE,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;KACvC;IAED,IAAI,UAAU,KAAK,MAAM,EAAE;QACvB,MAAM,WAAW,GAAG,8BAA8B,CAAC;YAC/C,SAAS;YACT,QAAQ;YACR,eAAe;SAClB,CAAC,CAAC;QAEH,IAAI,WAAW,IAAI,IAAI,EAAE;YACrB,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACpE,MAAM,eAAe,GAA6D,kBAAkB,IAAI,IAAI;gBACxG,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,qBAAqB,EAAE,CAAC,kBAA+C,CAAC,CAAC;YAE/E,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,CAAC;SAC3C;QAED,OAAO,IAAI,kBAAkB,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;KACjE;IAED,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,UAAU,CAAC,CAAC;AAC7D,CAAC"}
1
+ {"version":3,"file":"resolveChatWrapperBasedOnWrapperTypeName.js","sourceRoot":"","sources":["../../../src/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAC,gBAAgB,EAAC,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,sBAAsB,EAAC,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,8BAA8B,EAAC,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAC,gBAAgB,EAAC,MAAM,wCAAwC,CAAC;AAExE,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO;CACtF,CAAC,CAAC;AAGZ,MAAM,YAAY,GAAG;IACjB,SAAS,EAAE,kBAAkB;IAC7B,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,sBAAsB;IACrC,QAAQ,EAAE,iBAAiB;IAC3B,YAAY,EAAE,iBAAiB;IAC/B,OAAO,EAAE,gBAAgB;CACyC,CAAC;AACvE,MAAM,uBAAuB,GAAG,IAAI,GAAG,CACnC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CACrF,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,wCAAwC,CAAC,UAA+B,EAAE,EACtF,SAAS,EACT,QAAQ,EACR,eAAe,EACf,qBAAqB,KAWrB,EAAE;IACF,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE;QACzC,MAAM,OAAO,GAAG,YAAY,CAAC,UAAuC,CAAC,CAAC;QACtE,MAAM,eAAe,GACjB,qBAAqB,EAAE,CAAC,UAAuC,CAAC,CAAC;QAErE,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;KACvC;IAED,IAAI,UAAU,KAAK,MAAM,EAAE;QACvB,MAAM,WAAW,GAAG,8BAA8B,CAAC;YAC/C,SAAS;YACT,QAAQ;YACR,eAAe;SAClB,CAAC,CAAC;QAEH,IAAI,WAAW,IAAI,IAAI,EAAE;YACrB,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACpE,MAAM,eAAe,GAA6D,kBAAkB,IAAI,IAAI;gBACxG,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,qBAAqB,EAAE,CAAC,kBAA+C,CAAC,CAAC;YAE/E,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,CAAC;SAC3C;QAED,OAAO,IAAI,kBAAkB,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;KACjE;IAED,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,UAAU,CAAC,CAAC;AAC7D,CAAC"}
@@ -0,0 +1 @@
1
+ export declare function testBindingBinary(bindingBinaryPath: string, testTimeout?: number): Promise<boolean>;
@@ -0,0 +1,98 @@
1
+ import { fork } from "node:child_process";
2
+ import { fileURLToPath } from "url";
3
+ import { createRequire } from "module";
4
+ import path from "path";
5
+ import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
6
+ const require = createRequire(import.meta.url);
7
+ const __filename = fileURLToPath(import.meta.url);
8
+ const detectedFileName = path.basename(__filename);
9
+ const expectedFileName = "testBindingBinary";
10
+ export function testBindingBinary(bindingBinaryPath, testTimeout = 1000 * 60 * 5) {
11
+ if (!detectedFileName.startsWith(expectedFileName)) {
12
+ console.warn(getConsoleLogPrefix() +
13
+ `"${expectedFileName}.js" file is not independent, so testing a binding binary with the current system` +
14
+ "prior to importing it cannot be done.\n" +
15
+ getConsoleLogPrefix() +
16
+ "Assuming the test passed with the risk that the process may crash due to an incompatible binary.\n" +
17
+ getConsoleLogPrefix() +
18
+ '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 Promise.resolve(true);
20
+ }
21
+ const subProcess = fork(__filename, [], {
22
+ detached: false,
23
+ env: {
24
+ ...process.env,
25
+ TEST_BINDING_CP: "true"
26
+ }
27
+ });
28
+ let testPassed = false;
29
+ let forkSucceeded = false;
30
+ let timeoutHandle = null;
31
+ function cleanup() {
32
+ if (subProcess.exitCode == null)
33
+ subProcess.kill("SIGKILL");
34
+ if (timeoutHandle != null)
35
+ clearTimeout(timeoutHandle);
36
+ process.off("exit", cleanup);
37
+ }
38
+ process.on("exit", cleanup);
39
+ return Promise.race([
40
+ new Promise((_, reject) => {
41
+ timeoutHandle = setTimeout(() => {
42
+ reject(new Error("Binding binary load test timed out"));
43
+ cleanup();
44
+ }, testTimeout);
45
+ }),
46
+ new Promise((resolve, reject) => {
47
+ function done() {
48
+ if (!forkSucceeded)
49
+ reject(new Error(`Binding binary test failed to run a test process via file "${__filename}"`));
50
+ else
51
+ resolve(testPassed);
52
+ cleanup();
53
+ }
54
+ subProcess.on("message", (message) => {
55
+ if (message.type === "ready") {
56
+ forkSucceeded = true;
57
+ subProcess.send({ type: "start", bindingBinaryPath });
58
+ }
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
+ });
69
+ if (subProcess.killed || subProcess.exitCode != null) {
70
+ if (subProcess.exitCode !== 0)
71
+ testPassed = false;
72
+ done();
73
+ }
74
+ })
75
+ ]);
76
+ }
77
+ if (process.env.TEST_BINDING_CP === "true" && process.send != null) {
78
+ process.on("message", async (message) => {
79
+ if (message.type === "start") {
80
+ if (process.send == null)
81
+ process.exit(1);
82
+ try {
83
+ const binding = require(message.bindingBinaryPath);
84
+ await binding.init();
85
+ process.send({ type: "done" });
86
+ }
87
+ catch (err) {
88
+ console.error(err);
89
+ process.exit(1);
90
+ }
91
+ }
92
+ else if (message.type === "exit") {
93
+ process.exit(0);
94
+ }
95
+ });
96
+ process.send({ type: "ready" });
97
+ }
98
+ //# sourceMappingURL=testBindingBinary.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"testBindingBinary.js","sourceRoot":"","sources":["../../../src/bindings/utils/testBindingBinary.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import process from "process";
2
+ export declare function testCmakeBinary(cmakeBinaryPath?: string, { cwd, env }?: {
3
+ cwd?: string;
4
+ env?: typeof process.env;
5
+ }): Promise<boolean>;
@@ -0,0 +1,32 @@
1
+ import process from "process";
2
+ import { execFile } from "node:child_process";
3
+ import path from "path";
4
+ import { fileURLToPath } from "url";
5
+ import fs from "fs-extra";
6
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
7
+ export async function testCmakeBinary(cmakeBinaryPath, { cwd = __dirname, env = process.env } = {}) {
8
+ if (cmakeBinaryPath == null || !(await fs.pathExists(cmakeBinaryPath)))
9
+ return false;
10
+ return new Promise((resolve, reject) => {
11
+ const child = execFile(cmakeBinaryPath, ["--version"], {
12
+ cwd,
13
+ env,
14
+ windowsHide: true
15
+ });
16
+ child.on("exit", (code) => {
17
+ if (code == 0)
18
+ resolve(true);
19
+ else
20
+ reject(false);
21
+ });
22
+ child.on("error", reject);
23
+ child.on("disconnect", () => resolve(false));
24
+ child.on("close", code => {
25
+ if (code == 0)
26
+ resolve(true);
27
+ else
28
+ resolve(false);
29
+ });
30
+ });
31
+ }
32
+ //# sourceMappingURL=testCmakeBinary.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"testCmakeBinary.js","sourceRoot":"","sources":["../../../src/bindings/utils/testCmakeBinary.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAwB,EAAE,EAC5D,GAAG,GAAG,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,KAGlC,EAAE;IACF,IAAI,eAAe,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE;YACnD,GAAG;YACH,GAAG;YACH,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,CAAC;;gBAEd,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,CAAC;;gBAEd,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -63,7 +63,7 @@ export class ChatMLChatWrapper extends ChatWrapper {
63
63
  ? LlamaText([])
64
64
  : LlamaText([
65
65
  new SpecialToken("<|im_start|>assistant\n"),
66
- user,
66
+ model,
67
67
  isLastItem
68
68
  ? LlamaText([])
69
69
  : new SpecialToken("<|im_end|>\n")
@@ -1 +1 @@
1
- {"version":3,"file":"ChatMLChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/ChatMLChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnF,0GAA0G;AAC1G,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAC9B,WAAW,GAAW,QAAQ,CAAC;IAE/B,mBAAmB,CAAC,OAAmC,EAAE,EAAC,kBAAkB,EAAE,sBAAsB,KAGhH,EAAE;QASF,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,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,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,IAAI,YAAY,CAAC,sBAAsB,CAAC;wBACxC,MAAM;wBACN,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,CAAC;gBAEN,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,YAAY,CAAC,oBAAoB,CAAC;wBACtC,IAAI;wBACJ,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,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,IAAI,YAAY,CAAC,yBAAyB,CAAC;wBAC3C,IAAI;wBAEJ,UAAU;4BACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC;qBACzC,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,YAAY,CAAC,CAAC;gBACzC,SAAS,CAAC,YAAY,CAAC;aAC1B;SACJ,CAAC;IACN,CAAC;CACJ"}
1
+ {"version":3,"file":"ChatMLChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/ChatMLChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnF,0GAA0G;AAC1G,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAC9B,WAAW,GAAW,QAAQ,CAAC;IAE/B,mBAAmB,CAAC,OAAmC,EAAE,EAAC,kBAAkB,EAAE,sBAAsB,KAGhH,EAAE;QASF,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,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,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,IAAI,YAAY,CAAC,sBAAsB,CAAC;wBACxC,MAAM;wBACN,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,CAAC;gBAEN,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,YAAY,CAAC,oBAAoB,CAAC;wBACtC,IAAI;wBACJ,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,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,IAAI,YAAY,CAAC,yBAAyB,CAAC;wBAC3C,KAAK;wBAEL,UAAU;4BACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC;qBACzC,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,YAAY,CAAC,CAAC;gBACzC,SAAS,CAAC,YAAY,CAAC;aAC1B;SACJ,CAAC;IACN,CAAC;CACJ"}
@@ -0,0 +1,18 @@
1
+ import { ChatWrapper } from "../ChatWrapper.js";
2
+ import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
3
+ import { LlamaText } from "../utils/LlamaText.js";
4
+ export declare class GemmaChatWrapper 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
+ ignoreStartText?: LlamaText[];
13
+ functionCall?: {
14
+ initiallyEngaged: boolean;
15
+ disengageInitiallyEngaged: LlamaText[];
16
+ };
17
+ };
18
+ }
@@ -0,0 +1,86 @@
1
+ import { ChatWrapper } from "../ChatWrapper.js";
2
+ import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
3
+ // source: https://ai.google.dev/gemma/docs/formatting
4
+ // source: https://www.promptingguide.ai/models/gemma
5
+ export class GemmaChatWrapper extends ChatWrapper {
6
+ wrapperName = "Gemma";
7
+ generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
8
+ const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
9
+ documentParams: documentFunctionParams
10
+ });
11
+ const resultItems = [];
12
+ let systemTexts = [];
13
+ let userTexts = [];
14
+ let modelTexts = [];
15
+ let currentAggregateFocus = null;
16
+ function flush() {
17
+ if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0) {
18
+ const systemText = systemTexts.join("\n\n");
19
+ let userText = userTexts.join("\n\n");
20
+ // there's no system prompt support in Gemma, so we'll prepend the system text to the user message
21
+ if (systemText.length > 0) {
22
+ if (userText.length === 0)
23
+ userText = systemText;
24
+ else
25
+ userText = systemText + "\n\n---\n\n" + userText;
26
+ }
27
+ resultItems.push({
28
+ user: userText,
29
+ model: modelTexts.join("\n\n")
30
+ });
31
+ }
32
+ systemTexts = [];
33
+ userTexts = [];
34
+ modelTexts = [];
35
+ }
36
+ for (const item of historyWithFunctions) {
37
+ if (item.type === "system") {
38
+ if (currentAggregateFocus !== "system")
39
+ flush();
40
+ currentAggregateFocus = "system";
41
+ systemTexts.push(item.text);
42
+ }
43
+ else if (item.type === "user") {
44
+ if (currentAggregateFocus !== "system" && currentAggregateFocus !== "user")
45
+ flush();
46
+ currentAggregateFocus = "user";
47
+ userTexts.push(item.text);
48
+ }
49
+ else if (item.type === "model") {
50
+ currentAggregateFocus = "model";
51
+ modelTexts.push(this.generateModelResponseText(item.response));
52
+ }
53
+ }
54
+ flush();
55
+ const contextText = LlamaText(resultItems.map(({ user, model }, index) => {
56
+ const isLastItem = index === resultItems.length - 1;
57
+ return LlamaText([
58
+ (user.length === 0)
59
+ ? LlamaText([])
60
+ : LlamaText([
61
+ new SpecialToken("<start_of_turn>user\n"),
62
+ user,
63
+ new SpecialToken("<end_of_turn>\n")
64
+ ]),
65
+ (model.length === 0 && !isLastItem)
66
+ ? LlamaText([])
67
+ : LlamaText([
68
+ new SpecialToken("<start_of_turn>model\n"),
69
+ model,
70
+ isLastItem
71
+ ? LlamaText([])
72
+ : new SpecialToken("<end_of_turn>\n")
73
+ ])
74
+ ]);
75
+ }));
76
+ return {
77
+ contextText,
78
+ stopGenerationTriggers: [
79
+ LlamaText(new BuiltinSpecialToken("EOS")),
80
+ LlamaText(new SpecialToken("<end_of_turn>\n")),
81
+ LlamaText("<end_of_turn>")
82
+ ]
83
+ };
84
+ }
85
+ }
86
+ //# sourceMappingURL=GemmaChatWrapper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GemmaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/GemmaChatWrapper.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
6
6
  import { FalconChatWrapper } from "./FalconChatWrapper.js";
7
7
  import { FunctionaryChatWrapper } from "./FunctionaryChatWrapper.js";
8
8
  import { AlpacaChatWrapper } from "./AlpacaChatWrapper.js";
9
+ import { GemmaChatWrapper } from "./GemmaChatWrapper.js";
9
10
  /**
10
11
  * @param options
11
12
  */
@@ -38,6 +39,8 @@ export function resolveChatWrapperBasedOnModel({ bosString, filename, typeDescri
38
39
  return FunctionaryChatWrapper;
39
40
  else if (lowercaseName === "dolphin" && splitLowercaseSubType.includes("mistral"))
40
41
  return ChatMLChatWrapper;
42
+ else if (lowercaseName === "gemma")
43
+ return GemmaChatWrapper;
41
44
  }
42
45
  }
43
46
  if (typeDescription != null) {
@@ -1 +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;AAEhF,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;AAGzD;;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,IAAI,EAAE,CAAC;YACjE,MAAM,0BAA0B,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAE5D,IAAI,aAAa,KAAK,OAAO,EAAE;gBAC3B,IAAI,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACtC,OAAO,gBAAgB,CAAC;gBAE5B,OAAO,kBAAkB,CAAC;aAC7B;iBAAM,IAAI,aAAa,KAAK,MAAM,IAAI,0BAA0B,KAAK,OAAO;gBACzE,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;iBAC7B,IAAI,aAAa,KAAK,SAAS,IAAI,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC7E,OAAO,iBAAiB,CAAC;SAChC;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"}
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;AAEhF,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;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAGvD;;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,IAAI,EAAE,CAAC;YACjE,MAAM,0BAA0B,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAE5D,IAAI,aAAa,KAAK,OAAO,EAAE;gBAC3B,IAAI,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACtC,OAAO,gBAAgB,CAAC;gBAE5B,OAAO,kBAAkB,CAAC;aAC7B;iBAAM,IAAI,aAAa,KAAK,MAAM,IAAI,0BAA0B,KAAK,OAAO;gBACzE,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;iBAC7B,IAAI,aAAa,KAAK,SAAS,IAAI,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC7E,OAAO,iBAAiB,CAAC;iBACxB,IAAI,aAAa,KAAK,OAAO;gBAC9B,OAAO,gBAAgB,CAAC;SAC/B;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
@@ -14,6 +14,7 @@ import { ClearCommand } from "./commands/ClearCommand.js";
14
14
  import { ChatCommand } from "./commands/ChatCommand.js";
15
15
  import { CompleteCommand } from "./commands/CompleteCommand.js";
16
16
  import { InfillCommand } from "./commands/InfillCommand.js";
17
+ import { InspectCommand } from "./commands/InspectCommand.js";
17
18
  import { DebugCommand } from "./commands/DebugCommand.js";
18
19
  const __dirname = path.dirname(fileURLToPath(import.meta.url));
19
20
  const packageJson = fs.readJSONSync(path.join(__dirname, "..", "..", "package.json"));
@@ -28,6 +29,7 @@ yarg
28
29
  .command(ChatCommand)
29
30
  .command(CompleteCommand)
30
31
  .command(InfillCommand)
32
+ .command(InspectCommand)
31
33
  .command(OnPostInstallCommand)
32
34
  .command(DebugCommand)
33
35
  .recommendCommands()
@@ -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,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,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAChD,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;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,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,mBAAmB,CAAC,IAAI,CAAC,CAAC;AAE1B,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,eAAe,CAAC;KACxB,OAAO,CAAC,aAAa,CAAC;KACtB,OAAO,CAAC,oBAAoB,CAAC;KAC7B,OAAO,CAAC,YAAY,CAAC;KACrB,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
+ {"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,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAChD,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;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,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,mBAAmB,CAAC,IAAI,CAAC,CAAC;AAE1B,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,eAAe,CAAC;KACxB,OAAO,CAAC,aAAa,CAAC;KACtB,OAAO,CAAC,cAAc,CAAC;KACvB,OAAO,CAAC,oBAAoB,CAAC;KAC7B,OAAO,CAAC,YAAY,CAAC;KACrB,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,12 +1,12 @@
1
+ import process from "process";
1
2
  import { CommandModule } from "yargs";
3
+ import { BuildGpu } from "../../bindings/types.js";
2
4
  type BuildCommand = {
3
- arch?: string;
5
+ arch?: typeof process.arch;
4
6
  nodeTarget?: string;
5
- metal?: boolean;
6
- cuda?: boolean;
7
- vulkan?: boolean;
7
+ gpu?: BuildGpu | "auto";
8
8
  noUsageExample?: boolean;
9
9
  };
10
10
  export declare const BuildCommand: CommandModule<object, BuildCommand>;
11
- export declare function BuildLlamaCppCommand({ arch, nodeTarget, metal, cuda, vulkan, noUsageExample, noCustomCmakeBuildOptionsInBinaryFolderName }: BuildCommand): Promise<void>;
11
+ export declare function BuildLlamaCppCommand({ arch, nodeTarget, gpu, noUsageExample, noCustomCmakeBuildOptionsInBinaryFolderName }: BuildCommand): Promise<void>;
12
12
  export {};