@ariacompute/engine-ts 1.15.1 → 1.17.0

package/README.md

@@ -24,10 +24,12 @@ and then loads it. Dashboard is not used. A Dashboard `sk-` / `bfvk-` token is
 ignored for hub auth. Token is optional for public models. A valid cached bundle
 is reused without re-downloading.
 
-Gated files: pass `hfToken` (`.com`) or `modelscopeApiToken` (`.cn`) — same keys as
-`aria-engine auth`. If omitted, the SDK reads `~/.ariacompute/config.yml`.
+Gated files: call `eng.setup({ hf_token })` (`.com`) or `eng.setup({ modelscope_api_token, site_url })` (`.cn`) **before** `open`. Same keys as `aria-engine setup`. Instance-only; does not write `engine.yml`. If omitted, the SDK reads `~/.ariacompute/engine.yml`.
 
 ```ts
 const eng = await Engine.open("gemma-4-e2b-it_q4");
-const gated = await Engine.open("gemma-4-e2b-it_q4", { hfToken: "hf_..." });
+
+const gated = new Engine();
+gated.setup({ hf_token: "hf_..." });
+await gated.open("gemma-4-e2b-it_q4");
 ```

package/dist/index.d.ts

@@ -29,15 +29,30 @@ export interface CompleteResult {
 export interface OpenOptions {
     /** Legacy generic hub token. Dashboard sk-/bfvk- keys are ignored. */
     token?: string;
-    /** Hugging Face hub token (`.com`). Same field as `aria-engine auth` `hf_token`. */
+    /** Hugging Face hub token (`.com`). Same field as `aria-engine setup` `hf_token`. */
     hfToken?: string;
-    /** ModelScope hub token (`.cn`). Same field as `aria-engine auth` `modelscope_api_token`. */
+    /** ModelScope hub token (`.cn`). Same field as `aria-engine setup` `modelscope_api_token`. */
     modelscopeApiToken?: string;
     /** Site used to pick the regional hub. Defaults to https://ariacompute.com (.com → HF, .cn → ModelScope). */
     site?: string;
     /** Explicit path to the FFI library. */
     ffiLib?: string;
 }
+export declare const INTL_SITE = "https://ariacompute.com";
+export declare const INTL_UPGRADE = "https://github.com/ariacompute";
+export declare const CN_SITE = "https://ariacompute.cn";
+export declare const CN_UPGRADE = "https://gitee.com/ariacompute";
+export interface SetupConfig {
+    router: string;
+    site_url: string;
+    upgrade_url: string;
+    compute: string;
+    hf_token: string;
+    modelscope_api_token: string;
+}
+export declare function defaultSetupConfig(): SetupConfig;
+export declare function fillSetupUrls(cfg: SetupConfig): SetupConfig;
+export declare function applySetup(existing: SetupConfig, updates: Partial<SetupConfig>): SetupConfig;
 /** Parse `slug`/`quant` from a model name such as `gemma-4-e2b-it_q4`. */
 export declare function parseBundleName(model: string): {
     slug: string;
@@ -70,8 +85,18 @@ export declare class Engine {
     private fnEmbed;
     private fnTranscribe;
     private fnLastError;
-    /** Construct from a local bundle directory. */
-    constructor(bundle: string, opts?: OpenOptions);
+    private cfg;
+    private opts;
+    /** Empty construct, or a local bundle directory. */
+    constructor(bundle?: string, opts?: OpenOptions);
+    /** Set Config / Run fields on this instance only. Does not write engine.yml. */
+    setup(updates: Partial<SetupConfig>): this;
+    setupStatus(): SetupConfig;
+    /** Reset instance defaults. Does not delete ~/.ariacompute/engine.yml. */
+    setupClear(): this;
+    private bindAndInit;
+    /** Download (if needed) and load a model using instance setup. */
+    open(modelRef: string): Promise<this>;
     /** Auto-detect: a value containing a separator or already on disk is a local
      * path; otherwise it is a model name downloaded from the regional public hub. */
     static open(modelRef: string, opts?: OpenOptions): Promise<Engine>;

package/dist/index.js

@@ -33,7 +33,10 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._internal = exports.Engine = void 0;
+exports._internal = exports.Engine = exports.CN_UPGRADE = exports.CN_SITE = exports.INTL_UPGRADE = exports.INTL_SITE = void 0;
+exports.defaultSetupConfig = defaultSetupConfig;
+exports.fillSetupUrls = fillSetupUrls;
+exports.applySetup = applySetup;
 exports.parseBundleName = parseBundleName;
 exports.preferredPublicHub = preferredPublicHub;
 exports.hubBearer = hubBearer;
@@ -56,6 +59,55 @@ const promises_1 = require("node:stream/promises");
 const node_stream_1 = require("node:stream");
 const zlib = __importStar(require("node:zlib"));
 const DEFAULT_SITE = "https://ariacompute.com";
+exports.INTL_SITE = "https://ariacompute.com";
+exports.INTL_UPGRADE = "https://github.com/ariacompute";
+exports.CN_SITE = "https://ariacompute.cn";
+exports.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" ? [exports.CN_SITE, exports.CN_UPGRADE] : [exports.INTL_SITE, exports.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);
+}
 const DEFAULT_SDK = "v1.0";
 const HUB_REQUIRED = ["config.json", "weight.bin"];
 const HUB_OPTIONAL = [
@@ -132,23 +184,27 @@ function unquoteYaml(v) {
     return t;
 }
 function configYmlScalar(key) {
-    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;
 }
@@ -236,7 +292,7 @@ async function fetchHubFile(source, model, file, dest, token, required) {
             last = e;
             if (e instanceof HubHttpError && (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)`);
+                throw new Error(`auth failed HTTP ${e.status}; set ${field} via aria-engine setup (do not pass a Dashboard sk-/bfvk- key as the hub token)`);
             }
         }
     }
@@ -508,9 +564,38 @@ function isLocalRef(modelRef) {
     return modelRef.includes("/") || modelRef.includes("\\") || fs.existsSync(modelRef);
 }
 class Engine {
-    /** Construct from a local bundle directory. */
+    /** Empty construct, or a local bundle directory. */
     constructor(bundle, opts = {}) {
-        this.lib = loadLib(opts.ffiLib, opts.site);
+        this.lib = null;
+        this.handle = null;
+        this.cfg = defaultSetupConfig();
+        this.opts = {};
+        this.opts = opts;
+        if (opts.site || opts.hfToken || opts.modelscopeApiToken) {
+            this.setup({
+                site_url: opts.site,
+                hf_token: opts.hfToken,
+                modelscope_api_token: opts.modelscopeApiToken,
+            });
+        }
+        if (bundle)
+            this.bindAndInit(bundle, opts.ffiLib);
+    }
+    /** Set Config / Run fields on this instance only. Does not write engine.yml. */
+    setup(updates) {
+        this.cfg = applySetup(this.cfg, updates);
+        return this;
+    }
+    setupStatus() {
+        return { ...this.cfg };
+    }
+    /** Reset instance defaults. Does not delete ~/.ariacompute/engine.yml. */
+    setupClear() {
+        this.cfg = defaultSetupConfig();
+        return this;
+    }
+    bindAndInit(bundle, ffiLib) {
+        this.lib = loadLib(ffiLib || this.opts.ffiLib, this.cfg.site_url || this.opts.site);
         this.fnInit = this.lib.func("aria_model_init", "void*", ["str"]);
         this.fnDestroy = this.lib.func("aria_model_destroy", "void", ["void*"]);
         this.fnComplete = this.lib.func("aria_complete", "int", ["void*", "str", "str", "str", "void*", "size_t"]);
@@ -523,14 +608,27 @@ class Engine {
             throw new Error(err || "init failed");
         }
     }
+    /** Download (if needed) and load a model using instance setup. */
+    async open(modelRef) {
+        await ensureFfiLib(this.cfg.site_url || this.opts.site);
+        const openOpts = {
+            ...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,
+        };
+        const bundle = isLocalRef(modelRef) ? modelRef : await downloadModel(modelRef, openOpts);
+        if (this.handle)
+            this.close();
+        this.bindAndInit(bundle, this.opts.ffiLib);
+        return this;
+    }
     /** Auto-detect: a value containing a separator or already on disk is a local
      * path; otherwise it is a model name downloaded from the regional public hub. */
     static async open(modelRef, opts = {}) {
-        await ensureFfiLib(opts.site);
-        if (isLocalRef(modelRef))
-            return new Engine(modelRef, opts);
-        const bundle = await downloadModel(modelRef, opts);
-        return new Engine(bundle, opts);
+        const eng = new Engine(undefined, opts);
+        await eng.open(modelRef);
+        return eng;
     }
     complete(messages, opts = {}) {
         const messagesJson = JSON.stringify(messages);
@@ -569,7 +667,7 @@ class Engine {
         return buf.toString("utf8").replace(/\0+$/, "");
     }
     close() {
-        if (this.handle)
+        if (this.handle && this.fnDestroy)
             this.fnDestroy(this.handle);
         this.handle = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariacompute/engine-ts",
-  "version": "1.15.1",
+  "version": "1.17.0",
   "description": "TypeScript/Node SDK for Aria Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",