RemoteRF 2.6.0__tar.gz → 2.6.2__tar.gz

{remoterf-2.6.0/src/remoterf.egg-info → remoterf-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.6.0
+Version: 2.6.2
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later

{remoterf-2.6.0 → remoterf-2.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoterf"
-version = "2.6.0"
+version = "2.6.2"
 description = "A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts."
 readme = "README.md"
 license = "GPL-3.0-or-later"

{remoterf-2.6.0 → remoterf-2.6.2}/src/remoterf/core/app.py

@@ -567,7 +567,7 @@ def _federated_devices():
             deployment = dev["deployment_name"]
             printf(f"  @{deployment}", (Sty.BOLD, Sty.MAGENTA))
         state = "online" if dev["online"] else "offline"
-        printf("    Device Name: ", Sty.GRAY, f"{dev['display_name']}{_handle_tag(dev)}", Sty.DEFAULT, f" ({dev['device_type'] or 'unknown'}, {state})", Sty.GRAY)
+        printf(f"    ({state}) ", Sty.GREEN if dev["online"] else Sty.GRAY, f"{dev['display_name']}{_handle_tag(dev)}", Sty.DEFAULT)
     if data.get("incomplete"):
         printf(f"{data['omitted_count']} more deployment(s) were not queried.", Sty.WARNING)
     return data
@@ -939,8 +939,9 @@ def _print_native_devices(rows, *, numbered=False):
             lab = row["lab"]
             printf(f"  @{lab}", (Sty.BOLD, Sty.MAGENTA))
         prefix = (f"{index}. ", Sty.CYAN) if numbered else ()
-        printf(*prefix, "    Device Name: " if not numbered else "  Device Name: ", Sty.GRAY,
-               row["name"], Sty.DEFAULT, f" ({row['state']})" if row["state"] else "", Sty.GRAY)
+        state = row["state"] or ""
+        printf(*prefix, ("    " if not numbered else "") + (f"({state}) " if state else ""),
+               Sty.GREEN if state.startswith("online") else Sty.GRAY, row["name"], Sty.DEFAULT)
 
 
 def devices():
@@ -1209,13 +1210,16 @@ def enroll(code=None):
     # Codes are handed out as <lab>/<code>; the lab part only says where to
     # register. Here we are already logged in somewhere, so strip it -- and
     # say so if it names a different lab than this one.
+    typed = code
     try:
         from remoterf.deployment import homes
 
         host, code = homes.parse_code(code)
     except Exception:  # noqa: BLE001 - not in that form; send as typed
         host = None
-    if host and home_name and homes.home_name_for(host) != home_name:
+    if account.is_https_home:
+        code = typed  # Global enrols at the lab the invite names, so it needs the whole invite
+    elif host and home_name and homes.home_name_for(host) != home_name:
         printf(f"That code is for {host}, not {home_name}. Register there with: remoterf -r", Sty.WARNING)
         return False
     account.enrollment_code = code

{remoterf-2.6.0 → remoterf-2.6.2/src/remoterf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.6.0
+Version: 2.6.2
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later

{remoterf-2.6.0 → remoterf-2.6.2}/tests/test_device_routes.py

@@ -618,7 +618,7 @@ def test_resdev_n_lists_numbered_devices(monkeypatch):
     lines = _shown(monkeypatch, client_app)
     account, _ = _native_shell(monkeypatch, client_app, ["1", "2026-01-01 10:00", "2026-01-01 11:00"])
     client_app.reserve()
-    assert "1.   Device Name: Pluto SDR (OTA) [PlutoA] (online)" in lines
+    assert "1. (online) Pluto SDR (OTA) [PlutoA]" in lines
     assert _row(lines, "Device", "handle", "PlutoA@ucla")
     assert account.reserve_device.call_args.args[0] == 3