makea-cli 0.2.29__tar.gz → 0.2.30__tar.gz

{makea_cli-0.2.29 → makea_cli-0.2.30}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.2.30
+
+Read HP-GL plot files (.plt), the pattern or marker a CAD sends to a cutting
+plotter (TECH-148).
+
+- A PLT reads as its size in cm (40 plotter units to the mm), its pens and the
+  text plotted on it (piece names and sizes), with a drawing of the plot.
+  PCL/PJL-wrapped HP-GL/2 opens too, with or without the extension.
+- Labels are decoded together, so a one-character GBK piece name (领, 前) is
+  read as Chinese rather than as Latin letters.
+- A .plt in another plotter language says to send a DXF + RUL instead.
+
 ## 0.2.29
 
 The file reader stays inside a web worker's memory (TECH-145).

{makea_cli-0.2.29 → makea_cli-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: makea-cli
-Version: 0.2.29
+Version: 0.2.30
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: click<9,>=8.1
@@ -122,7 +122,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli admin get about` | read | `GET /admin/about/{target}` | one account's About you (`--user`: a supplier account's person gets their factory's page; `--supplier`): facts, removed, unknown, paused, topic keys. | — |
 | `makea-cli admin get active-users` | read | `POST /admin/analytics/query` | Distinct active users per day over the last N days (DAU series). | `analytics-active-users` |
 | `makea-cli admin get analytics-query` | read | `POST /admin/analytics/query` | Run an arbitrary HogQL query (escape hatch). Example: analytics-query "SELECT count() FROM events" | `analytics-query` |
-| `makea-cli admin get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli admin get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli admin get currency-conversion` | read | `GET /admin/fx/rates` | the platform's own exchange rates and rounding (rate table for several --from; one --from with --amount converts it). | `convert-currency` |
 | `makea-cli admin get feature-usage` | read | `POST /admin/analytics/query` | How many distinct users used a feature recently, plus event volume. Matches $pageview path and feature_time_spent eve… | `analytics-feature-usage` |
 | `makea-cli admin get growth-snapshot` | read | `GET /admin/growth/snapshots/{id}` | one reconciled Growth Analysis snapshot (default `latest`); `--block` prints one block (headline, gates, review_items, …). | — |
@@ -207,7 +207,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli designer delete sampling-order` | write（never） | `DELETE /designer/sampling_orders/{sampling_order_id}` | delete a DRAFT sample order. The backend refuses any other status. Graded `never`. | — |
 | `makea-cli designer delete shipping-order` | write（never） | `POST /designer/shipping_orders/{shipping_order_id}/cancel` | the endpoint is called cancel but it unlinks every production order and removes the shipment, so it is a delete here.… | — |
 | `makea-cli designer download document` | read | `GET /designer/document/download` | save bytes for user_id + document_id (designer-authenticated; same query contract as admin document download). | `designer-download-document` |
-| `makea-cli designer get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli designer get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli designer get collection` | read | `GET /designer/collections/{collection_id}/overview` | one collection with its products, orders and lifecycle in a single read. | — |
 | `makea-cli designer get lifecycle` | read | `GET /designer/product_orders/{product_order_id}/lifecycle` | which stage this product is in. | — |
 | `makea-cli designer get product` | read | `GET /designer/get_product` | one product: status, documents, prices, links. | — |
@@ -251,7 +251,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 |---|---|---|---|---|
 | `makea-cli supplier create note` | write（ask） | `POST /supplier/products/{id}/channels/{key}/notes` | post a message into a product channel you are part of. | — |
 | `makea-cli supplier download document` | read | `GET /supplier/document/download` | save a document you are allowed to read. | — |
-| `makea-cli supplier get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli supplier get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli supplier get pack` | read | `GET /supplier/quote_requests/{id}/technical-specifications` | the tech pack for an RFQ, as the factory is allowed to see it (`--readable`: labels, values and blank essentials only). | — |
 | `makea-cli supplier get pack-changes` | read | `GET /supplier/products/{product_id}/specification-change-history` | what changed in the pack since you quoted, field by field. | — |
 | `makea-cli supplier get profile` | read | `GET /supplier/profile` | your own supplier profile. | — |

{makea_cli-0.2.29 → makea_cli-0.2.30}/README.md

@@ -106,7 +106,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli admin get about` | read | `GET /admin/about/{target}` | one account's About you (`--user`: a supplier account's person gets their factory's page; `--supplier`): facts, removed, unknown, paused, topic keys. | — |
 | `makea-cli admin get active-users` | read | `POST /admin/analytics/query` | Distinct active users per day over the last N days (DAU series). | `analytics-active-users` |
 | `makea-cli admin get analytics-query` | read | `POST /admin/analytics/query` | Run an arbitrary HogQL query (escape hatch). Example: analytics-query "SELECT count() FROM events" | `analytics-query` |
-| `makea-cli admin get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli admin get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli admin get currency-conversion` | read | `GET /admin/fx/rates` | the platform's own exchange rates and rounding (rate table for several --from; one --from with --amount converts it). | `convert-currency` |
 | `makea-cli admin get feature-usage` | read | `POST /admin/analytics/query` | How many distinct users used a feature recently, plus event volume. Matches $pageview path and feature_time_spent eve… | `analytics-feature-usage` |
 | `makea-cli admin get growth-snapshot` | read | `GET /admin/growth/snapshots/{id}` | one reconciled Growth Analysis snapshot (default `latest`); `--block` prints one block (headline, gates, review_items, …). | — |
@@ -191,7 +191,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli designer delete sampling-order` | write（never） | `DELETE /designer/sampling_orders/{sampling_order_id}` | delete a DRAFT sample order. The backend refuses any other status. Graded `never`. | — |
 | `makea-cli designer delete shipping-order` | write（never） | `POST /designer/shipping_orders/{shipping_order_id}/cancel` | the endpoint is called cancel but it unlinks every production order and removes the shipment, so it is a delete here.… | — |
 | `makea-cli designer download document` | read | `GET /designer/document/download` | save bytes for user_id + document_id (designer-authenticated; same query contract as admin document download). | `designer-download-document` |
-| `makea-cli designer get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli designer get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli designer get collection` | read | `GET /designer/collections/{collection_id}/overview` | one collection with its products, orders and lifecycle in a single read. | — |
 | `makea-cli designer get lifecycle` | read | `GET /designer/product_orders/{product_order_id}/lifecycle` | which stage this product is in. | — |
 | `makea-cli designer get product` | read | `GET /designer/get_product` | one product: status, documents, prices, links. | — |
@@ -235,7 +235,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 |---|---|---|---|---|
 | `makea-cli supplier create note` | write（ask） | `POST /supplier/products/{id}/channels/{key}/notes` | post a message into a product channel you are part of. | — |
 | `makea-cli supplier download document` | read | `GET /supplier/document/download` | save a document you are allowed to read. | — |
-| `makea-cli supplier get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
+| `makea-cli supplier get file` | read | local (makea_cli.file_reader) | read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine; saves PNG pictures of what it draws next to it. No API call. | — |
 | `makea-cli supplier get pack` | read | `GET /supplier/quote_requests/{id}/technical-specifications` | the tech pack for an RFQ, as the factory is allowed to see it (`--readable`: labels, values and blank essentials only). | — |
 | `makea-cli supplier get pack-changes` | read | `GET /supplier/products/{product_id}/specification-change-history` | what changed in the pack since you quoted, field by field. | — |
 | `makea-cli supplier get profile` | read | `GET /supplier/profile` | your own supplier profile. | — |

makea_cli-0.2.30/makea_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.30"

{makea_cli-0.2.29 → makea_cli-0.2.30}/makea_cli/commands/files/cmd.py

@@ -1,6 +1,6 @@
 """``makea-cli <persona> get file PATH``: read a file a brand sent, locally.
 
-Pattern DXF/RUL, Illustrator, EPS, Photoshop, embroidery (PES/DST/EMB), ZIP,
+Pattern DXF/RUL/PLT, Illustrator, EPS, Photoshop, embroidery (PES/DST/EMB), ZIP,
 AVIF/TIFF/SVG. No API call: the file never leaves the machine. Pictures of what
 the file draws are saved next to it so the caller can look at them (an agent
 reads them with its image tool).
@@ -21,7 +21,7 @@ from makea_cli.registry import command
 console = Console()
 
 _HELP = (
-    "Read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or "
+    "Read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or "
     "AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws."
 )
 

{makea_cli-0.2.29 → makea_cli-0.2.30}/makea_cli/file_reader.py

@@ -1071,6 +1071,261 @@ def _read_rul(data: bytes, name: str, depth: int) -> Reading:
     return Reading("grade-rules", "RUL", " ".join(lines) + "\n\n```\n" + text[:6000] + "\n```")
 
 
+# ── Pattern: HPGL plot files (.plt) ──────────────────────────────────────
+#
+# What a pattern CAD sends to a cutting or marker plotter: pen-up / pen-down
+# moves in plotter units (40 to the mm), with piece names and sizes as LB text.
+# A plot has no pieces, only strokes, so it says what it draws and how big; the
+# piece table comes from the DXF.
+
+_HPGL_EXTS = (".plt", ".hpgl", ".hpg", ".hgl")
+_HPGL_UNITS_PER_MM = 40.0
+# A full marker is millions of moves; past this the drawing is cut short (and
+# says so) so a read stays bounded in time and memory.
+_HPGL_MAX_POINTS = 2_000_000
+_HPGL_CMD = re.compile(rb"[A-Za-z]{2}")
+_HPGL_NUM = re.compile(rb"[-+]?(?:\d+\.?\d*|\.\d+)")
+# PCL / PJL wrapping around HP-GL/2: "ESC%-12345X@PJL ...", "ESC%1B", "ESCE".
+_PCL_ESCAPE = re.compile(rb"\x1b(?:%-12345X|%-?\d*[AB]|E|\*[a-z]\d*[A-Z])|@PJL[^\n]*\n?")
+
+
+def _is_hpgl(head: bytes, ext: str) -> bool:
+    if ext in _HPGL_EXTS:
+        return True
+    h = _PCL_ESCAPE.sub(b"", head).lstrip(b"\x00\r\n\t ;")
+    return bool(re.match(rb"(?:IN|DF)\s*;\s*(?:[A-Z]{2}[^;]*;\s*){0,6}(?:SP|PU|PD|PA)", h))
+
+
+@dataclass
+class _Plot:
+    strokes: List[Tuple[int, List[Tuple[float, float]]]] = field(
+        default_factory=list
+    )  # (pen, points)
+    labels: List[str] = field(default_factory=list)
+    raw_labels: List[bytes] = field(default_factory=list)
+    points: int = 0
+    truncated: bool = False
+    scaled: bool = False
+    pens: List[int] = field(default_factory=list)
+
+
+_HPGL_ABS_POINTS = (b"EA", b"RA")
+_HPGL_REL_POINTS = (b"PR", b"ER", b"RR", b"AR")
+
+
+def _hpgl_to_plotter(cmd: bytes, params: List[float], absolute: bool, t) -> List[float]:
+    """A command's coordinates from user units (after SC) to plotter units."""
+    fx, fy, ox, oy = t
+    if cmd == b"CI":
+        return [params[0] * fx] + params[1:] if params else params
+    if cmd in (b"AA", b"AR"):
+        # Centre then sweep angle (degrees) and chord tolerance: only the
+        # centre is a coordinate.
+        head = _hpgl_to_plotter(b"PA" if cmd == b"AA" else b"PR", params[:2], True, t)
+        return head + params[2:]
+    is_abs = cmd == b"PA" or cmd in _HPGL_ABS_POINTS or (cmd in (b"PU", b"PD") and absolute)
+    if not is_abs and cmd not in _HPGL_REL_POINTS + (b"PU", b"PD"):
+        return params
+    if is_abs:
+        return [(ox + v * fx) if k % 2 == 0 else (oy + v * fy) for k, v in enumerate(params)]
+    return [v * (fx if k % 2 == 0 else fy) for k, v in enumerate(params)]
+
+
+def _parse_hpgl(data: bytes) -> _Plot:
+    """A small HP-GL / HP-GL/2 interpreter: PU PD PA PR, SP, LB (and DT),
+    IP + SC scaling, CI and the rectangles. Anything else is skipped; arcs are
+    joined as chords. Everything is kept in plotter units (40 to the mm)."""
+    data = _PCL_ESCAPE.sub(b"", data)
+    plot = _Plot()
+    x = y = 0.0
+    # User units -> plotter units: X = ox + x * fx. Identity until SC maps the
+    # IP points (some CADs plot in 1/1000 inch: IP0,0,1016,1016;SC0,1000,0,1000).
+    ip: Optional[Tuple[float, float, float, float]] = None
+    fx = fy = 1.0
+    ox = oy = 0.0
+    absolute, pen_down, pen = True, False, 1
+    cur: Optional[List[Tuple[float, float]]] = None
+    label_end = b"\x03"
+    n = len(data)
+    i = 0
+
+    def start():
+        nonlocal cur
+        cur = [(x, y)]
+        plot.strokes.append((pen, cur))
+
+    def move(nx: float, ny: float):
+        nonlocal x, y, cur
+        if plot.points >= _HPGL_MAX_POINTS:
+            plot.truncated = True
+            x, y = nx, ny
+            return
+        if pen_down:
+            if cur is None:
+                start()
+            cur.append((nx, ny))
+            plot.points += 1
+        else:
+            cur = None
+        x, y = nx, ny
+
+    while i < n:
+        m = _HPGL_CMD.search(data, i)
+        if not m:
+            break
+        cmd = m.group().upper()
+        i = m.end()
+        if cmd == b"LB":
+            end = data.find(label_end, i)
+            end = n if end < 0 else end
+            plot.raw_labels.append(data[i:end])
+            i = end + len(label_end)
+            continue
+        if cmd == b"DT":
+            j = i
+            while j < n and data[j : j + 1] in (b" ", b"\t"):
+                j += 1
+            if j < n and data[j : j + 1] not in (b";",):
+                label_end = data[j : j + 1]
+                i = j + 1
+            continue
+        # Parameters run to the next command letter or ';'.
+        j = i
+        while j < n and not (data[j : j + 1].isalpha() or data[j : j + 1] == b";"):
+            j += 1
+        params = [float(v) for v in _HPGL_NUM.findall(data[i:j])]
+        i = j + 1 if j < n and data[j : j + 1] == b";" else j
+        if (fx, fy, ox, oy) != (1.0, 1.0, 0.0, 0.0):
+            params = _hpgl_to_plotter(cmd, params, absolute, (fx, fy, ox, oy))
+        if cmd in (b"PU", b"PD", b"PA", b"PR"):
+            if cmd == b"PU":
+                pen_down = False
+                cur = None
+            elif cmd == b"PD":
+                pen_down = True
+            elif cmd == b"PA":
+                absolute = True
+            else:
+                absolute = False
+            for k in range(0, len(params) - 1, 2):
+                nx, ny = params[k], params[k + 1]
+                move(nx, ny) if absolute else move(x + nx, y + ny)
+        elif cmd == b"SP":
+            pen = int(params[0]) if params else 0
+            cur = None
+            if pen and pen not in plot.pens:
+                plot.pens.append(pen)
+        elif cmd == b"CI" and params:
+            r = params[0]
+            cx, cy = x, y
+            ring = [
+                (cx + r * math.cos(t / 24 * 2 * math.pi), cy + r * math.sin(t / 24 * 2 * math.pi))
+                for t in range(25)
+            ]
+            plot.strokes.append((pen, ring))
+            plot.points += len(ring)
+        elif cmd in (b"EA", b"ER", b"RA", b"RR") and len(params) >= 2:
+            x1, y1 = (
+                (params[0], params[1]) if cmd in (b"EA", b"RA") else (x + params[0], y + params[1])
+            )
+            plot.strokes.append((pen, [(x, y), (x1, y), (x1, y1), (x, y1), (x, y)]))
+            plot.points += 5
+        elif cmd in (b"AA", b"AR") and len(params) >= 3:
+            cx, cy = (params[0], params[1]) if cmd == b"AA" else (x + params[0], y + params[1])
+            r = math.hypot(x - cx, y - cy)
+            a0 = math.atan2(y - cy, x - cx)
+            sweep = math.radians(params[2])
+            steps = max(2, int(abs(params[2]) / 10))
+            for k in range(1, steps + 1):
+                a = a0 + sweep * k / steps
+                move(cx + r * math.cos(a), cy + r * math.sin(a))
+        elif cmd == b"IP":
+            ip = tuple(params[:4]) if len(params) >= 4 else None
+        elif cmd == b"SC":
+            if len(params) >= 4 and ip and params[1] != params[0] and params[3] != params[2]:
+                fx = (ip[2] - ip[0]) / (params[1] - params[0])
+                fy = (ip[3] - ip[1]) / (params[3] - params[2])
+                ox, oy = ip[0] - params[0] * fx, ip[1] - params[2] * fy
+            elif len(params) >= 4:
+                plot.scaled = True  # scaled against the plotter's own P1/P2: size unknown
+            else:
+                fx = fy = 1.0
+                ox = oy = 0.0
+        elif cmd == b"IN":
+            absolute, pen_down, cur = True, False, None
+            ip, fx, fy, ox, oy = None, 1.0, 1.0, 0.0, 0.0
+    plot.strokes = [(p, pts) for p, pts in plot.strokes if len(pts) > 1]
+    # One encoding for every label, decided on all of them together: a
+    # one-character GBK piece name (领, 前) is no evidence on its own and
+    # reads as Latin or as valid UTF-8 nonsense.
+    joined = _decode_text(b"\x00".join(plot.raw_labels))
+    plot.labels = [t.replace("\r", " ").replace("\n", " ").strip() for t in joined.split("\x00")]
+    plot.labels = [t for t in plot.labels if t]
+    return plot
+
+
+def _read_hpgl(data: bytes, name: str, depth: int) -> Reading:
+    ext = os.path.splitext(name.lower())[1]
+    plot = _parse_hpgl(data)
+    if not plot.strokes:
+        return Reading(
+            "pattern",
+            _format_label(ext),
+            f"{_format_label(ext)} file with no HP-GL drawing in it; it may be a plot file in "
+            "another plotter language. To have it read, send an AAMA/ASTM DXF + RUL export "
+            "of the pattern, or a PDF of the pieces.",
+            readable=False,
+        )
+    pts = [p for _pen, s in plot.strokes for p in s]
+    x0, y0, x1, y1 = _bbox(pts)
+    labels = list(dict.fromkeys(plot.labels))
+    head = ["HP-GL plot file: a pattern or marker as sent to a cutting plotter."]
+    if plot.scaled:
+        head.append(
+            f"It sets its own drawing scale, so its size is in its own units: "
+            f"{_fmt(x1 - x0)} x {_fmt(y1 - y0)}."
+        )
+    else:
+        w_cm = (x1 - x0) / _HPGL_UNITS_PER_MM / 10
+        h_cm = (y1 - y0) / _HPGL_UNITS_PER_MM / 10
+        head.append(f"It draws {_fmt(w_cm)} x {_fmt(h_cm)} cm (40 plotter units to the mm).")
+    head.append(
+        f"{len(plot.strokes)} line(s), {plot.points} point(s), pen(s) {', '.join(map(str, plot.pens)) or '1'}."
+    )
+    if plot.truncated:
+        head.append(f"Only the first {_HPGL_MAX_POINTS} points were read.")
+    body = " ".join(head)
+    if labels:
+        shown = labels[:80]
+        body += "\n\nText in the plot (piece names, sizes and notes, in plot order):\n" + "\n".join(
+            f"- {t}" for t in shown
+        )
+        if len(labels) > len(shown):
+            body += f"\n- … and {len(labels) - len(shown)} more"
+    body += (
+        "\n\nA plot file has no pattern pieces, only strokes, so piece sizes, seam "
+        "allowance and grading are not stated; those come from the DXF + RUL."
+    )
+    return Reading("pattern", _format_label(ext), body, _draw_hpgl(plot, (x0, y0, x1, y1)))
+
+
+def _draw_hpgl(plot: _Plot, bb: Tuple[float, float, float, float]) -> List[Picture]:
+    Image = _pil()
+    if not Image:
+        return []
+    from PIL import ImageDraw  # noqa: PLC0415
+
+    w, h = max(bb[2] - bb[0], 1e-6), max(bb[3] - bb[1], 1e-6)
+    scale = (_PICTURE_SIDE - 40) / max(w, h)
+    im = Image.new("RGB", (max(1, int(w * scale) + 40), max(1, int(h * scale) + 40)), "white")
+    draw = ImageDraw.Draw(im)
+    colours = ["#111111", "#d0021b", "#4a90e2", "#2e7d32", "#9b9b9b", "#5a12c4", "#e68a00"]
+    for pen, pts in plot.strokes:
+        xy = [(20 + (px - bb[0]) * scale, 20 + (bb[3] - py) * scale) for px, py in pts]
+        draw.line(xy, fill=colours[(max(pen, 1) - 1) % len(colours)], width=2)
+    return [Picture("plot (each pen in its own colour)", _png(im))]
+
+
 # ── Archives ─────────────────────────────────────────────────────────────
 
 
@@ -1266,6 +1521,7 @@ _READERS: List[Tuple[Callable[[bytes, str], bool], Callable[[bytes, str, int], R
     (_is_stitch, _read_stitch),
     (_is_rul, _read_rul),
     (_is_dxf, _read_dxf),
+    (_is_hpgl, _read_hpgl),
     (_is_zip, _read_zip),
     (_is_svg, _read_svg),
     (_is_image, _read_image),

{makea_cli-0.2.29 → makea_cli-0.2.30}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "makea-cli"
-version = "0.2.29"
+version = "0.2.30"
 description = "Makea admin CLI (browser login + Makea admin HTTP API)"
 readme = "README.md"
 requires-python = ">=3.10"

{makea_cli-0.2.29 → makea_cli-0.2.30}/tests/golden_manifest.json

@@ -2483,7 +2483,7 @@
       "idempotent": null,
       "limit": null,
       "legacy": [],
-      "help": "Read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
+      "help": "Read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
       "function": "makea_cli.commands.files.cmd._register_for.<locals>.get_file",
       "flags": [
         {
@@ -9017,7 +9017,7 @@
       "idempotent": null,
       "limit": null,
       "legacy": [],
-      "help": "Read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
+      "help": "Read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
       "function": "makea_cli.commands.files.cmd._register_for.<locals>.get_file",
       "flags": [
         {
@@ -10871,7 +10871,7 @@
       "idempotent": null,
       "limit": null,
       "legacy": [],
-      "help": "Read a pattern (DXF/RUL), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
+      "help": "Read a pattern (DXF/RUL/PLT), artwork (AI/EPS/PSD/SVG), embroidery (PES/DST/EMB), ZIP or AVIF/TIFF file on this machine: what it states plus PNG pictures of what it draws.",
       "function": "makea_cli.commands.files.cmd._register_for.<locals>.get_file",
       "flags": [
         {

{makea_cli-0.2.29 → makea_cli-0.2.30}/tests/test_file_reader.py

@@ -100,6 +100,72 @@ def _palette_alpha_tiff() -> bytes:
     return bytes(raw)
 
 
+def _plt() -> bytes:
+    """What a Chinese pattern CAD plots: GBK labels, one piece per pen-down run."""
+    body = (
+        "IN;SP1;PU0,0;PD4000,0,4000,8000,0,8000,0,0;"  # 10 x 20 cm piece
+        "PU400,400;LB前片 M\x03;"
+        "SP2;PU2000,400;PD2000,7600;"  # grain line, pen 2
+        "SP1;PU6000,0;PR;PD4000,0,0,4000,-4000,0,0,-4000;PA;"  # relative square
+        "PU6400,400;LB后片 M\x03;PU0,0;SP0;"
+    )
+    return body.encode("gbk")
+
+
+class HpglPlotTest(unittest.TestCase):
+    def test_reads_size_labels_and_draws(self):
+        r = read_bytes(_plt(), "dress.plt")
+        self.assertEqual((r.kind, r.format, r.readable), ("pattern", "PLT", True))
+        self.assertIn("25.0 x 20.0 cm", r.text)
+        self.assertIn("- 前片 M", r.text)
+        self.assertIn("- 后片 M", r.text)
+        self.assertIn("pen(s) 1, 2", r.text)
+        self.assertEqual(len(r.pictures), 1)
+        self.assertTrue(r.pictures[0].png.startswith(b"\x89PNG"))
+
+    def test_pcl_wrapped_hpgl2_without_extension(self):
+        data = b"\x1b%-12345X@PJL ENTER LANGUAGE=HPGL2\r\n\x1bE\x1b%1B" + _plt() + b"\x1b%0A\x1bE"
+        r = read_bytes(data, "plot")
+        self.assertEqual(r.kind, "pattern")
+        self.assertIn("25.0 x 20.0 cm", r.text)
+
+    def test_relative_moves(self):
+        r = read_bytes(b"IN;PA;PU0,0;PR;PD400,0;PD0,400;", "a.plt")
+        self.assertIn("1.0 x 1.0 cm", r.text)
+
+    def test_ip_sc_scale_in_thousandths_of_an_inch(self):
+        # A 72-inch marker plotted in 1/1000 inch (a real garment CAD export).
+        body = b"IN;IP0,0,1016,1016;SC0,1000,0,1000;SP1;PU0,0;PD10000,0,10000,72000,0,72000,0,0;PU;"
+        r = read_bytes(body, "72-MLXL2.PLT")
+        self.assertIn("25.4 x 183 cm", r.text)
+        rel = read_bytes(
+            b"IN;IP0,0,1016,1016;SC0,1000,0,1000;PU0,0;PR;PD1000,0;PA;PD1000,1000;", "a.plt"
+        )
+        self.assertIn("2.5 x 2.5 cm", rel.text)
+
+    def test_own_scale_is_not_called_cm(self):
+        r = read_bytes(b"IN;SC0,100,0,100;PU0,0;PD50,0,50,50;", "a.plt")
+        self.assertIn("its own units", r.text)
+        self.assertNotIn(" cm ", r.text)
+
+    def test_plt_in_another_plotter_language(self):
+        r = read_bytes(bytes(range(256)) * 4, "cutter.plt")
+        self.assertFalse(r.readable)
+        self.assertIn("DXF", r.text)
+
+    def test_one_character_gbk_names_decode_with_the_rest(self):
+        body = "IN;PU0,0;PD400,0,400,400;LB领\x03;LB前\x03;LB后裤片\x03;"
+        r = read_bytes(body.encode("gbk"), "pants.plt")
+        self.assertIn("- 领", r.text)
+        self.assertIn("- 前", r.text)
+        self.assertIn("- 后裤片", r.text)
+
+    def test_semicolonless_space_separated(self):
+        r = read_bytes(b"IN SP1 PU 0 0 PD 400 0 400 400 PU", "a.hpgl")
+        self.assertEqual(r.kind, "pattern")
+        self.assertIn("1.0 x 1.0 cm", r.text)
+
+
 class EpsTest(unittest.TestCase):
     def test_illustrator_preview_opens(self):
         tiff = _palette_alpha_tiff()

makea_cli-0.2.29/makea_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.29"