@ariacompute/engine-ts 1.16.0 → 1.17.1

package/README.md

@@ -24,12 +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: 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`.
+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 = new Engine();
-gated.auth({ hf_token: "hf_..." });
+gated.setup({ hf_token: "hf_..." });
 await gated.open("gemma-4-e2b-it_q4");
 ```

package/dist/index.d.ts

@@ -29,43 +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_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;
+export interface SetupConfig {
+    router: 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;
+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;
@@ -102,13 +89,13 @@ export declare class Engine {
     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;
+    /** 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 auth. */
+    /** 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. */

package/dist/index.js

@@ -33,11 +33,10 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-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._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;
@@ -60,23 +59,15 @@ 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() {
+function defaultSetupConfig() {
     return {
-        cloud_api_key: "",
-        cloud_url: "",
+        router: "",
         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: "",
@@ -91,95 +82,31 @@ function gatewayRegion(url) {
     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];
+    return region === "cn" ? [exports.CN_SITE, exports.CN_UPGRADE] : [exports.INTL_SITE, exports.INTL_UPGRADE];
 }
-function fillAuthUrls(cfg) {
+function fillSetupUrls(cfg) {
     const out = { ...cfg };
-    const region = gatewayRegion(out.site_url) || gatewayRegion(out.cloud_url) || gatewayRegion(out.upgrade_url);
+    const region = gatewayRegion(out.site_url) || gatewayRegion(out.upgrade_url);
     if (!region)
         return out;
-    const [cloud, site, upgrade] = pairUrls(region);
-    if (!out.cloud_url)
-        out.cloud_url = cloud;
+    const [site, upgrade] = pairUrls(region);
     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) {
+function applySetup(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;
+    return fillSetupUrls(out);
 }
 const DEFAULT_SDK = "v1.0";
 const HUB_REQUIRED = ["config.json", "weight.bin"];
@@ -257,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;
 }
@@ -361,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)`);
             }
         }
     }
@@ -637,11 +568,11 @@ class Engine {
     constructor(bundle, opts = {}) {
         this.lib = null;
         this.handle = null;
-        this.cfg = defaultAuthConfig();
+        this.cfg = defaultSetupConfig();
         this.opts = {};
         this.opts = opts;
         if (opts.site || opts.hfToken || opts.modelscopeApiToken) {
-            this.auth({
+            this.setup({
                 site_url: opts.site,
                 hf_token: opts.hfToken,
                 modelscope_api_token: opts.modelscopeApiToken,
@@ -650,17 +581,17 @@ class Engine {
         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);
+    /** Set Config / Run fields on this instance only. Does not write engine.yml. */
+    setup(updates) {
+        this.cfg = applySetup(this.cfg, updates);
         return this;
     }
-    authStatus() {
+    setupStatus() {
         return { ...this.cfg };
     }
-    /** Reset instance defaults. Does not delete ~/.ariacompute/config.yml. */
-    authClear() {
-        this.cfg = defaultAuthConfig();
+    /** Reset instance defaults. Does not delete ~/.ariacompute/engine.yml. */
+    setupClear() {
+        this.cfg = defaultSetupConfig();
         return this;
     }
     bindAndInit(bundle, ffiLib) {
@@ -677,7 +608,7 @@ class Engine {
             throw new Error(err || "init failed");
         }
     }
-    /** Download (if needed) and load a model using instance auth. */
+    /** Download (if needed) and load a model using instance setup. */
     async open(modelRef) {
         await ensureFfiLib(this.cfg.site_url || this.opts.site);
         const openOpts = {

package/package.json

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