@wavespeed/cli 0.4.10 → 0.4.12

package/README.md

@@ -165,14 +165,10 @@ wavespeed init                           Create a wavespeed.json with defaults +
 wavespeed skill install                  Drop SKILL.md for coding agents
 ```
 
-**Pricing is an estimate.** `wavespeed price` quotes from the model's pricing
-formula, and many models bill from an input — audio/video duration, frame count,
-text length. Those inputs are optional in the quote: ask for a price without
-them and the formula collapses to the model's **base price**, which is the floor
-of its range, not a typical run. `wavespeed price wavespeed-ai/infinitetalk`
-says `$0.15`; a 60s audio actually bills `$1.80`. The command names the inputs it
-was blind to (`unpriced_inputs` / `at_base_price` in `--json`) — supply them for
-a real quote. Whatever it says, the amount actually charged for a run is
+**Pricing is an estimate.** `wavespeed price` quotes the inputs you pass, and many
+models bill from an input — audio/video duration, frame count, text length. Pass
+the same inputs you would pass to `wavespeed run`: a quote made without them can
+be lower than the real charge. The amount actually charged for a run is
 authoritative.
 
 ## Auth

package/dist/commands/auth.js

@@ -6,6 +6,7 @@ import clipboard from 'clipboardy';
 import { userConfig, getBaseUrl, getApiKey, loadProjectConfig, PROJECT_FILE } from '../lib/config.js';
 import { LINKS } from '../lib/links.js';
 import { clientAttributionHeaders } from '../lib/client-headers.js';
+import { GET_TIMEOUT_MS } from '../lib/api.js';
 const KEY_URL = 'https://wavespeed.ai/accesskey';
 function mask(key) {
     if (key.length < 12)
@@ -42,6 +43,7 @@ async function validateKey(apiKey, baseUrl) {
     try {
         res = await fetch(`${baseUrl}/api/v3/balance`, {
             headers: { Authorization: `Bearer ${apiKey}`, ...clientAttributionHeaders() },
+            signal: AbortSignal.timeout(GET_TIMEOUT_MS),
         });
     }
     catch (err) {

package/dist/commands/price.js

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { fetchPricing, fetchModels } from '../lib/api.js';
-import { missingPriceVars, isFloorQuote } from '../lib/pricing-vars.js';
+import { fetchPricing, modelLlmsTxtUrl } from '../lib/api.js';
 import { parseInputs } from '../lib/inputs.js';
 import { resolveModelToken } from '../lib/config.js';
 import { collectLocalFiles, resolveLocalFiles } from '../lib/local-files.js';
@@ -74,33 +73,14 @@ export function registerPrice(program) {
         const spinner = !opts.json ? ora('Calculating price…').start() : null;
         try {
             const data = await fetchPricing(resolved.model, inputs);
-            // /model/price evaluates the model's formula against whatever inputs we
-            // send and never complains about the ones we left out — a formula with
-            // every variable missing collapses to base_price. That is the floor of
-            // the model's range, not a representative charge, so name the inputs
-            // this quote could not see rather than presenting the floor as "the"
-            // price. Catalog is cached 1h; a lookup failure only costs the detail.
-            let unpriced = [];
-            let atFloor = false;
-            try {
-                const { models } = await fetchModels();
-                const meta = models.find((m) => m.model_id === resolved.model);
-                const props = meta?.api_schema?.api_schemas?.[0]?.request_schema?.properties;
-                unpriced = missingPriceVars(meta?.formula, inputs, props);
-                atFloor = isFloorQuote(meta?.formula, inputs);
-            }
-            catch {
-                /* no catalog — fall back to the generic disclaimer below */
-            }
             spinner?.stop();
             const disclaimer = 'Estimate only, for reference — the amount actually charged for a run is authoritative.';
             if (opts.json) {
                 process.stdout.write(JSON.stringify({
                     ...data,
                     estimate: true,
-                    unpriced_inputs: unpriced,
-                    at_base_price: atFloor,
                     disclaimer,
+                    llms_txt: modelLlmsTxtUrl(resolved.model),
                     uploaded: uploadedUrls,
                 }, null, 2) + '\n');
                 return;
@@ -113,19 +93,6 @@ export function registerPrice(program) {
                 (data.discounted_price > 0 && data.discounted_price !== data.price
                     ? chalk.gray(`  (list $${data.price})`)
                     : ''));
-            if (unpriced.length > 0) {
-                console.log('  ' +
-                    chalk.yellow('note:    ') +
-                    chalk.yellow(`this model is priced from ${unpriced.join(', ')}, which ${unpriced.length === 1 ? 'was' : 'were'} not supplied.`));
-                console.log('           ' +
-                    chalk.gray(atFloor
-                        ? 'The figure above is the base price — the floor of this model’s range, not a typical run.'
-                        : 'The figure above prices the rest at their defaults and can move once these are set.'));
-                console.log('           ' +
-                    chalk.gray('Pass ') +
-                    chalk.cyan(unpriced.map((v) => `-i ${v}=…`).join(' ')) +
-                    chalk.gray(' for a representative quote.'));
-            }
             console.log();
             for (const [file, url] of Object.entries(uploadedUrls)) {
                 console.log('  ' + chalk.gray('uploaded: ') + chalk.gray(file + ' → ') + chalk.cyan(url));
@@ -135,6 +102,7 @@ export function registerPrice(program) {
             }
             console.log();
             console.log(chalk.gray('Run it: ') + chalk.cyan(`wavespeed run ${modelArg}` + (opts.prompt ? ` -p "${opts.prompt}"` : '')));
+            console.log(chalk.gray('Model inputs:  ') + chalk.cyan(modelLlmsTxtUrl(resolved.model)));
             console.log(chalk.gray(disclaimer));
             console.log();
         }

package/dist/commands/schema.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { fetchModels } from '../lib/api.js';
+import { fetchModels, modelLlmsTxtUrl } from '../lib/api.js';
 function getRequestSchema(model) {
     return model.api_schema?.api_schemas?.[0]?.request_schema;
 }
@@ -116,6 +116,7 @@ export function registerSchema(program) {
             chalk.white(model.type ?? 'unknown') +
             (model.base_price !== undefined ? chalk.gray('   base price: ') + chalk.green(`$${model.base_price}`) : ''));
         console.log(chalk.gray('  page:  ') + chalk.cyan(`https://wavespeed.ai/models/${model.model_id}`));
+        console.log(chalk.gray('  llms:  ') + chalk.cyan(modelLlmsTxtUrl(model.model_id)));
         if (model.description) {
             console.log(wrap(model.description, '  '));
         }

package/dist/lib/api.js

@@ -46,6 +46,7 @@ export async function fetchModels(opts = {}) {
         throw new Error('No API key configured. Run `wavespeed login`.');
     const res = await fetch(`${baseUrl}/api/v3/models`, {
         headers: { Authorization: `Bearer ${apiKey}`, ...clientAttributionHeaders() },
+        signal: AbortSignal.timeout(GET_TIMEOUT_MS),
     });
     if (!res.ok) {
         throw await httpError(res, 'GET', '/api/v3/models');
@@ -66,6 +67,12 @@ export function clearModelsCache() {
         /* nothing to clear */
     }
 }
+// Per-request timeouts (no overall cap). A hung socket would otherwise stall
+// the CLI forever. Read-only GETs are far below 30s in practice (result p99.9
+// < 1s); the async submit gets more headroom because a timeout there is an
+// ambiguous outcome, not a clean failure.
+export const GET_TIMEOUT_MS = 30_000;
+export const SUBMIT_TIMEOUT_MS = 60_000;
 // --- Account + prediction endpoints (not exposed by the wavespeed SDK) ---
 function authHeaders() {
     const apiKey = getApiKey();
@@ -94,10 +101,10 @@ async function httpError(res, method, path) {
     err.status = res.status;
     return err;
 }
-async function apiGet(path, opts = {}) {
+async function apiGet(path) {
     const res = await fetch(`${getBaseUrl()}${path}`, {
         headers: authHeaders(),
-        signal: opts.timeoutMs ? AbortSignal.timeout(opts.timeoutMs) : undefined,
+        signal: AbortSignal.timeout(GET_TIMEOUT_MS),
     });
     if (!res.ok)
         throw await httpError(res, 'GET', path);
@@ -106,11 +113,12 @@ async function apiGet(path, opts = {}) {
         throw new Error(json.message || `API returned code ${json.code}`);
     return json.data;
 }
-async function apiPost(path, body) {
+async function apiPost(path, body, opts = {}) {
     const res = await fetch(`${getBaseUrl()}${path}`, {
         method: 'POST',
         headers: { ...authHeaders(), 'Content-Type': 'application/json' },
         body: JSON.stringify(body),
+        signal: opts.timeoutMs ? AbortSignal.timeout(opts.timeoutMs) : undefined,
     });
     if (!res.ok)
         throw await httpError(res, 'POST', path);
@@ -122,6 +130,10 @@ async function apiPost(path, body) {
 export async function fetchBalance() {
     return apiGet('/api/v3/balance');
 }
+// The model page's markdown summary for agents (inputs, endpoint, examples).
+export function modelLlmsTxtUrl(modelId) {
+    return `https://wavespeed.ai/models/${modelId}/llms.txt`;
+}
 export async function fetchPricing(modelId, inputs) {
     // /model/price is the documented pricing endpoint; /model/pricing is a
     // legacy contract kept for old clients and absent from the public docs.
@@ -142,13 +154,8 @@ export async function fetchHistory(query = {}) {
         body.status = query.status;
     return apiPost('/api/v3/predictions', body);
 }
-// A hung socket would otherwise stall the CLI forever. 30s is far above a
-// healthy status read, so it only trips on a dead connection.
-const POLL_REQUEST_TIMEOUT_MS = 30_000;
 export async function fetchPrediction(id) {
-    return apiGet(`/api/v3/predictions/${id}/result`, {
-        timeoutMs: POLL_REQUEST_TIMEOUT_MS,
-    });
+    return apiGet(`/api/v3/predictions/${id}/result`);
 }
 // Same set as wavespeed-python. A thrown error with no HTTP status is a
 // network failure or timeout; envelope/JSON errors carry no status either but
@@ -200,7 +207,20 @@ export async function submitPrediction(model, input, opts = {}) {
     const body = { ...input };
     if (opts.sync)
         body.enable_sync_mode = true;
-    return apiPost(`/api/v3/${model}`, body);
+    // sync mode legitimately holds the request until the task finishes, so only
+    // async submits get the per-request timeout.
+    try {
+        return await apiPost(`/api/v3/${model}`, body, {
+            timeoutMs: opts.sync ? undefined : SUBMIT_TIMEOUT_MS,
+        });
+    }
+    catch (err) {
+        // Never retried: the server may already have created (and billed) the task.
+        if (err?.name === 'TimeoutError') {
+            throw new Error(`Submission outcome unknown: no response within ${SUBMIT_TIMEOUT_MS / 1000}s. The task may have been created — run \`wavespeed history\` to check before retrying.`);
+        }
+        throw err;
+    }
 }
 /**
  * Poll a prediction until it reaches a terminal status. `onTick` fires each

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavespeed/cli",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "WaveSpeed CLI — one command to run any WaveSpeed AI model from your terminal.",
   "publishConfig": {
     "access": "public"
@@ -56,7 +56,7 @@
     "conf": "^13.0.0",
     "open": "^10.1.0",
     "ora": "^8.1.0",
-    "wavespeed": "^0.3.0"
+    "wavespeed": "^0.3.4"
   },
   "devDependencies": {
     "@types/node": "^20.14.0",

package/dist/lib/pricing-vars.js

@@ -1,75 +0,0 @@
-// Pricing formulas are JSONata expressions returned by /api/v3/models, e.g.
-//   {"total_price": $max([5, $min([$ceil(get_duration_v3(audio)), 600])]) / 5 * base_price}
-//   {"total_price": base_price * duration / 5}
-//
-// The pricing endpoint evaluates them server-side and happily accepts a partial
-// (or empty) `inputs` object — a formula whose variables are all missing
-// collapses to `base_price`, which is the floor of the model's price range, not
-// a typical charge. `wavespeed price wavespeed-ai/infinitetalk` with no inputs
-// quotes $0.15 while a 60s audio actually costs $1.80. So we parse the formula
-// to find which inputs move the price, and say which ones the quote is blind to.
-const RESERVED = new Set(['base_price', 'total_price', 'true', 'false', 'null']);
-/**
- * Variable names a pricing formula reads from the model's inputs, in first-seen
- * order. Excludes JSONata builtins (`$max`), helper calls (`get_duration_v3`),
- * string literals, and `base_price`/`total_price`.
- *
- * Returns [] for a flat-priced model (`base_price * 1`) or an unparseable
- * formula — callers should treat [] as "nothing input-dependent to warn about".
- */
-export function extractPriceVars(formula) {
-    if (!formula)
-        return [];
-    // Drop string literals first so "720p" / "total_price" keys never register.
-    const stripped = formula.replace(/"(?:[^"\\]|\\.)*"/g, '""').replace(/'(?:[^'\\]|\\.)*'/g, "''");
-    const vars = [];
-    const seen = new Set();
-    const re = /(\$?)([A-Za-z_][A-Za-z0-9_]*)\s*(\()?/g;
-    let m;
-    while ((m = re.exec(stripped)) !== null) {
-        const [, dollar, name, call] = m;
-        if (dollar)
-            continue; // $max, $ceil, $length — JSONata builtin
-        if (call)
-            continue; // get_duration_v3(...) — server-side helper
-        if (RESERVED.has(name))
-            continue;
-        if (seen.has(name))
-            continue;
-        seen.add(name);
-        vars.push(name);
-    }
-    return vars;
-}
-/**
- * Price-driving variables the quote is genuinely blind to.
- *
- * A driver the caller omitted but that carries a schema default is NOT blind —
- * the server priced it at that default, which is exactly what a run would use.
- * Only drivers with no default (infinitetalk's `audio`, seedance's
- * `reference_videos`) leave the quote uninformed, and those are the ones that
- * silently collapse the formula toward base_price.
- */
-export function missingPriceVars(formula, inputs, schemaProps) {
-    return extractPriceVars(formula).filter((v) => {
-        const val = inputs[v];
-        if (val !== undefined && val !== null && val !== '')
-            return false;
-        const prop = schemaProps?.[v];
-        return !(prop && 'default' in prop);
-    });
-}
-/**
- * True when every price driver is unsupplied — the case where the formula
- * degenerates to `base_price` and the quote is the floor of the model's range
- * rather than a representative charge.
- */
-export function isFloorQuote(formula, inputs) {
-    const vars = extractPriceVars(formula);
-    if (vars.length === 0)
-        return false;
-    return vars.every((v) => {
-        const val = inputs[v];
-        return val === undefined || val === null || val === '';
-    });
-}