lr-gladiator 0.8.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

gladiator/arena.py

@@ -9,6 +9,7 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple
 import requests
 from .config import LoginConfig
+from .checksums import sha256_file
 
 
 class ArenaError(RuntimeError):
@@ -252,7 +253,7 @@ class ArenaClient:
         description: Optional[str] = None,
         primary: bool = True,
         latest_edition_association: bool = True,
-        edition: str = "1",
+        edition: str = None,
     ) -> Dict:
         """
         Update-if-exists-else-create semantics, matching the bash script:
@@ -476,16 +477,16 @@ class ArenaClient:
                     "id": row.get("guid") or row.get("id"),
                     "fileGuid": file_guid,
                     "name": f.get("name") or f.get("title"),
+                    "title": 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
                     ),
-                    "version": f.get("version") or f.get("edition"),
+                    "edition": f.get("edition"),
                     "updatedAt": f.get("lastModifiedDateTime")
                     or f.get("lastModifiedDate")
                     or f.get("creationDateTime"),
@@ -571,14 +572,13 @@ class ArenaClient:
                     "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
                     ),
-                    "version": f.get("version") or f.get("edition"),
+                    "edition": f.get("edition"),
                     "updatedAt": f.get("lastModifiedDateTime")
                     or f.get("lastModifiedDate")
                     or f.get("creationDateTime"),
@@ -604,6 +604,13 @@ class ArenaClient:
         if not file_path.exists() or not file_path.is_file():
             raise ArenaError(f"File not found: {file_path}")
 
+        filename = file_path.name  # Use truncated SHA256 hash if no edition is provided
+        if not edition:
+            # Arena seems to only accept 16 characters of edition information.
+            # The hex digest gives 16 hex × 4 bits = 64 bits of entropy.
+            # Less than a million files, collision risk is practically zero (~1 / 10^8).
+            edition = sha256_file(file_path)[:16]
+
         # 0) Resolve EFFECTIVE revision guid from item number
         effective_guid = self._api_resolve_item_guid(item_number)
 
@@ -674,6 +681,17 @@ class ArenaClient:
                     if existing_ct is not None:
                         self.session.headers["Content-Type"] = existing_ct
             ur.raise_for_status()
+
+            # Update the edition label on the File itself
+            try:
+                put_url = f"{self._api_base()}/files/{file_guid}"
+                self._log(f"PUT {put_url} (set edition={edition})")
+                pr = self.session.put(put_url, json={"edition": str(edition)})
+                pr.raise_for_status()
+            except requests.HTTPError as e:
+                # Don't fail the whole operation if the label update is rejected
+                self._log(f"Edition update failed for {file_guid}: {e}")
+
             # Many tenants return 201 with no JSON for content updates. Be flexible.
             data = self._try_json(ur)
             if data is None:
@@ -683,6 +701,7 @@ class ArenaClient:
                     "status": ur.status_code,
                     "fileGuid": file_guid,
                     "location": ur.headers.get("Location"),
+                    "edition": str(edition),
                 }
             return data
 
@@ -706,7 +725,7 @@ class ArenaClient:
             )
 
         # 3) Prepare multipart (create association)
-        title = title or file_path.stem
+        title = title or file_path.name
         file_format = file_format or (
             file_path.suffix[1:].lower() if file_path.suffix else "bin"
         )
@@ -754,6 +773,22 @@ class ArenaClient:
         # Normalize common fields we use elsewhere
         row = resp if isinstance(resp, dict) else {}
         f = row.get("file", {})
+
+        # Ensure the edition label is exactly what we asked for (some tenants ignore form edition)
+        try:
+            file_guid_created = (f or {}).get("guid")
+            if file_guid_created and str(edition):
+                put_url = f"{self._api_base()}/files/{file_guid_created}"
+                self._log(f"PUT {put_url} (set edition={edition})")
+                pr = self.session.put(put_url, json={"edition": str(edition)})
+                pr.raise_for_status()
+                # Update local 'f' edition if the PUT succeeded
+                f["edition"] = str(edition)
+        except requests.HTTPError as e:
+            self._log(
+                f"Edition update after create failed for {file_guid_created}: {e}"
+            )
+
         return {
             "associationGuid": row.get("guid"),
             "primary": row.get("primary"),
@@ -765,7 +800,7 @@ class ArenaClient:
                 "size": f.get("size"),
                 "format": f.get("format"),
                 "category": (f.get("category") or {}).get("name"),
-                "edition": f.get("edition"),
+                "edition": f.get("edition") or str(edition),
                 "lastModifiedDateTime": f.get("lastModifiedDateTime"),
             },
             "downloadUrl": (

gladiator/checksums.py

@@ -0,0 +1,31 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# src/gladiator/checksums.py
+from __future__ import annotations
+from pathlib import Path
+import hashlib
+import base64
+
+
+def sha256_file(path: Path, chunk_size: int = 128 * 1024) -> str:
+    """
+    Return the lowercase hex SHA-256 of the file at `path`.
+    Streams the file in chunks to support large files.
+    """
+    h = hashlib.sha256()
+    with open(path, "rb") as f:
+        for chunk in iter(lambda: f.read(chunk_size), b""):
+            h.update(chunk)
+    return h.hexdigest()
+
+
+def md5_base64_file(path: Path, chunk_size: int = 128 * 1024) -> str:
+    """
+    Return base64-encoded MD5 digest of the file at `path`,
+    suitable for the Content-MD5 header per RFC 1864.
+    """
+    h = hashlib.md5()
+    with open(path, "rb") as f:
+        for chunk in iter(lambda: f.read(chunk_size), b""):
+            h.update(chunk)
+    return base64.b64encode(h.digest()).decode("ascii")

gladiator/cli.py

@@ -160,11 +160,9 @@ def list_files(
         table = Table(title=f"Files for {item} rev {revision or '(latest approved)'}")
         table.add_column("Name")
         table.add_column("Size", justify="right")
-        table.add_column("Checksum")
+        table.add_column("Edition")
         for f in files:
-            table.add_row(
-                str(f.get("filename")), str(f.get("size")), str(f.get("checksum"))
-            )
+            table.add_row(str(f.get("name")), str(f.get("size")), str(f.get("edition")))
         print(table)
     except requests.HTTPError as e:
         typer.secho(f"Arena request failed: {e}", fg=typer.colors.RED, err=True)
@@ -313,9 +311,9 @@ def upload_file(
         False, "--primary/--no-primary", help="Mark association as primary"
     ),
     edition: str = typer.Option(
-        "1",
+        None,
         "--edition",
-        help="Edition number when creating a new association (default: 1)",
+        help="Edition number when creating a new association (default: SHA256 checksum of file)",
     ),
 ):
     """If a file with the same filename exists: update its content (new edition).
@@ -339,7 +337,7 @@ def upload_file(
         raise typer.Exit(2)
     except ArenaError as e:
         typer.secho(str(e), fg=typer.colors.RED, err=True)
-
+        raise typer.Exit(2)
 
 if __name__ == "__main__":
     app()

{lr_gladiator-0.8.0.dist-info → lr_gladiator-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-gladiator
-Version: 0.8.0
+Version: 0.10.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
@@ -179,3 +179,5 @@ python -m build
 
 - **How does Gladiator handle authentication?**
   It performs a `/login` call and stores the resulting `arenaSessionId` for reuse. If it expires, re-run `gladiator login`.
+
+

lr_gladiator-0.10.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+gladiator/__init__.py,sha256=ZeHpVdzARFyIp9QbdTkX0jNqnbRFX5nFQ5RkEFzSRL0,208
+gladiator/arena.py,sha256=q98dvu92zcRH1UjvllnH7KRBbwflpuw3LwhqJX5hAjg,31931
+gladiator/checksums.py,sha256=5_3ra5E6itOPhWkb9MAR1ywuMtnVa_CxdcAe8t5x3PM,934
+gladiator/cli.py,sha256=pKi-xrotaRbynSWoSjwtV2KN7LT9R2Mk-FymCUSfRE0,11681
+gladiator/config.py,sha256=oe2UpFv1HcrP1-lVWs_nnex444Igq18BW3nTs9wL__k,1760
+lr_gladiator-0.10.0.dist-info/licenses/LICENSE,sha256=2CEtbEagerjoU3EDSk-eTM5LKgI_RpiVIOh3_CV4kms,1069
+lr_gladiator-0.10.0.dist-info/METADATA,sha256=h12V01uHW7qh77WeXMGIO_3_68Yk_n1uRxHXKyxTmv0,4433
+lr_gladiator-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lr_gladiator-0.10.0.dist-info/entry_points.txt,sha256=SLka4w7iGS2B8HrbeZyNk5mxaIC6QKcv93us1OaWNwQ,48
+lr_gladiator-0.10.0.dist-info/top_level.txt,sha256=tfrcAmK7_7Lf63w7kWy0wv_Qg9RrcFWGoins1-jGUF4,10
+lr_gladiator-0.10.0.dist-info/RECORD,,

lr_gladiator-0.8.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-gladiator/__init__.py,sha256=ZeHpVdzARFyIp9QbdTkX0jNqnbRFX5nFQ5RkEFzSRL0,208
-gladiator/arena.py,sha256=x2dg-JImb9Lw1fIj0ptm48GF1m4zIj2pmg4GqmWBPbA,30285
-gladiator/cli.py,sha256=vGpyxcVqDzCALt32h7vS3PFpw5B4721kL-ADWL6hIlA,11667
-gladiator/config.py,sha256=oe2UpFv1HcrP1-lVWs_nnex444Igq18BW3nTs9wL__k,1760
-lr_gladiator-0.8.0.dist-info/licenses/LICENSE,sha256=2CEtbEagerjoU3EDSk-eTM5LKgI_RpiVIOh3_CV4kms,1069
-lr_gladiator-0.8.0.dist-info/METADATA,sha256=MT_mo2LrDU2eExg-lgXHgnNVoIfRlxHFCRdJJVffYuU,4430
-lr_gladiator-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lr_gladiator-0.8.0.dist-info/entry_points.txt,sha256=SLka4w7iGS2B8HrbeZyNk5mxaIC6QKcv93us1OaWNwQ,48
-lr_gladiator-0.8.0.dist-info/top_level.txt,sha256=tfrcAmK7_7Lf63w7kWy0wv_Qg9RrcFWGoins1-jGUF4,10
-lr_gladiator-0.8.0.dist-info/RECORD,,