cactus-react-native 0.1.3 → 0.2.1

package/android/src/main/java/com/cactus/Cactus.java

@@ -2,6 +2,7 @@ package com.cactus;
 
 import androidx.annotation.NonNull;
 import android.util.Log;
+import android.provider.Settings;
 import android.os.Build;
 import android.os.Handler;
 import android.os.AsyncTask;
@@ -1080,6 +1081,46 @@ public class Cactus implements LifecycleEventListener {
     tasks.put(task, "decodeAudioTokens-" + contextId);
   }
 
+  @ReactMethod
+  public void getDeviceInfo(double id, final Promise promise) {
+    AsyncTask task = new AsyncTask<Void, Void, WritableMap>() {
+      private Exception exception;
+
+      @Override
+      protected WritableMap doInBackground(Void... voids) {
+        try {
+          WritableMap deviceInfo = Arguments.createMap();
+
+          String deviceId = Settings.Secure.getString(reactContext.getContentResolver(), Settings.Secure.ANDROID_ID);
+
+          String make = Build.MANUFACTURER;
+          String model = Build.MODEL;
+          String osVersion = Build.VERSION.RELEASE;
+
+          deviceInfo.putString("deviceId", deviceId);
+          deviceInfo.putString("make", make);
+          deviceInfo.putString("model", model);
+          deviceInfo.putString("os", "Android");
+          deviceInfo.putString("osVersion", osVersion);
+
+          return deviceInfo;
+        } catch (Exception e) {
+          exception = e;
+        }
+        return null;
+      }
+
+      @Override
+      protected void onPostExecute(WritableMap result) {
+        if (exception != null) {
+          promise.reject(exception);
+          return;
+        }
+        promise.resolve(result);
+      }
+    }.executeOnExecutor(singleThreadExecutor);
+  }
+
   public void releaseVocoder(double id, final Promise promise) {
     final int contextId = (int) id;
     AsyncTask task = new AsyncTask<Void, Void, Void>() {

package/android/src/main/java/com/cactus/LlamaContext.java

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import android.util.Log;
+import android.provider.Settings;
 import android.os.Build;
 import android.content.res.AssetManager;
 
@@ -520,6 +521,24 @@ public class LlamaContext {
     return decodeAudioTokens(this.context, toks);
   }
 
+  public WritableMap getDeviceInfo() {
+    WritableMap deviceInfo = Arguments.createMap();
+
+    String deviceId = Settings.Secure.getString(this.reactContext.getContentResolver(), Settings.Secure.ANDROID_ID);
+
+    String make = Build.MANUFACTURER; 
+    String model = Build.MODEL;       
+    String osVersion = Build.VERSION.RELEASE; 
+
+    deviceInfo.putString("deviceId", deviceId);
+    deviceInfo.putString("make", make);
+    deviceInfo.putString("model", model);
+    deviceInfo.putString("os", "Android");
+    deviceInfo.putString("osVersion", osVersion);
+
+    return deviceInfo;
+  }
+
   public void releaseVocoder() {
     releaseVocoder(this.context);
   }

package/android/src/newarch/java/com/cactus/CactusModule.java

@@ -179,6 +179,11 @@ public class CactusModule extends NativeCactusSpec {
     cactus.decodeAudioTokens(id, tokens, promise);
   }
 
+  @ReactMethod
+  public void getDeviceInfo(double id, Promise promise) {
+    cactus.getDeviceInfo(id, promise);
+  }
+
   @ReactMethod
   public void releaseVocoder(double id, Promise promise) {
     cactus.releaseVocoder(id, promise);

package/android/src/oldarch/java/com/cactus/CactusModule.java

@@ -178,6 +178,11 @@ public class CactusModule extends ReactContextBaseJavaModule {
     cactus.decodeAudioTokens(id, tokens, promise);
   }
 
+  @ReactMethod
+  public void getDeviceInfo(double id, final Promise promise) {
+    cactus.getDeviceInfo(id, promise);
+  }
+
   @ReactMethod
   public void releaseVocoder(double id, final Promise promise) {
     cactus.releaseVocoder(id, promise);

package/ios/Cactus.mm

@@ -597,6 +597,20 @@ RCT_EXPORT_METHOD(decodeAudioTokens:(double)contextId
     }
 }
 
+RCT_EXPORT_METHOD(getDeviceInfo:(double)contextId
+                 withResolver:(RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
+{
+    CactusContext *context = llamaContexts[[NSNumber numberWithDouble:contextId]];
+    if (context == nil) {
+        reject(@"llama_error", @"Context not found", nil);
+        return;
+    }
+    NSDictionary *deviceInfo = [context getDeviceInfo];
+    resolve(deviceInfo);
+}
+
+
 RCT_EXPORT_METHOD(releaseVocoder:(double)contextId
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)

package/ios/CactusContext.h

@@ -72,6 +72,7 @@
 - (NSString *)getFormattedAudioCompletion:(NSString *)speakerJsonStr textToSpeak:(NSString *)textToSpeak;
 - (NSArray *)getAudioCompletionGuideTokens:(NSString *)textToSpeak;
 - (NSArray *)decodeAudioTokens:(NSArray *)tokens;
+- (NSDictionary *)getDeviceInfo;
 - (void)releaseVocoder;
 
 - (void)invalidate;

package/ios/CactusContext.mm

@@ -1,5 +1,6 @@
 #import "CactusContext.h"
 #import <Metal/Metal.h>
+#import <sys/utsname.h>
 
 @implementation CactusContext
 
@@ -1007,4 +1008,21 @@
     return result;
 }
 
+- (NSDictionary *)getDeviceInfo {
+    UIDevice *device = [UIDevice currentDevice];
+    NSString *deviceId = [[device identifierForVendor] UUIDString];
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    NSString *model = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
+    NSString *os = [device systemName];
+    NSDictionary *deviceInfo = @{
+      @"deviceId": deviceId,
+      @"model": model,
+      @"make": @"Apple",
+      @"os": os
+    };
+    
+    return deviceInfo;
+}
+
 @end

package/lib/commonjs/NativeCactus.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactNative = require("react-native");
+// New TTS/Audio types
+var _default = exports.default = _reactNative.TurboModuleRegistry.get('Cactus');
+//# sourceMappingURL=NativeCactus.js.map

package/lib/commonjs/NativeCactus.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","get"],"sourceRoot":"../../src","sources":["NativeCactus.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAkSA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GA2LeC,gCAAmB,CAACC,GAAG,CAAO,QAAQ,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","get"],"sourceRoot":"../../src","sources":["NativeCactus.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAkSA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAkMeC,gCAAmB,CAACC,GAAG,CAAO,QAAQ,CAAC","ignoreList":[]}

package/lib/commonjs/chat.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatChat = formatChat;
+function formatChat(messages) {
+  const chat = [];
+  messages.forEach(currMsg => {
+    const role = currMsg.role || '';
+    let content = '';
+    if ('content' in currMsg) {
+      if (typeof currMsg.content === 'string') {
+        ;
+        ({
+          content
+        } = currMsg);
+      } else if (Array.isArray(currMsg.content)) {
+        currMsg.content.forEach(part => {
+          if ('text' in part) {
+            content += `${content ? '\n' : ''}${part.text}`;
+          }
+        });
+      } else {
+        throw new TypeError("Invalid 'content' type (ref: https://github.com/ggerganov/llama.cpp/issues/8367)");
+      }
+    } else {
+      throw new Error("Missing 'content' (ref: https://github.com/ggerganov/llama.cpp/issues/8367)");
+    }
+    chat.push({
+      role,
+      content
+    });
+  });
+  return chat;
+}
+//# sourceMappingURL=chat.js.map