remotivelabs-cli 0.0.32__py3-none-any.whl → 0.0.34__py3-none-any.whl

cli/broker/lib/broker.py

@@ -18,6 +18,7 @@ import remotivelabs.broker.generated.sync.traffic_api_pb2 as traffic_api
 import remotivelabs.broker.sync as br
 import remotivelabs.broker.sync.helper as br_helper
 import typer
+from google.protobuf.json_format import MessageToDict
 from rich.console import Console
 
 from cli import settings
@@ -360,7 +361,7 @@ class Broker:
             namespaces.append(network_info.namespace.name)
         return namespaces
 
-    def list_signal_names(self) -> List[Dict[str, Any]]:
+    def list_signal_names(self, prefix: Union[str, None], suffix: Union[str, None]) -> List[Dict[str, Any]]:
         # Lists available signals
         configuration = self.system_stub.GetConfiguration(br.common_pb2.Empty())
 
@@ -368,30 +369,37 @@ class Broker:
         for network_info in configuration.networkInfo:
             res = self.system_stub.ListSignals(network_info.namespace)
             for finfo in res.frame:
-                # f: br.common_pb2.FrameInfo = finfo
-                receivers = []
-                for sinfo in finfo.childInfo:
-                    rec = list(map(lambda r: r, sinfo.metaData.receiver))
-                    receivers.extend(rec)
-                    signal_names.append(
-                        {
-                            "signal": sinfo.id.name,
-                            "namespace": network_info.namespace.name,
-                            "receivers": rec,
-                            "min": sinfo.metaData.min,
-                            "max": sinfo.metaData.max,
-                        }
+                if (prefix is None or finfo.signalInfo.id.name.startswith(prefix)) and (
+                    suffix is None or finfo.signalInfo.id.name.endswith(suffix)
+                ):
+                    metadata_dict = MessageToDict(
+                        finfo.signalInfo.metaData,
+                        including_default_value_fields=True,
+                        preserving_proto_field_name=True,
                     )
-
-                signal_names.append(
-                    {
+                    sig_dict = {
                         "signal": finfo.signalInfo.id.name,
                         "namespace": network_info.namespace.name,
-                        "senders": list(map(lambda s: s, finfo.signalInfo.metaData.sender)),
-                        "receivers": list(set(receivers)),
-                        "cycletime": finfo.signalInfo.metaData.cycleTime,
                     }
-                )
+                    signal_names.append({**sig_dict, **metadata_dict})
+
+                for sinfo in finfo.childInfo:
+                    # For signals we can simply skip if prefix and suffix exists does not match
+                    if (prefix is not None and not sinfo.id.name.startswith(prefix)) or (
+                        suffix is not None and not sinfo.id.name.endswith(suffix)
+                    ):
+                        continue
+
+                    metadata_dict = MessageToDict(
+                        sinfo.metaData,
+                        including_default_value_fields=True,
+                        preserving_proto_field_name=True,
+                    )
+                    sig_dict = {
+                        "signal": sinfo.id.name,
+                        "namespace": network_info.namespace.name,
+                    }
+                    signal_names.append({**sig_dict, **metadata_dict})
 
         return signal_names
 
@@ -433,7 +441,7 @@ class Broker:
         def find_subscribed_signal(available_signal: List[Dict[str, str]]) -> List[str]:
             return list(filter(lambda s: available_signal["signal"] == s, subscribed_signals))  # type: ignore
 
-        existing_signals = self.list_signal_names()
+        existing_signals = self.list_signal_names(prefix=None, suffix=None)
         existing_ns = set(map(lambda s: s["namespace"], existing_signals))
         ns_not_matching = []
         for ns in subscribed_namespaces:

cli/broker/signals.py

@@ -5,7 +5,7 @@ import numbers
 import os
 import signal as os_signal
 from pathlib import Path
-from typing import Any, Dict, Iterable, List, TypedDict
+from typing import Any, Dict, Iterable, List, TypedDict, Union
 
 import grpc
 import plotext as plt  # type: ignore
@@ -30,23 +30,21 @@ class Signals(TypedDict):
 signal_values: Dict[Any, Any] = {}
 
 
-@app.command(name="list", help="List frame and signal metadata on broker")
+@app.command(name="list")
 def list_signals(
     url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
     api_key: str = typer.Option(None, help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
+    name_starts_with: Union[str, None] = typer.Option(None, help="Signal name prefix to include"),
+    name_ends_with: Union[str, None] = typer.Option(None, help="Signal name suffix to include"),
 ) -> None:
-    signal_names(url, api_key)
-
+    """
+    List signal metadata on a broker
 
-@app.command(help="List signals names on broker", deprecated=True)
-def signal_names(
-    url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
-    api_key: str = typer.Option(None, help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
-) -> None:
+    Filter are inclusive so --name-starts-with and --name-ends-with will include name that matches both
+    """
     try:
         broker = Broker(url, api_key)
-        # print("Listing available signals")
-        available_signals = broker.list_signal_names()
+        available_signals = broker.list_signal_names(prefix=name_starts_with, suffix=name_ends_with)
         print(json.dumps(available_signals))
     except grpc.RpcError as rpc_error:
         ErrorPrinter.print_grpc_error(rpc_error)

cli/cloud/auth/__init__.py

@@ -0,0 +1,3 @@
+from cli.cloud.auth.cmd import app
+
+__all__ = ["app"]

cli/cloud/auth/cmd.py

@@ -0,0 +1,46 @@
+import typer
+
+from cli import settings
+from cli.cloud.auth.login import login as do_login
+from cli.cloud.rest_helper import RestHelper as Rest
+
+from .. import auth_tokens
+
+HELP = """
+Manage how you authenticate with our cloud platform
+"""
+app = typer.Typer(help=HELP)
+app.add_typer(auth_tokens.app, name="tokens", help="Manage users personal access tokens")
+
+
+@app.command(name="login")
+def login() -> None:
+    """
+    Login to the cli using browser
+
+    This will be used as the current access token in all subsequent requests. This would
+    be the same as activating a personal access key or service-account access key.
+    """
+    do_login()
+
+
+@app.command()
+def whoami() -> None:
+    """
+    Validates authentication and fetches your user information
+    """
+    Rest.handle_get("/api/whoami")
+
+
+@app.command()
+def print_access_token() -> None:
+    """
+    Print current active access token
+    """
+    print(settings.read_secret_token())
+
+
+@app.command(help="Clear access token")
+def logout() -> None:
+    settings.clear_secret_token()
+    print("Access token removed")

cli/cloud/{auth.py → auth/login.py}

@@ -4,23 +4,13 @@ from http.server import BaseHTTPRequestHandler, HTTPServer
 from threading import Thread
 from typing import Any
 
-import typer
 from typing_extensions import override
 
 from cli import settings
-
-from . import auth_tokens
-from .rest_helper import RestHelper as Rest
-
-HELP = """
-Manage how you authenticate with our cloud platform
-"""
+from cli.cloud.rest_helper import RestHelper as Rest
 
 httpd: HTTPServer
 
-app = typer.Typer(help=HELP)
-app.add_typer(auth_tokens.app, name="tokens", help="Manage users personal access tokens")
-
 
 class S(BaseHTTPRequestHandler):
     def _set_response(self) -> None:
@@ -55,46 +45,10 @@ def start_local_webserver(server_class: type = HTTPServer, handler_class: type =
     httpd = server_class(server_address, handler_class)
 
 
-#
-# CLI commands go here
-#
-
-
-@app.command(name="login")
 def login() -> None:
     """
-    Login to the cli using browser
-
-    This will be used as the current access token in all subsequent requests. This would
-    be the same as activating a personal access key or service-account access key.
+    Initiate login using browser
     """
     start_local_webserver()
-    webbrowser.open(
-        f"{Rest.get_base_url()}/login?redirectUrl=http://localhost:{httpd.server_address[1]}",
-        new=1,
-        autoraise=True,
-    )
-
+    webbrowser.open_new_tab(f"{Rest.get_base_url()}/login?redirectUrl=http://localhost:{httpd.server_address[1]}")
     httpd.serve_forever()
-
-
-@app.command()
-def whoami() -> None:
-    """
-    Validates authentication and fetches your user information
-    """
-    Rest.handle_get("/api/whoami")
-
-
-@app.command()
-def print_access_token() -> None:
-    """
-    Print current active access token
-    """
-    print(settings.read_secret_token())
-
-
-@app.command(help="Clear access token")
-def logout() -> None:
-    settings.clear_secret_token()
-    print("Access token removed")

cli/cloud/cloud_cli.py

@@ -1,9 +1,8 @@
 import typer
 
+from cli.cloud import auth, brokers, configs, organisations, projects, recordings, sample_recordings, service_accounts, storage
 from cli.cloud.rest_helper import RestHelper
 
-from . import auth, brokers, configs, organisations, projects, recordings, sample_recordings, service_accounts, storage
-
 app = typer.Typer()
 
 

cli/cloud/storage/cmd.py

@@ -10,15 +10,14 @@ from cli.cloud.storage.uri_or_path import UriOrPath
 from cli.cloud.storage.uri_or_path import uri as uri_parser
 from cli.errors import ErrorPrinter
 
-app = typer.Typer(
-    rich_markup_mode="rich",
-    help="""
+HELP = """
 Manage files ([yellow]Beta feature not available for all customers[/yellow])
 
 Copy file from local to remote storage and vice versa, list and delete files.
 
-""",
-)
+"""
+
+app = typer.Typer(rich_markup_mode="rich", help=HELP)
 
 
 @app.command(name="ls")

cli/cloud/storage/uri.py

@@ -16,10 +16,37 @@ class JoinURIError(Exception):
 class URI:
     """
     Custom type for rcs (Remotive Cloud Storage) URIs.
+
+    The URI format follows the pattern: rcs://bucket/path/to/resource
     """
 
+    scheme: str
+    """The URI scheme (default: 'rcs')"""
+
+    path: str
+    """The full path component, including leading slash"""
+
+    filename: str
+    """The name of the file or last path segment"""
+
+    bucket: str
+    """The first path segment after the leading slash"""
+
+    parent: URI
+    """The parent URI. If at root, returns a copy of itself."""
+
     def __init__(self, value: str, scheme: str = "rcs"):
-        self.original_uri = value
+        """
+        Create a new URI.
+
+        Args:
+            value: The URI string in format "scheme://path/to/resource"
+            scheme: The URI scheme (default: 'rcs')
+
+        Raises:
+            InvalidURIError: If the URI format is invalid
+        """
+        self._raw = value
         self.scheme = scheme
 
         parsed = urlparse(value)
@@ -34,18 +61,39 @@ class URI:
 
         self._posix_path = PurePosixPath(self.path)
         self.filename = self._posix_path.name
+        self.bucket = self._posix_path.parts[1] if len(self._posix_path.parts) > 1 else ""
+
+        if self._posix_path == PurePosixPath("/"):
+            self.parent = self
+        else:
+            parent_path = self._posix_path.parent
+            new_uri = f"{self.scheme}://{str(parent_path)[1:]}"
+            self.parent = URI(new_uri, scheme=self.scheme)
 
     def is_dir(self) -> bool:
+        """Check if the URI points to a directory."""
         return self.path.endswith("/")
 
     def __truediv__(self, other: PathLike[str] | str) -> URI:
-        """Returns a new URI object with the joined path"""
+        """
+        Join this URI with another path component.
+
+        Args:
+            other: Path component to join
+
+        Returns:
+            A new URI with the joined path
+
+        Raises:
+            JoinURIError: If trying to join an absolute path
+            TypeError: If the path component is not a string or PathLike
+        """
         if str(other).startswith("/"):
             raise JoinURIError(f"Cannot join absolute path '{other}' to URI")
 
+        is_dir = str(other).endswith("/")
         new_path = self._posix_path / other
 
-        # handle relative paths
         for part in new_path.parts:
             if part == "..":
                 new_path = new_path.parent
@@ -53,7 +101,13 @@ class URI:
                 new_path = new_path / part
 
         new_uri = f"{self.scheme}://{new_path.relative_to('/')}"  # we need to strip the starting '/'
+        new_uri = new_uri if not is_dir else f"{new_uri}/"  # and append slash if the added path was a dir
         return URI(new_uri, scheme=self.scheme)
 
     def __str__(self) -> str:
-        return self.original_uri
+        """Return the original URI string."""
+        return self._raw
+
+    def __repr__(self) -> str:
+        """Return the original URI string."""
+        return f"URI({self._raw})"

{remotivelabs_cli-0.0.32.dist-info → remotivelabs_cli-0.0.34.dist-info}/METADATA

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.32
+Version: 0.0.34
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com
-Requires-Python: >=3.8,<3.12
+Requires-Python: >=3.8
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: grpc-stubs (>=1.53.0.5)
 Requires-Dist: mypy-protobuf (>=3.0.0)
 Requires-Dist: plotext (>=5.2,<6.0)

{remotivelabs_cli-0.0.32.dist-info → remotivelabs_cli-0.0.34.dist-info}/RECORD

@@ -3,18 +3,20 @@ cli/broker/brokers.py,sha256=oUadEL6xQ4bhXucBH-ZjL67VuERf19kn1g240v_lEpg,3197
 cli/broker/export.py,sha256=3sG9i6ZwOQW6snu87NSzOL2_giQTYQMzQlpPg7z8n78,4431
 cli/broker/files.py,sha256=_MVwitQ5Z9-lNDb3biXqnlkKti8rizTEw0nnAViussU,4181
 cli/broker/lib/__about__.py,sha256=xnZ5V6ZcHW9dhWLWdMzVjYJbEnMKpeXm0_S_mbNzypE,141
-cli/broker/lib/broker.py,sha256=iBv-uegVD6awnhkukV50CcZywIybEO3qvI0YU47KcGo,23949
+cli/broker/lib/broker.py,sha256=Ip9Fg3WskADWjaIO-315s0vCMtZxM5jwBFpK0QuuIPI,24515
 cli/broker/license_flows.py,sha256=qJplaeugkUiypFGPdEIl5Asqlf7W3geJ-wU-QbYMP_8,7216
 cli/broker/licenses.py,sha256=Ddl243re8RoeP9CoWWbIzwDePQ9l8r7ixmbd1gqn8f0,3973
 cli/broker/playback.py,sha256=hdDKXGPuIE3gcT-kgQltgn5jsPzK19Yh9hiNcgtkLX0,3992
 cli/broker/record.py,sha256=Oa6hUpS0Dgnt0f6Ig33vl0Jy8wN7wMXfemaxXWjRVoQ,1414
 cli/broker/scripting.py,sha256=8577_C6siOk90s4G1ItIfAoFIUAkS0ItUl5kqR0cD-k,3792
-cli/broker/signals.py,sha256=llok_jUGWOzAiiQUK54uRDnDuonBOAYBDbPdnzCFdog,7075
+cli/broker/signals.py,sha256=KflNaVFgsKFi1suec7fSkCfGhcJ0LfPTMRGVQUlsU-0,7058
 cli/cloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/cloud/auth.py,sha256=RBTDUGRBVsK28u-aeqzRIzHnW7FqH4KADlVlQEgBCww,2534
+cli/cloud/auth/__init__.py,sha256=MtQ01-n8CgZb9Y_SvxwZUgj44Yo0dFAU3_XwhQiUYtw,54
+cli/cloud/auth/cmd.py,sha256=T2o-T3KYQPZU5Ujj7IuOYA7icbv930hks14YA-4Gh1s,1077
+cli/cloud/auth/login.py,sha256=yhehYM97tcS6A7srVU4Olg8s58H0JJzfSl7yWp9a1VI,1607
 cli/cloud/auth_tokens.py,sha256=0U60Gk2-TnAUff5anZmTB1rOEninNvYy1o5ihCqgj8A,4525
 cli/cloud/brokers.py,sha256=DNj79MTkPylKUQbr-iPUhQgfNJLAW8UehnvgpEmNH_k,3890
-cli/cloud/cloud_cli.py,sha256=0VvFexnVnYvb1vueYxraHiH_WjbQp0Y42ttL_koDFh8,1255
+cli/cloud/cloud_cli.py,sha256=c_JMjAOsJnAw4TM7gkPWmEfrrQly6lAppvfHAmaUGmo,1262
 cli/cloud/configs.py,sha256=bZzZF-yNkZkfJK5baU0Xh_vQRrJkmuzEv8xx4_IkXZ8,4714
 cli/cloud/organisations.py,sha256=txKQmSQEpTmeqlqngai8pwgQQEvRgeDd0dT_VzZ7RNc,752
 cli/cloud/projects.py,sha256=YrwPJClC2Sq_y1HjPd_tzaiv4GEnnsXSXHBhtQCPdK0,1431
@@ -26,9 +28,9 @@ cli/cloud/sample_recordings.py,sha256=OVX32U1dkkkJZysbgr5Dy515oOQKnwBAbZYzV_QUu1
 cli/cloud/service_account_tokens.py,sha256=263u1bRmBKfYsxL6TV6YjReUBUaVHWc3ETCd7AS3DTU,2297
 cli/cloud/service_accounts.py,sha256=XOIPobUamCLIaufjyvb33XJDwy6uRqW5ZljZx3GYEfo,1659
 cli/cloud/storage/__init__.py,sha256=y6V0QswTVY7lHcy5kVUbNKIPc5tyWDqvhakcRFKV6HA,167
-cli/cloud/storage/cmd.py,sha256=kukFatuL-YOy6VC7FC4PvjjS1teQya7R__fNX0jdubY,2929
+cli/cloud/storage/cmd.py,sha256=Uq8tRJw9AYD8V4F5SeqUGKGfAZRdB-J3vHDdCbhfhCg,2931
 cli/cloud/storage/copy.py,sha256=thjdhqnFHSstsA5Iidz74c2o4zHfEaDXfRUGOpjWh1o,3228
-cli/cloud/storage/uri.py,sha256=uGEGggJp7Nnu3oUadBs9bAMUDf2e5YjhZ6gAdeYLBFI,1963
+cli/cloud/storage/uri.py,sha256=QZCus--KJQlVwGCOzZqiglvj8VvSRKxfVvN33Pilgyg,3616
 cli/cloud/storage/uri_or_path.py,sha256=rTjg9G0h8-jb4QUlza1YMqqs99ifrydnEL7o7rmidKQ,1166
 cli/connect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/connect/connect.py,sha256=U--6dtHxUlvE81J37rABFez4TbF7AXWOpZYZnL7sPMY,3994
@@ -37,11 +39,12 @@ cli/errors.py,sha256=CXYArw1W82bRFwJkJ3tD-Ek1huKeah502DGMvPxHYFo,1366
 cli/remotive.py,sha256=z834JeOwENyUM4bS74_zE95sGwu1efgfDVtCLKV5rV0,1789
 cli/settings.py,sha256=A5rtp_1oix7Com5aHCAHdwJqxoV2LgxpYXwCe40v7oY,2072
 cli/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli/tools/can/RemotiveLabs.can1.log,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/can.py,sha256=8uATViSFlpkdSiIm4fzbuQi1_m7V9Pym-K17TaJQRHU,2262
 cli/tools/tools.py,sha256=0KU-hXR1f9xHP4BOG9A9eXfmICLmNuQCOU8ueF6iGg0,198
-remotivelabs_cli-0.0.32.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.32.dist-info/METADATA,sha256=pvFD_mvS0qOntQP-7EAivZAPl1vKcNJDfzGSh-jwKEw,1311
-remotivelabs_cli-0.0.32.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-remotivelabs_cli-0.0.32.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.32.dist-info/RECORD,,
+remotivelabs_cli-0.0.34.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.34.dist-info/METADATA,sha256=_QH02sJMCawf9FDqD071Fs_UBJ9g5FUmauy3Ef53b2k,1356
+remotivelabs_cli-0.0.34.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+remotivelabs_cli-0.0.34.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.34.dist-info/RECORD,,