@enslo/sd-metadata 1.0.1 → 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
@@ -548,6 +570,10 @@ function parseA1111(entries) {
     return Result.error({ type: "unsupportedFormat" });
   }
   const text = parametersEntry.text;
+  const hasAIMarkers = text.includes("Steps:") || text.includes("Sampler:") || text.includes("Negative prompt:");
+  if (!hasAIMarkers) {
+    return Result.error({ type: "unsupportedFormat" });
+  }
   const { prompt, negativePrompt, settings } = parseParametersText(text);
   const settingsMap = parseSettings(settings);
   const size = settingsMap.get("Size") ?? "0x0";
@@ -556,7 +582,6 @@ function parseA1111(entries) {
   const app = settingsMap.get("App");
   const software = detectSoftwareVariant(version, app);
   const metadata = {
-    type: "a1111",
     software,
     prompt,
     negativePrompt,
@@ -705,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) {
@@ -778,7 +804,7 @@ function parseComfyUI(entries) {
 }
 function findPromptJson(entryRecord) {
   if (entryRecord.prompt) {
-    return entryRecord.prompt;
+    return entryRecord.prompt.replace(/:\s*NaN\b/g, ": null");
   }
   const candidates = [
     entryRecord.Comment,
@@ -792,7 +818,7 @@ function findPromptJson(entryRecord) {
   for (const candidate of candidates) {
     if (!candidate) continue;
     if (candidate.startsWith("{")) {
-      const cleaned = candidate.replace(/\0+$/, "");
+      const cleaned = candidate.replace(/\0+$/, "").replace(/:\s*NaN\b/g, ": null");
       const parsed = parseJson(cleaned);
       if (!parsed.ok) continue;
       if (parsed.value.prompt && typeof parsed.value.prompt === "object") {
@@ -800,7 +826,7 @@ function findPromptJson(entryRecord) {
       }
       const values = Object.values(parsed.value);
       if (values.some((v) => v && typeof v === "object" && "class_type" in v)) {
-        return candidate;
+        return cleaned;
       }
     }
   }
@@ -822,11 +848,17 @@ function extractExtraMetadata(prompt) {
 // src/parsers/detect.ts
 function detectSoftware(entries) {
   const entryRecord = buildEntryRecord(entries);
-  const keywordResult = detectFromKeywords(entryRecord);
-  if (keywordResult) return keywordResult;
-  return detectFromContent(entryRecord);
+  const uniqueResult = detectUniqueKeywords(entryRecord);
+  if (uniqueResult) return uniqueResult;
+  const comfyResult = detectComfyUIEntries(entryRecord);
+  if (comfyResult) return comfyResult;
+  const text = entryRecord.parameters ?? entryRecord.Comment ?? "";
+  if (text) {
+    return detectFromTextContent(text);
+  }
+  return null;
 }
-function detectFromKeywords(entryRecord) {
+function detectUniqueKeywords(entryRecord) {
   if (entryRecord.Software === "NovelAI") {
     return "novelai";
   }
@@ -842,56 +874,80 @@ function detectFromKeywords(entryRecord) {
   if ("negative_prompt" in entryRecord || "Negative Prompt" in entryRecord) {
     return "easydiffusion";
   }
+  const parameters = entryRecord.parameters;
+  if (parameters?.includes("sui_image_params")) {
+    return "swarmui";
+  }
   const comment = entryRecord.Comment;
   if (comment?.startsWith("{")) {
-    try {
-      const parsed = JSON.parse(comment);
-      if ("invokeai_metadata" in parsed) {
-        return "invokeai";
-      }
-      if ("prompt" in parsed && "workflow" in parsed) {
-        const workflow = parsed.workflow;
-        const prompt = parsed.prompt;
-        const isObject = typeof workflow === "object" || typeof prompt === "object";
-        const isJsonString = typeof workflow === "string" && workflow.startsWith("{") || typeof prompt === "string" && prompt.startsWith("{");
-        if (isObject || isJsonString) {
-          return "comfyui";
-        }
+    return detectFromCommentJson(comment);
+  }
+  return null;
+}
+function detectFromCommentJson(comment) {
+  try {
+    const parsed = JSON.parse(comment);
+    if ("invokeai_metadata" in parsed) {
+      return "invokeai";
+    }
+    if ("prompt" in parsed && "workflow" in parsed) {
+      const workflow = parsed.workflow;
+      const prompt = parsed.prompt;
+      const isObject = typeof workflow === "object" || typeof prompt === "object";
+      const isJsonString = typeof workflow === "string" && workflow.startsWith("{") || typeof prompt === "string" && prompt.startsWith("{");
+      if (isObject || isJsonString) {
+        return "comfyui";
       }
-      if ("sui_image_params" in parsed) {
+    }
+    if ("sui_image_params" in parsed) {
+      return "swarmui";
+    }
+    if ("prompt" in parsed && "parameters" in parsed) {
+      const params = String(parsed.parameters || "");
+      if (params.includes("sui_image_params") || params.includes("swarm_version")) {
         return "swarmui";
       }
-      if ("prompt" in parsed && "parameters" in parsed) {
-        const params = String(parsed.parameters || "");
-        if (params.includes("sui_image_params") || params.includes("swarm_version")) {
-          return "swarmui";
-        }
-      }
-    } catch {
     }
+  } catch {
   }
   return null;
 }
-function detectFromContent(entryRecord) {
+function detectComfyUIEntries(entryRecord) {
   if ("prompt" in entryRecord && "workflow" in entryRecord) {
     return "comfyui";
   }
-  const text = entryRecord.parameters ?? entryRecord.Comment ?? "";
-  if (!text) {
-    if ("workflow" in entryRecord) {
-      return "comfyui";
+  if ("workflow" in entryRecord) {
+    return "comfyui";
+  }
+  if ("prompt" in entryRecord) {
+    const promptText = entryRecord.prompt;
+    if (promptText?.startsWith("{")) {
+      if (promptText.includes("sui_image_params")) {
+        return "swarmui";
+      }
+      if (promptText.includes("class_type")) {
+        return "comfyui";
+      }
     }
-    return null;
   }
+  return null;
+}
+function detectFromTextContent(text) {
   if (text.startsWith("{")) {
-    return detectFromJson(text);
+    return detectFromJsonFormat(text);
   }
-  return detectFromA1111Text(text);
+  return detectFromA1111Format(text);
 }
-function detectFromJson(json) {
+function detectFromJsonFormat(json) {
   if (json.includes("sui_image_params")) {
     return "swarmui";
   }
+  if (json.includes('"software":"RuinedFooocus"') || json.includes('"software": "RuinedFooocus"')) {
+    return "ruined-fooocus";
+  }
+  if (json.includes('"use_stable_diffusion_model"')) {
+    return "easydiffusion";
+  }
   if (json.includes("civitai:") || json.includes('"resource-stack"')) {
     return "civitai";
   }
@@ -901,12 +957,6 @@ function detectFromJson(json) {
   if (json.includes('"Model"') && json.includes('"resolution"')) {
     return "hf-space";
   }
-  if (json.includes('"use_stable_diffusion_model"')) {
-    return "easydiffusion";
-  }
-  if (json.includes('"software":"RuinedFooocus"') || json.includes('"software": "RuinedFooocus"')) {
-    return "ruined-fooocus";
-  }
   if (json.includes('"prompt"') && json.includes('"base_model"')) {
     return "fooocus";
   }
@@ -915,11 +965,8 @@ function detectFromJson(json) {
   }
   return null;
 }
-function detectFromA1111Text(text) {
-  if (text.includes("sui_image_params")) {
-    return "swarmui";
-  }
-  if (text.includes("swarm_version")) {
+function detectFromA1111Format(text) {
+  if (text.includes("sui_image_params") || text.includes("swarm_version")) {
     return "swarmui";
   }
   const versionMatch = text.match(/Version:\s*([^\s,]+)/);
@@ -981,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(),
@@ -1012,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(),
@@ -1052,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() ?? "",
@@ -1096,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 ?? "",
@@ -1147,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 ?? "",
@@ -1197,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,
@@ -1247,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() ?? "",
@@ -1273,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"];
@@ -1340,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
@@ -1389,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 = {
@@ -1404,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
@@ -1413,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) {