node-llama-cpp 2.8.0 → 3.0.0-beta.1

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 (80) hide show
  1. package/README.md +1 -1
  2. package/dist/chatWrappers/generateContextTextFromConversationHistory.d.ts +0 -8
  3. package/dist/chatWrappers/generateContextTextFromConversationHistory.js +0 -8
  4. package/dist/chatWrappers/generateContextTextFromConversationHistory.js.map +1 -1
  5. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.d.ts +13 -0
  6. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js +49 -0
  7. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map +1 -0
  8. package/dist/cli/cli.js +1 -1
  9. package/dist/cli/cli.js.map +1 -1
  10. package/dist/cli/commands/ChatCommand.js +20 -10
  11. package/dist/cli/commands/ChatCommand.js.map +1 -1
  12. package/dist/index.d.ts +6 -4
  13. package/dist/index.js +5 -4
  14. package/dist/index.js.map +1 -1
  15. package/dist/llamaEvaluator/LlamaBins.d.ts +19 -4
  16. package/dist/llamaEvaluator/LlamaBins.js +3 -3
  17. package/dist/llamaEvaluator/LlamaChatSession.d.ts +24 -23
  18. package/dist/llamaEvaluator/LlamaChatSession.js +90 -36
  19. package/dist/llamaEvaluator/LlamaChatSession.js.map +1 -1
  20. package/dist/llamaEvaluator/LlamaContext/LlamaContext.d.ts +112 -0
  21. package/dist/llamaEvaluator/LlamaContext/LlamaContext.js +640 -0
  22. package/dist/llamaEvaluator/LlamaContext/LlamaContext.js.map +1 -0
  23. package/dist/llamaEvaluator/LlamaContext/types.d.ts +90 -0
  24. package/dist/llamaEvaluator/LlamaContext/types.js +2 -0
  25. package/dist/llamaEvaluator/LlamaContext/types.js.map +1 -0
  26. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.d.ts +5 -0
  27. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.js +16 -0
  28. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.js.map +1 -0
  29. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.d.ts +5 -0
  30. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.js +42 -0
  31. package/dist/llamaEvaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.js.map +1 -0
  32. package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.d.ts +2 -0
  33. package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.js +13 -0
  34. package/dist/llamaEvaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.js.map +1 -0
  35. package/dist/llamaEvaluator/LlamaGrammar.d.ts +5 -5
  36. package/dist/llamaEvaluator/LlamaGrammar.js +7 -7
  37. package/dist/llamaEvaluator/LlamaGrammarEvaluationState.d.ts +6 -5
  38. package/dist/llamaEvaluator/LlamaGrammarEvaluationState.js +8 -7
  39. package/dist/llamaEvaluator/LlamaGrammarEvaluationState.js.map +1 -1
  40. package/dist/llamaEvaluator/LlamaModel.d.ts +93 -112
  41. package/dist/llamaEvaluator/LlamaModel.js +294 -59
  42. package/dist/llamaEvaluator/LlamaModel.js.map +1 -1
  43. package/dist/types.d.ts +3 -1
  44. package/dist/utils/ReplHistory.js +1 -1
  45. package/dist/utils/ReplHistory.js.map +1 -1
  46. package/dist/utils/getBin.d.ts +71 -39
  47. package/dist/utils/getBin.js.map +1 -1
  48. package/dist/utils/getReleaseInfo.d.ts +1 -1
  49. package/dist/utils/getReleaseInfo.js.map +1 -1
  50. package/dist/utils/parseModelFileName.d.ts +9 -0
  51. package/dist/utils/parseModelFileName.js +68 -0
  52. package/dist/utils/parseModelFileName.js.map +1 -0
  53. package/dist/utils/parseModelTypeDescription.d.ts +6 -0
  54. package/dist/utils/parseModelTypeDescription.js +9 -0
  55. package/dist/utils/parseModelTypeDescription.js.map +1 -0
  56. package/llama/.clang-format +10 -9
  57. package/llama/addon.cpp +689 -356
  58. package/llama/binariesGithubRelease.json +1 -1
  59. package/llama/gitRelease.bundle +0 -0
  60. package/llama/grammars/README.md +2 -2
  61. package/llamaBins/linux-arm64/llama-addon.node +0 -0
  62. package/llamaBins/linux-armv7l/llama-addon.node +0 -0
  63. package/llamaBins/linux-x64/llama-addon.node +0 -0
  64. package/llamaBins/mac-arm64/ggml-metal.metal +107 -1
  65. package/llamaBins/mac-arm64/llama-addon.node +0 -0
  66. package/llamaBins/mac-x64/ggml-metal.metal +107 -1
  67. package/llamaBins/mac-x64/llama-addon.node +0 -0
  68. package/llamaBins/win-x64/llama-addon.exp +0 -0
  69. package/llamaBins/win-x64/llama-addon.lib +0 -0
  70. package/llamaBins/win-x64/llama-addon.node +0 -0
  71. package/package.json +13 -7
  72. package/dist/chatWrappers/createChatWrapperByBos.d.ts +0 -2
  73. package/dist/chatWrappers/createChatWrapperByBos.js +0 -14
  74. package/dist/chatWrappers/createChatWrapperByBos.js.map +0 -1
  75. package/dist/llamaEvaluator/LlamaContext.d.ts +0 -100
  76. package/dist/llamaEvaluator/LlamaContext.js +0 -141
  77. package/dist/llamaEvaluator/LlamaContext.js.map +0 -1
  78. package/dist/utils/withLock.d.ts +0 -1
  79. package/dist/utils/withLock.js +0 -19
  80. package/dist/utils/withLock.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"parseModelFileName.js","sourceRoot":"","sources":["../../src/utils/parseModelFileName.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import type { AddonModelArchName, AddonModelFileTypeName, AddonModelTypeName, ModelTypeDescription } from "./getBin.js";
2
+ export declare function parseModelTypeDescription(modelTypeDescription: ModelTypeDescription): {
3
+ arch: AddonModelArchName;
4
+ type: AddonModelTypeName;
5
+ fileType: AddonModelFileTypeName;
6
+ };
@@ -0,0 +1,9 @@
1
+ export function parseModelTypeDescription(modelTypeDescription) {
2
+ const [arch, type, ...fileTypeParts] = modelTypeDescription.split(" ");
3
+ return {
4
+ arch: arch,
5
+ type: type,
6
+ fileType: fileTypeParts.join(" ")
7
+ };
8
+ }
9
+ //# sourceMappingURL=parseModelTypeDescription.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"parseModelTypeDescription.js","sourceRoot":"","sources":["../../src/utils/parseModelTypeDescription.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CAAC,oBAA0C;IAChF,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEvE,OAAO;QACH,IAAI,EAAE,IAA0B;QAChC,IAAI,EAAE,IAA0B;QAChC,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAA2B;KAC9D,CAAC;AACN,CAAC"}
@@ -1,20 +1,20 @@
1
1
  BasedOnStyle: Google
2
- IndentWidth: 2
2
+ IndentWidth: 4
3
3
  UseTab: Never
4
- TabWidth: 2
5
- ColumnLimit: 500
4
+ TabWidth: 4
5
+ ColumnLimit: 140
6
6
  AllowShortCaseLabelsOnASingleLine: true
7
- AllowShortFunctionsOnASingleLine: true
8
- AllowShortIfStatementsOnASingleLine: true
9
- AllowShortLoopsOnASingleLine: true
7
+ AllowShortFunctionsOnASingleLine: false
8
+ AllowShortIfStatementsOnASingleLine: false
9
+ AllowShortLoopsOnASingleLine: false
10
10
  AlignTrailingComments: false
11
11
  SpaceAfterTemplateKeyword: false
12
- AllowShortBlocksOnASingleLine: true
12
+ AllowShortBlocksOnASingleLine: false
13
13
  MaxEmptyLinesToKeep: 3
14
14
  NamespaceIndentation: None
15
15
  CommentPragmas: '^[^ ]'
16
16
  FixNamespaceComments: false
17
- AccessModifierOffset: -4
17
+ IndentAccessModifiers: true
18
18
  SpaceAfterCStyleCast: false
19
19
  PointerAlignment: Left
20
20
  IndentCaseLabels: false
@@ -31,6 +31,7 @@ UseCRLF: false
31
31
  AllowAllArgumentsOnNextLine: true
32
32
  AlignAfterOpenBracket: DontAlign
33
33
  PackConstructorInitializers: CurrentLine
34
+ AlignAfterOpenBracket: BlockIndent
34
35
  BraceWrapping:
35
36
  AfterStruct: false
36
37
  AfterClass: false
@@ -43,4 +44,4 @@ BraceWrapping:
43
44
  BeforeElse: false
44
45
  SplitEmptyFunction: false
45
46
  SplitEmptyRecord: false
46
- SplitEmptyNamespace: false
47
+ SplitEmptyNamespace: false