@ariacompute/engine-rn 1.15.1 → 1.17.0

package/README.md

@@ -20,10 +20,13 @@ 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.
+`aria-engine setup`); if omitted, reads `~/.ariacompute/engine.yml`. Instance
+`setup` is in-memory only (does not write that file). A valid cached bundle is
+reused without re-downloading.
 
 ```js
 const eng = await AriaEngine.open("gemma-4-e2b-it_q4");
-const gated = await AriaEngine.open("gemma-4-e2b-it_q4", { hfToken: "hf_..." });
+const gated = new AriaEngine();
+gated.setup({ hf_token: "hf_..." });
+await gated.open("gemma-4-e2b-it_q4");
 ```

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@ariacompute/engine-rn",
-  "version": "1.15.1",
+  "version": "1.17.0",
   "description": "React Native binding for Aria Engine",
   "main": "src/index.js",
   "license": "MIT",
   "peerDependencies": {
     "react-native": ">=0.72.0"
+  },
+  "scripts": {
+    "test": "node --test test/setup.test.cjs"
   }
 }

package/src/index.js

@@ -8,6 +8,10 @@
  * `~/.ariacompute/models/{model}`, then loads via native init.
  */
 import { NativeModules } from 'react-native';
+import {
+  defaultSetupConfig,
+  applySetup,
+} from './setup.js';
 
 const AriaEngineModule = NativeModules.AriaEngine;
 
@@ -87,19 +91,22 @@ function unquoteYaml(v) {
 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;
+  const home = ariaHome();
+  for (const name of ['engine.yml', 'config.yml']) {
+    try {
+      const raw = fs.readFileSync(path.join(home, name), '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));
+        if (v) return v;
+      }
+    } catch {
+      continue;
     }
-  } catch {
-    return undefined;
   }
   return undefined;
 }
@@ -209,7 +216,7 @@ async function fetchHubFile(source, model, file, dest, token, required) {
       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)`,
+          `auth failed HTTP ${e.status}; set ${field} via aria-engine setup (do not pass a Dashboard sk-/bfvk- key as the hub token)`,
         );
       }
     }
@@ -421,14 +428,49 @@ async function ensureFfiLib(site) {
 export class AriaEngine {
   constructor(bundlePath) {
     this.bundlePath = bundlePath;
+    this.cfg = defaultSetupConfig();
+    this.opts = {};
     // NativeModules.AriaEngine.init(bundlePath) when linked.
   }
 
-  static async open(modelRef, opts = {}) {
+  setup(updates) {
+    this.cfg = applySetup(this.cfg, updates);
+    return this;
+  }
+
+  setupStatus() {
+    return { ...this.cfg };
+  }
+
+  setupClear() {
+    this.cfg = defaultSetupConfig();
+    return this;
+  }
+
+  async open(modelRef) {
+    const opts = {
+      ...this.opts,
+      site: this.cfg.site_url || this.opts.site,
+      hfToken: this.cfg.hf_token || this.opts.hfToken,
+      modelscopeApiToken: this.cfg.modelscope_api_token || this.opts.modelscopeApiToken,
+    };
     await ensureFfiLib(opts.site);
-    if (isLocalRef(modelRef)) return new AriaEngine(modelRef);
-    const bundle = await downloadModel(modelRef, opts);
-    return new AriaEngine(bundle);
+    this.bundlePath = isLocalRef(modelRef) ? modelRef : await downloadModel(modelRef, opts);
+    return this;
+  }
+
+  static async open(modelRef, opts = {}) {
+    const eng = new AriaEngine();
+    eng.opts = opts;
+    if (opts.site || opts.hfToken || opts.modelscopeApiToken) {
+      eng.setup({
+        site_url: opts.site,
+        hf_token: opts.hfToken,
+        modelscope_api_token: opts.modelscopeApiToken,
+      });
+    }
+    await eng.open(modelRef);
+    return eng;
   }
 
   async complete(messages, options = { max_tokens: 16 }, tools = []) {

package/src/setup.js

@@ -0,0 +1,60 @@
+/** Instance-level Engine setup (in-memory; does not write engine.yml). */
+
+const INTL_SITE = 'https://ariacompute.com';
+const INTL_UPGRADE = 'https://github.com/ariacompute';
+const CN_SITE = 'https://ariacompute.cn';
+const CN_UPGRADE = 'https://gitee.com/ariacompute';
+
+function defaultSetupConfig() {
+  return {
+    router: '',
+    site_url: '',
+    upgrade_url: '',
+    compute: 'auto',
+    hf_token: '',
+    modelscope_api_token: '',
+  };
+}
+
+function gatewayRegion(url) {
+  const lower = (url || '').toLowerCase();
+  if (lower.includes('ariacompute.cn') || lower.includes('gitee.com/ariacompute')) return 'cn';
+  if (lower.includes('ariacompute.com') || lower.includes('github.com/ariacompute')) return 'intl';
+  return undefined;
+}
+
+function pairUrls(region) {
+  return region === 'cn' ? [CN_SITE, CN_UPGRADE] : [INTL_SITE, INTL_UPGRADE];
+}
+
+function fillSetupUrls(cfg) {
+  const out = { ...cfg };
+  const region = gatewayRegion(out.site_url) || gatewayRegion(out.upgrade_url);
+  if (!region) return out;
+  const [site, upgrade] = pairUrls(region);
+  if (!out.site_url) out.site_url = site;
+  if (!out.upgrade_url) out.upgrade_url = upgrade;
+  return out;
+}
+
+function applySetup(existing, updates) {
+  const out = { ...existing };
+  for (const [k, v] of Object.entries(updates || {})) {
+    if (v === undefined) continue;
+    out[k] = v;
+  }
+  if (!['auto', 'cpu', 'cuda'].includes(out.compute)) {
+    throw new Error(`invalid compute: ${out.compute}`);
+  }
+  return fillSetupUrls(out);
+}
+
+module.exports = {
+  INTL_SITE,
+  INTL_UPGRADE,
+  CN_SITE,
+  CN_UPGRADE,
+  defaultSetupConfig,
+  fillSetupUrls,
+  applySetup,
+};

package/test/setup.test.cjs

@@ -0,0 +1,77 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const {
+  applySetup,
+  defaultSetupConfig,
+  fillSetupUrls,
+  CN_SITE,
+  CN_UPGRADE,
+} = require('../src/setup.js');
+
+test('setup defaults', () => {
+  const cfg = defaultSetupConfig();
+  assert.equal(cfg.compute, 'auto');
+  assert.equal(cfg.router, '');
+});
+
+test('setup invalid enum', () => {
+  assert.throws(() => applySetup(defaultSetupConfig(), { compute: 'gpu' }));
+});
+
+test('setup fills urls from cn site', () => {
+  const got = fillSetupUrls({ site_url: CN_SITE, upgrade_url: '' });
+  assert.equal(got.upgrade_url, CN_UPGRADE);
+});
+
+test('setup instance all fields via applySetup', () => {
+  const st = applySetup(defaultSetupConfig(), {
+    router: 'http://127.0.0.1:8080',
+    site_url: CN_SITE,
+    upgrade_url: CN_UPGRADE,
+    compute: 'cpu',
+    hf_token: 'hf_abc',
+    modelscope_api_token: 'ms_xyz',
+  });
+  assert.equal(st.router, 'http://127.0.0.1:8080');
+  assert.equal(st.hf_token, 'hf_abc');
+});
+
+test('setup partial merge', () => {
+  const once = applySetup(defaultSetupConfig(), { hf_token: 'hf_one', router: 'http://127.0.0.1:1' });
+  const st = applySetup(once, { compute: 'cuda' });
+  assert.equal(st.hf_token, 'hf_one');
+  assert.equal(st.router, 'http://127.0.0.1:1');
+  assert.equal(st.compute, 'cuda');
+});
+
+test('setup invalid enum leaves state', () => {
+  const once = applySetup(defaultSetupConfig(), { compute: 'cpu' });
+  assert.throws(() => applySetup(once, { compute: 'gpu' }));
+  assert.equal(once.compute, 'cpu');
+});
+
+test('setup fills urls from site tld', () => {
+  const st = applySetup(defaultSetupConfig(), { site_url: 'https://ariacompute.cn' });
+  assert.equal(st.upgrade_url, CN_UPGRADE);
+});
+
+test('setup does not write engine.yml', () => {
+  const prev = process.env.ARIA_COMPUTE_HOME;
+  const home = fs.mkdtempSync(path.join(os.tmpdir(), 'aria-rn-setup-'));
+  process.env.ARIA_COMPUTE_HOME = home;
+  try {
+    applySetup(defaultSetupConfig(), {
+      router: 'http://127.0.0.1:8080',
+      site_url: 'https://ariacompute.com',
+      hf_token: 'hf_x',
+    });
+    assert.equal(fs.existsSync(path.join(home, 'engine.yml')), false);
+    assert.equal(fs.existsSync(path.join(home, 'config.yml')), false);
+  } finally {
+    if (prev === undefined) delete process.env.ARIA_COMPUTE_HOME;
+    else process.env.ARIA_COMPUTE_HOME = prev;
+  }
+});