ima2-gen 1.1.7 → 1.1.9

package/bin/commands/show.js

@@ -2,47 +2,82 @@ import { parseArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { openUrl } from "../lib/platform.js";
 import { out, die, color, json, exitCodeForError } from "../lib/output.js";
-
+import { fileToDataUri } from "../lib/files.js";
+import { config } from "../../config.js";
 const SPEC = {
-  flags: {
-    json:   { type: "boolean" },
-    reveal: { type: "boolean" },
-    server: { type: "string" },
-    help:   { short: "h", type: "boolean" },
-  },
+    flags: {
+        json: { type: "boolean" },
+        reveal: { type: "boolean" },
+        metadata: { type: "boolean" },
+        server: { type: "string" },
+        help: { short: "h", type: "boolean" },
+    },
 };
-
 export default async function showCmd(argv) {
-  const args = parseArgs(argv, SPEC);
-  if (args.help) { out("ima2 show <filename> [--json] [--reveal]"); return; }
-  const name = args.positional[0];
-  if (!name) die(2, "filename required");
-
-  let server;
-  try { server = await resolveServer({ serverFlag: args.server }); }
-  catch (e) { die(exitCodeForError(e), e.message); }
-
-  let resp;
-  try { resp = await request(server.base, "/api/history"); }
-  catch (e) { die(exitCodeForError(e), e.message); }
-
-  const items = resp.items || resp.history || [];
-  const item = items.find((it) => it.filename === name || (it.filename && it.filename.endsWith(name)));
-  if (!item) die(1, `not found: ${name}`);
-
-  if (args.json) { json(item); }
-  else {
-    out(color.bold(item.filename));
-    out(color.dim(`  prompt:`)   + ` ${item.prompt || ""}`);
-    out(color.dim(`  size:`)     + ` ${item.size || ""}  quality: ${item.quality || ""}`);
-    if (item.createdAt) out(color.dim(`  when:`) + ` ${new Date(item.createdAt).toISOString()}`);
-    if (item.url) out(color.dim(`  url:`) + ` ${server.base}${item.url}`);
-  }
-
-  if (args.reveal) {
-    const url = item.url ? `${server.base}${item.url}` : null;
-    if (!url) { out(color.yellow("(no url)")); return; }
-    const res = openUrl(url);
-    if (!res.ok) out(color.yellow("(could not reveal)"));
-  }
+    const args = parseArgs(argv, SPEC);
+    if (args.help) {
+        out("ima2 show <filename> [--json] [--reveal] [--metadata]");
+        return;
+    }
+    const name = args.positional[0];
+    if (!name)
+        die(2, "filename required");
+    let server;
+    try {
+        server = await resolveServer({ serverFlag: args.server });
+    }
+    catch (e) {
+        die(exitCodeForError(e), e.message);
+    }
+    let resp;
+    try {
+        resp = await request(server.base, "/api/history");
+    }
+    catch (e) {
+        die(exitCodeForError(e), e.message);
+    }
+    const items = resp.items || resp.history || [];
+    const item = items.find((it) => it.filename === name || (it.filename && it.filename.endsWith(name)));
+    if (!item)
+        die(1, `not found: ${name}`);
+    let metadata = null;
+    if (args.metadata) {
+        try {
+            const dataUrl = await fileToDataUri(`${config.storage.generatedDir}/${item.filename}`);
+            metadata = await request(server.base, "/api/metadata/read", {
+                method: "POST",
+                body: { dataUrl },
+            });
+        }
+        catch (e) {
+            out(color.dim(`(metadata unavailable: ${e?.message || e})`));
+        }
+    }
+    if (args.json) {
+        json(args.metadata ? { ...item, metadata } : item);
+    }
+    else {
+        out(color.bold(item.filename));
+        out(color.dim(`  prompt:`) + ` ${item.prompt || ""}`);
+        out(color.dim(`  size:`) + ` ${item.size || ""}  quality: ${item.quality || ""}`);
+        if (item.createdAt)
+            out(color.dim(`  when:`) + ` ${new Date(item.createdAt).toISOString()}`);
+        if (item.url)
+            out(color.dim(`  url:`) + ` ${server.base}${item.url}`);
+        if (metadata) {
+            out(color.dim(`  metadata:`));
+            const dump = JSON.stringify(metadata, null, 2).split("\n").map(l => "    " + l).join("\n");
+            out(dump);
+        }
+    }
+    if (args.reveal) {
+        const url = item.url ? `${server.base}${item.url}` : null;
+        if (!url) {
+            out(color.yellow("(no url)"));
+            return;
+        }
+        const res = openUrl(url);
+        if (!res.ok)
+            out(color.yellow("(could not reveal)"));
+    }
 }

package/bin/commands/show.ts

@@ -0,0 +1,69 @@
+import { parseArgs } from "../lib/args.js";
+import { resolveServer, request } from "../lib/client.js";
+import { openUrl } from "../lib/platform.js";
+import { out, die, color, json, exitCodeForError } from "../lib/output.js";
+import { fileToDataUri } from "../lib/files.js";
+import { config } from "../../config.js";
+
+const SPEC = {
+  flags: {
+    json:   { type: "boolean" },
+    reveal: { type: "boolean" },
+    metadata: { type: "boolean" },
+    server: { type: "string" },
+    help:   { short: "h", type: "boolean" },
+  },
+};
+
+export default async function showCmd(argv) {
+  const args = parseArgs(argv, SPEC);
+  if (args.help) { out("ima2 show <filename> [--json] [--reveal] [--metadata]"); return; }
+  const name = args.positional[0];
+  if (!name) die(2, "filename required");
+
+  let server;
+  try { server = await resolveServer({ serverFlag: args.server }); }
+  catch (e) { die(exitCodeForError(e), e.message); }
+
+  let resp;
+  try { resp = await request(server.base, "/api/history"); }
+  catch (e) { die(exitCodeForError(e), e.message); }
+
+  const items = resp.items || resp.history || [];
+  const item = items.find((it) => it.filename === name || (it.filename && it.filename.endsWith(name)));
+  if (!item) die(1, `not found: ${name}`);
+
+  let metadata: any = null;
+  if (args.metadata) {
+    try {
+      const dataUrl = await fileToDataUri(`${config.storage.generatedDir}/${item.filename}`);
+      metadata = await request(server.base, "/api/metadata/read", {
+        method: "POST",
+        body: { dataUrl },
+      });
+    } catch (e: any) {
+      out(color.dim(`(metadata unavailable: ${e?.message || e})`));
+    }
+  }
+
+  if (args.json) { json(args.metadata ? { ...item, metadata } : item); }
+  else {
+    out(color.bold(item.filename));
+    out(color.dim(`  prompt:`)   + ` ${item.prompt || ""}`);
+    out(color.dim(`  size:`)     + ` ${item.size || ""}  quality: ${item.quality || ""}`);
+    if (item.createdAt) out(color.dim(`  when:`) + ` ${new Date(item.createdAt).toISOString()}`);
+    if (item.url) out(color.dim(`  url:`) + ` ${server.base}${item.url}`);
+    if (metadata) {
+      out(color.dim(`  metadata:`));
+      const dump = JSON.stringify(metadata, null, 2).split("\n").map(l => "    " + l).join("\n");
+      out(dump);
+    }
+  }
+
+  if (args.reveal) {
+    const url = item.url ? `${server.base}${item.url}` : null;
+    if (!url) { out(color.yellow("(no url)")); return; }
+    const res = openUrl(url);
+    if (!res.ok) out(color.yellow("(could not reveal)"));
+  }
+}