@enslo/sd-metadata 1.0.2 → 1.1.0

package/dist/index.js

@@ -407,23 +407,45 @@ function convertSwarmUIPngToSegments(chunks) {
   }
   const parsed = parseJson(parametersChunk.text);
   const data = parsed.ok ? parsed.value : parametersChunk.text;
-  return [
+  const segments = [
     {
       source: { type: "exifUserComment" },
       data: typeof data === "string" ? data : JSON.stringify(data)
     }
   ];
+  const promptChunk = chunks.find((c) => c.keyword === "prompt");
+  if (promptChunk) {
+    segments.push({
+      source: { type: "exifMake" },
+      data: promptChunk.text
+    });
+  }
+  return segments;
 }
 function convertSwarmUISegmentsToPng(segments) {
   const userComment = findSegment(segments, "exifUserComment");
   if (!userComment) {
     return [];
   }
-  return createEncodedChunk(
-    "parameters",
-    userComment.data,
-    getEncodingStrategy("swarmui")
+  const chunks = [];
+  const make = findSegment(segments, "exifMake");
+  if (make) {
+    chunks.push(
+      ...createEncodedChunk(
+        "prompt",
+        make.data,
+        getEncodingStrategy("swarmui")
+      )
+    );
+  }
+  chunks.push(
+    ...createEncodedChunk(
+      "parameters",
+      userComment.data,
+      getEncodingStrategy("swarmui")
+    )
   );
+  return chunks;
 }
 
 // src/converters/index.ts
@@ -560,7 +582,6 @@ function parseA1111(entries) {
   const app = settingsMap.get("App");
   const software = detectSoftwareVariant(version, app);
   const metadata = {
-    type: "a1111",
     software,
     prompt,
     negativePrompt,
@@ -709,12 +730,13 @@ function parseComfyUI(entries) {
   const width = latentWidth || extraMeta?.width || 0;
   const height = latentHeight || extraMeta?.height || 0;
   const metadata = {
-    type: "comfyui",
     software: "comfyui",
     prompt: positiveText,
     negativePrompt: negativeText,
     width,
-    height
+    height,
+    nodes: prompt
+    // Store the parsed node graph
   };
   const checkpoint = findNode(prompt, ["CheckpointLoader_Base"])?.inputs?.ckpt_name;
   if (checkpoint) {
@@ -1006,7 +1028,6 @@ function parseFromEntries(entryRecord) {
   const width = Number(entryRecord.width ?? entryRecord.Width) || 0;
   const height = Number(entryRecord.height ?? entryRecord.Height) || 0;
   const metadata = {
-    type: "a1111",
     software: "easydiffusion",
     prompt: prompt.trim(),
     negativePrompt: negativePrompt.trim(),
@@ -1037,7 +1058,6 @@ function parseFromJson(json) {
   const width = getValue(json, "width", "Width") ?? 0;
   const height = getValue(json, "height", "Height") ?? 0;
   const metadata = {
-    type: "a1111",
     software: "easydiffusion",
     prompt: prompt.trim(),
     negativePrompt: negativePrompt.trim(),
@@ -1077,7 +1097,6 @@ function parseFooocus(entries) {
     return Result.error({ type: "unsupportedFormat" });
   }
   const metadata = {
-    type: "a1111",
     software: "fooocus",
     prompt: json.prompt?.trim() ?? "",
     negativePrompt: json.negative_prompt?.trim() ?? "",
@@ -1121,7 +1140,6 @@ function parseHfSpace(entries) {
   };
   const { width, height } = parseResolution(json.resolution);
   const metadata = {
-    type: "a1111",
     software: "hf-space",
     prompt: json.prompt ?? "",
     negativePrompt: json.negative_prompt ?? "",
@@ -1172,7 +1190,6 @@ function parseInvokeAI(entries) {
   const width = data.width ?? 0;
   const height = data.height ?? 0;
   const metadata = {
-    type: "invokeai",
     software: "invokeai",
     prompt: data.positive_prompt ?? "",
     negativePrompt: data.negative_prompt ?? "",
@@ -1222,7 +1239,6 @@ function parseNovelAI(entries) {
   const prompt = comment.v4_prompt?.caption?.base_caption ?? comment.prompt ?? "";
   const negativePrompt = comment.v4_negative_prompt?.caption?.base_caption ?? comment.uc ?? "";
   const metadata = {
-    type: "novelai",
     software: "novelai",
     prompt,
     negativePrompt,
@@ -1272,7 +1288,6 @@ function parseRuinedFooocus(entries) {
     return Result.error({ type: "unsupportedFormat" });
   }
   const metadata = {
-    type: "a1111",
     software: "ruined-fooocus",
     prompt: json.Prompt?.trim() ?? "",
     negativePrompt: json.Negative?.trim() ?? "",
@@ -1298,12 +1313,11 @@ function parseRuinedFooocus(entries) {
 function parseStabilityMatrix(entries) {
   const entryRecord = buildEntryRecord(entries);
   const comfyResult = parseComfyUI(entries);
-  if (!comfyResult.ok) {
+  if (!comfyResult.ok || comfyResult.value.software !== "comfyui") {
     return Result.error({ type: "unsupportedFormat" });
   }
   const metadata = {
     ...comfyResult.value,
-    type: "comfyui",
     software: "stability-matrix"
   };
   const jsonText = entryRecord["parameters-json"];
@@ -1365,13 +1379,19 @@ function parseSwarmUI(entries) {
   const width = params.width ?? 0;
   const height = params.height ?? 0;
   const metadata = {
-    type: "swarmui",
     software: "swarmui",
     prompt: params.prompt ?? "",
     negativePrompt: params.negativeprompt ?? "",
     width,
     height
   };
+  const promptSource = entryRecord.prompt || entryRecord.Make;
+  if (promptSource) {
+    const promptParsed = parseJson(promptSource);
+    if (promptParsed.ok) {
+      metadata.nodes = promptParsed.value;
+    }
+  }
   if (params.model) {
     metadata.model = {
       name: params.model
@@ -1414,13 +1434,24 @@ function parseTensorArt(entries) {
   const data = parsed.value;
   const width = data.width ?? 0;
   const height = data.height ?? 0;
+  const promptChunk = entryRecord.prompt;
+  if (!promptChunk) {
+    return Result.error({ type: "unsupportedFormat" });
+  }
+  const promptParsed = parseJson(promptChunk);
+  if (!promptParsed.ok) {
+    return Result.error({
+      type: "parseError",
+      message: "Invalid JSON in prompt chunk"
+    });
+  }
   const metadata = {
-    type: "comfyui",
     software: "tensorart",
     prompt: data.prompt ?? "",
     negativePrompt: data.negativePrompt ?? "",
     width,
-    height
+    height,
+    nodes: promptParsed.value
   };
   if (data.baseModel?.modelFileName || data.baseModel?.hash) {
     metadata.model = {
@@ -1429,8 +1460,9 @@ function parseTensorArt(entries) {
     };
   }
   if (data.seed !== void 0 || data.steps !== void 0 || data.cfgScale !== void 0 || data.clipSkip !== void 0) {
+    const baseSeed = data.seed ? Number(data.seed) : void 0;
     metadata.sampling = {
-      seed: data.seed ? Number(data.seed) : void 0,
+      seed: baseSeed === -1 ? findActualSeed(promptParsed.value) : baseSeed,
       steps: data.steps,
       cfg: data.cfgScale,
       clipSkip: data.clipSkip
@@ -1438,6 +1470,15 @@ function parseTensorArt(entries) {
   }
   return Result.ok(metadata);
 }
+function findActualSeed(nodes) {
+  const samplerNode = findSamplerNode(nodes);
+  return samplerNode && typeof samplerNode.inputs.seed === "number" ? samplerNode.inputs.seed : -1;
+}
+function findSamplerNode(nodes) {
+  return Object.values(nodes).find(
+    (node) => node.class_type === "KSampler" || node.class_type.toLowerCase().includes("sampler")
+  );
+}
 
 // src/parsers/index.ts
 function parseMetadata(entries) {