@enslo/sd-metadata 1.0.1 → 1.0.2

package/dist/index.js

@@ -548,6 +548,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";
@@ -778,7 +782,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 +796,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 +804,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 +826,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 +852,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 +935,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 +943,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,]+)/);