makea-cli 0.2.28__py3-none-any.whl → 0.2.29__py3-none-any.whl

makea_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.28"
+__version__ = "0.2.29"

makea_cli/file_reader.py

@@ -33,6 +33,26 @@ _MAX_MEMBERS = 40
 _MAX_PICTURES = 8
 _PICTURE_SIDE = 1800
 
+# Never decode an image bigger than this. A decoded image costs w x h x 4
+# bytes whatever the file size, and this runs in web workers (previews) as
+# well as Celery: a 410 MB decode killed one and 502'd the site (TECH-145).
+# Same bound as garmentby_service/common/image_limits.MAX_DECODE_PIXELS.
+MAX_DECODE_PIXELS = 120_000_000
+_MAX_PIECES_DRAWN = 40
+
+
+def _open_bounded(data: bytes):
+    """Open an image and decode it only when it fits MAX_DECODE_PIXELS; JPEGs
+    are decoded at reduced scale. Raises ValueError when it is too big."""
+    Image = _pil()
+    im = Image.open(io.BytesIO(data))
+    if im.width * im.height > MAX_DECODE_PIXELS:
+        raise ValueError(f"{im.width} x {im.height} px is too large to draw here")
+    if im.format == "JPEG":
+        im.draft("RGB", (_PICTURE_SIDE, _PICTURE_SIDE))
+    im.load()
+    return im
+
 
 @dataclass
 class Picture:
@@ -109,20 +129,24 @@ def _pil():
             Image,
         )  # noqa: PLC0415 - optional at import time, required to draw
 
-        Image.MAX_IMAGE_PIXELS = 400_000_000
         return Image
     except ImportError:  # pragma: no cover - Pillow is a dependency
         return None
 
 
 def _png(im) -> bytes:
+    """Shrink first, then flatten: every conversion of the full-size image is
+    another full-size copy in memory."""
     Image = _pil()
+    if max(im.size) > _PICTURE_SIDE:
+        if im.mode in ("P", "PA", "1"):
+            im = im.convert("RGBA")  # palette images cannot be resampled
+        im.thumbnail((_PICTURE_SIDE, _PICTURE_SIDE))
     if im.mode not in ("RGB", "L"):
         rgba = im.convert("RGBA")
         bg = Image.new("RGB", rgba.size, "white")
         bg.paste(rgba, mask=rgba.split()[-1])
         im = bg
-    im.thumbnail((_PICTURE_SIDE, _PICTURE_SIDE))
     buf = io.BytesIO()
     im.save(buf, "PNG", optimize=True)
     return buf.getvalue()
@@ -499,8 +523,7 @@ def _read_eps(data: bytes, name: str, depth: int) -> Reading:
         Image = _pil()
         if tif_len and Image:
             try:
-                im = Image.open(io.BytesIO(_fix_preview_tiff(data[tif_off : tif_off + tif_len])))
-                im.load()
+                im = _open_bounded(_fix_preview_tiff(data[tif_off : tif_off + tif_len]))
                 pictures.append(Picture("preview", _png(im)))
             except Exception:  # noqa: BLE001 - no preview is still a reading
                 pass
@@ -574,8 +597,11 @@ def _read_psd(data: bytes, name: str, depth: int) -> Reading:
             layers = [layer[0] for layer in (getattr(im, "layers", None) or []) if layer[0]]
             if layers:
                 lines.append(f"{len(layers)} layer(s): " + "; ".join(layers[:30]) + ".")
-            im.load()
-            pictures.append(Picture("flattened image", _png(im)))
+            if width * height > MAX_DECODE_PIXELS:
+                lines.append("Too large to draw here.")
+            else:
+                im.load()
+                pictures.append(Picture("flattened image", _png(im)))
         except Exception:  # noqa: BLE001
             lines.append("The flattened image could not be decoded.")
     return Reading("psd", "PSD", " ".join(lines), pictures, readable=bool(pictures))
@@ -711,8 +737,7 @@ def _read_wilcom(data: bytes, name: str, depth: int) -> Reading:
         if Image and ole.exists(stream):
             raw = ole.openstream(stream).read()
             try:
-                im = Image.open(io.BytesIO(zlib.decompress(raw[4:])))
-                im.load()
+                im = _open_bounded(zlib.decompress(raw[4:]))
                 pictures.append(Picture("stitch-out preview", _png(im)))
                 break
             except Exception:  # noqa: BLE001
@@ -974,10 +999,12 @@ def _seam_allowance(b: _Block, cut: Tuple[float, float, float, float]) -> str:
 
 
 def _draw_dxf(items: List[Tuple[str, _Block]]) -> List[Picture]:
-    """One sheet with every piece of the base size, numbered."""
+    """One sheet with every piece of the base size, numbered (the first
+    _MAX_PIECES_DRAWN, so the sheet stays a bounded size)."""
     Image = _pil()
     if not Image or not items:
         return []
+    items = items[:_MAX_PIECES_DRAWN]
     from PIL import ImageDraw  # noqa: PLC0415
 
     shapes = []
@@ -1171,8 +1198,17 @@ def _read_image(data: bytes, name: str, depth: int) -> Reading:
     ext = os.path.splitext(name.lower())[1]
     im = Image.open(io.BytesIO(data))
     frames = getattr(im, "n_frames", 1)
-    im.load()
     text = f"{im.format or _format_label(ext)} image, {im.width} x {im.height} px"
+    if im.width * im.height > MAX_DECODE_PIXELS:
+        return Reading(
+            "image",
+            im.format or _format_label(ext),
+            text + ". Too large to draw here.",
+            readable=False,
+        )
+    if im.format == "JPEG":
+        im.draft("RGB", (_PICTURE_SIDE, _PICTURE_SIDE))
+    im.load()
     dpi = im.info.get("dpi")
     if dpi and dpi[0]:
         text += f", {dpi[0]:.0f} dpi ({im.width / dpi[0] * 25.4:.0f} x {im.height / dpi[1] * 25.4:.0f} mm)"
@@ -1234,3 +1270,78 @@ _READERS: List[Tuple[Callable[[bytes, str], bool], Callable[[bytes, str, int], R
     (_is_svg, _read_svg),
     (_is_image, _read_image),
 ]
+
+
+# ── Run in a child process ───────────────────────────────────────────────
+#
+# A long-lived worker never gives decoded-image memory back to the system, so
+# the backend reads through `python -m makea_cli.file_reader <name>` (file on
+# stdin, JSON on stdout): whatever the read costs is returned when the child
+# exits (TECH-145).
+
+
+def to_json(reading: Reading) -> dict:
+    import base64  # noqa: PLC0415
+
+    return {
+        "kind": reading.kind,
+        "format": reading.format,
+        "text": reading.text,
+        "readable": reading.readable,
+        "pictures": [
+            {"label": p.label, "png": base64.b64encode(p.png).decode("ascii")}
+            for p in reading.pictures
+        ],
+        "members": [[name, to_json(sub)] for name, sub in reading.members],
+        "raw": base64.b64encode(reading.raw).decode("ascii") if reading.raw is not None else None,
+    }
+
+
+def from_json(data: dict) -> Reading:
+    import base64  # noqa: PLC0415
+
+    return Reading(
+        kind=data["kind"],
+        format=data["format"],
+        text=data["text"],
+        readable=data["readable"],
+        pictures=[Picture(p["label"], base64.b64decode(p["png"])) for p in data["pictures"]],
+        members=[(name, from_json(sub)) for name, sub in data["members"]],
+        raw=base64.b64decode(data["raw"]) if data.get("raw") is not None else None,
+    )
+
+
+def read_in_child(data: bytes, name: str, *, timeout: float = 90.0) -> Reading:
+    """read_bytes in a child Python process; a failure or a timeout is a
+    reading that says so, never an exception."""
+    import json  # noqa: PLC0415
+    import subprocess  # noqa: PLC0415
+    import sys  # noqa: PLC0415
+
+    try:
+        done = subprocess.run(
+            [sys.executable, "-m", "makea_cli.file_reader", name],
+            input=data,
+            capture_output=True,
+            timeout=timeout,
+            check=True,
+        )
+        return from_json(json.loads(done.stdout))
+    except Exception as e:  # noqa: BLE001 - the file stays uploaded either way
+        detail = (
+            "it took too long" if isinstance(e, subprocess.TimeoutExpired) else type(e).__name__
+        )
+        ext = os.path.splitext(name.lower())[1]
+        return Reading(
+            "unknown",
+            _format_label(ext),
+            f"{_format_label(ext)} file; it could not be read here ({detail}).",
+            readable=False,
+        )
+
+
+if __name__ == "__main__":
+    import json
+    import sys
+
+    sys.stdout.write(json.dumps(to_json(read_bytes(sys.stdin.buffer.read(), sys.argv[1]))))

{makea_cli-0.2.28.dist-info → makea_cli-0.2.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: makea-cli
-Version: 0.2.28
+Version: 0.2.29
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: click<9,>=8.1

{makea_cli-0.2.28.dist-info → makea_cli-0.2.29.dist-info}/RECORD

@@ -1,4 +1,4 @@
-makea_cli/__init__.py,sha256=KP-rlT7kt2ra8vABrHAwk3sAxXx9YgGE14_P5mGaLL4,23
+makea_cli/__init__.py,sha256=UMXg-6yePyXOpL1XY9AsgEVhTAokVdbXvVLiJBpkwPI,23
 makea_cli/__main__.py,sha256=AkQjxWfKE3w9iD1d6I-2Zqvv2t9cct0oYyFF0UiA-Z0,144
 makea_cli/api_client.py,sha256=jQX6ogn9kt5rHXSmWst0J-1esLb0BYXzDTpPEboEN7Q,80996
 makea_cli/auth_pkce.py,sha256=iXSyJ7DM3qVuj-3FwPiqM25CxXz9ebFs9FNthZdw3ws,7315
@@ -6,7 +6,7 @@ makea_cli/broker.py,sha256=5O650nAdRuF-u9E1MuVM2jVv796iBdxJGIaJasxHij0,3019
 makea_cli/companion.py,sha256=lEEMRDbS-5-CWPawlkPDeCij08pAYW8MsXLVSG3_8V0,10116
 makea_cli/config.py,sha256=hz8MnJSkhxcIEZkcpHR005JrDceo1Xmi8qwIUq50cMU,3003
 makea_cli/errors.py,sha256=_2qKjvkU8YWeBcUd04Yn62lKkZoqQY52kH8klNMyxhM,2780
-makea_cli/file_reader.py,sha256=NQamUyEdNtSw4e1dX_ysHKaocRkcMw6T5P7vlKJhMDU,46625
+makea_cli/file_reader.py,sha256=vY1WlCAeutrDxUSMHMwYmaQnoObxrrLzGUH4vmKuwLo,50825
 makea_cli/identity.py,sha256=pfYT-asaY1ZTzoAzfqI-v4Eyz1RtxqR2YgvxRGx_lxg,2758
 makea_cli/main.py,sha256=oU7cMXiZwCnT8gZS1vvuZYgtpDnyqTtb0dlkKIULZzo,9445
 makea_cli/output.py,sha256=6xOJFjoIBphc10nz53xKCyQiz06an7oGtFJ0bap1G-Y,6739
@@ -55,7 +55,7 @@ makea_cli/commands/supplier/__init__.py,sha256=qfQDeQdQ-B7I_uwFVfcp1vXFUTL4fAcNL
 makea_cli/commands/supplier/cmd.py,sha256=3M7OYhBd-uQk5naoM2I87vJ6IA_P-gdrsbIX2vbyDns,63763
 makea_cli/commands/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 makea_cli/commands/tasks/cmd.py,sha256=72MrVigmjjQCpDVF2a3aJn_gclw2iBbJdFmyd87mXec,8549
-makea_cli-0.2.28.dist-info/METADATA,sha256=Og-CWSQOx383bH_VOY3ETP-JFtPjqQuz195eHrjyhn4,44527
-makea_cli-0.2.28.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-makea_cli-0.2.28.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
-makea_cli-0.2.28.dist-info/RECORD,,
+makea_cli-0.2.29.dist-info/METADATA,sha256=l0IX5F3K-yrNV7EGsM6A2Yv2QKp4qHnraqcEi6SAiao,44527
+makea_cli-0.2.29.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+makea_cli-0.2.29.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
+makea_cli-0.2.29.dist-info/RECORD,,