@enslo/sd-metadata 1.8.0 → 1.8.1

package/README.ja.md

@@ -149,7 +149,7 @@ if (result.status === 'success') {
 > 本番環境では `@latest` の代わりに特定のバージョンを指定してください：
 >
 > ```text
-> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.8.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.8.1/dist/index.js
 > ```
 
 ### 応用例

package/README.md

@@ -148,7 +148,7 @@ if (result.status === 'success') {
 > For production use, pin to a specific version instead of `@latest`:
 >
 > ```text
-> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.8.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.8.1/dist/index.js
 > ```
 
 ### Advanced Examples

package/dist/index.js

@@ -18,10 +18,6 @@ function parseA1111(entries) {
   if (!text) {
     return Result.error({ type: "unsupportedFormat" });
   }
-  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";
@@ -393,9 +389,6 @@ function parseComfyUI(entries) {
     });
   }
   const prompt = parsed.value;
-  if (!Object.values(prompt).some((node) => "class_type" in node)) {
-    return Result.error({ type: "unsupportedFormat" });
-  }
   const comfyMetadata = extractComfyUIMetadata(prompt);
   const civitaiMetadata = extractCivitaiMetadata(
     extractExtraMetadata(prompt, entries)
@@ -618,24 +611,22 @@ function detectFromCommentJson(comment) {
   return null;
 }
 function detectComfyUIEntries(entryRecord) {
-  if ("prompt" in entryRecord && "workflow" in entryRecord) {
+  if ("prompt" in entryRecord && "workflow" in entryRecord || "Prompt" in entryRecord && "Workflow" in entryRecord) {
     return "comfyui";
   }
-  if ("workflow" in entryRecord) {
+  if ("workflow" in entryRecord || "Workflow" in entryRecord) {
     return "comfyui";
   }
-  if ("prompt" in entryRecord) {
-    const promptText = entryRecord.prompt;
-    if (promptText?.startsWith("{")) {
-      if (promptText.includes(M_SWARMUI)) {
-        return "swarmui";
-      }
-      if (promptText.includes(`"${M_CIVITAI_EXTRA}"`)) {
-        return "civitai";
-      }
-      if (promptText.includes(M_COMFYUI_NODE)) {
-        return "comfyui";
-      }
+  const promptText = entryRecord.prompt ?? entryRecord.Prompt;
+  if (promptText?.startsWith("{")) {
+    if (promptText.includes(M_SWARMUI)) {
+      return "swarmui";
+    }
+    if (promptText.includes(`"${M_CIVITAI_EXTRA}"`)) {
+      return "civitai";
+    }
+    if (promptText.includes(M_COMFYUI_NODE)) {
+      return "comfyui";
     }
   }
   return null;
@@ -696,7 +687,7 @@ function detectFromA1111Format(text) {
   if (text.includes(M_CIVITAI_RESOURCES)) {
     return "civitai";
   }
-  if (text.includes("Steps:") && text.includes("Sampler:")) {
+  if (text.includes("Steps:") || text.includes("Sampler:") || text.includes("Negative prompt:")) {
     return "sd-webui";
   }
   return null;
@@ -771,9 +762,6 @@ function parseFooocus(entries) {
     });
   }
   const json = parsed.value;
-  if (!json.base_model && !json.prompt) {
-    return Result.error({ type: "unsupportedFormat" });
-  }
   const metadata = {
     software: "fooocus",
     prompt: json.prompt?.trim() ?? "",
@@ -905,9 +893,6 @@ function buildUpscale(data) {
 
 // src/parsers/novelai.ts
 function parseNovelAI(entries) {
-  if (!entries.Software?.startsWith("NovelAI")) {
-    return Result.error({ type: "unsupportedFormat" });
-  }
   const commentText = entries.UserComment ?? entries.Comment;
   if (!commentText) {
     return Result.error({
@@ -968,9 +953,6 @@ function parseRuinedFooocus(entries) {
     });
   }
   const json = parsed.value;
-  if (json.software !== "RuinedFooocus") {
-    return Result.error({ type: "unsupportedFormat" });
-  }
   const metadata = {
     software: "ruined-fooocus",
     prompt: json.Prompt?.trim() ?? "",
@@ -1179,23 +1161,8 @@ function parseMetadata(entries) {
       return parseFooocus(entries);
     case "ruined-fooocus":
       return parseRuinedFooocus(entries);
-    default: {
-      const a1111Result = parseA1111(entries);
-      if (a1111Result.ok) return a1111Result;
-      const comfyResult = parseComfyUI(entries);
-      if (comfyResult.ok) return comfyResult;
-      const invokeResult = parseInvokeAI(entries);
-      if (invokeResult.ok) return invokeResult;
-      const swarmResult = parseSwarmUI(entries);
-      if (swarmResult.ok) return swarmResult;
-      const tensorResult = parseTensorArt(entries);
-      if (tensorResult.ok) return tensorResult;
-      const stabilityResult = parseStabilityMatrix(entries);
-      if (stabilityResult.ok) return stabilityResult;
-      const novelaiResult = parseNovelAI(entries);
-      if (novelaiResult.ok) return novelaiResult;
+    default:
       return Result.error({ type: "unsupportedFormat" });
-    }
   }
 }