cui-llama.rn 1.7.0 → 1.7.1

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

@@ -112,15 +112,7 @@ public class LlamaContext {
       throw new IllegalArgumentException("File is not in GGUF format");
     }
 
-    if ( modelName.startsWith("content://")) {
-    Uri uri = Uri.parse(modelName);
-      try {
-        ParcelFileDescriptor pfd = reactContext.getApplicationContext().getContentResolver().openFileDescriptor(uri, "r");
-        modelName = "" + pfd.getFd();
-      } catch (Exception e) {
-        Log.e(NAME, "Failed to convert to FD!");
-      }
-    }
+    modelName = getContentFileDescriptor(modelName);
     
     // Check if file has GGUF magic numbers
     this.id = id;
@@ -471,6 +463,18 @@ public class LlamaContext {
     freeContext(context);
   }
 
+  private String getContentFileDescriptor(String modelName) {
+    if (!modelName.startsWith("content://")) return modelName;  
+    Uri uri = Uri.parse(modelName);
+    try {
+      ParcelFileDescriptor pfd = reactContext.getApplicationContext().getContentResolver().openFileDescriptor(uri, "r");
+      return "" + pfd.getFd();
+    } catch (Exception e) {
+      Log.e(NAME, "Failed to convert to FD!");
+    }
+    return modelName;
+  }
+
   static {
     Log.d(NAME, "Primary ABI: " + Build.SUPPORTED_ABIS[0]);
 

package/android/src/main/java/com/rnllama/RNLlama.java

@@ -5,6 +5,8 @@ import android.util.Log;
 import android.os.Build;
 import android.os.Handler;
 import android.os.AsyncTask;
+import android.os.ParcelFileDescriptor;
+import android.net.Uri;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,6 +17,7 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.Arguments;
 
+
 import java.util.HashMap;
 import java.util.Random;
 import java.io.File;
@@ -68,10 +71,24 @@ public class RNLlama implements LifecycleEventListener {
     promise.resolve(null);
   }
 
+  private String getContentFileDescriptor(String modelName) {
+    if (!modelName.startsWith("content://")) return modelName;  
+    Uri uri = Uri.parse(modelName);
+    try {
+      ParcelFileDescriptor pfd = reactContext.getApplicationContext().getContentResolver().openFileDescriptor(uri, "r");
+      return "" + pfd.getFd();
+    } catch (Exception e) {
+      Log.e(NAME, "Failed to convert to FD!");
+    }
+    return modelName;
+  }
+
   public void modelInfo(final String model, final ReadableArray skip, final Promise promise) {
+    final String modelPath = getContentFileDescriptor(model);
+
     new AsyncTask<Void, Void, WritableMap>() {
       private Exception exception;
-
+  
       @Override
       protected WritableMap doInBackground(Void... voids) {
         try {
@@ -79,7 +96,7 @@ public class RNLlama implements LifecycleEventListener {
           for (int i = 0; i < skip.size(); i++) {
             skipArray[i] = skip.getString(i);
           }
-          return LlamaContext.modelInfo(model, skipArray);
+          return LlamaContext.modelInfo(modelPath, skipArray);
         } catch (Exception e) {
           exception = e;
         }

package/cpp/common.cpp

@@ -1112,9 +1112,6 @@ struct llama_model_params common_model_params_to_llama(common_params & params) {
         mparams.tensor_buft_overrides = params.tensor_buft_overrides.data();
     }
 
-    mparams.progress_callback           = params.load_progress_callback;
-    mparams.progress_callback_user_data = params.load_progress_callback_user_data;
-
     return mparams;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cui-llama.rn",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Fork of llama.rn for ChatterUI",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",