@ariacompute/engine-rn 1.13.0 → 1.14.1

package/README.md

@@ -12,12 +12,16 @@ npm publish name: `@ariacompute/engine-rn`. Device-farm CI: `.github/workflows/b
 
 `AriaEngine.open(modelRef, { token, site })` accepts a local bundle path **or**
 an Aria model name (e.g. `gemma-4-e2b-it_q4`). A value containing `/` or already
-on disk is loaded directly; otherwise the SDK downloads it from the Dashboard
-private source (requires `token`; `site` defaults to `https://ariacompute.com`)
-into `~/.ariacompute/models/{model}` and then loads it. A valid cached bundle is
-reused without re-downloading. The zip streaming + extraction is delegated to the
-native `AriaEngineModule` bridge.
+on disk is loaded directly; otherwise the SDK downloads it from the regional
+public hub (same as `aria-engine download`: `.com` → Hugging Face, `.cn` →
+ModelScope; `site` defaults to `https://ariacompute.com`) into
+`~/.ariacompute/models/{model}` and then loads it. Dashboard is not used. A
+Dashboard `sk-` / `bfvk-` token is ignored for hub auth. Token is optional for
+public models. Gated files: pass `hfToken` / `modelscopeApiToken` (same as
+`aria-engine auth`); if omitted, reads `~/.ariacompute/config.yml`. A valid
+cached bundle is reused without re-downloading.
 
 ```js
-const eng = await AriaEngine.open("gemma-4-e2b-it_q4", { token: "API_TOKEN" });
+const eng = await AriaEngine.open("gemma-4-e2b-it_q4");
+const gated = await AriaEngine.open("gemma-4-e2b-it_q4", { hfToken: "hf_..." });
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariacompute/engine-rn",
-  "version": "1.13.0",
+  "version": "1.14.1",
   "description": "React Native binding for Aria Engine",
   "main": "src/index.js",
   "license": "MIT",

package/src/index.js

@@ -3,15 +3,25 @@
  * JS API mirrors @ariacompute/engine-ts for docs samples.
  *
  * Auto-download: `AriaEngine.open(modelRef, { token, site })` resolves a model
- * name via the Dashboard private source (requires `token`), downloads the zip,
- * extracts it through the native `AriaEngineModule` (which bridges unzip and
- * writes to `~/.ariacompute/models/{model}`), then loads via the native init.
+ * name via the regional public hub (Hugging Face / ModelScope — same as
+ * `aria-engine download`; Dashboard is not used), writes files to
+ * `~/.ariacompute/models/{model}`, then loads via native init.
  */
-import { NativeModules, Platform } from 'react-native';
+import { NativeModules } from 'react-native';
 
 const AriaEngineModule = NativeModules.AriaEngine;
 
 const DEFAULT_SITE = 'https://ariacompute.com';
+const DEFAULT_SDK = 'v1.0';
+const HUB_REQUIRED = ['config.json', 'weight.bin'];
+const HUB_OPTIONAL = [
+  'tokenizer.json',
+  'tokenizer.model',
+  'tokenizer_config.json',
+  'special_tokens_map.json',
+  'vocab.json',
+  'merges.txt',
+];
 
 function parseBundleName(model) {
   if (!model || model.includes('/') || model.includes('\\')) {
@@ -20,7 +30,10 @@ function parseBundleName(model) {
   const idx = model.lastIndexOf('_q');
   if (idx !== -1) {
     const slug = model.slice(0, idx);
-    const suffix = model.slice(idx + 2);
+    let suffix = model.slice(idx + 2);
+    if (suffix.endsWith('_channel') || suffix.endsWith('_group')) {
+      suffix = suffix.slice(0, suffix.lastIndexOf('_'));
+    }
     const quant =
       suffix === '4'
         ? 'int4'
@@ -50,25 +63,202 @@ function isLocalRef(ref) {
   return ref.includes('/') || ref.includes('\\') || require('fs').existsSync(ref);
 }
 
-async function downloadModel(model, token, site = DEFAULT_SITE) {
-  if (!token) throw new Error('api token is required to download a model');
-  const { slug, quant } = parseBundleName(model);
+function preferredPublicHub(site) {
+  if (site && String(site).toLowerCase().includes('ariacompute.cn')) return 'modelscope';
+  return 'huggingface';
+}
+
+function hubBearer(token) {
+  const t = (token || '').trim();
+  if (!t) return undefined;
+  const low = t.toLowerCase();
+  if (low.startsWith('sk-') || low.startsWith('bfvk-')) return undefined;
+  return t;
+}
+
+function unquoteYaml(v) {
+  const t = (v || '').trim();
+  if (t.length >= 2 && ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'")))) {
+    return t.slice(1, -1);
+  }
+  return t;
+}
+
+function configYmlScalar(key) {
+  const fs = require('fs');
+  const path = require('path');
+  try {
+    const raw = fs.readFileSync(path.join(ariaHome(), 'config.yml'), 'utf8');
+    for (const line of raw.split('\n')) {
+      if (line.startsWith(' ') || line.startsWith('\t')) continue;
+      const s = line.trim();
+      if (!s || s.startsWith('#') || !s.includes(':')) continue;
+      const idx = s.indexOf(':');
+      if (s.slice(0, idx).trim() !== key) continue;
+      const v = unquoteYaml(s.slice(idx + 1));
+      return v || undefined;
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+}
+
+function resolveHubToken(source, opts = {}) {
+  const named = source === 'modelscope' ? opts.modelscopeApiToken : opts.hfToken;
+  const field = source === 'modelscope' ? 'modelscope_api_token' : 'hf_token';
+  for (const cand of [named, opts.token, configYmlScalar(field)]) {
+    const b = hubBearer(cand);
+    if (b) return b;
+  }
+  return undefined;
+}
+
+function hubPathNames(model) {
+  const names = [model];
+  let lower = model.toLowerCase();
+  let core = model;
+  for (const suf of ['_channel', '_group']) {
+    if (lower.endsWith(suf)) {
+      core = model.slice(0, -suf.length);
+      lower = core.toLowerCase();
+      break;
+    }
+  }
+  const stems = [core];
+  if (lower.endsWith('_q326')) stems.push(`${core.slice(0, -5)}q3.26`);
+  else if (lower.endsWith('_q3.26')) stems.push(`${core.slice(0, -6)}q326`);
+  for (const stem of stems) {
+    for (const share of ['', '_channel', '_group']) {
+      const cand = `${stem}${share}`;
+      if (!names.includes(cand)) names.push(cand);
+    }
+  }
+  return names;
+}
+
+function hubFileUrls(source, model, file) {
+  const urls = [];
+  for (const name of hubPathNames(model)) {
+    if (source === 'modelscope') {
+      for (const repo of [`AriaCompute/${name}`, 'AriaCompute/model']) {
+        urls.push(`https://www.modelscope.cn/models/${repo}/resolve/master/${DEFAULT_SDK}/${name}/${file}`);
+        urls.push(`https://modelscope.cn/models/${repo}/resolve/master/${DEFAULT_SDK}/${name}/${file}`);
+      }
+    } else {
+      for (const repo of [`ariacompute/${name}`, 'ariacompute/model']) {
+        urls.push(`https://huggingface.co/${repo}/resolve/main/${DEFAULT_SDK}/${name}/${file}`);
+      }
+    }
+  }
+  return urls;
+}
+
+function isValidBundleSync(dir) {
+  const fs = require('fs');
+  const path = require('path');
+  try {
+    if (!fs.statSync(path.join(dir, 'weight.bin')).isFile()) return false;
+    const meta = JSON.parse(fs.readFileSync(path.join(dir, 'config.json'), 'utf8'));
+    return meta.format === 'aria-quant-bundle';
+  } catch {
+    return false;
+  }
+}
+
+async function isValidBundle(dir) {
+  if (AriaEngineModule?.isValidBundle) {
+    try {
+      return await AriaEngineModule.isValidBundle(dir);
+    } catch {
+      /* fall through */
+    }
+  }
+  return isValidBundleSync(dir);
+}
+
+async function fetchUrlToFile(url, dest, token) {
+  const headers = {};
+  if (token) headers.Authorization = `Bearer ${token}`;
+  const resp = await fetch(url, { headers });
+  if (resp.status === 401 || resp.status === 403) {
+    const err = new Error(`HTTP ${resp.status}`);
+    err.status = resp.status;
+    throw err;
+  }
+  if (!resp.ok) {
+    const err = new Error(`HTTP ${resp.status}`);
+    err.status = resp.status;
+    throw err;
+  }
+  const fs = require('fs');
+  const path = require('path');
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  const buf = Buffer.from(await resp.arrayBuffer());
+  fs.writeFileSync(dest, buf);
+}
+
+async function fetchHubFile(source, model, file, dest, token, required) {
+  let last;
+  for (const url of hubFileUrls(source, model, file)) {
+    try {
+      await fetchUrlToFile(url, dest, token);
+      return true;
+    } catch (e) {
+      last = e;
+      if (e && (e.status === 401 || e.status === 403)) {
+        const field = source === 'modelscope' ? 'modelscope_api_token' : 'hf_token';
+        throw new Error(
+          `auth failed HTTP ${e.status}; set ${field} via aria-engine auth (do not pass a Dashboard sk-/bfvk- key as the hub token)`,
+        );
+      }
+    }
+  }
+  if (required) throw new Error(`${source}: missing ${file}${last ? `: ${last}` : ''}`);
+  return false;
+}
+
+async function downloadModel(model, tokenOrOpts, site = DEFAULT_SITE) {
+  const opts =
+    tokenOrOpts && typeof tokenOrOpts === 'object'
+      ? tokenOrOpts
+      : { token: tokenOrOpts, site };
+  parseBundleName(model);
+  const fs = require('fs');
+  const path = require('path');
+  const resolvedSite = opts.site ?? site ?? DEFAULT_SITE;
+  const source = preferredPublicHub(resolvedSite);
+  const hubToken = resolveHubToken(source, opts);
   const cache = cacheDir(model);
-  if (require('fs').existsSync(cache) && (await AriaEngineModule?.isValidBundle?.(cache))) {
+  if (fs.existsSync(cache) && (await isValidBundle(cache))) {
     return cache;
   }
-  if (!AriaEngineModule?.downloadModel) {
-    throw new Error('native AriaEngineModule.downloadModel bridge is not linked');
+  const staging = path.join(ariaHome(), 'models', `.${model}.partial`);
+  try {
+    if (fs.existsSync(staging)) fs.rmSync(staging, { recursive: true, force: true });
+    fs.mkdirSync(staging, { recursive: true });
+    for (const file of HUB_REQUIRED) {
+      await fetchHubFile(source, model, file, path.join(staging, file), hubToken, true);
+    }
+    for (const extra of HUB_OPTIONAL) {
+      try {
+        await fetchHubFile(source, model, extra, path.join(staging, extra), hubToken, false);
+      } catch {
+        /* optional tokenizer sidecar */
+      }
+    }
+    if (!(await isValidBundle(staging))) {
+      throw new Error(
+        `${source} fetch completed but bundle invalid (need weight.bin + aria-quant-bundle config.json)`,
+      );
+    }
+    if (fs.existsSync(cache)) fs.rmSync(cache, { recursive: true, force: true });
+    fs.renameSync(staging, cache);
+    return cache;
+  } catch (e) {
+    if (fs.existsSync(staging)) fs.rmSync(staging, { recursive: true, force: true });
+    throw e;
   }
-  const metaUrl = `${site.replace(/\/$/, '')}/api/dashboard/models/${encodeURIComponent(
-    slug,
-  )}/download?quant=${encodeURIComponent(quant)}&sdk=v1.0&format=json`;
-  const metaResp = await fetch(metaUrl, { headers: { Authorization: `Bearer ${token}` } });
-  if (!metaResp.ok) throw new Error(`dashboard request failed: ${metaResp.status}`);
-  const meta = await metaResp.json();
-  if (!meta.url) throw new Error('dashboard meta returned empty url');
-  // Delegates streaming + zip extraction (and bundle validation) to native.
-  return AriaEngineModule.downloadModel(model, meta.url, token, cache);
 }
 
 export class AriaEngine {
@@ -79,10 +269,7 @@ export class AriaEngine {
 
   static async open(modelRef, opts = {}) {
     if (isLocalRef(modelRef)) return new AriaEngine(modelRef);
-    if (!opts.token) {
-      throw new Error(`model name '${modelRef}' requires an api token to download`);
-    }
-    const bundle = await downloadModel(modelRef, opts.token, opts.site ?? DEFAULT_SITE);
+    const bundle = await downloadModel(modelRef, opts);
     return new AriaEngine(bundle);
   }