kscale 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

kscale/__init__.py

@@ -1,6 +1,6 @@
 """Defines the common interface for the K-Scale Python API."""
 
-__version__ = "0.3.7"
+__version__ = "0.3.9"
 
 from pathlib import Path
 

kscale/cli.py

@@ -8,7 +8,6 @@ import colorlogging
 from kscale.utils.cli import recursive_help
 from kscale.web.cli.robot import cli as robot_cli
 from kscale.web.cli.robot_class import cli as robot_class_cli
-from kscale.web.cli.token import cli as token_cli
 from kscale.web.cli.user import cli as user_cli
 
 
@@ -22,7 +21,6 @@ def cli() -> None:
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
 
 
-cli.add_command(token_cli, "token")
 cli.add_command(user_cli, "user")
 cli.add_command(robot_class_cli, "robots")
 cli.add_command(robot_cli, "robot")

kscale/web/cli/robot_class.py

@@ -1,5 +1,6 @@
 """Defines the CLI for getting information about robot classes."""
 
+import itertools
 import json
 import logging
 import math
@@ -452,19 +453,20 @@ async def run_mujoco(class_name: str, no_cache: bool) -> None:
     try:
         import mujoco.viewer
     except ImportError:
-        click.echo(
-            click.style(
-                "Mujoco and mujoco-python-viewer are required; install with `pip install mujoco`",
-                fg="red",
-            )
-        )
+        click.echo(click.style("Mujoco is required; install with `pip install mujoco`", fg="red"))
         return
 
     async with RobotClassClient() as client:
         extracted_folder = await client.download_and_extract_urdf(class_name, cache=not no_cache)
 
     try:
-        mjcf_file = next(extracted_folder.glob("*.mjcf"))
+        mjcf_file = next(
+            itertools.chain(
+                extracted_folder.glob("*.scene.mjcf"),
+                extracted_folder.glob("*.mjcf"),
+                extracted_folder.glob("*.xml"),
+            )
+        )
     except StopIteration:
         click.echo(click.style(f"No MJCF file found in {extracted_folder}", fg="red"))
         return

kscale/web/cli/user.py

@@ -45,8 +45,7 @@ async def key() -> None:
     """Get an API key for the currently-authenticated user."""
     client = UserClient()
     api_key = await client.get_api_key()
-    click.echo("API key:")
-    click.echo(click.style(api_key, fg="green"))
+    click.echo(f"API key: {click.style(api_key, fg='green')}")
 
 
 if __name__ == "__main__":

kscale/web/clients/base.py

@@ -5,6 +5,7 @@ import json
 import logging
 import os
 import secrets
+import sys
 import time
 import webbrowser
 from types import TracebackType
@@ -31,6 +32,10 @@ OAUTH_PORT = 16821
 HEADER_NAME = "x-kscale-api-key"
 
 
+def verbose_error() -> bool:
+    return os.environ.get("KSCALE_VERBOSE_ERROR", "0") == "1"
+
+
 class OAuthCallback:
     def __init__(self) -> None:
         self.token_type: str | None = None
@@ -375,8 +380,14 @@ class BaseClient:
         response = await client.request(method, url, **kwargs)
 
         if response.is_error:
-            logger.error("Error response from K-Scale: %s", response.text)
-        response.raise_for_status()
+            logger.error("Got %d error K-Scale: %s", response.status_code, response.text)
+            if verbose_error():
+                response.raise_for_status()
+            else:
+                logger.error("Use KSCALE_VERBOSE_ERROR=1 to see the full error message")
+                logger.error("If this persists, please create an issue here: https://github.com/kscalelabs/kscale")
+                sys.exit(1)
+
         return response.json()
 
     async def close(self) -> None:

kscale/web/gen/api.py

@@ -36,6 +36,7 @@ class JointMetadataInput(BaseModel):
     friction: Optional[Union[float, str]] = Field(None, title="Friction")
     offset: Optional[Union[float, str]] = Field(None, title="Offset")
     flipped: Optional[bool] = Field(None, title="Flipped")
+    actuator_type: Optional[str] = Field(None, title="Actuator Type")
 
 
 class JointMetadataOutput(BaseModel):
@@ -46,6 +47,7 @@ class JointMetadataOutput(BaseModel):
     friction: Optional[str] = Field(None, title="Friction")
     offset: Optional[str] = Field(None, title="Offset")
     flipped: Optional[bool] = Field(None, title="Flipped")
+    actuator_type: Optional[str] = Field(None, title="Actuator Type")
 
 
 class OICDInfo(BaseModel):

{kscale-0.3.7.dist-info → kscale-0.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: kscale
-Version: 0.3.7
+Version: 0.3.9
 Summary: The kscale project
 Home-page: https://github.com/kscalelabs/kscale
 Author: Benjamin Bolte
@@ -32,6 +32,7 @@ Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{kscale-0.3.7.dist-info → kscale-0.3.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
-kscale/__init__.py,sha256=JXk1-68D39Xj5C7awsV8wBXSDoj4Zds3jDuQP0VvMyY,200
-kscale/cli.py,sha256=PMHLKR5UwdbbReVmqHXpJ-K9-mGHv_0I7KQkwxmFcUA,881
+kscale/__init__.py,sha256=Cy-vvz6K5u5eWHpZ4Ia6rH75rLZxjsRF9FGJDItTADs,200
+kscale/cli.py,sha256=JvaPtmWvF7s0D4I3K98eZAItf3oOi2ULsn5aPGxDcu4,795
 kscale/conf.py,sha256=dm35XSnzJp93St-ixVtYN4Nvqvb5upPGBrWkSI6Yb-4,1743
 kscale/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kscale/requirements-dev.txt,sha256=WI7-ea4IRJakmqVMN8QKhOsDGrghwtvk03aIsFaNSIw,130
@@ -15,20 +15,19 @@ kscale/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kscale/web/utils.py,sha256=Mme-FAQ0_zbjjOQeX8wyq8F4kL4i9fH7ytri16U6qOA,1046
 kscale/web/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kscale/web/cli/robot.py,sha256=rI-A4_0uvJPeA71Apl4Z3mV5fIfWkgmzT9JRmJYxz3A,3307
-kscale/web/cli/robot_class.py,sha256=QjE65uw2lSaerrdFr_zZzN9_W5w4Rx4exWZkijpDzmQ,18892
-kscale/web/cli/token.py,sha256=1rFC8MYKtqbNsQa2KIqwW1tqpaMtFaxuNsallwejXTU,787
-kscale/web/cli/user.py,sha256=aaJJCL1P5lfhK6ZC9OwOHXKA-I3MWqVZ_k7TYnx33CY,1303
+kscale/web/cli/robot_class.py,sha256=DLB5ok69JAeUUeA7Yy80VmyZGFt9dKf8kD0vSBMmqP8,18987
+kscale/web/cli/user.py,sha256=9IGsJBPyhjsmT04mZ2RGOs35ePfqB2RltYP0Ty5zF5o,1290
 kscale/web/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kscale/web/clients/base.py,sha256=A70BF9ZnHEBds0RKrowbeUNsX_WwsgV349csUlM4iMc,15174
+kscale/web/clients/base.py,sha256=ThQakuvGh7CquiGQ4wiCyCWAgqmKInsJcANo910X9Uw,15585
 kscale/web/clients/client.py,sha256=rzW2s8T7bKVuybOSQ65-ghl02rcXBoOxnx_nUDwgEPw,362
 kscale/web/clients/robot.py,sha256=PI8HHkU-4Re9I5rLpp6dGbekRE-rBNVfXZxR_mO2MqE,1485
 kscale/web/clients/robot_class.py,sha256=G8Nk6V7LGJE9Wpg9tyyCkIfz1fRTsxXQRgHtleiUVqo,6834
 kscale/web/clients/user.py,sha256=jsa1_s6qXRM-AGBbHlPhd1NierUtynjY9tVAPNr6_Os,568
 kscale/web/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kscale/web/gen/api.py,sha256=VWlt8TaMZaAhCPPIWhx1d4yE0BRfpVz0-_Cps8hjgAI,4662
-kscale-0.3.7.dist-info/LICENSE,sha256=HCN2bImAzUOXldAZZI7JZ9PYq6OwMlDAP_PpX1HnuN0,1071
-kscale-0.3.7.dist-info/METADATA,sha256=0hDh7EJaKk94ofN-EfGPVcvlSNs1vfcuVTI5vx9DB6Y,2320
-kscale-0.3.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kscale-0.3.7.dist-info/entry_points.txt,sha256=N_0pCpPnwGDYVzOeuaSOrbJkS5L3lS9d8CxpJF1f8UI,62
-kscale-0.3.7.dist-info/top_level.txt,sha256=C2ynjYwopg6YjgttnI2dJjasyq3EKNmYp-IfQg9Xms4,7
-kscale-0.3.7.dist-info/RECORD,,
+kscale/web/gen/api.py,sha256=GEQpOovAzixZa582d-t_O1dYYoEXrso2_DXXlxn7A48,4802
+kscale-0.3.9.dist-info/licenses/LICENSE,sha256=HCN2bImAzUOXldAZZI7JZ9PYq6OwMlDAP_PpX1HnuN0,1071
+kscale-0.3.9.dist-info/METADATA,sha256=ZaPRFJfJ8YKHaK7pmQSEXNWZLkmqV2IHt3m2Vz3gY74,2342
+kscale-0.3.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+kscale-0.3.9.dist-info/entry_points.txt,sha256=N_0pCpPnwGDYVzOeuaSOrbJkS5L3lS9d8CxpJF1f8UI,62
+kscale-0.3.9.dist-info/top_level.txt,sha256=C2ynjYwopg6YjgttnI2dJjasyq3EKNmYp-IfQg9Xms4,7
+kscale-0.3.9.dist-info/RECORD,,

{kscale-0.3.7.dist-info → kscale-0.3.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

kscale/web/cli/token.py

@@ -1,33 +0,0 @@
-"""Defines the CLI for interacting with K-Scale's OpenID Connect server."""
-
-import logging
-
-import click
-
-from kscale.utils.cli import coro
-from kscale.web.clients.base import BaseClient
-
-logger = logging.getLogger(__name__)
-
-
-@click.group()
-def cli() -> None:
-    """Retrieve an OICD token from the K-Scale authentication server."""
-    pass
-
-
-@cli.command()
-@coro
-async def get() -> None:
-    """Get a bearer token from OpenID Connect."""
-    logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
-    async with BaseClient() as client:
-        try:
-            token = await client.get_bearer_token()
-            logger.info("Bearer token: %s", token)
-        except Exception:
-            logger.exception("Error getting bearer token")
-
-
-if __name__ == "__main__":
-    cli()