simulo 0.28.2__tar.gz → 0.28.3__tar.gz

{simulo-0.28.2/src/simulo.egg-info → simulo-0.28.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.28.2
+Version: 0.28.3
 Summary: Python SDK and CLI for cloud-native robotics simulation, reinforcement learning, and robot policy training on managed GPUs.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause

{simulo-0.28.2 → simulo-0.28.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simulo"
-version = "0.28.2"
+version = "0.28.3"
 description = "Python SDK and CLI for cloud-native robotics simulation, reinforcement learning, and robot policy training on managed GPUs."
 readme = "PYPI.md"
 requires-python = ">=3.11"

{simulo-0.28.2 → simulo-0.28.3}/src/simulo/_client/asset_package.py

@@ -82,6 +82,10 @@ from simulo.interfaces.platform.asset_catalog import (
 #: recipe can never silently collide with today's identities.
 _CONTENT_DIGEST_SCHEMA = "simulo.asset_content.v1"
 
+#: Local-cache metadata written after extraction. Like the backend validator,
+#: the packager excludes this exact name only at the package root.
+_ASSET_CACHE_SIDECAR_FILENAME = "simulo.asset.json"
+
 #: USD layer suffixes the inspector parses for references. ``.usdz`` is a
 #: sealed package — included as an opaque file, valid as an entry only when
 #: named explicitly via ``--entry`` (never auto-detected).
@@ -516,6 +520,8 @@ def _collect_tree_files(root: Path) -> list[tuple[str, Path]]:
             if abspath.is_symlink():
                 continue
             rel = PurePosixPath(abspath.relative_to(root).as_posix())
+            if str(rel) == _ASSET_CACHE_SIDECAR_FILENAME:
+                continue
             collected.append((str(rel), abspath))
     collected.sort(key=lambda item: item[0])
     return collected

{simulo-0.28.2 → simulo-0.28.3}/src/simulo/_client/cli.py

@@ -7222,6 +7222,11 @@ def _cmd_systems(args: argparse.Namespace) -> int:
 #: not by any prose document.
 ASSET_CACHE_ROOT = Path.home() / ".simulo" / "assets"
 
+#: Sidecar consumed by ``simulo-backend`` when a cached asset path names a
+#: directory rather than the loadable file inside it. Kept private because the
+#: thin client must not import the backend package just to share this filename.
+_ASSET_SIDECAR_FILENAME = "simulo.asset.json"
+
 #: Conservative Windows ``MAX_PATH`` guard (260 chars, minus 1) applied to
 #: every extracted cache path — a defensive REFUSAL, not a guarantee: a
 #: legitimately deep USD tree can still need Windows long-path support
@@ -7350,7 +7355,7 @@ def _validate_asset_archive_member(member: tarfile.TarInfo, dest_root: Path) ->
     return resolved, None
 
 
-def _extract_asset_archive(tar_path: Path, dest_dir: Path) -> None:
+def _extract_asset_archive(tar_path: Path, dest_dir: Path, *, entry_path: Optional[str] = None) -> Optional[str]:
     """Safely extract *tar_path* (a digest-verified asset archive) into
     *dest_dir* — member-by-member, never ``TarFile.extractall``. This
     function IS the safety filter ``extractall``'s ``filter=`` parameter
@@ -7363,8 +7368,12 @@ def _extract_asset_archive(tar_path: Path, dest_dir: Path) -> None:
     single unsafe member aborts the whole extraction with nothing written,
     never a partial mix of safe and unsafe content.
 
-    Raises :class:`AssetExtractionError` on any unsafe/malformed member, a
-    non-tar file, or a local filesystem failure.
+    When *entry_path* is provided, it must name one of the archive's regular
+    files through the same containment check as every member. The normalized
+    package-relative path is returned for the platform sidecar.
+
+    Raises :class:`AssetExtractionError` on any unsafe/malformed member or
+    entry, a non-tar file, or a local filesystem failure.
     """
     dest_dir.mkdir(parents=True, exist_ok=True)
     dest_root = dest_dir.resolve()
@@ -7378,6 +7387,20 @@ def _extract_asset_archive(tar_path: Path, dest_dir: Path) -> None:
                         f"Refusing to extract {member.name!r}: {reason}. Nothing was written for this asset."
                     )
                 planned.append((member, target))
+            entry_target: Optional[Path] = None
+            if entry_path is not None:
+                entry_member = tarfile.TarInfo(entry_path)
+                entry_member.type = tarfile.REGTYPE
+                entry_target, reason = _validate_asset_archive_member(entry_member, dest_root)
+                if entry_target is None:
+                    raise AssetExtractionError(
+                        f"Refusing asset entry path {entry_path!r}: {reason}. Nothing was written for this asset."
+                    )
+                if not any(member.isfile() and target == entry_target for member, target in planned):
+                    raise AssetExtractionError(
+                        f"Refusing asset entry path {entry_path!r}: it does not name a regular file in the "
+                        "downloaded archive. Nothing was written for this asset."
+                    )
             for member, target in planned:
                 if member.isdir():
                     target.mkdir(parents=True, exist_ok=True)
@@ -7388,10 +7411,50 @@ def _extract_asset_archive(tar_path: Path, dest_dir: Path) -> None:
                     raise AssetExtractionError(f"Archive member {member.name!r} has no readable content.")
                 with src, open(target, "wb") as dst:
                     shutil.copyfileobj(src, dst)
+            if entry_target is not None:
+                return entry_target.relative_to(dest_root).as_posix()
     except tarfile.TarError as exc:
         raise AssetExtractionError(f"The downloaded archive is not a valid tar file: {exc}") from exc
     except OSError as exc:
         raise AssetExtractionError(f"Could not write the extracted asset to {dest_dir}: {exc}") from exc
+    return None
+
+
+def _write_asset_cache_sidecar(dest_dir: Path, *, uri: str, entry: str, kind: str, archive_sha256: str) -> None:
+    """Write the backend-compatible entry record after trusted extraction."""
+    sidecar = {
+        "uri": uri,
+        "entry": entry,
+        "kind": kind,
+        "digest": f"sha256:{archive_sha256}",
+    }
+    temp_path: Optional[Path] = None
+    try:
+        dest_root = dest_dir.resolve()
+        with tempfile.NamedTemporaryFile(
+            mode="w",
+            encoding="utf-8",
+            dir=dest_root,
+            prefix=f".{_ASSET_SIDECAR_FILENAME}.",
+            delete=False,
+        ) as temp_file:
+            temp_path = Path(temp_file.name)
+            temp_file.write(json.dumps(sidecar, indent=2) + "\n")
+            # NamedTemporaryFile creates the file owner-only (0600). Give the
+            # record the permissions a plain write would get, so anything that
+            # reads the cache as another user keeps working.
+            if hasattr(os, "fchmod"):
+                current_umask = os.umask(0)
+                os.umask(current_umask)
+                os.fchmod(temp_file.fileno(), 0o666 & ~current_umask)
+        os.replace(temp_path, dest_root / _ASSET_SIDECAR_FILENAME)
+    except OSError as exc:
+        if temp_path is not None:
+            try:
+                temp_path.unlink(missing_ok=True)
+            except OSError:
+                pass
+        raise AssetExtractionError(f"Could not write the asset entry record in {dest_dir}: {exc}") from exc
 
 
 #: Statuses an ``AssetVersionSummary`` can carry while it is still mid-pipeline
@@ -8004,6 +8067,13 @@ def _asset_get_impl(args: argparse.Namespace) -> int:
     expected_sha256 = str(target.get("archive_sha256") or "").lower().removeprefix("sha256:")
     display_ref = f"{parsed.kind}/{parsed.name}:v{version_number}"
 
+    if not entry_path:
+        raise AssetExtractionError(f"{display_ref} has no loadable entry path. Nothing was written.")
+    if "\x00" in entry_path:
+        raise AssetExtractionError(
+            f"Refusing asset entry path {entry_path!r}: NUL characters are refused. Nothing was written for this asset."
+        )
+
     # SECURITY (LOW, PR-8 trio review): a downloadable version with NO
     # recorded digest is refused outright, before any network call — the
     # earlier code treated a missing `archive_sha256` as "skip verification"
@@ -8038,9 +8108,18 @@ def _asset_get_impl(args: argparse.Namespace) -> int:
     with tempfile.TemporaryDirectory(prefix="simulo-asset-get-") as tmp_dir:
         tar_path = Path(tmp_dir) / "package.tar"
         tar_path.write_bytes(data)
-        _extract_asset_archive(tar_path, dest_dir)
+        safe_entry_path = _extract_asset_archive(tar_path, dest_dir, entry_path=entry_path)
+    if safe_entry_path is None:
+        raise AssetExtractionError(f"{display_ref} has no loadable entry path. Nothing was written.")
+    _write_asset_cache_sidecar(
+        dest_dir,
+        uri=f"{publisher}/{display_ref}",
+        entry=safe_entry_path,
+        kind=parsed.kind,
+        archive_sha256=actual_sha256,
+    )
 
-    echo(f"Downloaded to {dest_dir}/ (entry: {entry_path or '?'})")
+    echo(f"Downloaded to {dest_dir}/ (entry: {sanitize_server_text(entry_path)})")
     if args.json:
         print(
             json.dumps(

{simulo-0.28.2 → simulo-0.28.3/src/simulo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.28.2
+Version: 0.28.3
 Summary: Python SDK and CLI for cloud-native robotics simulation, reinforcement learning, and robot policy training on managed GPUs.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause