lr-gladiator 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

gladiator/arena.py

@@ -156,21 +156,88 @@ class ArenaClient:
         out_dir.mkdir(parents=True, exist_ok=True)
         downloaded: List[Path] = []
         for f in files:
+            # Skip associations with no blob
+            if not f.get("haveContent", True):
+                self._log(
+                    f"Skip {item_number}: file {f.get('filename')} has no content"
+                )
+                continue
+
             url = f.get("downloadUrl") or f.get("url")
             filename = f.get("filename") or f.get("name")
             if not url or not filename:
                 continue
+
             p = out_dir / filename
-            with self.session.get(
-                url,
-                stream=True,
-                headers={"arena_session_id": self.cfg.arena_session_id or ""},
-            ) as r:
-                r.raise_for_status()
-                with open(p, "wb") as fh:
-                    for chunk in r.iter_content(128 * 1024):
-                        fh.write(chunk)
-            downloaded.append(p)
+            try:
+                with self.session.get(
+                    url,
+                    stream=True,
+                    headers={"arena_session_id": self.cfg.arena_session_id or ""},
+                ) as r:
+                    # If the blob is missing/forbidden, don’t abort the whole command
+                    if r.status_code in (400, 403, 404):
+                        self._log(
+                            f"Skip {item_number}: {filename} content unavailable "
+                            f"(HTTP {r.status_code})"
+                        )
+                        continue
+                    r.raise_for_status()
+                    with open(p, "wb") as fh:
+                        for chunk in r.iter_content(128 * 1024):
+                            fh.write(chunk)
+                downloaded.append(p)
+            except requests.HTTPError as e:
+                # Be resilient: log and continue
+                self._log(f"Download failed for {filename}: {e}")
+                continue
+        return downloaded
+
+    def download_files_recursive(
+        self,
+        item_number: str,
+        revision: Optional[str] = None,
+        out_dir: Path = Path("."),
+        *,
+        max_depth: Optional[int] = None,
+    ) -> List[Path]:
+        """
+        Download files for `item_number` AND, recursively, for all subassemblies
+        discovered via the BOM. Each child item is placed under a subdirectory:
+            <out_dir>/<child_item_number>/
+        Root files go directly in <out_dir>/.
+
+        Depth semantics match `get_bom(..., recursive=True, max_depth=...)`.
+        """
+        # Ensure the root directory exists
+        out_dir.mkdir(parents=True, exist_ok=True)
+
+        downloaded: List[Path] = []
+        # 1) Download files for the root item into out_dir
+        downloaded.extend(self.download_files(item_number, revision, out_dir=out_dir))
+
+        # 2) Expand BOM recursively and collect unique child item numbers
+        lines = self.get_bom(
+            item_number,
+            revision,
+            recursive=True,
+            max_depth=max_depth,
+        )
+        seen_children = set()
+        for ln in lines:
+            child_num = (ln or {}).get("itemNumber")
+            if not child_num or child_num == item_number:
+                continue
+            if child_num in seen_children:
+                continue
+            seen_children.add(child_num)
+
+            # Place each child's files under <out_dir>/<child_num>/
+            child_dir = out_dir / child_num
+            downloaded.extend(
+                self.download_files(child_num, revision, out_dir=child_dir)
+            )
+
         return downloaded
 
     def upload_file_to_working(
@@ -406,18 +473,18 @@ class ArenaClient:
             file_guid = f.get("guid") or f.get("id")
             norm.append(
                 {
-                    "id": row.get("guid") or row.get("id"),  # association id
-                    "fileGuid": file_guid,  # actual file id
+                    "id": row.get("guid") or row.get("id"),
+                    "fileGuid": file_guid,
                     "name": f.get("name") or f.get("title"),
                     "filename": f.get("name") or f.get("title"),
                     "size": f.get("size"),
                     "checksum": f.get("checksum") or f.get("md5"),
+                    "haveContent": f.get("haveContent", True),
                     "downloadUrl": (
                         f"{self._api_base()}/files/{file_guid}/content"
                         if file_guid
                         else None
                     ),
-                    # for “pick latest” helper:
                     "version": f.get("version") or f.get("edition"),
                     "updatedAt": f.get("lastModifiedDateTime")
                     or f.get("lastModifiedDate")
@@ -505,6 +572,7 @@ class ArenaClient:
                     "filename": f.get("name") or f.get("title"),
                     "size": f.get("size"),
                     "checksum": f.get("checksum") or f.get("md5"),
+                    "haveContent": f.get("haveContent", True),
                     "downloadUrl": (
                         f"{self._api_base()}/files/{file_guid}/content"
                         if file_guid

gladiator/cli.py

@@ -221,10 +221,27 @@ def get_files(
         "--out",
         help="Output directory (default: a folder named after the item number)",
     ),
+    recursive: bool = typer.Option(
+        False,
+        "--recursive/--no-recursive",
+        help="Recursively download files from subassemblies",
+    ),
+    max_depth: Optional[int] = typer.Option(
+        None,
+        "--max-depth",
+        min=1,
+        help="Maximum recursion depth for --recursive (1 = only direct children).",
+    ),
 ):
     try:
-        out_dir = out or Path(item)
-        paths = _client().download_files(item, revision, out_dir=out_dir)
+        out_dir = out or Path(item)  # article numbers are never files; safe as dir name
+        if recursive:
+            paths = _client().download_files_recursive(
+                item, revision, out_dir=out_dir, max_depth=max_depth
+            )
+        else:
+            paths = _client().download_files(item, revision, out_dir=out_dir)
+
         for p in paths:
             print(str(p))
     except requests.HTTPError as e:

{lr_gladiator-0.6.0.dist-info → lr_gladiator-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-gladiator
-Version: 0.6.0
+Version: 0.7.0
 Summary: CLI and Python client for Arena PLM (app.bom.com): login, get revisions, list/download attachments, and upload to working revisions.
 Author-email: Jonas Estberger <jonas.estberger@lumenradio.com>
 License: MIT

lr_gladiator-0.7.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+gladiator/__init__.py,sha256=ZeHpVdzARFyIp9QbdTkX0jNqnbRFX5nFQ5RkEFzSRL0,208
+gladiator/arena.py,sha256=x2dg-JImb9Lw1fIj0ptm48GF1m4zIj2pmg4GqmWBPbA,30285
+gladiator/cli.py,sha256=Pi1yjRZDr2s4izq51xQgpUiKN-Z7wl7yQjHiht9J9BU,10295
+gladiator/config.py,sha256=oe2UpFv1HcrP1-lVWs_nnex444Igq18BW3nTs9wL__k,1760
+lr_gladiator-0.7.0.dist-info/licenses/LICENSE,sha256=2CEtbEagerjoU3EDSk-eTM5LKgI_RpiVIOh3_CV4kms,1069
+lr_gladiator-0.7.0.dist-info/METADATA,sha256=RckucPmR2KG5YwcP9gq3yNf-21JYDhEtT_uAdnl32BM,1912
+lr_gladiator-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lr_gladiator-0.7.0.dist-info/entry_points.txt,sha256=SLka4w7iGS2B8HrbeZyNk5mxaIC6QKcv93us1OaWNwQ,48
+lr_gladiator-0.7.0.dist-info/top_level.txt,sha256=tfrcAmK7_7Lf63w7kWy0wv_Qg9RrcFWGoins1-jGUF4,10
+lr_gladiator-0.7.0.dist-info/RECORD,,

lr_gladiator-0.6.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-gladiator/__init__.py,sha256=ZeHpVdzARFyIp9QbdTkX0jNqnbRFX5nFQ5RkEFzSRL0,208
-gladiator/arena.py,sha256=fy26XTNbJnC8XdeALZYNrzUhfbncQGUAU_hNvB3onDs,27747
-gladiator/cli.py,sha256=B8zHulDQUldC-WQ37jhkCfyxEPV1KvY3FEsF-Af25Wk,9716
-gladiator/config.py,sha256=oe2UpFv1HcrP1-lVWs_nnex444Igq18BW3nTs9wL__k,1760
-lr_gladiator-0.6.0.dist-info/licenses/LICENSE,sha256=2CEtbEagerjoU3EDSk-eTM5LKgI_RpiVIOh3_CV4kms,1069
-lr_gladiator-0.6.0.dist-info/METADATA,sha256=ohbCWnqTS1baU_cZiMtyBiYiqOtDj8AlkclIPzzl0U0,1912
-lr_gladiator-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lr_gladiator-0.6.0.dist-info/entry_points.txt,sha256=SLka4w7iGS2B8HrbeZyNk5mxaIC6QKcv93us1OaWNwQ,48
-lr_gladiator-0.6.0.dist-info/top_level.txt,sha256=tfrcAmK7_7Lf63w7kWy0wv_Qg9RrcFWGoins1-jGUF4,10
-lr_gladiator-0.6.0.dist-info/RECORD,,