molecule-publish

@@ -1,62 +1,62 @@-{
-  "slug": "molecule-publish",
-  "version": "2.11.0",
-  "type": "skill",
-  "description": "Publish molecules AND generic boards to the Adom wiki - one publisher, two shapes: OCCT conversion (molecule mode with stats gates, or plain for boards), component packaging, adom-wiki publish, APM render assets + component dependencies. Companion to adom-molecule-import.",
-  "tags": [
-    "molecule",
-    "pipeline",
-    "wiki",
-    "hydrogen",
-    "skill"
-  ],
-  "dependencies": {
-    "adom/adom-molecule": "^1.1.3"
-  },
-  "scripts": {
-    "install": "./install.sh",
-    "uninstall": "./uninstall.sh"
-  },
-  "hero": {
-    "headline": "Molecule bundle to wiki page",
-    "subhead": "OCCT convert, stats gates, package, publish - EDA-agnostic",
-    "screenshot": "docs/shot.png"
-  },
-  "discovery_triggers": [
-    "publish this molecule to the wiki",
-    "upload molecule bundle",
-    "convert and publish my molecule",
-    "molecule to the wiki",
-    "publish molecule package",
-    "publish my board",
-    "publish board to the wiki",
-    "board to project manager",
-    "render board for apm"
-  ],
-  "discovery_pitch": "Publish a molecule source bundle (STEP + schematic + board + metadata) to the Adom wiki: OCCT molecule-mode conversion with stats gates, component packaging, adom-wiki publish. EDA-agnostic middle of the pipeline; companion to adom-molecule-import.",
-  "sample_prompts": [
-    {
-      "label": "Publish a bundle",
-      "prompt": "I have ABC.step, ABC.kicad_pcb and ABC.kicad_sch - publish this molecule to the wiki"
-    },
-    {
-      "label": "Convert and publish",
-      "prompt": "Convert my molecule through OCCT and publish it"
-    }
-  ],
-  "files": [
-    "README.md",
-    "SKILL.md",
-    "docs/fabrication.md",
-    "install.sh",
-    "uninstall.sh",
-    "package.json",
-    "page.json",
-    "scripts/bundle_3d.py",
-    "scripts/component_graph.py",
-    "scripts/fab_bundle.py",
-    "scripts/hero_camera.py",
-    "scripts/render_parity.py",
-    "scripts/tested_with.py"
-  ]
-}
+{+  "slug": "molecule-publish",+  "version": "2.12.0",+  "type": "skill",+  "description": "Publish molecules AND generic boards to the Adom wiki - one publisher, two shapes: OCCT conversion (molecule mode with stats gates, or plain for boards), component packaging, adom-wiki publish, APM render assets + component dependencies. Companion to adom-molecule-import.",+  "tags": [+    "molecule",+    "pipeline",+    "wiki",+    "hydrogen",+    "skill"+  ],+  "dependencies": {+    "adom/adom-molecule": "^1.1.3"+  },+  "scripts": {+    "install": "./install.sh",+    "uninstall": "./uninstall.sh"+  },+  "hero": {+    "headline": "Molecule bundle to wiki page",+    "subhead": "OCCT convert, stats gates, package, publish - EDA-agnostic",+    "screenshot": "docs/shot.png"+  },+  "discovery_triggers": [+    "publish this molecule to the wiki",+    "upload molecule bundle",+    "convert and publish my molecule",+    "molecule to the wiki",+    "publish molecule package",+    "publish my board",+    "publish board to the wiki",+    "board to project manager",+    "render board for apm"+  ],+  "discovery_pitch": "Publish a molecule source bundle (STEP + schematic + board + metadata) to the Adom wiki: OCCT molecule-mode conversion with stats gates, component packaging, adom-wiki publish. EDA-agnostic middle of the pipeline; companion to adom-molecule-import.",+  "sample_prompts": [+    {+      "label": "Publish a bundle",+      "prompt": "I have ABC.step, ABC.kicad_pcb and ABC.kicad_sch - publish this molecule to the wiki"+    },+    {+      "label": "Convert and publish",+      "prompt": "Convert my molecule through OCCT and publish it"+    }+  ],+  "files": [+    "README.md",+    "SKILL.md",+    "docs/fabrication.md",+    "install.sh",+    "uninstall.sh",+    "package.json",+    "page.json",+    "scripts/bundle_3d.py",+    "scripts/component_graph.py",+    "scripts/fab_bundle.py",+    "scripts/hero_camera.py",+    "scripts/render_parity.py",+    "scripts/tested_with.py"+  ]+}

@@ -8,7 +8,7 @@ import sys import zipfile from pathlib import Path, PurePosixPath -VERSION = "1.0.0"+VERSION = "1.1.0" REQUIRED = {"copper_top", "copper_bottom", "mask_top", "mask_bottom",             "silk_top", "silk_bottom", "outline"} DRILLS = {"drill_plated", "drill_unplated", "drill_mixed"}@@ -16,6 +16,11 @@ EXT_ROLES = {"gtl": "copper_top", "gbl": "copper_bottom", "gts": "mask_top",              "gbs": "mask_bottom", "gto": "silk_top", "gbo": "silk_bottom",              "gtp": "paste_top", "gbp": "paste_bottom", "gko": "outline",              "gm1": "outline", "gbrjob": "gerber_job"}+# The names board-look's fab.py reads from a fabrication zip (it keeps only these, by file name).+# Layer files must match it, and no two may share a file name, or the reader renders another file.+READER_EXT = re.compile(r"\.(gbr|gtl|gbl|gts|gbs|gto|gbo|gko|gm1|gml|gm|cmp|sol|stc|sts|plc|pls|drl|xln|txt|exc|gbrjob|g\d+|gp\d|gtp|gbp|dri|gpi)$", re.I)+ZIP_BUDGET = (2000, 512 * 1024 ** 2)+EMAIL = re.compile(rb"[\w.+-]+@[\w-]+(?:\.[\w-]+)+")   def safe_path(name):@@ -49,10 +54,15 @@ def role_for(name, data):             layer = next((p for p in parts if re.fullmatch(r"L[2-9][0-9]*", p)), None)             return "copper_inner_" + str(int(layer[1:]) - 1) if layer else "copper_inner"     if ext in ("drl", "xln", "exc", "txt") and re.search(r"(?m)^M48\s*$", text):-        stem = Path(name).stem.upper()-        if "NPTH" in stem or "NONPLATED" in stem or "NonPlated" in text:+        # The file's own X2 plating first (KiCad writes MixedPlating for a mixed file, whose+        # NonPlated aperture lines do not make it unplated), then whole words of the name.+        kind = match[1].split(",")[0] if match else None+        if kind in ("Plated", "NonPlated", "MixedPlating"):+            return {"Plated": "drill_plated", "NonPlated": "drill_unplated", "MixedPlating": "drill_mixed"}[kind]+        words = set(re.split(r"[^A-Z0-9]+", Path(name).stem.upper()))+        if words & {"NPTH", "NONPLATED"}:             return "drill_unplated"-        if "PTH" in stem or stem.endswith("-PLATED") or re.search(r"FileFunction,Plated,", text):+        if words & {"PTH", "PLATED"}:             return "drill_plated"         return "drill_mixed"     if re.fullmatch(r"g[1-9][0-9]*", ext):@@ -62,6 +72,7 @@ def role_for(name, data):  def read_zip(path):     out = {}+    total = 0     with zipfile.ZipFile(path) as z:         for item in z.infolist():             if item.is_dir():@@ -69,12 +80,64 @@ def read_zip(path):             safe_path(item.filename)             if item.filename in out:                 raise ValueError(f"duplicate zip entry: {item.filename}")+            total += item.file_size+            if len(out) >= ZIP_BUDGET[0] or total > ZIP_BUDGET[1]:+                raise ValueError("fabrication zip exceeds 2000 files or 512 MiB unpacked")             out[item.filename] = z.read(item)     return out  +def _drop_owner(o):+    if isinstance(o, dict):+        return {k: _drop_owner(v) for k, v in o.items() if k != "Owner"}+    if isinstance(o, list):+        return [_drop_owner(v) for v in o]+    return o+++def without_owner(files):+    """The files with every Gerber job file's Owner field removed; all other bytes unchanged.++    Fusion writes the EDA account's name and email there, and the zip is published with the page.+    A job file that is not readable JSON but holds an email address is refused.+    """+    out = {}+    for name, data in files.items():+        if name.lower().endswith(".gbrjob"):+            try:+                doc = json.loads(data)+            except ValueError:+                doc = None+            if doc is None and EMAIL.search(data):+                raise ValueError(f"{name} holds an email address and is not readable JSON; remove its owner or leave the file out")+            if doc is not None and _drop_owner(doc) != doc:+                data = (json.dumps(_drop_owner(doc), indent=2, ensure_ascii=False) + "\n").encode("utf-8")+        out[name] = data+    return out++ def layer_entries(files):     entries = [fingerprint(n, role_for(n, b), b) for n, b in sorted(files.items())]+    # .GKO is the board outline in EAGLE/Fusion CAM output but the keep-out layer in Altium's,+    # whose outline is a mechanical layer (.GM1). It counts as the outline only when nothing else is.+    if any(e["role"] == "outline" and not e["path"].lower().endswith(".gko") for e in entries):+        for e in entries:+            if e["role"] == "outline" and e["path"].lower().endswith(".gko"):+                e["role"] = "keepout"+    layers = [e for e in entries if e["role"] not in ("other", "gerber_job")]+    unread = [e["path"] for e in layers if not READER_EXT.search(e["path"])]+    if unread:+        raise ValueError("layer files the board reader skips by name (use KiCad or Protel extensions): " + ", ".join(unread))+    seen = {}+    for e in entries:+        if READER_EXT.search(e["path"]):+            seen.setdefault(PurePosixPath(e["path"]).name.lower(), []).append(e["path"])+    clash = [v for v in seen.values() if len(v) > 1]+    if clash:+        raise ValueError("files share a name, so the board reader cannot tell them apart: " + "; ".join(", ".join(v) for v in clash))+    for role in sorted(REQUIRED):+        if sum(e["role"] == role for e in entries) > 1:+            raise ValueError(f"more than one {role} layer: " + ", ".join(e["path"] for e in entries if e["role"] == role))     roles = {e["role"] for e in entries}     missing = REQUIRED - roles     if missing:@@ -84,7 +147,7 @@ def layer_entries(files):     # An empty mechanical-layer plot is not a board outline (Altium can emit one).     outlines = [files[e["path"]].decode("utf-8", errors="replace")                 for e in entries if e["role"] == "outline"]-    if not any(re.search(r"[XY][+-]?\d+[^*]*D0?1\*", t) for t in outlines):+    if not any(re.search(r"[XY][+-]?\d+[^*XY]*D0?1\*", t) for t in outlines):         raise ValueError("outline Gerber has no drawn segments; export the actual board boundary")     return entries @@ -133,18 +196,31 @@ def check(root, slug):     if len(zips) != 1 or zips[0]["path"] != f"{slug}-fab.zip":         raise ValueError(f"exactly one fab_zip named {slug}-fab.zip is required")     files = read_zip(root / zips[0]["path"])+    stripped = without_owner(files)+    owned = [n for n in sorted(files) if stripped[n] != files[n]]+    if owned:+        raise ValueError("Gerber job file names its owner (the EDA account's name and email); repack with create: " + ", ".join(owned))     actual = layer_entries(files)     expected = zips[0].get("entries", [])     by_name = {e["path"]: e for e in expected}     if len(by_name) != len(expected) or set(by_name) != set(files):         raise ValueError("zip entries and export.json disagree")+    # Bytes are the record; roles are recomputed here (layer_entries), so a record written by an+    # older classifier stays valid.     for entry in actual:         saved = by_name[entry["path"]]-        if any(saved.get(k) != entry[k] for k in ("sha256", "bytes", "role")):-            raise ValueError(f"zip entry changed or has wrong role: {entry['path']}")+        if any(saved.get(k) != entry[k] for k in ("sha256", "bytes")):+            raise ValueError(f"zip entry changed: {entry['path']}")     return rec  +def drill_plating(layers):+    roles = {e["role"] for e in layers}+    if "drill_mixed" in roles:+        return "mixed"+    return "split" if {"drill_plated", "drill_unplated"} <= roles else "plated" if "drill_plated" in roles else "unplated"++ def create(args):     root = Path(args.root).resolve()     if (root / "export.json").exists():@@ -161,12 +237,13 @@ def create(args):                 files[name] = p.read_bytes()     else:         files = read_zip(source)+    files = without_owner(files)     layers = layer_entries(files)     entries = [source_entry(root, s) for s in args.source]     target = root / f"{args.slug}-fab.zip"     if target.exists():         raise ValueError(f"output exists: {target}; use a fresh export folder")-    # Fixed ZIP metadata; the Gerber/drill bytes remain exactly as exported.+    # Fixed ZIP metadata; the Gerber/drill bytes remain exactly as exported (job files lose Owner).     with zipfile.ZipFile(target, "w", compression=zipfile.ZIP_DEFLATED) as z:         for name, data in sorted(files.items()):             item = zipfile.ZipInfo(name, date_time=(1980, 1, 1, 0, 0, 0))@@ -181,7 +258,7 @@ def create(args):            "exporter": args.exporter, "exporterVersion": args.exporter_version,            "design": args.slug, "files": entries, "stackup": stackup,            "gerbers": {"included": True},-           "drill": {"plating": "mixed" if any(e["role"] == "drill_mixed" for e in layers) else "split"}}+           "drill": {"plating": drill_plating(layers)}}     (root / "export.json").write_text(json.dumps(rec, indent=2) + "\n", encoding="utf-8")     return check(root, args.slug)