cactus-react-native 1.5.0 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cactus.podspec +1 -1
- package/README.md +347 -241
- package/android/CMakeLists.txt +24 -5
- package/android/src/main/jniLibs/arm64-v8a/libcactus.a +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libcurl.a +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libmbedcrypto.a +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libmbedtls.a +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libmbedx509.a +0 -0
- package/cpp/HybridCactus.cpp +149 -117
- package/cpp/HybridCactus.hpp +14 -10
- package/cpp/cactus_ffi.h +54 -43
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/cactus.h +0 -1
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/cactus_ffi.h +54 -43
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/cactus_utils.h +318 -123
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/engine.h +118 -15
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/graph.h +77 -32
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/kernel.h +68 -6
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/kernel_utils.h +21 -155
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/cactus +0 -0
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/cactus.h +0 -1
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/cactus_ffi.h +54 -43
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/cactus_utils.h +318 -123
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/engine.h +118 -15
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/graph.h +77 -32
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/kernel.h +68 -6
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/kernel_utils.h +21 -155
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/cactus +0 -0
- package/lib/module/classes/CactusLM.js +16 -49
- package/lib/module/classes/CactusLM.js.map +1 -1
- package/lib/module/classes/CactusSTT.js +30 -79
- package/lib/module/classes/CactusSTT.js.map +1 -1
- package/lib/module/classes/CactusVAD.js +95 -0
- package/lib/module/classes/CactusVAD.js.map +1 -0
- package/lib/module/hooks/useCactusLM.js +10 -11
- package/lib/module/hooks/useCactusLM.js.map +1 -1
- package/lib/module/hooks/useCactusSTT.js +23 -62
- package/lib/module/hooks/useCactusSTT.js.map +1 -1
- package/lib/module/hooks/useCactusVAD.js +171 -0
- package/lib/module/hooks/useCactusVAD.js.map +1 -0
- package/lib/module/index.js +2 -3
- package/lib/module/index.js.map +1 -1
- package/lib/module/modelRegistry.js +52 -0
- package/lib/module/modelRegistry.js.map +1 -0
- package/lib/module/native/Cactus.js +85 -23
- package/lib/module/native/Cactus.js.map +1 -1
- package/lib/module/native/CactusIndex.js.map +1 -1
- package/lib/module/native/index.js +0 -3
- package/lib/module/native/index.js.map +1 -1
- package/lib/module/types/CactusVAD.js +4 -0
- package/lib/module/{specs/CactusUtil.nitro.js.map → types/CactusVAD.js.map} +1 -1
- package/lib/typescript/src/classes/CactusLM.d.ts +5 -7
- package/lib/typescript/src/classes/CactusLM.d.ts.map +1 -1
- package/lib/typescript/src/classes/CactusSTT.d.ts +8 -12
- package/lib/typescript/src/classes/CactusSTT.d.ts.map +1 -1
- package/lib/typescript/src/classes/CactusVAD.d.ts +20 -0
- package/lib/typescript/src/classes/CactusVAD.d.ts.map +1 -0
- package/lib/typescript/src/hooks/useCactusLM.d.ts +2 -2
- package/lib/typescript/src/hooks/useCactusLM.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useCactusSTT.d.ts +6 -8
- package/lib/typescript/src/hooks/useCactusSTT.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useCactusVAD.d.ts +15 -0
- package/lib/typescript/src/hooks/useCactusVAD.d.ts.map +1 -0
- package/lib/typescript/src/index.d.ts +7 -5
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/modelRegistry.d.ts +5 -0
- package/lib/typescript/src/modelRegistry.d.ts.map +1 -0
- package/lib/typescript/src/native/Cactus.d.ts +12 -11
- package/lib/typescript/src/native/Cactus.d.ts.map +1 -1
- package/lib/typescript/src/native/CactusIndex.d.ts +2 -2
- package/lib/typescript/src/native/CactusIndex.d.ts.map +1 -1
- package/lib/typescript/src/native/index.d.ts +0 -3
- package/lib/typescript/src/native/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/Cactus.nitro.d.ts +6 -6
- package/lib/typescript/src/specs/Cactus.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/CactusIndex.d.ts +2 -2
- package/lib/typescript/src/types/CactusIndex.d.ts.map +1 -1
- package/lib/typescript/src/types/CactusLM.d.ts +19 -11
- package/lib/typescript/src/types/CactusLM.d.ts.map +1 -1
- package/lib/typescript/src/types/CactusSTT.d.ts +33 -12
- package/lib/typescript/src/types/CactusSTT.d.ts.map +1 -1
- package/lib/typescript/src/types/CactusVAD.d.ts +34 -0
- package/lib/typescript/src/types/CactusVAD.d.ts.map +1 -0
- package/lib/typescript/src/types/common.d.ts +1 -6
- package/lib/typescript/src/types/common.d.ts.map +1 -1
- package/nitro.json +0 -11
- package/nitrogen/generated/android/cactus+autolinking.cmake +0 -5
- package/nitrogen/generated/android/cactusOnLoad.cpp +0 -30
- package/nitrogen/generated/ios/Cactus-Swift-Cxx-Bridge.cpp +0 -50
- package/nitrogen/generated/ios/Cactus-Swift-Cxx-Bridge.hpp +9 -147
- package/nitrogen/generated/ios/Cactus-Swift-Cxx-Umbrella.hpp +0 -13
- package/nitrogen/generated/ios/CactusAutolinking.mm +0 -26
- package/nitrogen/generated/ios/CactusAutolinking.swift +0 -30
- package/nitrogen/generated/shared/c++/HybridCactusSpec.cpp +4 -4
- package/nitrogen/generated/shared/c++/HybridCactusSpec.hpp +6 -6
- package/package.json +3 -3
- package/src/classes/CactusLM.ts +18 -65
- package/src/classes/CactusSTT.ts +39 -97
- package/src/classes/CactusVAD.ts +129 -0
- package/src/hooks/useCactusLM.ts +14 -17
- package/src/hooks/useCactusSTT.ts +47 -98
- package/src/hooks/useCactusVAD.ts +215 -0
- package/src/index.tsx +18 -12
- package/src/modelRegistry.ts +65 -0
- package/src/native/Cactus.ts +102 -41
- package/src/native/CactusIndex.ts +2 -2
- package/src/native/index.ts +0 -3
- package/src/specs/Cactus.nitro.ts +11 -7
- package/src/types/CactusIndex.ts +2 -2
- package/src/types/CactusLM.ts +19 -11
- package/src/types/CactusSTT.ts +33 -13
- package/src/types/CactusVAD.ts +39 -0
- package/src/types/common.ts +1 -6
- package/android/src/main/java/com/margelo/nitro/cactus/HybridCactusCrypto.kt +0 -46
- package/android/src/main/java/com/margelo/nitro/cactus/HybridCactusDeviceInfo.kt +0 -27
- package/android/src/main/jniLibs/arm64-v8a/libcactus_util.a +0 -0
- package/cpp/HybridCactusUtil.cpp +0 -47
- package/cpp/HybridCactusUtil.hpp +0 -27
- package/cpp/cactus_util.h +0 -25
- package/ios/HybridCactusCrypto.swift +0 -37
- package/ios/HybridCactusDeviceInfo.swift +0 -32
- package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/cactus_telemetry.h +0 -656
- package/ios/cactus.xcframework/ios-arm64-simulator/cactus.framework/Headers/cactus_telemetry.h +0 -656
- package/ios/cactus_util.xcframework/Info.plist +0 -39
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/Headers/cactus_util.h +0 -25
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/Headers/database.h +0 -27
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/Headers/ios_utils.h +0 -10
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/Headers/logging.h +0 -25
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/Info.plist +0 -0
- package/ios/cactus_util.xcframework/ios-arm64/cactus_util.framework/cactus_util +0 -0
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/Headers/cactus_util.h +0 -25
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/Headers/database.h +0 -27
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/Headers/ios_utils.h +0 -10
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/Headers/logging.h +0 -25
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/Info.plist +0 -0
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/_CodeSignature/CodeResources +0 -135
- package/ios/cactus_util.xcframework/ios-arm64-simulator/cactus_util.framework/cactus_util +0 -0
- package/lib/module/api/Database.js +0 -45
- package/lib/module/api/Database.js.map +0 -1
- package/lib/module/api/RemoteLM.js +0 -201
- package/lib/module/api/RemoteLM.js.map +0 -1
- package/lib/module/config/CactusConfig.js +0 -12
- package/lib/module/config/CactusConfig.js.map +0 -1
- package/lib/module/models.js +0 -336
- package/lib/module/models.js.map +0 -1
- package/lib/module/native/CactusCrypto.js +0 -10
- package/lib/module/native/CactusCrypto.js.map +0 -1
- package/lib/module/native/CactusDeviceInfo.js +0 -13
- package/lib/module/native/CactusDeviceInfo.js.map +0 -1
- package/lib/module/native/CactusUtil.js +0 -36
- package/lib/module/native/CactusUtil.js.map +0 -1
- package/lib/module/specs/CactusCrypto.nitro.js +0 -4
- package/lib/module/specs/CactusCrypto.nitro.js.map +0 -1
- package/lib/module/specs/CactusDeviceInfo.nitro.js +0 -4
- package/lib/module/specs/CactusDeviceInfo.nitro.js.map +0 -1
- package/lib/module/specs/CactusUtil.nitro.js +0 -4
- package/lib/module/telemetry/Telemetry.js +0 -154
- package/lib/module/telemetry/Telemetry.js.map +0 -1
- package/lib/typescript/src/api/Database.d.ts +0 -12
- package/lib/typescript/src/api/Database.d.ts.map +0 -1
- package/lib/typescript/src/api/RemoteLM.d.ts +0 -14
- package/lib/typescript/src/api/RemoteLM.d.ts.map +0 -1
- package/lib/typescript/src/config/CactusConfig.d.ts +0 -7
- package/lib/typescript/src/config/CactusConfig.d.ts.map +0 -1
- package/lib/typescript/src/models.d.ts +0 -6
- package/lib/typescript/src/models.d.ts.map +0 -1
- package/lib/typescript/src/native/CactusCrypto.d.ts +0 -5
- package/lib/typescript/src/native/CactusCrypto.d.ts.map +0 -1
- package/lib/typescript/src/native/CactusDeviceInfo.d.ts +0 -7
- package/lib/typescript/src/native/CactusDeviceInfo.d.ts.map +0 -1
- package/lib/typescript/src/native/CactusUtil.d.ts +0 -6
- package/lib/typescript/src/native/CactusUtil.d.ts.map +0 -1
- package/lib/typescript/src/specs/CactusCrypto.nitro.d.ts +0 -8
- package/lib/typescript/src/specs/CactusCrypto.nitro.d.ts.map +0 -1
- package/lib/typescript/src/specs/CactusDeviceInfo.nitro.d.ts +0 -16
- package/lib/typescript/src/specs/CactusDeviceInfo.nitro.d.ts.map +0 -1
- package/lib/typescript/src/specs/CactusUtil.nitro.d.ts +0 -10
- package/lib/typescript/src/specs/CactusUtil.nitro.d.ts.map +0 -1
- package/lib/typescript/src/telemetry/Telemetry.d.ts +0 -34
- package/lib/typescript/src/telemetry/Telemetry.d.ts.map +0 -1
- package/nitrogen/generated/android/c++/JDeviceInfo.hpp +0 -74
- package/nitrogen/generated/android/c++/JHybridCactusCryptoSpec.cpp +0 -65
- package/nitrogen/generated/android/c++/JHybridCactusCryptoSpec.hpp +0 -65
- package/nitrogen/generated/android/c++/JHybridCactusDeviceInfoSpec.cpp +0 -85
- package/nitrogen/generated/android/c++/JHybridCactusDeviceInfoSpec.hpp +0 -66
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/cactus/DeviceInfo.kt +0 -50
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/cactus/HybridCactusCryptoSpec.kt +0 -58
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/cactus/HybridCactusDeviceInfoSpec.kt +0 -62
- package/nitrogen/generated/ios/c++/HybridCactusCryptoSpecSwift.cpp +0 -11
- package/nitrogen/generated/ios/c++/HybridCactusCryptoSpecSwift.hpp +0 -77
- package/nitrogen/generated/ios/c++/HybridCactusDeviceInfoSpecSwift.cpp +0 -11
- package/nitrogen/generated/ios/c++/HybridCactusDeviceInfoSpecSwift.hpp +0 -88
- package/nitrogen/generated/ios/swift/DeviceInfo.swift +0 -98
- package/nitrogen/generated/ios/swift/Func_void_DeviceInfo.swift +0 -47
- package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string_.swift +0 -54
- package/nitrogen/generated/ios/swift/HybridCactusCryptoSpec.swift +0 -57
- package/nitrogen/generated/ios/swift/HybridCactusCryptoSpec_cxx.swift +0 -139
- package/nitrogen/generated/ios/swift/HybridCactusDeviceInfoSpec.swift +0 -58
- package/nitrogen/generated/ios/swift/HybridCactusDeviceInfoSpec_cxx.swift +0 -164
- package/nitrogen/generated/shared/c++/DeviceInfo.hpp +0 -92
- package/nitrogen/generated/shared/c++/HybridCactusCryptoSpec.cpp +0 -21
- package/nitrogen/generated/shared/c++/HybridCactusCryptoSpec.hpp +0 -63
- package/nitrogen/generated/shared/c++/HybridCactusDeviceInfoSpec.cpp +0 -22
- package/nitrogen/generated/shared/c++/HybridCactusDeviceInfoSpec.hpp +0 -67
- package/nitrogen/generated/shared/c++/HybridCactusUtilSpec.cpp +0 -23
- package/nitrogen/generated/shared/c++/HybridCactusUtilSpec.hpp +0 -66
- package/src/api/Database.ts +0 -55
- package/src/api/RemoteLM.ts +0 -273
- package/src/config/CactusConfig.ts +0 -11
- package/src/models.ts +0 -344
- package/src/native/CactusCrypto.ts +0 -11
- package/src/native/CactusDeviceInfo.ts +0 -18
- package/src/native/CactusUtil.ts +0 -43
- package/src/specs/CactusCrypto.nitro.ts +0 -6
- package/src/specs/CactusDeviceInfo.nitro.ts +0 -15
- package/src/specs/CactusUtil.nitro.ts +0 -8
- package/src/telemetry/Telemetry.ts +0 -236
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,YAAY,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACtE,YAAY,EACV,cAAc,EACd,sBAAsB,EACtB,eAAe,EACf,uBAAuB,EACvB,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,yBAAyB,EACzB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,eAAe,EACf,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,qCAAqC,EACrC,sCAAsC,EACtC,sCAAsC,EACtC,mCAAmC,GACpC,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelRegistry.d.ts","sourceRoot":"","sources":["../../../src/modelRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMlD,wBAAgB,WAAW,IAAI,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,CAAC,CAErE"}
|
|
@@ -1,25 +1,26 @@
|
|
|
1
|
-
import type { CactusLMCompleteResult,
|
|
2
|
-
import type { CactusSTTTranscribeResult,
|
|
1
|
+
import type { CactusLMCompleteResult, CactusLMMessage, CactusLMCompleteOptions, CactusLMTool } from '../types/CactusLM';
|
|
2
|
+
import type { CactusSTTTranscribeResult, CactusSTTTranscribeOptions, CactusSTTStreamTranscribeStartOptions, CactusSTTStreamTranscribeProcessResult, CactusSTTStreamTranscribeStopResult } from '../types/CactusSTT';
|
|
3
|
+
import type { CactusVADOptions, CactusVADResult } from '../types/CactusVAD';
|
|
3
4
|
export declare class Cactus {
|
|
4
5
|
private readonly hybridCactus;
|
|
5
|
-
init(modelPath: string,
|
|
6
|
-
complete(messages:
|
|
6
|
+
init(modelPath: string, corpusDir?: string, cacheIndex?: boolean): Promise<void>;
|
|
7
|
+
complete(messages: CactusLMMessage[], responseBufferSize: number, options?: CactusLMCompleteOptions, tools?: {
|
|
7
8
|
type: 'function';
|
|
8
|
-
function:
|
|
9
|
+
function: CactusLMTool;
|
|
9
10
|
}[], callback?: (token: string, tokenId: number) => void): Promise<CactusLMCompleteResult>;
|
|
10
11
|
tokenize(text: string): Promise<number[]>;
|
|
11
12
|
scoreWindow(tokens: number[], start: number, end: number, context: number): Promise<number>;
|
|
12
|
-
transcribe(audio: string | number[], prompt: string, responseBufferSize: number, options?:
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
streamTranscribeDestroy(): Promise<void>;
|
|
13
|
+
transcribe(audio: string | number[], prompt: string, responseBufferSize: number, options?: CactusSTTTranscribeOptions, callback?: (token: string, tokenId: number) => void): Promise<CactusSTTTranscribeResult>;
|
|
14
|
+
streamTranscribeStart(options?: CactusSTTStreamTranscribeStartOptions): Promise<void>;
|
|
15
|
+
streamTranscribeProcess(audio: number[]): Promise<CactusSTTStreamTranscribeProcessResult>;
|
|
16
|
+
streamTranscribeStop(): Promise<CactusSTTStreamTranscribeStopResult>;
|
|
17
|
+
vad(audio: string | number[], options?: CactusVADOptions): Promise<CactusVADResult>;
|
|
18
18
|
embed(text: string, embeddingBufferSize: number, normalize: boolean): Promise<number[]>;
|
|
19
19
|
imageEmbed(imagePath: string, embeddingBufferSize: number): Promise<number[]>;
|
|
20
20
|
audioEmbed(audioPath: string, embeddingBufferSize: number): Promise<number[]>;
|
|
21
21
|
reset(): Promise<void>;
|
|
22
22
|
stop(): Promise<void>;
|
|
23
23
|
destroy(): Promise<void>;
|
|
24
|
+
setTelemetryEnvironment(cacheDir: string): Promise<void>;
|
|
24
25
|
}
|
|
25
26
|
//# sourceMappingURL=Cactus.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cactus.d.ts","sourceRoot":"","sources":["../../../../src/native/Cactus.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"Cactus.d.ts","sourceRoot":"","sources":["../../../../src/native/Cactus.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EACf,uBAAuB,EACvB,YAAY,EACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,qCAAqC,EACrC,sCAAsC,EACtC,mCAAmC,EACpC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE5E,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAC2B;IAEjD,IAAI,CACT,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,IAAI,CAAC;IAIH,QAAQ,CACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,OAAO,CAAC,EAAE,uBAAuB,EACjC,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,YAAY,CAAA;KAAE,EAAE,EACtD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAClD,OAAO,CAAC,sBAAsB,CAAC;IAuE3B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInC,WAAW,CACtB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;IAeL,UAAU,CACrB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,OAAO,CAAC,EAAE,0BAA0B,EACpC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAClD,OAAO,CAAC,yBAAyB,CAAC;IAkD9B,qBAAqB,CAC1B,OAAO,CAAC,EAAE,qCAAqC,GAC9C,OAAO,CAAC,IAAI,CAAC;IAWH,uBAAuB,CAClC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,sCAAsC,CAAC;IA4BrC,oBAAoB,IAAI,OAAO,CAAC,mCAAmC,CAAC;IAUpE,GAAG,CACd,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC;IAkCpB,KAAK,CACV,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;IAIP,UAAU,CACrB,SAAS,EAAE,MAAM,EACjB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC;IAUb,UAAU,CACf,SAAS,EAAE,MAAM,EACjB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC;IAOb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhE"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { CactusIndexGetResult, CactusIndexQueryResult,
|
|
1
|
+
import type { CactusIndexGetResult, CactusIndexQueryResult, CactusIndexQueryOptions } from '../types/CactusIndex';
|
|
2
2
|
export declare class CactusIndex {
|
|
3
3
|
private readonly hybridCactusIndex;
|
|
4
4
|
init(indexPath: string, embeddingDim: number): Promise<void>;
|
|
5
5
|
add(ids: number[], documents: string[], embeddings: number[][], metadatas?: string[]): Promise<void>;
|
|
6
6
|
delete(ids: number[]): Promise<void>;
|
|
7
7
|
get(ids: number[]): Promise<CactusIndexGetResult>;
|
|
8
|
-
query(embeddings: number[][], options?:
|
|
8
|
+
query(embeddings: number[][], options?: CactusIndexQueryOptions): Promise<CactusIndexQueryResult>;
|
|
9
9
|
compact(): Promise<void>;
|
|
10
10
|
destroy(): Promise<void>;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CactusIndex.d.ts","sourceRoot":"","sources":["../../../../src/native/CactusIndex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"CactusIndex.d.ts","sourceRoot":"","sources":["../../../../src/native/CactusIndex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACgC;IAE3D,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,GAAG,CACR,GAAG,EAAE,MAAM,EAAE,EACb,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,EAAE,MAAM,EAAE,EAAE,EACtB,SAAS,CAAC,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,IAAI,CAAC;IAIT,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAIjD,KAAK,CACV,UAAU,EAAE,MAAM,EAAE,EAAE,EACtB,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,sBAAsB,CAAC;IAU3B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
export { Cactus } from './Cactus';
|
|
2
2
|
export { CactusIndex } from './CactusIndex';
|
|
3
|
-
export { CactusCrypto } from './CactusCrypto';
|
|
4
|
-
export { CactusDeviceInfo } from './CactusDeviceInfo';
|
|
5
3
|
export { CactusFileSystem } from './CactusFileSystem';
|
|
6
4
|
export { CactusImage } from './CactusImage';
|
|
7
|
-
export { CactusUtil } from './CactusUtil';
|
|
8
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
|
|
@@ -3,21 +3,21 @@ export interface Cactus extends HybridObject<{
|
|
|
3
3
|
ios: 'c++';
|
|
4
4
|
android: 'c++';
|
|
5
5
|
}> {
|
|
6
|
-
init(modelPath: string,
|
|
6
|
+
init(modelPath: string, corpusDir?: string, cacheIndex?: boolean): Promise<void>;
|
|
7
7
|
complete(messagesJson: string, responseBufferSize: number, optionsJson?: string, toolsJson?: string, callback?: (token: string, tokenId: number) => void): Promise<string>;
|
|
8
8
|
tokenize(text: string): Promise<number[]>;
|
|
9
9
|
scoreWindow(tokens: number[], start: number, end: number, context: number): Promise<string>;
|
|
10
10
|
transcribe(audio: string | number[], prompt: string, responseBufferSize: number, optionsJson?: string, callback?: (token: string, tokenId: number) => void): Promise<string>;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
streamTranscribeDestroy(): Promise<void>;
|
|
11
|
+
streamTranscribeStart(optionsJson?: string): Promise<void>;
|
|
12
|
+
streamTranscribeProcess(audio: number[]): Promise<string>;
|
|
13
|
+
streamTranscribeStop(): Promise<string>;
|
|
14
|
+
vad(audio: string | number[], responseBufferSize: number, optionsJson?: string): Promise<string>;
|
|
16
15
|
embed(text: string, embeddingBufferSize: number, normalize: boolean): Promise<number[]>;
|
|
17
16
|
imageEmbed(imagePath: string, embeddingBufferSize: number): Promise<number[]>;
|
|
18
17
|
audioEmbed(audioPath: string, embeddingBufferSize: number): Promise<number[]>;
|
|
19
18
|
reset(): Promise<void>;
|
|
20
19
|
stop(): Promise<void>;
|
|
21
20
|
destroy(): Promise<void>;
|
|
21
|
+
setTelemetryEnvironment(cacheDir: string): Promise<void>;
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=Cactus.nitro.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cactus.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/Cactus.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,MAAO,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;IAC1E,IAAI,CACF,SAAS,EAAE,MAAM,EACjB,
|
|
1
|
+
{"version":3,"file":"Cactus.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/Cactus.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,MAAO,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;IAC1E,IAAI,CACF,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,QAAQ,CACN,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAClD,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,WAAW,CACT,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,UAAU,CACR,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAClD,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,qBAAqB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,kBAAkB,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}
|
|
@@ -16,13 +16,13 @@ export interface CactusIndexGetResult {
|
|
|
16
16
|
metadatas: string[];
|
|
17
17
|
embeddings: number[][];
|
|
18
18
|
}
|
|
19
|
-
export interface
|
|
19
|
+
export interface CactusIndexQueryOptions {
|
|
20
20
|
topK?: number;
|
|
21
21
|
scoreThreshold?: number;
|
|
22
22
|
}
|
|
23
23
|
export interface CactusIndexQueryParams {
|
|
24
24
|
embeddings: number[][];
|
|
25
|
-
options?:
|
|
25
|
+
options?: CactusIndexQueryOptions;
|
|
26
26
|
}
|
|
27
27
|
export interface CactusIndexQueryResult {
|
|
28
28
|
ids: number[][];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CactusIndex.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusIndex.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"CactusIndex.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusIndex.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,uBAAuB,CAAC;CACnC;AAED,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,EAAE,CAAC;CACf"}
|
|
@@ -1,27 +1,32 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type CactusModelOptions } from './common';
|
|
2
2
|
export interface CactusLMParams {
|
|
3
3
|
model?: string;
|
|
4
|
-
contextSize?: number;
|
|
5
4
|
corpusDir?: string;
|
|
6
|
-
|
|
5
|
+
cacheIndex?: boolean;
|
|
6
|
+
options?: CactusModelOptions;
|
|
7
7
|
}
|
|
8
8
|
export interface CactusLMDownloadParams {
|
|
9
9
|
onProgress?: (progress: number) => void;
|
|
10
10
|
}
|
|
11
|
-
export interface
|
|
11
|
+
export interface CactusLMMessage {
|
|
12
12
|
role: 'user' | 'assistant' | 'system';
|
|
13
13
|
content?: string;
|
|
14
14
|
images?: string[];
|
|
15
15
|
}
|
|
16
|
-
export interface
|
|
16
|
+
export interface CactusLMCompleteOptions {
|
|
17
17
|
temperature?: number;
|
|
18
18
|
topP?: number;
|
|
19
19
|
topK?: number;
|
|
20
20
|
maxTokens?: number;
|
|
21
21
|
stopSequences?: string[];
|
|
22
22
|
forceTools?: boolean;
|
|
23
|
+
telemetryEnabled?: boolean;
|
|
24
|
+
confidenceThreshold?: number;
|
|
25
|
+
toolRagTopK?: number;
|
|
26
|
+
includeStopSequences?: boolean;
|
|
27
|
+
useVad?: boolean;
|
|
23
28
|
}
|
|
24
|
-
export interface
|
|
29
|
+
export interface CactusLMTool {
|
|
25
30
|
name: string;
|
|
26
31
|
description: string;
|
|
27
32
|
parameters: {
|
|
@@ -36,11 +41,10 @@ export interface Tool {
|
|
|
36
41
|
};
|
|
37
42
|
}
|
|
38
43
|
export interface CactusLMCompleteParams {
|
|
39
|
-
messages:
|
|
40
|
-
options?:
|
|
41
|
-
tools?:
|
|
44
|
+
messages: CactusLMMessage[];
|
|
45
|
+
options?: CactusLMCompleteOptions;
|
|
46
|
+
tools?: CactusLMTool[];
|
|
42
47
|
onToken?: (token: string) => void;
|
|
43
|
-
mode?: 'local' | 'hybrid';
|
|
44
48
|
}
|
|
45
49
|
export interface CactusLMCompleteResult {
|
|
46
50
|
success: boolean;
|
|
@@ -51,12 +55,16 @@ export interface CactusLMCompleteResult {
|
|
|
51
55
|
[key: string]: any;
|
|
52
56
|
};
|
|
53
57
|
}[];
|
|
58
|
+
cloudHandoff?: boolean;
|
|
59
|
+
confidence?: number;
|
|
54
60
|
timeToFirstTokenMs: number;
|
|
55
61
|
totalTimeMs: number;
|
|
56
|
-
tokensPerSecond: number;
|
|
57
62
|
prefillTokens: number;
|
|
63
|
+
prefillTps: number;
|
|
58
64
|
decodeTokens: number;
|
|
65
|
+
decodeTps: number;
|
|
59
66
|
totalTokens: number;
|
|
67
|
+
ramUsageMb?: number;
|
|
60
68
|
}
|
|
61
69
|
export interface CactusLMTokenizeParams {
|
|
62
70
|
text: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CactusLM.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusLM.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"CactusLM.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusLM.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,34 +1,42 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type CactusModelOptions } from './common';
|
|
2
2
|
export interface CactusSTTParams {
|
|
3
3
|
model?: string;
|
|
4
|
-
|
|
5
|
-
options?: ModelOptions;
|
|
4
|
+
options?: CactusModelOptions;
|
|
6
5
|
}
|
|
7
6
|
export interface CactusSTTDownloadParams {
|
|
8
7
|
onProgress?: (progress: number) => void;
|
|
9
8
|
}
|
|
10
|
-
export interface
|
|
9
|
+
export interface CactusSTTTranscribeOptions {
|
|
11
10
|
temperature?: number;
|
|
12
11
|
topP?: number;
|
|
13
12
|
topK?: number;
|
|
14
13
|
maxTokens?: number;
|
|
15
14
|
stopSequences?: string[];
|
|
15
|
+
useVad?: boolean;
|
|
16
|
+
telemetryEnabled?: boolean;
|
|
17
|
+
confidenceThreshold?: number;
|
|
18
|
+
cloudHandoffThreshold?: number;
|
|
19
|
+
includeStopSequences?: boolean;
|
|
16
20
|
}
|
|
17
21
|
export interface CactusSTTTranscribeParams {
|
|
18
22
|
audio: string | number[];
|
|
19
23
|
prompt?: string;
|
|
20
|
-
options?:
|
|
24
|
+
options?: CactusSTTTranscribeOptions;
|
|
21
25
|
onToken?: (token: string) => void;
|
|
22
26
|
}
|
|
23
27
|
export interface CactusSTTTranscribeResult {
|
|
24
28
|
success: boolean;
|
|
25
29
|
response: string;
|
|
30
|
+
cloudHandoff?: boolean;
|
|
31
|
+
confidence?: number;
|
|
26
32
|
timeToFirstTokenMs: number;
|
|
27
33
|
totalTimeMs: number;
|
|
28
|
-
tokensPerSecond: number;
|
|
29
34
|
prefillTokens: number;
|
|
35
|
+
prefillTps: number;
|
|
30
36
|
decodeTokens: number;
|
|
37
|
+
decodeTps: number;
|
|
31
38
|
totalTokens: number;
|
|
39
|
+
ramUsageMb?: number;
|
|
32
40
|
}
|
|
33
41
|
export interface CactusSTTAudioEmbedParams {
|
|
34
42
|
audioPath: string;
|
|
@@ -36,21 +44,34 @@ export interface CactusSTTAudioEmbedParams {
|
|
|
36
44
|
export interface CactusSTTAudioEmbedResult {
|
|
37
45
|
embedding: number[];
|
|
38
46
|
}
|
|
39
|
-
export interface
|
|
40
|
-
audio: number[];
|
|
41
|
-
}
|
|
42
|
-
export interface StreamTranscribeProcessOptions {
|
|
47
|
+
export interface CactusSTTStreamTranscribeStartOptions {
|
|
43
48
|
confirmationThreshold?: number;
|
|
49
|
+
minChunkSize?: number;
|
|
50
|
+
telemetryEnabled?: boolean;
|
|
44
51
|
}
|
|
45
52
|
export interface CactusSTTStreamTranscribeProcessParams {
|
|
46
|
-
|
|
53
|
+
audio: number[];
|
|
47
54
|
}
|
|
48
55
|
export interface CactusSTTStreamTranscribeProcessResult {
|
|
49
56
|
success: boolean;
|
|
50
57
|
confirmed: string;
|
|
51
58
|
pending: string;
|
|
59
|
+
bufferDurationMs?: number;
|
|
60
|
+
confidence?: number;
|
|
61
|
+
cloudHandoff?: boolean;
|
|
62
|
+
cloudResult?: string;
|
|
63
|
+
cloudJobId?: number;
|
|
64
|
+
cloudResultJobId?: number;
|
|
65
|
+
timeToFirstTokenMs?: number;
|
|
66
|
+
totalTimeMs?: number;
|
|
67
|
+
prefillTokens?: number;
|
|
68
|
+
prefillTps?: number;
|
|
69
|
+
decodeTokens?: number;
|
|
70
|
+
decodeTps?: number;
|
|
71
|
+
totalTokens?: number;
|
|
72
|
+
ramUsageMb?: number;
|
|
52
73
|
}
|
|
53
|
-
export interface
|
|
74
|
+
export interface CactusSTTStreamTranscribeStopResult {
|
|
54
75
|
success: boolean;
|
|
55
76
|
confirmed: string;
|
|
56
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CactusSTT.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusSTT.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"CactusSTT.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusSTT.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { CactusModelOptions } from './common';
|
|
2
|
+
export interface CactusVADParams {
|
|
3
|
+
model?: string;
|
|
4
|
+
options?: CactusModelOptions;
|
|
5
|
+
}
|
|
6
|
+
export interface CactusVADDownloadParams {
|
|
7
|
+
onProgress?: (progress: number) => void;
|
|
8
|
+
}
|
|
9
|
+
export interface CactusVADOptions {
|
|
10
|
+
threshold?: number;
|
|
11
|
+
negThreshold?: number;
|
|
12
|
+
minSpeechDurationMs?: number;
|
|
13
|
+
maxSpeechDurationS?: number;
|
|
14
|
+
minSilenceDurationMs?: number;
|
|
15
|
+
speechPadMs?: number;
|
|
16
|
+
windowSizeSamples?: number;
|
|
17
|
+
samplingRate?: number;
|
|
18
|
+
minSilenceAtMaxSpeech?: number;
|
|
19
|
+
useMaxPossSilAtMaxSpeech?: boolean;
|
|
20
|
+
}
|
|
21
|
+
export interface CactusVADSegment {
|
|
22
|
+
start: number;
|
|
23
|
+
end: number;
|
|
24
|
+
}
|
|
25
|
+
export interface CactusVADResult {
|
|
26
|
+
segments: CactusVADSegment[];
|
|
27
|
+
totalTime: number;
|
|
28
|
+
ramUsage: number;
|
|
29
|
+
}
|
|
30
|
+
export interface CactusVADVadParams {
|
|
31
|
+
audio: string | number[];
|
|
32
|
+
options?: CactusVADOptions;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=CactusVAD.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CactusVAD.d.ts","sourceRoot":"","sources":["../../../../src/types/CactusVAD.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B"}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
1
|
export interface CactusModel {
|
|
2
|
-
completion: boolean;
|
|
3
|
-
tools: boolean;
|
|
4
|
-
vision: boolean;
|
|
5
|
-
embed: boolean;
|
|
6
|
-
speech: boolean;
|
|
7
2
|
quantization: {
|
|
8
3
|
int4: {
|
|
9
4
|
sizeMb: number;
|
|
@@ -21,7 +16,7 @@ export interface CactusModel {
|
|
|
21
16
|
};
|
|
22
17
|
};
|
|
23
18
|
}
|
|
24
|
-
export interface
|
|
19
|
+
export interface CactusModelOptions {
|
|
25
20
|
quantization?: 'int4' | 'int8';
|
|
26
21
|
pro?: boolean;
|
|
27
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/types/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/types/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE;QACZ,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM,CAAC;YACf,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,CAAC,EAAE;gBACJ,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;SACH,CAAC;QACF,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM,CAAC;YACf,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,CAAC,EAAE;gBACJ,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf"}
|
package/nitro.json
CHANGED
|
@@ -14,21 +14,10 @@
|
|
|
14
14
|
"CactusIndex": {
|
|
15
15
|
"cpp": "HybridCactusIndex"
|
|
16
16
|
},
|
|
17
|
-
"CactusUtil": {
|
|
18
|
-
"cpp": "HybridCactusUtil"
|
|
19
|
-
},
|
|
20
17
|
"CactusFileSystem": {
|
|
21
18
|
"kotlin": "HybridCactusFileSystem",
|
|
22
19
|
"swift": "HybridCactusFileSystem"
|
|
23
20
|
},
|
|
24
|
-
"CactusCrypto": {
|
|
25
|
-
"kotlin": "HybridCactusCrypto",
|
|
26
|
-
"swift": "HybridCactusCrypto"
|
|
27
|
-
},
|
|
28
|
-
"CactusDeviceInfo": {
|
|
29
|
-
"kotlin": "HybridCactusDeviceInfo",
|
|
30
|
-
"swift": "HybridCactusDeviceInfo"
|
|
31
|
-
},
|
|
32
21
|
"CactusImage": {
|
|
33
22
|
"kotlin": "HybridCactusImage",
|
|
34
23
|
"swift": "HybridCactusImage"
|
|
@@ -34,15 +34,10 @@ target_sources(
|
|
|
34
34
|
../nitrogen/generated/android/cactusOnLoad.cpp
|
|
35
35
|
# Shared Nitrogen C++ sources
|
|
36
36
|
../nitrogen/generated/shared/c++/HybridCactusSpec.cpp
|
|
37
|
-
../nitrogen/generated/shared/c++/HybridCactusCryptoSpec.cpp
|
|
38
|
-
../nitrogen/generated/shared/c++/HybridCactusDeviceInfoSpec.cpp
|
|
39
37
|
../nitrogen/generated/shared/c++/HybridCactusFileSystemSpec.cpp
|
|
40
38
|
../nitrogen/generated/shared/c++/HybridCactusImageSpec.cpp
|
|
41
39
|
../nitrogen/generated/shared/c++/HybridCactusIndexSpec.cpp
|
|
42
|
-
../nitrogen/generated/shared/c++/HybridCactusUtilSpec.cpp
|
|
43
40
|
# Android-specific Nitrogen C++ sources
|
|
44
|
-
../nitrogen/generated/android/c++/JHybridCactusCryptoSpec.cpp
|
|
45
|
-
../nitrogen/generated/android/c++/JHybridCactusDeviceInfoSpec.cpp
|
|
46
41
|
../nitrogen/generated/android/c++/JHybridCactusFileSystemSpec.cpp
|
|
47
42
|
../nitrogen/generated/android/c++/JHybridCactusImageSpec.cpp
|
|
48
43
|
)
|
|
@@ -15,14 +15,11 @@
|
|
|
15
15
|
#include <fbjni/fbjni.h>
|
|
16
16
|
#include <NitroModules/HybridObjectRegistry.hpp>
|
|
17
17
|
|
|
18
|
-
#include "JHybridCactusCryptoSpec.hpp"
|
|
19
|
-
#include "JHybridCactusDeviceInfoSpec.hpp"
|
|
20
18
|
#include "JHybridCactusFileSystemSpec.hpp"
|
|
21
19
|
#include "JFunc_void_double.hpp"
|
|
22
20
|
#include "JHybridCactusImageSpec.hpp"
|
|
23
21
|
#include "HybridCactus.hpp"
|
|
24
22
|
#include "HybridCactusIndex.hpp"
|
|
25
|
-
#include "HybridCactusUtil.hpp"
|
|
26
23
|
#include <NitroModules/DefaultConstructableObject.hpp>
|
|
27
24
|
|
|
28
25
|
namespace margelo::nitro::cactus {
|
|
@@ -34,8 +31,6 @@ int initialize(JavaVM* vm) {
|
|
|
34
31
|
|
|
35
32
|
return facebook::jni::initialize(vm, [] {
|
|
36
33
|
// Register native JNI methods
|
|
37
|
-
margelo::nitro::cactus::JHybridCactusCryptoSpec::registerNatives();
|
|
38
|
-
margelo::nitro::cactus::JHybridCactusDeviceInfoSpec::registerNatives();
|
|
39
34
|
margelo::nitro::cactus::JHybridCactusFileSystemSpec::registerNatives();
|
|
40
35
|
margelo::nitro::cactus::JFunc_void_double_cxx::registerNatives();
|
|
41
36
|
margelo::nitro::cactus::JHybridCactusImageSpec::registerNatives();
|
|
@@ -59,15 +54,6 @@ int initialize(JavaVM* vm) {
|
|
|
59
54
|
return std::make_shared<HybridCactusIndex>();
|
|
60
55
|
}
|
|
61
56
|
);
|
|
62
|
-
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
63
|
-
"CactusUtil",
|
|
64
|
-
[]() -> std::shared_ptr<HybridObject> {
|
|
65
|
-
static_assert(std::is_default_constructible_v<HybridCactusUtil>,
|
|
66
|
-
"The HybridObject \"HybridCactusUtil\" is not default-constructible! "
|
|
67
|
-
"Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
|
|
68
|
-
return std::make_shared<HybridCactusUtil>();
|
|
69
|
-
}
|
|
70
|
-
);
|
|
71
57
|
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
72
58
|
"CactusFileSystem",
|
|
73
59
|
[]() -> std::shared_ptr<HybridObject> {
|
|
@@ -76,22 +62,6 @@ int initialize(JavaVM* vm) {
|
|
|
76
62
|
return instance->cthis()->shared();
|
|
77
63
|
}
|
|
78
64
|
);
|
|
79
|
-
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
80
|
-
"CactusCrypto",
|
|
81
|
-
[]() -> std::shared_ptr<HybridObject> {
|
|
82
|
-
static DefaultConstructableObject<JHybridCactusCryptoSpec::javaobject> object("com/margelo/nitro/cactus/HybridCactusCrypto");
|
|
83
|
-
auto instance = object.create();
|
|
84
|
-
return instance->cthis()->shared();
|
|
85
|
-
}
|
|
86
|
-
);
|
|
87
|
-
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
88
|
-
"CactusDeviceInfo",
|
|
89
|
-
[]() -> std::shared_ptr<HybridObject> {
|
|
90
|
-
static DefaultConstructableObject<JHybridCactusDeviceInfoSpec::javaobject> object("com/margelo/nitro/cactus/HybridCactusDeviceInfo");
|
|
91
|
-
auto instance = object.create();
|
|
92
|
-
return instance->cthis()->shared();
|
|
93
|
-
}
|
|
94
|
-
);
|
|
95
65
|
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
96
66
|
"CactusImage",
|
|
97
67
|
[]() -> std::shared_ptr<HybridObject> {
|
|
@@ -9,8 +9,6 @@
|
|
|
9
9
|
|
|
10
10
|
// Include C++ implementation defined types
|
|
11
11
|
#include "Cactus-Swift-Cxx-Umbrella.hpp"
|
|
12
|
-
#include "HybridCactusCryptoSpecSwift.hpp"
|
|
13
|
-
#include "HybridCactusDeviceInfoSpecSwift.hpp"
|
|
14
12
|
#include "HybridCactusFileSystemSpecSwift.hpp"
|
|
15
13
|
#include "HybridCactusImageSpecSwift.hpp"
|
|
16
14
|
|
|
@@ -32,54 +30,6 @@ namespace margelo::nitro::cactus::bridge::swift {
|
|
|
32
30
|
};
|
|
33
31
|
}
|
|
34
32
|
|
|
35
|
-
// pragma MARK: std::shared_ptr<HybridCactusCryptoSpec>
|
|
36
|
-
std::shared_ptr<HybridCactusCryptoSpec> create_std__shared_ptr_HybridCactusCryptoSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
|
|
37
|
-
Cactus::HybridCactusCryptoSpec_cxx swiftPart = Cactus::HybridCactusCryptoSpec_cxx::fromUnsafe(swiftUnsafePointer);
|
|
38
|
-
return std::make_shared<margelo::nitro::cactus::HybridCactusCryptoSpecSwift>(swiftPart);
|
|
39
|
-
}
|
|
40
|
-
void* NON_NULL get_std__shared_ptr_HybridCactusCryptoSpec_(std__shared_ptr_HybridCactusCryptoSpec_ cppType) {
|
|
41
|
-
std::shared_ptr<margelo::nitro::cactus::HybridCactusCryptoSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::cactus::HybridCactusCryptoSpecSwift>(cppType);
|
|
42
|
-
#ifdef NITRO_DEBUG
|
|
43
|
-
if (swiftWrapper == nullptr) [[unlikely]] {
|
|
44
|
-
throw std::runtime_error("Class \"HybridCactusCryptoSpec\" is not implemented in Swift!");
|
|
45
|
-
}
|
|
46
|
-
#endif
|
|
47
|
-
Cactus::HybridCactusCryptoSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
|
|
48
|
-
return swiftPart.toUnsafe();
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
// pragma MARK: std::function<void(const std::optional<std::string>& /* result */)>
|
|
52
|
-
Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
53
|
-
auto swiftClosure = Cactus::Func_void_std__optional_std__string_::fromUnsafe(swiftClosureWrapper);
|
|
54
|
-
return [swiftClosure = std::move(swiftClosure)](const std::optional<std::string>& result) mutable -> void {
|
|
55
|
-
swiftClosure.call(result);
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
// pragma MARK: std::function<void(const DeviceInfo& /* result */)>
|
|
60
|
-
Func_void_DeviceInfo create_Func_void_DeviceInfo(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
61
|
-
auto swiftClosure = Cactus::Func_void_DeviceInfo::fromUnsafe(swiftClosureWrapper);
|
|
62
|
-
return [swiftClosure = std::move(swiftClosure)](const DeviceInfo& result) mutable -> void {
|
|
63
|
-
swiftClosure.call(result);
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
// pragma MARK: std::shared_ptr<HybridCactusDeviceInfoSpec>
|
|
68
|
-
std::shared_ptr<HybridCactusDeviceInfoSpec> create_std__shared_ptr_HybridCactusDeviceInfoSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
|
|
69
|
-
Cactus::HybridCactusDeviceInfoSpec_cxx swiftPart = Cactus::HybridCactusDeviceInfoSpec_cxx::fromUnsafe(swiftUnsafePointer);
|
|
70
|
-
return std::make_shared<margelo::nitro::cactus::HybridCactusDeviceInfoSpecSwift>(swiftPart);
|
|
71
|
-
}
|
|
72
|
-
void* NON_NULL get_std__shared_ptr_HybridCactusDeviceInfoSpec_(std__shared_ptr_HybridCactusDeviceInfoSpec_ cppType) {
|
|
73
|
-
std::shared_ptr<margelo::nitro::cactus::HybridCactusDeviceInfoSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::cactus::HybridCactusDeviceInfoSpecSwift>(cppType);
|
|
74
|
-
#ifdef NITRO_DEBUG
|
|
75
|
-
if (swiftWrapper == nullptr) [[unlikely]] {
|
|
76
|
-
throw std::runtime_error("Class \"HybridCactusDeviceInfoSpec\" is not implemented in Swift!");
|
|
77
|
-
}
|
|
78
|
-
#endif
|
|
79
|
-
Cactus::HybridCactusDeviceInfoSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
|
|
80
|
-
return swiftPart.toUnsafe();
|
|
81
|
-
}
|
|
82
|
-
|
|
83
33
|
// pragma MARK: std::function<void(bool /* result */)>
|
|
84
34
|
Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
85
35
|
auto swiftClosure = Cactus::Func_void_bool::fromUnsafe(swiftClosureWrapper);
|