react-native-nobodywho 0.1.2 → 0.3.0

package/README.md

@@ -30,13 +30,31 @@ This library uses the **GGUF format** — a binary format optimized for fast loa
 - iOS: iPhone 11 or newer with at least 4 GB of RAM.
 - Android: Snapdragon 855 / Adreno 640 / 6 GB RAM or better.
 
+## Model Loading
+
+Models can be loaded from a local file path or downloaded automatically from HuggingFace:
+
+```typescript
+import { Model } from "react-native-nobodywho";
+
+// Download from HuggingFace (cached automatically)
+const model = await Model.load({
+  modelPath: "hf://NobodyWho/Qwen_Qwen3-0.6B-GGUF/Qwen_Qwen3-0.6B-Q4_K_M.gguf",
+});
+
+// Or load from a local file
+const model = await Model.load({ modelPath: "/path/to/model.gguf" });
+```
+
+Downloaded models are cached on disk and reused on subsequent loads.
+
 ## Chat
 
 ```typescript
 import { Chat } from "react-native-nobodywho";
 
 const chat = await Chat.fromPath({
-  modelPath: "/path/to/model.gguf",
+  modelPath: "hf://NobodyWho/Qwen_Qwen3-0.6B-GGUF/Qwen_Qwen3-0.6B-Q4_K_M.gguf",
   systemPrompt: "You are a helpful assistant.",
 });
 

package/android/CMakeLists.txt

@@ -42,16 +42,18 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size
 
 # NOBODYWHO_NATIVE_LIBS_DIR is passed from build.gradle via cmake arguments.
 # Fall back to src/main/jniLibs for local development where libs are placed manually.
+# The .so files are pre-built shared libraries — fully linked at CI time — so the
+# consumer's NDK version does not affect the Rust code.
 if(NOT NOBODYWHO_NATIVE_LIBS_DIR)
   set(NOBODYWHO_NATIVE_LIBS_DIR "${CMAKE_SOURCE_DIR}/src/main/jniLibs")
 endif()
 
 cmake_path(
   SET MY_RUST_LIB
-  ${NOBODYWHO_NATIVE_LIBS_DIR}/${ANDROID_ABI}/libnobodywho_uniffi.a
+  ${NOBODYWHO_NATIVE_LIBS_DIR}/${ANDROID_ABI}/libnobodywho_uniffi.so
   NORMALIZE
 )
-add_library(my_rust_lib STATIC IMPORTED)
+add_library(my_rust_lib SHARED IMPORTED)
 set_target_properties(my_rust_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_LIB})
 
 # Add ReactAndroid libraries, being careful to account for different versions.

package/android/build.gradle

@@ -60,20 +60,19 @@ def packageJsonFile = file("${projectDir}/../package.json")
 def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
 def nobodywhoVersion = packageJson.version
 
-// Directory for downloaded native libraries (outside source tree to avoid Gradle conflicts)
+// Directory for downloaded native shared libraries.
+// These .so files are fully linked at CI time with a known-good NDK, eliminating
+// NDK version coupling for consumers.
 def nativeLibsDir = new File(buildDir, "nobodywho-native")
 
-// Download native static libraries from GitHub Releases if not already present.
-// These are .a files used by CMake at link time — not .so files for jniLibs.
+// Download native shared libraries from GitHub Releases if not already present.
 task resolveNativeLibraries {
-  description = "Downloads NobodyWho native static libraries from GitHub Releases"
-
-  outputs.dir(nativeLibsDir)
+  description = "Downloads NobodyWho native shared libraries from GitHub Releases"
 
   doLast {
     abiToTriple.each { abi, triple ->
       def abiDir = new File(nativeLibsDir, abi)
-      def libFile = new File(abiDir, "libnobodywho_uniffi.a")
+      def libFile = new File(abiDir, "libnobodywho_uniffi.so")
 
       if (libFile.exists()) {
         logger.lifecycle("[NobodyWho] ${abi}: Using existing library at ${libFile.path}")
@@ -82,7 +81,7 @@ task resolveNativeLibraries {
 
       abiDir.mkdirs()
 
-      def fileName = "libnobodywho-uniffi-${triple}-release.a"
+      def fileName = "libnobodywho-uniffi-${triple}-release.so"
       def downloadUrl = "https://github.com/nobodywho-ooo/nobodywho/releases/download/nobodywho-react-native-${nobodywhoVersion}/${fileName}"
 
       logger.lifecycle("[NobodyWho] ${abi}: Downloading from ${downloadUrl}")
@@ -121,7 +120,7 @@ task resolveNativeLibraries {
       } catch (Exception e) {
         throw new GradleException(
           "Failed to download NobodyWho library for ${abi}: ${e.message}\n" +
-          "For local development, build the uniffi crate and place the .a file at: ${libFile.path}",
+          "For local development, build the uniffi crate and place the .so file at: ${libFile.path}",
           e
         )
       }
@@ -140,7 +139,11 @@ android {
     }
   }
 
-  ndkVersion getExtOrDefault("ndkVersion")
+  // Let the consumer's rootProject.ext.ndkVersion control the NDK version.
+  // If not set, AGP uses the default NDK bundled with the Android SDK.
+  if (rootProject.ext.has("ndkVersion")) {
+    ndkVersion rootProject.ext.get("ndkVersion")
+  }
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
@@ -160,7 +163,7 @@ android {
       }
     }
     ndk {
-      abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
+      abiFilters "arm64-v8a", "x86_64"
     }
   }
 
@@ -191,6 +194,8 @@ android {
 
   sourceSets {
     main {
+      // Include downloaded .so files so they get packaged into the APK
+      jniLibs.srcDirs += [nativeLibsDir]
       if (isNewArchitectureEnabled()) {
           java.srcDirs += [
             "generated/java",
@@ -201,12 +206,12 @@ android {
   }
 }
 
-// Ensure native libraries are downloaded before CMake runs
-afterEvaluate {
-  tasks.matching {
-    it.name.contains("configureCMake") || it.name.contains("externalNativeBuild")
-  }.configureEach {
-    dependsOn(resolveNativeLibraries)
+// Ensure native libraries are downloaded before CMake and JNI merge tasks run.
+tasks.configureEach { task ->
+  if (task.name.contains("configureCMake") ||
+      task.name.contains("externalNativeBuild") ||
+      task.name.contains("ergeJniLibFolders")) {
+    task.dependsOn(resolveNativeLibraries)
   }
 }
 

package/android/src/main/java/com/nobodywho/NobodywhoModule.kt

@@ -37,6 +37,7 @@ class NobodywhoModule(reactContext: ReactApplicationContext) :
     const val NAME = "Nobodywho"
 
     init {
+      System.loadLibrary("nobodywho_uniffi")
       System.loadLibrary("react-native-nobodywho")
     }
   }