@ariacompute/engine-ts 1.15.0 → 1.16.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.auth({ hf_token })` (`.com`) or `eng.auth({ modelscope_api_token, site_url })` (`.cn`) **before** `open`. Same keys as `aria-engine auth`. Instance-only; does not write `config.yml`. If omitted, the SDK reads `~/.ariacompute/config.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.auth({ hf_token: "hf_..." });
+await gated.open("gemma-4-e2b-it_q4");
 ```

package/dist/index.d.ts

@@ -38,6 +38,34 @@ export interface OpenOptions {
     /** Explicit path to the FFI library. */
     ffiLib?: string;
 }
+export declare const INTL_CLOUD = "https://gateway.ariacompute.com";
+export declare const INTL_SITE = "https://ariacompute.com";
+export declare const INTL_UPGRADE = "https://github.com/ariacompute";
+export declare const CN_CLOUD = "https://gateway.ariacompute.cn";
+export declare const CN_SITE = "https://ariacompute.cn";
+export declare const CN_UPGRADE = "https://gitee.com/ariacompute";
+export interface AuthConfig {
+    cloud_api_key: string;
+    cloud_url: string;
+    site_url: string;
+    upgrade_url: string;
+    hybrid_mode: string;
+    hybrid_execution: string;
+    hybrid_semantic: boolean;
+    hybrid_semantic_timeout_ms: number;
+    hybrid_semantic_cache_size: number;
+    compute: string;
+    hf_token: string;
+    modelscope_api_token: string;
+}
+export declare function defaultAuthConfig(): AuthConfig;
+export declare function fillAuthUrls(cfg: AuthConfig): AuthConfig;
+/** Replace `authHooks.probeDashboard` in tests to avoid a real Dashboard probe. */
+export declare const authHooks: {
+    probeDashboard: (siteUrl: string, apiKey: string) => boolean;
+};
+export declare function detectGatewayPair(apiKey: string): [string, string, string];
+export declare function applyAuth(existing: AuthConfig, updates: Partial<AuthConfig>): AuthConfig;
 /** Parse `slug`/`quant` from a model name such as `gemma-4-e2b-it_q4`. */
 export declare function parseBundleName(model: string): {
     slug: string;
@@ -70,8 +98,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 config.yml. */
+    auth(updates: Partial<AuthConfig>): this;
+    authStatus(): AuthConfig;
+    /** Reset instance defaults. Does not delete ~/.ariacompute/config.yml. */
+    authClear(): this;
+    private bindAndInit;
+    /** Download (if needed) and load a model using instance auth. */
+    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,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._internal = exports.Engine = void 0;
+exports._internal = exports.Engine = exports.authHooks = exports.CN_UPGRADE = exports.CN_SITE = exports.CN_CLOUD = exports.INTL_UPGRADE = exports.INTL_SITE = exports.INTL_CLOUD = void 0;
+exports.defaultAuthConfig = defaultAuthConfig;
+exports.fillAuthUrls = fillAuthUrls;
+exports.detectGatewayPair = detectGatewayPair;
+exports.applyAuth = applyAuth;
 exports.parseBundleName = parseBundleName;
 exports.preferredPublicHub = preferredPublicHub;
 exports.hubBearer = hubBearer;
@@ -56,6 +60,127 @@ 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_CLOUD = "https://gateway.ariacompute.com";
+exports.INTL_SITE = "https://ariacompute.com";
+exports.INTL_UPGRADE = "https://github.com/ariacompute";
+exports.CN_CLOUD = "https://gateway.ariacompute.cn";
+exports.CN_SITE = "https://ariacompute.cn";
+exports.CN_UPGRADE = "https://gitee.com/ariacompute";
+function defaultAuthConfig() {
+    return {
+        cloud_api_key: "",
+        cloud_url: "",
+        site_url: "",
+        upgrade_url: "",
+        hybrid_mode: "balance",
+        hybrid_execution: "hybrid",
+        hybrid_semantic: true,
+        hybrid_semantic_timeout_ms: 800,
+        hybrid_semantic_cache_size: 512,
+        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_CLOUD, exports.CN_SITE, exports.CN_UPGRADE] : [exports.INTL_CLOUD, exports.INTL_SITE, exports.INTL_UPGRADE];
+}
+function fillAuthUrls(cfg) {
+    const out = { ...cfg };
+    const region = gatewayRegion(out.site_url) || gatewayRegion(out.cloud_url) || gatewayRegion(out.upgrade_url);
+    if (!region)
+        return out;
+    const [cloud, site, upgrade] = pairUrls(region);
+    if (!out.cloud_url)
+        out.cloud_url = cloud;
+    if (!out.site_url)
+        out.site_url = site;
+    if (!out.upgrade_url)
+        out.upgrade_url = upgrade;
+    return out;
+}
+function localePrefersCn() {
+    const lang = `${process.env.LANG || ""}${process.env.LC_ALL || ""}`.toLowerCase();
+    return lang.includes("zh") || lang.includes(".cn") || lang.startsWith("cn");
+}
+function defaultProbeDashboard(siteUrl, apiKey) {
+    const url = `${(siteUrl || "").replace(/\/$/, "")}/api/dashboard/models`;
+    const script = 'fetch(process.env.ARIA_PROBE_URL,{headers:{"User-Agent":"aria-engine-sdk/0.1.0","Authorization":"Bearer "+process.env.ARIA_PROBE_KEY},redirect:"follow"}).then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))';
+    const r = (0, node_child_process_1.spawnSync)(process.execPath, ["-e", script], {
+        env: { ...process.env, ARIA_PROBE_URL: url, ARIA_PROBE_KEY: apiKey },
+        timeout: 10000,
+    });
+    return r.status === 0;
+}
+/** Replace `authHooks.probeDashboard` in tests to avoid a real Dashboard probe. */
+exports.authHooks = {
+    probeDashboard: defaultProbeDashboard,
+};
+function detectGatewayPair(apiKey) {
+    const key = (apiKey || "").trim();
+    const first = localePrefersCn() ? "cn" : "intl";
+    const second = first === "cn" ? "intl" : "cn";
+    for (const region of [first, second]) {
+        const [cloud, site, upgrade] = pairUrls(region);
+        if (key && exports.authHooks.probeDashboard(site, key))
+            return [cloud, site, upgrade];
+    }
+    return pairUrls(first);
+}
+function applyAuth(existing, updates) {
+    const out = { ...existing };
+    for (const [k, v] of Object.entries(updates)) {
+        if (v === undefined)
+            continue;
+        out[k] = v;
+    }
+    if (!["cost", "balance", "intelligence"].includes(out.hybrid_mode)) {
+        throw new Error(`invalid hybrid_mode: ${out.hybrid_mode}`);
+    }
+    if (!["hybrid", "device", "cloud"].includes(out.hybrid_execution)) {
+        throw new Error(`invalid hybrid_execution: ${out.hybrid_execution}`);
+    }
+    if (!["auto", "cpu", "cuda"].includes(out.compute)) {
+        throw new Error(`invalid compute: ${out.compute}`);
+    }
+    const timeout = Number(out.hybrid_semantic_timeout_ms);
+    const cache = Number(out.hybrid_semantic_cache_size);
+    if (!Number.isInteger(timeout) || !Number.isInteger(cache) || timeout <= 0 || cache <= 0) {
+        throw new Error("hybrid_semantic_timeout_ms / cache_size must be positive integers");
+    }
+    out.hybrid_semantic = Boolean(out.hybrid_semantic);
+    out.hybrid_semantic_timeout_ms = timeout;
+    out.hybrid_semantic_cache_size = cache;
+    for (const key of [
+        "cloud_api_key",
+        "cloud_url",
+        "site_url",
+        "upgrade_url",
+        "hf_token",
+        "modelscope_api_token",
+    ]) {
+        out[key] = out[key] == null ? "" : String(out[key]);
+    }
+    const filled = fillAuthUrls(out);
+    if (filled.cloud_api_key && !(filled.cloud_url && filled.site_url && filled.upgrade_url)) {
+        const [cloud, site, upgrade] = detectGatewayPair(filled.cloud_api_key);
+        if (!filled.cloud_url)
+            filled.cloud_url = cloud;
+        if (!filled.site_url)
+            filled.site_url = site;
+        if (!filled.upgrade_url)
+            filled.upgrade_url = upgrade;
+    }
+    return filled;
+}
 const DEFAULT_SDK = "v1.0";
 const HUB_REQUIRED = ["config.json", "weight.bin"];
 const HUB_OPTIONAL = [
@@ -508,9 +633,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 = defaultAuthConfig();
+        this.opts = {};
+        this.opts = opts;
+        if (opts.site || opts.hfToken || opts.modelscopeApiToken) {
+            this.auth({
+                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 config.yml. */
+    auth(updates) {
+        this.cfg = applyAuth(this.cfg, updates);
+        return this;
+    }
+    authStatus() {
+        return { ...this.cfg };
+    }
+    /** Reset instance defaults. Does not delete ~/.ariacompute/config.yml. */
+    authClear() {
+        this.cfg = defaultAuthConfig();
+        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 +677,27 @@ class Engine {
             throw new Error(err || "init failed");
         }
     }
+    /** Download (if needed) and load a model using instance auth. */
+    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 +736,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.0",
+  "version": "1.16.0",
   "description": "TypeScript/Node SDK for Aria Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",