simulo 0.13.0__tar.gz → 0.13.2__tar.gz

{simulo-0.13.0/src/simulo.egg-info → simulo-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.13.0
+Version: 0.13.2
 Summary: Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause
@@ -18,6 +18,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: simulo-interfaces<0.6,>=0.5
 Requires-Dist: mcap<2,>=1.3
 Requires-Dist: defusedxml>=0.7.1
+Requires-Dist: usd-core<27,>=25.5
 Provides-Extra: assets
 Requires-Dist: usd-core<27,>=25.5; extra == "assets"
 Provides-Extra: dev

{simulo-0.13.0 → simulo-0.13.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simulo"
-version = "0.13.0"
+version = "0.13.2"
 description = "Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud."
 readme = "PYPI.md"
 requires-python = ">=3.11"
@@ -34,22 +34,25 @@ dependencies = [
     # defaults to stay XXE/billion-laughs-safe; defusedxml pins that
     # protection explicitly. Pure Python, zero transitive dependencies,
     # ~25 KB — genuinely "cheap": adding it does not compromise the
-    # featherweight/no-USD-extra promise below (that promise is about
-    # avoiding usd-core's tens of MB, not about being literally
-    # zero-dependency).
+    # featherweight promise below (that promise was about avoiding
+    # usd-core's tens of MB via an opt-in extra; usd-core itself joined the
+    # base footprint in 0.13.1 — see its own comment just below).
     "defusedxml>=0.7.1",
+    # usd-core: simulator-free but tens of MB — moved from the `assets`
+    # extra into the base install in 0.13.1 so `pip install simulo` covers
+    # USD-tree publishing/inspection out of the box (no separate extra to
+    # discover first). Still torch-free and still lazy-imported ONLY on the
+    # USD inspection path (`_client/asset_package.py::_load_pxr_usdutils`) —
+    # importing `simulo` itself never pays its cost.
+    "usd-core>=25.5,<27",
 ]
 
 [project.optional-dependencies]
-# `assets` — the FIRST user-facing extras group: USD package inspection for
-# `simulo asset publish`/`validate` of USD trees (dependency closure + entry
-# detection via pxr.UsdUtils). usd-core is simulator-free but tens of MB, so
-# it must never tax users who don't publish USD: the import is lazy, ONLY in
-# the USD inspection path (`_client/asset_package.py::_load_pxr_usdutils`),
-# and a missing extra fails with the copyable `pip install "simulo[assets]"`.
-# URDF publishing needs no OPT-IN extra (defusedxml + path math, both tiny
-# always-installed base dependencies above — see that dependency's own
-# comment).
+# `assets` — kept for backward compatibility with `pip install
+# "simulo[assets]"` (the 0.13.0-era spelling): usd-core moved into the base
+# install above in 0.13.1, so this extra is now redundant (its dep is
+# already installed unconditionally) but harmless — resolvers don't warn on
+# an extra whose contents are already satisfied by the base requirement.
 assets = ["usd-core>=25.5,<27"]
 dev = ["black>=24.0", "isort>=5.13", "ruff>=0.5", "mypy>=1.10", "pytest>=8.2", "build>=1.2", "twine>=5.1"]
 # `dev` carries build/twine but deliberately not commitizen; `release` below

{simulo-0.13.0 → simulo-0.13.2}/src/simulo/_client/asset.py

@@ -2,12 +2,12 @@
 
 A registry asset ref is ``[<publisher>/]<kind>/<name>[:v<N>]`` (e.g.
 ``robot/so-arm-100:v3``, ``simulo/world/warehouse:v2``, or the unpinned
-``robot/forklift`` — resolved to an exact version **at submit**, §6). The grammar
+``robot/forklift`` — resolved to an exact version **at submit**). The grammar
 is the ONE shared parser from ``simulo.interfaces.platform.asset_catalog`` — the
 CLI, the control plane, the worker, and the console all parse through it, so the
 grammar can never drift. This handle carries the parsed ``kind`` (``robot`` /
-``world``), which enables **kind safety** (``Robot(asset=<world asset>)`` fails
-with a one-line explanation — see :meth:`require_kind`).
+``world`` / ``prop``), which enables **kind safety** (``Robot(asset=<world asset>)`` fails
+with a one-line explanation naming the mismatched kind).
 
 The on-disk :attr:`path` only exists in **execution mode**:
 
@@ -131,7 +131,7 @@ class Asset:
     """A read-only, registry-resolved resource mounted into running jobs.
 
     A registry ref is ``[<publisher>/]<kind>/<name>[:v<N>]`` (e.g.
-    ``robot/so-arm-100:v3``); :meth:`from_registry` names one, and :attr:`path`
+    ``simulo/robot/cartpole:v1``); :meth:`from_registry` names one, and :attr:`path`
     resolves to its read-only mount inside a running job. ``Asset`` is also how a
     task names USD/URDF model sources to load into a scene — :meth:`usd` /
     :meth:`urdf`.
@@ -154,8 +154,8 @@ class Asset:
 
         ``uri`` is a catalog ref ``[<publisher>/]<kind>/<name>[:v<N>]`` — the
         publisher defaults to your own org, ``simulo`` names the global catalog,
-        and an omitted ``:v<N>`` is resolved to the current latest **at submit**
-        (§6). The handle is directly consumable wherever a model source is
+        and an omitted ``:v<N>`` is resolved to the current latest **at submit**.
+        The handle is directly consumable wherever a model source is
         accepted — ``Robot(asset=...)`` for a ``robot`` ref, ``scene.add(...)``
         for a ``world`` ref.
         """
@@ -166,7 +166,7 @@ class Asset:
         """Name a USD model source to load into a scene.
 
         At submit time this returns an inert, torch-free spec object so authoring
-        stays lean; on the worker it resolves to the real model asset. The return
+        stays lean; in the execution runtime it resolves to the real model asset. The return
         type depends on mode, so it is typed ``Any``.
         """
         return cls._model_asset("usd", path)
@@ -194,7 +194,7 @@ class Asset:
 
     @property
     def kind(self) -> str:
-        """The ``<kind>`` segment of the ref — ``"robot"`` or ``"world"``."""
+        """The ``<kind>`` segment of the ref — ``"robot"``, ``"world"``, or ``"prop"``."""
         return self._ref.kind
 
     @property
@@ -252,8 +252,8 @@ class Asset:
 
         Resolution order, in execution mode:
 
-        1. ``SIMULO_ASSET_<uri>`` — the mount the runner (cloud worker or local
-           ``run-package``) exported for this asset. When set, it is authoritative.
+        1. ``SIMULO_ASSET_<uri>`` — the mount the execution environment
+           exported for this asset. When set, it is authoritative.
         2. The on-disk catalog cache ``~/.simulo/assets/<org>/<kind>/<name>/v<N>/``
            — the colon-free layout ``simulo asset get`` writes into. Used for a
            local run with no runner-provided mount.

{simulo-0.13.0 → simulo-0.13.2}/src/simulo/_client/cancel_api.py

@@ -1,7 +1,7 @@
 """HTTP client for the job cancel endpoint (stdlib only, torch-free).
 
 Wire contract (job-cancel-and-demo-apps plan — see
-``context/implementation-plans/job-cancel-and-demo-apps-plan.md``; the control
+``context/implementation-plans/archive/job-cancel-and-demo-apps-plan.md``; the control
 plane's half of this route is built by a parallel PR, so this client codes
 directly against the plan's PINNED contract rather than waiting on it):
 ``POST /v1/jobs/{job_id}/cancel`` (Cognito bearer, org-scoped).

{simulo-0.13.0 → simulo-0.13.2}/src/simulo/_client/cli.py

@@ -80,6 +80,7 @@ from __future__ import annotations
 
 import argparse
 import hashlib
+import importlib.metadata
 import importlib.resources
 import json
 import math
@@ -325,6 +326,9 @@ def _submit_app(
     fallback) so every construction anywhere in the discovery-time control flow is
     captured, mounted or not.
     """
+    if not app_file.is_file():
+        raise SystemExit(f"No such app file: {app_file}")
+
     previous_mode = os.environ.get("SIMULO_MODE")
     os.environ["SIMULO_MODE"] = DISCOVERY
     try:
@@ -458,7 +462,19 @@ def _follow_and_report(handle: JobHandle) -> int:
     assert handle.base_url is not None, "a cloud JobHandle always carries a base_url"
     client = JobsApiClient(handle.base_url, token=handle.token)
     print(f"Following job {handle.job_id} (--detach to submit without waiting)...", file=sys.stderr, flush=True)
-    return _drain_logs(client, str(handle.job_id), follow=True)
+    try:
+        return _drain_logs(client, str(handle.job_id), follow=True)
+    except KeyboardInterrupt:
+        # The submit already succeeded — only the client-side follow loop
+        # died. Say so explicitly: without this, a user watching a raw
+        # traceback (or even a bare "^C") could easily read Ctrl-C as having
+        # killed the job itself, when it is still running server-side.
+        print(
+            f"\nInterrupted — the job is still running in the cloud. Reattach with:"
+            f"  simulo logs {handle.job_id} --follow",
+            file=sys.stderr,
+        )
+        return 130
 
 
 def _cmd_run(args: argparse.Namespace, extras: Sequence[str]) -> int:
@@ -3079,8 +3095,18 @@ def _asset_publish_impl(args: argparse.Namespace) -> int:
         revived = bool(initiate.get("revived"))
 
         if upload is not None:
-            target = "the global catalog" if admin else _asset_publisher_label(client, args.kind, name)
-            echo(f"Uploading to {target}…")
+            if admin:
+                echo("Uploading to the global catalog…")
+            else:
+                publisher = _asset_publisher_label(client, args.kind, name)
+                # `_asset_publisher_label` already falls back to "your
+                # organization" when the org handle can't be resolved
+                # (display-only, never fails a publish) — don't wrap that
+                # into "your organization's catalog (your organization)".
+                if publisher == "your organization":
+                    echo("Uploading to your organization's catalog…")
+                else:
+                    echo(f"Uploading to your organization's catalog ({publisher})…")
             complete, resumed_parts = upload_archive(
                 client,
                 version_id=version_id,
@@ -4312,6 +4338,21 @@ def _nonnegative_int(value: str) -> int:
     return parsed
 
 
+def _resolve_version() -> str:
+    """Resolve the installed ``simulo`` distribution version for ``--version``.
+
+    Reads the installed wheel's metadata (``importlib.metadata``) rather than a
+    hardcoded string, so it can never drift from what ``pip show simulo``
+    reports. Falls back to a plain placeholder if the distribution metadata is
+    unavailable (e.g. running this module straight from a source checkout with
+    no installed ``simulo`` distribution at all).
+    """
+    try:
+        return importlib.metadata.version("simulo")
+    except importlib.metadata.PackageNotFoundError:
+        return "unknown"
+
+
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="simulo",
@@ -4320,6 +4361,18 @@ def _build_parser() -> argparse.ArgumentParser:
             "(simulo jobs / logs / result / recordings / models / view / cancel)."
         ),
     )
+    # ``action="version"`` fires (prints + exits 0) while argparse is still
+    # consuming optionals — before the subparsers' ``required=True`` check
+    # runs — so ``simulo --version`` / ``simulo -v`` work standalone, with no
+    # subcommand needed. No other short flag is registered anywhere on this
+    # parser (or any subparser), so ``-v`` is free to alias ``--version``.
+    parser.add_argument(
+        "--version",
+        "-v",
+        action="version",
+        version=f"simulo {_resolve_version()}",
+        help="Show the simulo version and exit.",
+    )
     sub = parser.add_subparsers(dest="command", required=True)
 
     run = sub.add_parser(
@@ -4489,7 +4542,7 @@ def _build_parser() -> argparse.ArgumentParser:
     asset = sub.add_parser(
         "asset",
         help=(
-            "Publish, validate, browse, and manage robot/world asset packages in your "
+            "Publish, validate, browse, and manage robot, world, and prop asset packages in your "
             "organization's catalog and the Simulo global catalog (USD or URDF)."
         ),
     )
@@ -4560,7 +4613,7 @@ def _build_parser() -> argparse.ArgumentParser:
         "publish",
         help=(
             "Publish a USD or URDF package as a new immutable asset version: inspect + "
-            "upload + cloud-validate in one command (§5.1)."
+            "upload + cloud-validate in one command."
         ),
     )
     asset_publish.add_argument("path", help="Directory (or single USD/URDF file) to publish.")
@@ -4708,7 +4761,7 @@ def _build_parser() -> argparse.ArgumentParser:
         "get",
         help=(
             "Download an org-catalog asset version to the local cache (~/.simulo/assets/...); "
-            "global assets are usable in jobs but not exportable (§5.4)."
+            "global assets are usable in jobs but not exportable."
         ),
     )
     asset_get.add_argument("ref", help="Asset reference, e.g. robot/forklift:v3 (unpinned = latest published version).")
@@ -5003,7 +5056,16 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     _make_output_encoding_safe()
     parser = _build_parser()
     args, extras = parser.parse_known_args(argv)
-    result: int = args.func(args, extras)
+    try:
+        result: int = args.func(args, extras)
+    except KeyboardInterrupt:
+        # Last-resort safety net: every dispatched command already has its own
+        # clean handling (``_observe_handler`` for the observe verbs,
+        # ``_follow_and_report`` for ``simulo run``'s post-submit follow), so
+        # this only fires for a Ctrl-C in whatever's left uncovered. Either
+        # way, standard SIGINT exit code, never a raw traceback.
+        print("\nInterrupted.", file=sys.stderr)
+        return 130
     return result
 
 

{simulo-0.13.0 → simulo-0.13.2}/src/simulo/_client/view_session_api.py

@@ -1,7 +1,7 @@
 """HTTP client for the live-view session mint endpoint (stdlib only, torch-free).
 
 Wire contract (live-visualization plan, Wave 2 PR3 — control-plane; see
-``context/implementation-plans/live-visualization-plan.md`` and PR3's
+``context/implementation-plans/archive/live-visualization-plan.md`` and PR3's
 ``simulo_control_plane.jobs.view_sessions.mint_view_session``):
 ``POST /v1/jobs/{job_id}/view-session`` mints a short-lived (TTL <= 5 min)
 gateway-audience session for watching a running ``--viewstream`` job's live

{simulo-0.13.0 → simulo-0.13.2/src/simulo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.13.0
+Version: 0.13.2
 Summary: Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause
@@ -18,6 +18,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: simulo-interfaces<0.6,>=0.5
 Requires-Dist: mcap<2,>=1.3
 Requires-Dist: defusedxml>=0.7.1
+Requires-Dist: usd-core<27,>=25.5
 Provides-Extra: assets
 Requires-Dist: usd-core<27,>=25.5; extra == "assets"
 Provides-Extra: dev

{simulo-0.13.0 → simulo-0.13.2}/src/simulo.egg-info/requires.txt

@@ -1,6 +1,7 @@
 simulo-interfaces<0.6,>=0.5
 mcap<2,>=1.3
 defusedxml>=0.7.1
+usd-core<27,>=25.5
 
 [assets]
 usd-core<27,>=25.5