@wavespeed/cli 0.4.22 → 0.4.23

package/dist/commands/media.js

@@ -45,6 +45,7 @@ async function execute(prompt, opts, build, media, rest) {
     try {
         const spinner = !isJsonMode() ? ora({ color: 'magenta' }) : null;
         const resolved = await resolveLocalFiles(media, {
+            allFields: true,
             upload: async (file) => (await uploadWithCache(file, (f) => client.upload(f))).url,
             onUpload: (file, i, total) => spinner?.start(total > 1 ? `Uploading ${path.basename(file)} (${i + 1}/${total})…` : `Uploading ${path.basename(file)}…`),
         });

package/dist/commands/price.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { fetchPricing, modelPlaygroundUrl } from '../lib/api.js';
 import { parseInputs } from '../lib/inputs.js';
+import { modelInputProps } from '../lib/validate-inputs.js';
 import { resolveModelToken } from '../lib/config.js';
 import { collectLocalFiles, resolveLocalFiles } from '../lib/local-files.js';
 import { uploadWithCache } from '../lib/upload-cache.js';
@@ -34,7 +35,8 @@ export function registerPrice(program) {
         // pricing engine. Uploading is slow and quota-limited, so it is opt-in:
         // without --upload we stop and say why, rather than silently sending a
         // filesystem path and quoting from garbage.
-        const localRefs = collectLocalFiles(inputs);
+        const props = await modelInputProps(resolved.model);
+        const localRefs = collectLocalFiles(inputs, { props });
         let uploadedUrls = {};
         if (localRefs.length > 0 && !opts.upload) {
             const files = [...new Set(localRefs.map((r) => r.path))].join(', ');
@@ -52,6 +54,7 @@ export function registerPrice(program) {
             const upSpinner = !opts.json ? ora('Uploading for an exact quote…').start() : null;
             try {
                 const resolvedFiles = await resolveLocalFiles(inputs, {
+                    props,
                     upload: async (file) => {
                         const { url, cached } = await uploadWithCache(file, (f) => client.upload(f));
                         uploadedUrls[file] = url;

package/dist/commands/run.js

@@ -6,7 +6,7 @@ import { requireClient } from '../lib/client.js';
 import { parseInputs, withInputSyntaxHint } from '../lib/inputs.js';
 import { resolveLocalFiles } from '../lib/local-files.js';
 import { fetchModels, submitPrediction, waitForPrediction } from '../lib/api.js';
-import { findUnknownInputs } from '../lib/validate-inputs.js';
+import { findUnknownInputs, modelInputProps } from '../lib/validate-inputs.js';
 import { uploadWithCache } from '../lib/upload-cache.js';
 import { downloadOutputs, printOutputs } from '../lib/output.js';
 import { emitJson, emitJsonError, isJsonMode, log, setJsonMode } from '../lib/log.js';
@@ -149,6 +149,7 @@ export function registerRun(program) {
         try {
             const uploadSpinner = !isJsonMode() ? ora({ color: 'magenta' }) : null;
             const resolved = await resolveLocalFiles(input, {
+                props: await modelInputProps(model),
                 upload: async (file) => (await uploadWithCache(file, (f) => client.upload(f))).url,
                 onUpload: (file, i, total) => {
                     uploadSpinner?.start(total > 1

package/dist/lib/local-files.js

@@ -6,9 +6,30 @@
 // asked to share based on a heuristic; a value that merely looks like a
 // filename must never leave the machine. No `@`, no upload: bare paths pass
 // through to the API untouched and fail model validation there if they were
-// meant to be files.
+// meant to be files. The `@` is only read in media fields (isMediaField):
+// prompts legitimately start with "@Image 1".
 import fs from 'node:fs';
 import path from 'node:path';
+// The same rule api-server (pkg/openapi IsMediaField) and the dashboard use to
+// tell which inputs carry media, so a text field such as `prompt` that merely
+// starts with "@" ("@Image 1 waves") is never read as a file path:
+//   - an enum is never media;
+//   - an explicit x-ui-component decides: uploader, uploaders and mask are
+//     media, any other component is not;
+//   - otherwise the name decides: image, *_image, *_image_url, video…, audio…
+//     (and their plurals), plus mask (api-server needs the uploader component
+//     for masks; the CLI also takes the bare name, which no text field uses).
+const MEDIA_NAME = /(^|_)(image|image_url|video|video_url|audio|audio_url|images|image_urls|videos|video_urls|audios|audio_urls|mask)$/;
+export function isMediaField(name, prop) {
+    const def = (prop && typeof prop === 'object' ? prop : {});
+    if (Array.isArray(def.enum) && def.enum.length > 0)
+        return false;
+    const component = def['x-ui-component'];
+    if (typeof component === 'string' && component !== '') {
+        return ['uploader', 'uploaders', 'mask'].includes(component.toLowerCase());
+    }
+    return MEDIA_NAME.test(name.toLowerCase());
+}
 function isRegularFile(p) {
     try {
         return fs.statSync(p).isFile();
@@ -21,24 +42,27 @@ function isRegularFile(p) {
  * Walk the input and list every `@path` value. Pure over `exists`, so the
  * rules can be tested without touching the disk.
  */
-export function collectLocalFiles(input, _opts = {}) {
+export function collectLocalFiles(input, opts = {}) {
     const found = [];
-    const walk = (node, at) => {
+    // `media` is whether the nearest named field (an array's elements take the
+    // array's name) carries media.
+    const walk = (node, at, media, depth) => {
         if (Array.isArray(node)) {
-            node.forEach((v, i) => walk(v, at ? `${at}.${i}` : String(i)));
+            node.forEach((v, i) => walk(v, at ? `${at}.${i}` : String(i), media, depth));
             return;
         }
         if (node && typeof node === 'object') {
             for (const [k, v] of Object.entries(node)) {
-                walk(v, at ? `${at}.${k}` : k);
+                const prop = depth === 0 ? opts.props?.[k] : undefined;
+                walk(v, at ? `${at}.${k}` : k, opts.allFields || isMediaField(k, prop), depth + 1);
             }
             return;
         }
-        if (typeof node !== 'string' || !node.startsWith('@'))
+        if (!media || typeof node !== 'string' || !node.startsWith('@'))
             return;
         found.push({ path: node.slice(1), at });
     };
-    walk(input, '');
+    walk(input, '', !!opts.allFields, 0);
     return found;
 }
 function setAt(root, dotted, value) {

package/dist/lib/validate-inputs.js

@@ -9,6 +9,17 @@
 // Validation fails OPEN: no schema (brand-new model, catalog lag, offline
 // cache miss) means no check. It must never block a submission the API would
 // have accepted.
+import { fetchModels } from './api.js';
+/** The model's input properties with their definitions, or undefined when the catalog has no schema (fails open). */
+export async function modelInputProps(modelId) {
+    try {
+        const { models } = await fetchModels();
+        return models.find((m) => m.model_id === modelId)?.api_schema?.api_schemas?.[0]?.request_schema?.properties;
+    }
+    catch {
+        return undefined;
+    }
+}
 export function requestSchemaProps(model) {
     const props = model?.api_schema?.api_schemas?.[0]?.request_schema?.properties;
     if (!props)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavespeed/cli",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "description": "WaveSpeed CLI — one command to run any WaveSpeed AI model from your terminal.",
   "publishConfig": {
     "access": "public"