quickmagic-cli 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickmagic-cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Quick Magic CLI — generate AI images/videos, product photoshoots, virtual try-on, hook ad videos, subtitles and more via the Quick Magic REST API, with browser-based OAuth PKCE login (no API keys to manage). Ships with 8 Claude Agent Skills and an MCP server integration.",
   "bin": {
     "quickmagic": "src/index.js",

package/skills/quickmagic-generate/SKILL.md

@@ -63,10 +63,10 @@ holds credit immediately.
 | `qm generate image` | `--prompt <p>` | `--model <m>` (default `qimi_3`), `--quality <q>`, `--aspect-ratio <r>`, `--n <n>` (default 1), `--ref <r...>` (repeatable — URL or local file path), `--wait`, `--out <dir>` |
 | `qm generate video` | `--prompt <p>`, `--model <m>` | `--duration <d>`, `--resolution <r>`, `--aspect-ratio <r>`, `--image <i...>` (repeatable), `--mode reference\|frames`, `--wait`, `--out <dir>` |
 
-- `--ref` / `--image` accept a URL (kept as-is) or a local file path (read + base64
-  encoded automatically). Files over ~8MB print a warning — prefer URLs (`qm scrape
-  <url>` or `qm import <url>` can produce a hosted URL from a product page or a
-  TikTok/Instagram post).
+- `--ref` / `--image` accept a URL (kept as-is) or a local file path — files are
+  UPLOADED automatically to Quick Magic storage (presigned, full original quality)
+  and the resulting file_url is used; tiny images ≤64KB are inlined. URLs from
+  `qm scrape <url>` / `qm import <url>` also work directly.
 - `--mode frames` caps at 2 images (first/last frame); `--mode reference` allows
   more (see the `IMAGES` column). A wrong count is rejected server-side.
 

package/src/commands/generate.js

@@ -1,39 +1,12 @@
-// commands/generate.js — tạo ảnh/video AI. --ref/--image: URL giữ nguyên, file local → base64 data URI.
-const fs = require('fs');
-const path = require('path');
+// commands/generate.js — tạo ảnh/video AI. --ref/--image: URL giữ nguyên; file local →
+// upload presigned (>64KB) hoặc base64 nhỏ — xem src/media.js [260722].
 const api = require('../api');
 const jobs = require('./jobs');
-
-const MAX_LOCAL_BYTES = 8 * 1024 * 1024; // cảnh báo khi file > 8MB (body giới hạn ~10MB)
-const MIME_BY_EXT = {
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.png': 'image/png',
-  '.webp': 'image/webp',
-  '.gif': 'image/gif',
-};
-
-// URL/data URI → giữ nguyên; file local → data:<mime>;base64,...
-function resolveInputImage(ref) {
-  if (/^https?:\/\//i.test(ref) || /^data:/i.test(ref)) return ref;
-  const abs_path = path.resolve(ref);
-  const ext = path.extname(abs_path).toLowerCase();
-  const mime = MIME_BY_EXT[ext] || 'image/png';
-  const buf = fs.readFileSync(abs_path);
-  if (buf.length > MAX_LOCAL_BYTES) {
-    console.warn(`Cảnh báo: ${ref} > 8MB — body giới hạn ~10MB, nên dùng URL thay vì file local.`);
-  }
-  return `data:${mime};base64,${buf.toString('base64')}`;
-}
-
-function resolveInputImages(refs) {
-  if (!refs || !refs.length) return [];
-  return refs.map(resolveInputImage);
-}
+const { resolveMediaInputs } = require('../media');
 
 // generate image — POST /public/v1/images.
 async function image(options) {
-  const ref_image_urls = resolveInputImages(options.ref);
+  const ref_image_urls = await resolveMediaInputs(options.ref);
   const num_images = parseInt(options.n, 10) || 1;
   const body = { prompt: options.prompt, model: options.model, num_images };
   if (options.quality) body.quality = options.quality;
@@ -50,7 +23,7 @@ async function image(options) {
 
 // generate video — POST /public/v1/videos.
 async function video(options) {
-  const image_urls = resolveInputImages(options.image);
+  const image_urls = await resolveMediaInputs(options.image);
   const body = { prompt: options.prompt, model: options.model };
   if (options.duration) body.duration = options.duration;
   if (options.resolution) body.resolution = options.resolution;

package/src/commands/tools.js

@@ -1,5 +1,10 @@
 // tools.js — lệnh CLI cho 17 tool mở rộng (gọi REST /public/v1 qua api.call). In kết quả JSON gọn.
+// [260722] Mọi param ảnh/media đi qua resolveMediaInput(s): URL giữ nguyên, file local
+// tự upload presigned (server chặn inline base64 >64KB) — user truyền path file thoải mái.
 const { call } = require('../api');
+const { resolveMediaInput, resolveMediaInputs } = require('../media');
+
+const rmi = (v) => (v == null ? v : resolveMediaInput(v)); // giữ undefined/null nguyên vẹn
 
 const out = (data) => console.log(JSON.stringify(data, null, 2));
 const jobHint = (data) => {
@@ -20,22 +25,22 @@ const marketingModes = run(async () => out(await call('GET', '/marketing/modes')
 const marketingVideo = run(async (o) => jobHint(await call('POST', '/marketing/videos', { body: { mode_id: Number(o.mode), product_id: o.productId ? Number(o.productId) : undefined, avatar_id: o.avatarId ? Number(o.avatarId) : undefined, avatar_kind: o.avatarKind, duration: o.duration ? Number(o.duration) : undefined, aspect_ratio: o.aspectRatio, client_request_id: o.crid } })));
 
 // ── Product / Fashion ──
-const product = run(async (o) => jobHint(await call('POST', '/product/images', { body: { refs: (o.refs || []).map((r) => (/^\d+$/.test(r) ? Number(r) : r)), image_types: o.types || ['product'], count_per_type: o.count ? Number(o.count) : undefined, kol_id: o.kolId ? Number(o.kolId) : undefined, instruction: o.instruction, model: o.model, client_request_id: o.crid } })));
+const product = run(async (o) => jobHint(await call('POST', '/product/images', { body: { refs: await Promise.all((o.refs || []).map(async (r) => (/^\d+$/.test(r) ? Number(r) : await rmi(r)))), image_types: o.types || ['product'], count_per_type: o.count ? Number(o.count) : undefined, kol_id: o.kolId ? Number(o.kolId) : undefined, instruction: o.instruction, model: o.model, client_request_id: o.crid } })));
 const fashion = run(async (o) => jobHint(await call('POST', '/fashion/images', { body: { mode: o.mode, outfit_ids: (o.outfit || []).map(Number), kol_kind: o.kolKind, kol_id: o.kolId ? Number(o.kolId) : undefined, model: o.model, client_request_id: o.crid } })));
 
 // ── Ảnh ──
-const edit = run(async (image, o) => jobHint(await call('POST', '/edit', { body: { image, tool: o.tool, model: o.model, upscale_target: o.upscaleTarget, style: o.style, client_request_id: o.crid } })));
-const tryon = run(async (o) => jobHint(await call('POST', '/tryon', { body: { type: o.type, model: o.model, model_image: o.model_image, garment_image: o.garment, upper_image: o.upper, lower_image: o.lower, background_image: o.background, prompt: o.prompt, client_request_id: o.crid } })));
+const edit = run(async (image, o) => jobHint(await call('POST', '/edit', { body: { image: await rmi(image), tool: o.tool, model: o.model, upscale_target: o.upscaleTarget, style: o.style, client_request_id: o.crid } })));
+const tryon = run(async (o) => jobHint(await call('POST', '/tryon', { body: { type: o.type, model: o.model, model_image: await rmi(o.model_image), garment_image: await rmi(o.garment), upper_image: await rmi(o.upper), lower_image: await rmi(o.lower), background_image: await rmi(o.background), prompt: o.prompt, client_request_id: o.crid } })));
 
 // ── Video nặng / audio ──
 const stt = run(async (audio_url, o) => jobHint(await call('POST', '/stt', { body: { audio_url, language_translate: o.translate, client_request_id: o.crid } })));
 const subtitle = run(async (video_url, o) => jobHint(await call('POST', '/subtitle', { body: { video_url, enable_voice_dubbing: !!o.dub, target_lang: o.translate, client_request_id: o.crid } })));
 const split = run(async (video_url, o) => jobHint(await call('POST', '/split', { body: { video_url, clip_mode: o.mode, title_lang: o.titleLang, translate_lang: o.translate, client_request_id: o.crid } })));
-const motion = run(async (video_url, o) => jobHint(await call('POST', '/motion', { body: { video_url, image_urls: o.image || [], model: o.model, mode: o.mode, prompt: o.prompt, client_request_id: o.crid } })));
+const motion = run(async (video_url, o) => jobHint(await call('POST', '/motion', { body: { video_url, image_urls: await resolveMediaInputs(o.image || []), model: o.model, mode: o.mode, prompt: o.prompt, client_request_id: o.crid } })));
 
 // ── Cutout / Hook Studio ──
-const cutout = run(async (o) => jobHint(await call('POST', '/cutout', { body: { operation: o.operation, ref_image_urls: o.ref || [], prompt: o.prompt, model: o.model, aspect_ratio: o.aspectRatio, quality: o.quality, num_images: o.n ? Number(o.n) : undefined, transparent_bg: o.transparentBg, client_request_id: o.crid } })));
+const cutout = run(async (o) => jobHint(await call('POST', '/cutout', { body: { operation: o.operation, ref_image_urls: await resolveMediaInputs(o.ref || []), prompt: o.prompt, model: o.model, aspect_ratio: o.aspectRatio, quality: o.quality, num_images: o.n ? Number(o.n) : undefined, transparent_bg: o.transparentBg, client_request_id: o.crid } })));
 const hookPresets = run(async () => out(await call('GET', '/hook/presets')));
-const hookVideo = run(async (o) => jobHint(await call('POST', '/hook/videos', { body: { preset_id: o.preset, character_url: o.character, product_url: o.product, aspect: o.aspect, speech_lang: o.speechLang, custom_cta: o.cta, location_url: o.location, accessory_url: o.accessory, style: o.style, format: o.format, resolution: o.resolution, client_request_id: o.crid } })));
+const hookVideo = run(async (o) => jobHint(await call('POST', '/hook/videos', { body: { preset_id: o.preset, character_url: await rmi(o.character), product_url: await rmi(o.product), aspect: o.aspect, speech_lang: o.speechLang, custom_cta: o.cta, location_url: o.location, accessory_url: o.accessory, style: o.style, format: o.format, resolution: o.resolution, client_request_id: o.crid } })));
 
 module.exports = { scrape, importSocial, assets, analyze, marketingModes, marketingVideo, product, fashion, edit, tryon, stt, subtitle, split, motion, cutout, hookPresets, hookVideo };

package/src/media.js

@@ -0,0 +1,63 @@
+// media.js — resolve input media cho mọi lệnh nhận ảnh/video/audio [260722].
+// URL/data URI → giữ nguyên. File local: ≤64KB → data:base64 (server chấp nhận inline nhỏ);
+// >64KB → POST /public/v1/uploads lấy presigned URL → PUT bytes thẳng lên storage → dùng file_url.
+// WHY: server chặn inline base64 >64KB (chống agent chép base64 khổng lồ qua hội thoại) —
+// CLI có mạng thật nên upload trực tiếp luôn nhanh hơn và giữ NGUYÊN chất lượng file gốc.
+const fs = require('fs');
+const path = require('path');
+const api = require('./api');
+
+const MAX_INLINE_BYTES = 64 * 1024;
+const MIME_BY_EXT = {
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.png': 'image/png',
+  '.webp': 'image/webp',
+  '.mp4': 'video/mp4',
+  '.mov': 'video/quicktime',
+  '.webm': 'video/webm',
+  '.mp3': 'audio/mpeg',
+  '.wav': 'audio/wav',
+  '.m4a': 'audio/mp4',
+};
+
+async function putBytes(upload_url, buf, content_type) {
+  const res = await fetch(upload_url, {
+    method: 'PUT',
+    headers: { 'Content-Type': content_type },
+    body: buf,
+  });
+  if (!res.ok) throw new Error(`Upload thất bại (HTTP ${res.status}). Thử lại hoặc dùng URL.`);
+}
+
+// 1 input → URL dùng được ngay cho tool (async — có thể upload).
+async function resolveMediaInput(ref) {
+  if (/^https?:\/\//i.test(ref) || /^data:/i.test(ref)) return ref;
+  const abs_path = path.resolve(ref);
+  if (!fs.existsSync(abs_path)) throw new Error(`Không thấy file: ${ref}`);
+  const ext = path.extname(abs_path).toLowerCase();
+  const content_type = MIME_BY_EXT[ext];
+  if (!content_type) throw new Error(`Định dạng không hỗ trợ: ${ext} (${ref}) — hỗ trợ: ${Object.keys(MIME_BY_EXT).join(' ')}`);
+  const buf = fs.readFileSync(abs_path);
+
+  if (buf.length <= MAX_INLINE_BYTES && content_type.startsWith('image/')) {
+    return `data:${content_type};base64,${buf.toString('base64')}`;
+  }
+
+  const data = await api.call('POST', '/uploads', {
+    body: { content_type, filename: path.basename(abs_path).slice(0, 120) },
+  });
+  if (!data.upload_url || !data.file_url) throw new Error('Server không cấp được link upload. Thử lại.');
+  await putBytes(data.upload_url, buf, content_type);
+  console.log(`Đã upload ${path.basename(abs_path)} (${Math.round(buf.length / 1024)}KB) → ${data.file_url}`);
+  return data.file_url;
+}
+
+async function resolveMediaInputs(refs) {
+  if (!refs || !refs.length) return [];
+  const out = [];
+  for (const r of refs) out.push(await resolveMediaInput(r));
+  return out;
+}
+
+module.exports = { resolveMediaInput, resolveMediaInputs };