cactus-react-native 0.1.4 → 0.2.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 +550 -721
- package/android/src/main/java/com/cactus/Cactus.java +41 -0
- package/android/src/main/java/com/cactus/LlamaContext.java +19 -0
- package/android/src/main/jni.cpp +36 -11
- package/android/src/main/jniLibs/arm64-v8a/libcactus.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcactus_v8.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcactus_v8_2.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcactus_v8_2_dotprod.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcactus_v8_2_dotprod_i8mm.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcactus_v8_2_i8mm.so +0 -0
- package/android/src/main/jniLibs/x86_64/libcactus.so +0 -0
- package/android/src/main/jniLibs/x86_64/libcactus_x86_64.so +0 -0
- package/android/src/newarch/java/com/cactus/CactusModule.java +5 -0
- package/android/src/oldarch/java/com/cactus/CactusModule.java +5 -0
- package/ios/Cactus.mm +14 -0
- package/ios/CactusContext.h +1 -0
- package/ios/CactusContext.mm +18 -0
- package/ios/cactus.xcframework/ios-arm64_x86_64-simulator/cactus.framework/cactus +0 -0
- package/ios/cactus.xcframework/tvos-arm64_x86_64-simulator/cactus.framework/cactus +0 -0
- package/lib/commonjs/NativeCactus.js.map +1 -1
- package/lib/commonjs/index.js +92 -6
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/lm.js +64 -21
- package/lib/commonjs/lm.js.map +1 -1
- package/lib/commonjs/projectId.js +8 -0
- package/lib/commonjs/projectId.js.map +1 -0
- package/lib/commonjs/remote.js +153 -0
- package/lib/commonjs/remote.js.map +1 -0
- package/lib/commonjs/telemetry.js +11 -5
- package/lib/commonjs/telemetry.js.map +1 -1
- package/lib/commonjs/vlm.js +90 -23
- package/lib/commonjs/vlm.js.map +1 -1
- package/lib/module/NativeCactus.js.map +1 -1
- package/lib/module/index.js +48 -5
- package/lib/module/index.js.map +1 -1
- package/lib/module/lm.js +63 -21
- package/lib/module/lm.js.map +1 -1
- package/lib/module/projectId.js +4 -0
- package/lib/module/projectId.js.map +1 -0
- package/lib/module/remote.js +144 -0
- package/lib/module/remote.js.map +1 -0
- package/lib/module/telemetry.js +11 -5
- package/lib/module/telemetry.js.map +1 -1
- package/lib/module/vlm.js +90 -23
- package/lib/module/vlm.js.map +1 -1
- package/lib/typescript/NativeCactus.d.ts +7 -0
- package/lib/typescript/NativeCactus.d.ts.map +1 -1
- package/lib/typescript/index.d.ts +3 -1
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/lm.d.ts +4 -3
- package/lib/typescript/lm.d.ts.map +1 -1
- package/lib/typescript/projectId.d.ts +2 -0
- package/lib/typescript/projectId.d.ts.map +1 -0
- package/lib/typescript/remote.d.ts +7 -0
- package/lib/typescript/remote.d.ts.map +1 -0
- package/lib/typescript/telemetry.d.ts +7 -3
- package/lib/typescript/telemetry.d.ts.map +1 -1
- package/lib/typescript/vlm.d.ts +4 -2
- package/lib/typescript/vlm.d.ts.map +1 -1
- package/package.json +4 -4
- package/scripts/postInstall.js +33 -0
- package/src/NativeCactus.ts +7 -0
- package/src/index.ts +58 -5
- package/src/lm.ts +66 -28
- package/src/projectId.ts +1 -0
- package/src/remote.ts +175 -0
- package/src/telemetry.ts +27 -12
- package/src/vlm.ts +104 -25
package/lib/commonjs/lm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_index","require","_telemetry","CactusLM","constructor","context","
|
|
1
|
+
{"version":3,"names":["_index","require","_reactNative","_telemetry","_remote","CactusLM","constructor","context","init","params","onProgress","cactusToken","setCactusToken","needGpuAttempt","Platform","OS","n_gpu_layers","configs","config","initLlama","lm","error","e","Telemetry","n_ctx","model","indexOf","length","Error","completion","messages","callback","embedding","text","mode","result","lastError","_handleRemoteEmbedding","_handleLocalEmbedding","remoteError","localError","embeddingValues","getVertexAIEmbedding","rewind","release","exports"],"sourceRoot":"../../src","sources":["lm.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["PROJECT_ID","exports"],"sourceRoot":"../../src","sources":["projectId.ts"],"mappings":";;;;;;AAAO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG,SAAS","ignoreList":[]}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getTextCompletion = getTextCompletion;
|
|
7
|
+
exports.getVertexAICompletion = getVertexAICompletion;
|
|
8
|
+
exports.getVertexAIEmbedding = getVertexAIEmbedding;
|
|
9
|
+
exports.getVisionCompletion = getVisionCompletion;
|
|
10
|
+
exports.getVisionCompletionFromData = getVisionCompletionFromData;
|
|
11
|
+
exports.setCactusToken = setCactusToken;
|
|
12
|
+
let _cactusToken = null;
|
|
13
|
+
function setCactusToken(token) {
|
|
14
|
+
_cactusToken = token;
|
|
15
|
+
}
|
|
16
|
+
async function getVertexAIEmbedding(text) {
|
|
17
|
+
if (_cactusToken === null) {
|
|
18
|
+
throw new Error('CactusToken not set. Please call CactusLM.init with cactusToken parameter.');
|
|
19
|
+
}
|
|
20
|
+
const projectId = 'cactus-v1-452518';
|
|
21
|
+
const location = 'us-central1';
|
|
22
|
+
const modelId = 'text-embedding-005';
|
|
23
|
+
const endpoint = `https://${location}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location}/publishers/google/models/${modelId}:predict`;
|
|
24
|
+
const headers = {
|
|
25
|
+
'Authorization': `Bearer ${_cactusToken}`,
|
|
26
|
+
'Content-Type': 'application/json'
|
|
27
|
+
};
|
|
28
|
+
const requestBody = {
|
|
29
|
+
instances: [{
|
|
30
|
+
content: text
|
|
31
|
+
}]
|
|
32
|
+
};
|
|
33
|
+
const response = await fetch(endpoint, {
|
|
34
|
+
method: 'POST',
|
|
35
|
+
headers,
|
|
36
|
+
body: JSON.stringify(requestBody)
|
|
37
|
+
});
|
|
38
|
+
if (response.status === 401) {
|
|
39
|
+
_cactusToken = null;
|
|
40
|
+
throw new Error('Authentication failed. Please update your cactusToken.');
|
|
41
|
+
} else if (!response.ok) {
|
|
42
|
+
const errorText = await response.text();
|
|
43
|
+
throw new Error(`HTTP ${response.status}: ${errorText}`);
|
|
44
|
+
}
|
|
45
|
+
const responseBody = await response.json();
|
|
46
|
+
if (responseBody.error) {
|
|
47
|
+
throw new Error(`API Error: ${responseBody.error.message}`);
|
|
48
|
+
}
|
|
49
|
+
const predictions = responseBody.predictions;
|
|
50
|
+
if (!predictions || predictions.length === 0) {
|
|
51
|
+
throw new Error('No predictions in response');
|
|
52
|
+
}
|
|
53
|
+
const embeddings = predictions[0].embeddings;
|
|
54
|
+
const values = embeddings.values;
|
|
55
|
+
return values;
|
|
56
|
+
}
|
|
57
|
+
async function getVertexAICompletion(textPrompt, imageData, imagePath, mimeType) {
|
|
58
|
+
if (_cactusToken === null) {
|
|
59
|
+
throw new Error('CactusToken not set. Please call CactusVLM.init with cactusToken parameter.');
|
|
60
|
+
}
|
|
61
|
+
const projectId = 'cactus-v1-452518';
|
|
62
|
+
const location = 'global';
|
|
63
|
+
const modelId = 'gemini-2.5-flash-lite-preview-06-17';
|
|
64
|
+
const endpoint = `https://aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location}/publishers/google/models/${modelId}:generateContent`;
|
|
65
|
+
const headers = {
|
|
66
|
+
'Authorization': `Bearer ${_cactusToken}`,
|
|
67
|
+
'Content-Type': 'application/json'
|
|
68
|
+
};
|
|
69
|
+
const parts = [];
|
|
70
|
+
if (imageData) {
|
|
71
|
+
const detectedMimeType = mimeType || 'image/jpeg';
|
|
72
|
+
parts.push({
|
|
73
|
+
inlineData: {
|
|
74
|
+
mimeType: detectedMimeType,
|
|
75
|
+
data: imageData
|
|
76
|
+
}
|
|
77
|
+
});
|
|
78
|
+
} else if (imagePath) {
|
|
79
|
+
const detectedMimeType = mimeType || detectMimeType(imagePath);
|
|
80
|
+
const RNFS = require('react-native-fs');
|
|
81
|
+
const base64Data = await RNFS.readFile(imagePath, 'base64');
|
|
82
|
+
parts.push({
|
|
83
|
+
inlineData: {
|
|
84
|
+
mimeType: detectedMimeType,
|
|
85
|
+
data: base64Data
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
parts.push({
|
|
90
|
+
text: textPrompt
|
|
91
|
+
});
|
|
92
|
+
const requestBody = {
|
|
93
|
+
contents: {
|
|
94
|
+
role: 'user',
|
|
95
|
+
parts: parts
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
const response = await fetch(endpoint, {
|
|
99
|
+
method: 'POST',
|
|
100
|
+
headers,
|
|
101
|
+
body: JSON.stringify(requestBody)
|
|
102
|
+
});
|
|
103
|
+
if (response.status === 401) {
|
|
104
|
+
_cactusToken = null;
|
|
105
|
+
throw new Error('Authentication failed. Please update your cactusToken.');
|
|
106
|
+
} else if (!response.ok) {
|
|
107
|
+
const errorText = await response.text();
|
|
108
|
+
throw new Error(`HTTP ${response.status}: ${errorText}`);
|
|
109
|
+
}
|
|
110
|
+
const responseBody = await response.json();
|
|
111
|
+
if (Array.isArray(responseBody)) {
|
|
112
|
+
throw new Error('Unexpected response format: received array instead of object');
|
|
113
|
+
}
|
|
114
|
+
if (responseBody.error) {
|
|
115
|
+
throw new Error(`API Error: ${responseBody.error.message}`);
|
|
116
|
+
}
|
|
117
|
+
const candidates = responseBody.candidates;
|
|
118
|
+
if (!candidates || candidates.length === 0) {
|
|
119
|
+
throw new Error('No candidates in response');
|
|
120
|
+
}
|
|
121
|
+
const content = candidates[0].content;
|
|
122
|
+
const responseParts = content.parts;
|
|
123
|
+
if (!responseParts || responseParts.length === 0) {
|
|
124
|
+
throw new Error('No parts in response');
|
|
125
|
+
}
|
|
126
|
+
return responseParts[0].text || '';
|
|
127
|
+
}
|
|
128
|
+
async function getTextCompletion(prompt) {
|
|
129
|
+
return getVertexAICompletion(prompt);
|
|
130
|
+
}
|
|
131
|
+
async function getVisionCompletion(prompt, imagePath) {
|
|
132
|
+
return getVertexAICompletion(prompt, undefined, imagePath);
|
|
133
|
+
}
|
|
134
|
+
async function getVisionCompletionFromData(prompt, imageData, mimeType) {
|
|
135
|
+
return getVertexAICompletion(prompt, imageData, undefined, mimeType);
|
|
136
|
+
}
|
|
137
|
+
function detectMimeType(filePath) {
|
|
138
|
+
const extension = filePath.toLowerCase().split('.').pop();
|
|
139
|
+
switch (extension) {
|
|
140
|
+
case 'jpg':
|
|
141
|
+
case 'jpeg':
|
|
142
|
+
return 'image/jpeg';
|
|
143
|
+
case 'png':
|
|
144
|
+
return 'image/png';
|
|
145
|
+
case 'gif':
|
|
146
|
+
return 'image/gif';
|
|
147
|
+
case 'webp':
|
|
148
|
+
return 'image/webp';
|
|
149
|
+
default:
|
|
150
|
+
return 'image/jpeg';
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
//# sourceMappingURL=remote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_cactusToken","setCactusToken","token","getVertexAIEmbedding","text","Error","projectId","location","modelId","endpoint","headers","requestBody","instances","content","response","fetch","method","body","JSON","stringify","status","ok","errorText","responseBody","json","error","message","predictions","length","embeddings","values","getVertexAICompletion","textPrompt","imageData","imagePath","mimeType","parts","detectedMimeType","push","inlineData","data","detectMimeType","RNFS","require","base64Data","readFile","contents","role","Array","isArray","candidates","responseParts","getTextCompletion","prompt","getVisionCompletion","undefined","getVisionCompletionFromData","filePath","extension","toLowerCase","split","pop"],"sourceRoot":"../../src","sources":["remote.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.Telemetry = void 0;
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
|
+
var _projectId = require("./projectId");
|
|
8
9
|
// Import package.json to get version
|
|
9
10
|
const packageJson = require('../package.json');
|
|
10
11
|
class Telemetry {
|
|
@@ -35,11 +36,11 @@ class Telemetry {
|
|
|
35
36
|
Telemetry.instance = new Telemetry(config);
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
static track(payload, options) {
|
|
39
|
+
static track(payload, options, deviceMetadata) {
|
|
39
40
|
if (!Telemetry.instance) {
|
|
40
41
|
Telemetry.autoInit();
|
|
41
42
|
}
|
|
42
|
-
Telemetry.instance.trackInternal(payload, options);
|
|
43
|
+
Telemetry.instance.trackInternal(payload, options, deviceMetadata);
|
|
43
44
|
}
|
|
44
45
|
static error(error, options) {
|
|
45
46
|
if (!Telemetry.instance) {
|
|
@@ -47,15 +48,19 @@ class Telemetry {
|
|
|
47
48
|
}
|
|
48
49
|
Telemetry.instance.errorInternal(error, options);
|
|
49
50
|
}
|
|
50
|
-
trackInternal(payload, options) {
|
|
51
|
+
trackInternal(payload, options, deviceMetadata) {
|
|
51
52
|
const record = {
|
|
53
|
+
project_id: _projectId.PROJECT_ID,
|
|
54
|
+
device_id: deviceMetadata?.deviceId,
|
|
55
|
+
device_manufacturer: deviceMetadata?.make,
|
|
56
|
+
device_model: deviceMetadata?.model,
|
|
52
57
|
os: _reactNative.Platform.OS === 'ios' ? 'iOS' : 'Android',
|
|
53
58
|
os_version: _reactNative.Platform.Version.toString(),
|
|
54
59
|
framework: 'react-native',
|
|
55
60
|
framework_version: packageJson.version,
|
|
56
61
|
telemetry_payload: payload,
|
|
57
62
|
timestamp: new Date().toISOString(),
|
|
58
|
-
model_filename: Telemetry.getFilename(options.model),
|
|
63
|
+
model_filename: Telemetry.getFilename(options.model || ''),
|
|
59
64
|
n_ctx: options.n_ctx,
|
|
60
65
|
n_gpu_layers: options.n_gpu_layers
|
|
61
66
|
};
|
|
@@ -68,13 +73,14 @@ class Telemetry {
|
|
|
68
73
|
name: error.name
|
|
69
74
|
};
|
|
70
75
|
const record = {
|
|
76
|
+
project_id: _projectId.PROJECT_ID,
|
|
71
77
|
os: _reactNative.Platform.OS === 'ios' ? 'iOS' : 'Android',
|
|
72
78
|
os_version: _reactNative.Platform.Version.toString(),
|
|
73
79
|
framework: 'react-native',
|
|
74
80
|
framework_version: packageJson.version,
|
|
75
81
|
error_payload: errorPayload,
|
|
76
82
|
timestamp: new Date().toISOString(),
|
|
77
|
-
model_filename: Telemetry.getFilename(options.model),
|
|
83
|
+
model_filename: Telemetry.getFilename(options.model || ''),
|
|
78
84
|
n_ctx: options.n_ctx,
|
|
79
85
|
n_gpu_layers: options.n_gpu_layers
|
|
80
86
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","packageJson","Telemetry","instance","constructor","config","table","getFilename","path","split","pop","autoInit","supabaseUrl","supabaseKey","init","track","payload","options","trackInternal","error","errorInternal","record","os","Platform","OS","os_version","Version","toString","framework","framework_version","version","telemetry_payload","timestamp","Date","toISOString","model_filename","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_projectId","packageJson","Telemetry","instance","constructor","config","table","getFilename","path","split","pop","autoInit","supabaseUrl","supabaseKey","init","track","payload","options","deviceMetadata","trackInternal","error","errorInternal","record","project_id","PROJECT_ID","device_id","deviceId","device_manufacturer","make","device_model","model","os","Platform","OS","os_version","Version","toString","framework","framework_version","version","telemetry_payload","timestamp","Date","toISOString","model_filename","n_ctx","n_gpu_layers","sendRecord","catch","errorPayload","message","stack","name","error_payload","globalThis","fetch","method","headers","body","JSON","stringify","exports"],"sourceRoot":"../../src","sources":["telemetry.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/vlm.js
CHANGED
|
@@ -6,12 +6,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.CactusVLM = void 0;
|
|
7
7
|
var _index = require("./index");
|
|
8
8
|
var _telemetry = require("./telemetry");
|
|
9
|
+
var _remote = require("./remote");
|
|
9
10
|
class CactusVLM {
|
|
10
|
-
constructor(context
|
|
11
|
+
constructor(context) {
|
|
11
12
|
this.context = context;
|
|
12
|
-
this.initParams = initParams;
|
|
13
13
|
}
|
|
14
|
-
static async init(params, onProgress) {
|
|
14
|
+
static async init(params, onProgress, cactusToken) {
|
|
15
|
+
if (cactusToken) {
|
|
16
|
+
(0, _remote.setCactusToken)(cactusToken);
|
|
17
|
+
}
|
|
15
18
|
const configs = [params, {
|
|
16
19
|
...params,
|
|
17
20
|
n_gpu_layers: 0
|
|
@@ -19,14 +22,17 @@ class CactusVLM {
|
|
|
19
22
|
for (const config of configs) {
|
|
20
23
|
try {
|
|
21
24
|
const context = await (0, _index.initLlama)(config, onProgress);
|
|
22
|
-
// Explicitly disable GPU for the multimodal projector for stability.
|
|
23
25
|
await (0, _index.initMultimodal)(context.id, params.mmproj, false);
|
|
24
26
|
return {
|
|
25
|
-
vlm: new CactusVLM(context
|
|
27
|
+
vlm: new CactusVLM(context),
|
|
26
28
|
error: null
|
|
27
29
|
};
|
|
28
30
|
} catch (e) {
|
|
29
|
-
_telemetry.Telemetry.error(e,
|
|
31
|
+
_telemetry.Telemetry.error(e, {
|
|
32
|
+
n_gpu_layers: config.n_gpu_layers ?? null,
|
|
33
|
+
n_ctx: config.n_ctx ?? null,
|
|
34
|
+
model: config.model ?? null
|
|
35
|
+
});
|
|
30
36
|
if (configs.indexOf(config) === configs.length - 1) {
|
|
31
37
|
return {
|
|
32
38
|
vlm: null,
|
|
@@ -41,35 +47,96 @@ class CactusVLM {
|
|
|
41
47
|
};
|
|
42
48
|
}
|
|
43
49
|
async completion(messages, params = {}, callback) {
|
|
44
|
-
const
|
|
45
|
-
let firstTokenTime = null;
|
|
46
|
-
const wrappedCallback = callback ? data => {
|
|
47
|
-
if (firstTokenTime === null) firstTokenTime = Date.now();
|
|
48
|
-
callback(data);
|
|
49
|
-
} : undefined;
|
|
50
|
+
const mode = params.mode || 'local';
|
|
50
51
|
let result;
|
|
52
|
+
let lastError = null;
|
|
53
|
+
if (mode === 'remote') {
|
|
54
|
+
result = await this._handleRemoteCompletion(messages, params, callback);
|
|
55
|
+
} else if (mode === 'local') {
|
|
56
|
+
result = await this._handleLocalCompletion(messages, params, callback);
|
|
57
|
+
} else if (mode === 'localfirst') {
|
|
58
|
+
try {
|
|
59
|
+
result = await this._handleLocalCompletion(messages, params, callback);
|
|
60
|
+
} catch (e) {
|
|
61
|
+
lastError = e;
|
|
62
|
+
try {
|
|
63
|
+
result = await this._handleRemoteCompletion(messages, params, callback);
|
|
64
|
+
} catch (remoteError) {
|
|
65
|
+
throw lastError;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
} else if (mode === 'remotefirst') {
|
|
69
|
+
try {
|
|
70
|
+
result = await this._handleRemoteCompletion(messages, params, callback);
|
|
71
|
+
} catch (e) {
|
|
72
|
+
lastError = e;
|
|
73
|
+
try {
|
|
74
|
+
result = await this._handleLocalCompletion(messages, params, callback);
|
|
75
|
+
} catch (localError) {
|
|
76
|
+
throw lastError;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
} else {
|
|
80
|
+
throw new Error('Invalid mode: ' + mode + '. Must be "local", "remote", "localfirst", or "remotefirst"');
|
|
81
|
+
}
|
|
82
|
+
return result;
|
|
83
|
+
}
|
|
84
|
+
async _handleLocalCompletion(messages, params, callback) {
|
|
51
85
|
if (params.images && params.images.length > 0) {
|
|
52
86
|
const formattedPrompt = await this.context.getFormattedChat(messages);
|
|
53
87
|
const prompt = typeof formattedPrompt === 'string' ? formattedPrompt : formattedPrompt.prompt;
|
|
54
|
-
|
|
88
|
+
return await (0, _index.multimodalCompletion)(this.context.id, prompt, params.images, {
|
|
55
89
|
...params,
|
|
56
90
|
prompt,
|
|
57
91
|
emit_partial_completion: !!callback
|
|
58
92
|
});
|
|
59
93
|
} else {
|
|
60
|
-
|
|
94
|
+
return await this.context.completion({
|
|
61
95
|
messages,
|
|
62
96
|
...params
|
|
63
|
-
},
|
|
97
|
+
}, callback);
|
|
64
98
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
99
|
+
}
|
|
100
|
+
async _handleRemoteCompletion(messages, params, callback) {
|
|
101
|
+
const prompt = messages.map(m => `${m.role}: ${m.content}`).join('\n');
|
|
102
|
+
const imagePath = params.images && params.images.length > 0 ? params.images[0] : '';
|
|
103
|
+
let responseText;
|
|
104
|
+
if (imagePath) {
|
|
105
|
+
responseText = await (0, _remote.getVisionCompletion)(prompt, imagePath);
|
|
106
|
+
} else {
|
|
107
|
+
responseText = await (0, _remote.getTextCompletion)(prompt);
|
|
108
|
+
}
|
|
109
|
+
if (callback) {
|
|
110
|
+
for (let i = 0; i < responseText.length; i++) {
|
|
111
|
+
callback({
|
|
112
|
+
token: responseText[i]
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return {
|
|
117
|
+
text: responseText,
|
|
118
|
+
reasoning_content: '',
|
|
119
|
+
tool_calls: [],
|
|
120
|
+
content: responseText,
|
|
121
|
+
tokens_predicted: responseText.split(' ').length,
|
|
122
|
+
tokens_evaluated: prompt.split(' ').length,
|
|
123
|
+
truncated: false,
|
|
124
|
+
stopped_eos: true,
|
|
125
|
+
stopped_word: '',
|
|
126
|
+
stopped_limit: 0,
|
|
127
|
+
stopping_word: '',
|
|
128
|
+
tokens_cached: 0,
|
|
129
|
+
timings: {
|
|
130
|
+
prompt_n: prompt.split(' ').length,
|
|
131
|
+
prompt_ms: 0,
|
|
132
|
+
prompt_per_token_ms: 0,
|
|
133
|
+
prompt_per_second: 0,
|
|
134
|
+
predicted_n: responseText.split(' ').length,
|
|
135
|
+
predicted_ms: 0,
|
|
136
|
+
predicted_per_token_ms: 0,
|
|
137
|
+
predicted_per_second: 0
|
|
138
|
+
}
|
|
139
|
+
};
|
|
73
140
|
}
|
|
74
141
|
async rewind() {
|
|
75
142
|
// @ts-ignore
|
package/lib/commonjs/vlm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_index","require","_telemetry","CactusVLM","constructor","context","
|
|
1
|
+
{"version":3,"names":["_index","require","_telemetry","_remote","CactusVLM","constructor","context","init","params","onProgress","cactusToken","setCactusToken","configs","n_gpu_layers","config","initLlama","initMultimodal","id","mmproj","vlm","error","e","Telemetry","n_ctx","model","indexOf","length","Error","completion","messages","callback","mode","result","lastError","_handleRemoteCompletion","_handleLocalCompletion","remoteError","localError","images","formattedPrompt","getFormattedChat","prompt","multimodalCompletion","emit_partial_completion","map","m","role","content","join","imagePath","responseText","getVisionCompletion","getTextCompletion","i","token","text","reasoning_content","tool_calls","tokens_predicted","split","tokens_evaluated","truncated","stopped_eos","stopped_word","stopped_limit","stopping_word","tokens_cached","timings","prompt_n","prompt_ms","prompt_per_token_ms","prompt_per_second","predicted_n","predicted_ms","predicted_per_token_ms","predicted_per_second","rewind","release","exports"],"sourceRoot":"../../src","sources":["vlm.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../src","sources":["NativeCactus.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;;AAkSlD;;
|
|
1
|
+
{"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../src","sources":["NativeCactus.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;;AAkSlD;;AAkMA,eAAeA,mBAAmB,CAACC,GAAG,CAAO,QAAQ,CAAC","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -5,7 +5,9 @@ import Cactus from './NativeCactus';
|
|
|
5
5
|
import { SchemaGrammarConverter, convertJsonSchemaToGrammar } from './grammar';
|
|
6
6
|
import { formatChat } from './chat';
|
|
7
7
|
import { Tools, parseAndExecuteTool } from './tools';
|
|
8
|
+
import { Telemetry } from './telemetry';
|
|
8
9
|
export { SchemaGrammarConverter, convertJsonSchemaToGrammar, Tools };
|
|
10
|
+
export * from './remote';
|
|
9
11
|
const EVENT_ON_INIT_CONTEXT_PROGRESS = '@Cactus_onInitContextProgress';
|
|
10
12
|
const EVENT_ON_TOKEN = '@Cactus_onToken';
|
|
11
13
|
const EVENT_ON_NATIVE_LOG = '@Cactus_onNativeLog';
|
|
@@ -36,6 +38,11 @@ const getJsonSchema = responseFormat => {
|
|
|
36
38
|
}
|
|
37
39
|
return null;
|
|
38
40
|
};
|
|
41
|
+
const telemetryParams = {
|
|
42
|
+
n_gpu_layers: null,
|
|
43
|
+
n_ctx: null,
|
|
44
|
+
model: null
|
|
45
|
+
};
|
|
39
46
|
export class LlamaContext {
|
|
40
47
|
gpu = false;
|
|
41
48
|
reasonNoGPU = '';
|
|
@@ -182,17 +189,30 @@ export class LlamaContext {
|
|
|
182
189
|
const jsonSchema = getJsonSchema(params.response_format);
|
|
183
190
|
if (jsonSchema) nativeParams.json_schema = JSON.stringify(jsonSchema);
|
|
184
191
|
}
|
|
185
|
-
|
|
192
|
+
const startTime = Date.now();
|
|
193
|
+
let firstTokenTime = null;
|
|
194
|
+
const deviceInfo = await getDeviceInfo(this.id);
|
|
195
|
+
const wrappedCallback = callback ? data => {
|
|
196
|
+
if (firstTokenTime === null) firstTokenTime = Date.now();
|
|
197
|
+
callback(data);
|
|
198
|
+
} : undefined;
|
|
199
|
+
let tokenListener = wrappedCallback && EventEmitter.addListener(EVENT_ON_TOKEN, evt => {
|
|
186
200
|
const {
|
|
187
201
|
contextId,
|
|
188
202
|
tokenResult
|
|
189
203
|
} = evt;
|
|
190
204
|
if (contextId !== this.id) return;
|
|
191
|
-
|
|
205
|
+
wrappedCallback(tokenResult);
|
|
192
206
|
});
|
|
193
207
|
if (!nativeParams.prompt) throw new Error('Prompt is required');
|
|
194
208
|
const promise = Cactus.completion(this.id, nativeParams);
|
|
195
209
|
return promise.then(completionResult => {
|
|
210
|
+
Telemetry.track({
|
|
211
|
+
event: 'completion',
|
|
212
|
+
tok_per_sec: completionResult.timings?.predicted_per_second,
|
|
213
|
+
toks_generated: completionResult.timings?.predicted_n,
|
|
214
|
+
ttft: firstTokenTime ? firstTokenTime - startTime : null
|
|
215
|
+
}, telemetryParams, deviceInfo);
|
|
196
216
|
tokenListener?.remove();
|
|
197
217
|
tokenListener = null;
|
|
198
218
|
return completionResult;
|
|
@@ -211,8 +231,17 @@ export class LlamaContext {
|
|
|
211
231
|
detokenize(tokens) {
|
|
212
232
|
return Cactus.detokenize(this.id, tokens);
|
|
213
233
|
}
|
|
214
|
-
embedding(text, params) {
|
|
215
|
-
|
|
234
|
+
async embedding(text, params) {
|
|
235
|
+
const startTime = Date.now();
|
|
236
|
+
const embeddingResult = await Cactus.embedding(this.id, text, params || {});
|
|
237
|
+
const totalTime = Date.now() - startTime;
|
|
238
|
+
const deviceInfo = await getDeviceInfo(this.id);
|
|
239
|
+
Telemetry.track({
|
|
240
|
+
event: 'embedding',
|
|
241
|
+
mode: 'local',
|
|
242
|
+
embedding_time: totalTime
|
|
243
|
+
}, telemetryParams, deviceInfo);
|
|
244
|
+
return embeddingResult;
|
|
216
245
|
}
|
|
217
246
|
async bench(pp, tg, pl, nr) {
|
|
218
247
|
const result = await Cactus.bench(this.id, pp, tg, pl, nr);
|
|
@@ -298,6 +327,9 @@ export async function initLlama({
|
|
|
298
327
|
path: l.path.replace(/file:\/\//, ''),
|
|
299
328
|
scaled: l.scaled
|
|
300
329
|
}));
|
|
330
|
+
telemetryParams.n_gpu_layers = rest.n_gpu_layers || null;
|
|
331
|
+
telemetryParams.n_ctx = rest.n_ctx || null;
|
|
332
|
+
telemetryParams.model = model;
|
|
301
333
|
const contextId = contextIdCounter + contextIdRandom();
|
|
302
334
|
contextIdCounter += 1;
|
|
303
335
|
let removeProgressListener = null;
|
|
@@ -356,7 +388,15 @@ export const releaseMultimodal = async contextId => {
|
|
|
356
388
|
return await Cactus.releaseMultimodal(contextId);
|
|
357
389
|
};
|
|
358
390
|
export const multimodalCompletion = async (contextId, prompt, mediaPaths, params) => {
|
|
359
|
-
|
|
391
|
+
const result = await Cactus.multimodalCompletion(contextId, prompt, mediaPaths, params);
|
|
392
|
+
const deviceInfo = await getDeviceInfo(contextId);
|
|
393
|
+
Telemetry.track({
|
|
394
|
+
event: 'completion',
|
|
395
|
+
tok_per_sec: result.timings?.predicted_per_second,
|
|
396
|
+
toks_generated: result.timings?.predicted_n,
|
|
397
|
+
num_images: mediaPaths?.length
|
|
398
|
+
}, telemetryParams, deviceInfo);
|
|
399
|
+
return result;
|
|
360
400
|
};
|
|
361
401
|
export const initVocoder = async (contextId, vocoderModelPath) => {
|
|
362
402
|
return await Cactus.initVocoder(contextId, vocoderModelPath);
|
|
@@ -386,6 +426,9 @@ export const tokenize = async (contextId, text, mediaPaths) => {
|
|
|
386
426
|
return await Cactus.tokenize(contextId, text);
|
|
387
427
|
}
|
|
388
428
|
};
|
|
429
|
+
export const getDeviceInfo = async contextId => {
|
|
430
|
+
return await Cactus.getDeviceInfo(contextId);
|
|
431
|
+
};
|
|
389
432
|
export { CactusLM } from './lm';
|
|
390
433
|
export { CactusVLM } from './vlm';
|
|
391
434
|
export { CactusTTS } from './tts';
|