RemoteRF 2.3.0__tar.gz → 2.3.1__tar.gz

{remoterf-2.3.0/src/remoterf.egg-info → remoterf-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.3.0
+Version: 2.3.1
 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.3.0 → remoterf-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoterf"
-version = "2.3.0"
+version = "2.3.1"
 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.3.0 → remoterf-2.3.1}/src/remoterf/core/app.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from remoterf.core.grpc_client import addr as server_addr, handle_admin_command
+from remoterf.core.grpc_client import addr as server_addr, handle_admin_command, _key
 from . import *
 from ..common.utils import *
 
@@ -146,9 +146,16 @@ def _routable(token):
 
 
 def _name_and_handle(name):
-    """A listed device name, 'Pluto SDR [PlutoA]' -> ('Pluto SDR', 'PlutoA')."""
+    """A listed device name -> (name, handle). The handle is the name keyed,
+    'Pluto SDR' -> 'Pluto_SDR' (None when the lab can't address it), unless a
+    1.2.0 lab tags it: 'Pluto SDR [PlutoA]'."""
     m = _HANDLE_TAG.match(name)
-    return (m["name"], m["handle"]) if m else (name, None)
+    if m:
+        return m["name"], m["handle"]
+    h = _key(name)
+    # The lab's is_device_handle (core 0.19.0; this client pins 0.16.0).
+    ok = h and not h.startswith(("rfg_", "bridge-")) and not any(c in "@:" or c.isspace() or not c.isprintable() for c in h)
+    return name, h if ok else None
 
 
 def _print_reserved(where, when, token, handle, logged_in_to, install, no_handle=_NO_HANDLE):
@@ -519,7 +526,9 @@ def _render_destinations(entries):
 
 
 def _handle_tag(dev):
-    return f" [{dev['handle']}]" if dev.get("handle") else ""
+    """' [handle]' only when it isn't just the name."""
+    h = dev.get("handle")
+    return f" [{h}]" if h and _key(dev.get("display_name") or "") != _key(h) else ""
 
 
 def _federated_devices():

{remoterf-2.3.0 → remoterf-2.3.1}/src/remoterf/core/grpc_client.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import os
+import re
 import sys
 import threading
 from dataclasses import dataclass
@@ -421,8 +422,15 @@ def _lab(t, x, dep, connection):
     return DeviceRoute(unmap_arg(results["Token"]), kind, connection, res_id=res_id)
 
 
+def _key(s):
+    """A device name as a handle: 'pluto A', 'pluto_A' and 'pluto__A' are one.
+    Only for comparing names; never rewrite a string that may be a token."""
+    return re.sub(r"[\s_]+", "_", s).strip("_")
+
+
 def _global_handle(x, dep):
     """A handle on a device Global lists for this user, as its ref (None: no match)."""
+    key = _key(x)
     try:
         backend = federated_backend()
         dep_id = _deployment_id(dep)
@@ -430,7 +438,7 @@ def _global_handle(x, dep):
         return None
     matches = [
         d for d in backend.devices()["devices"]
-        if d.get("deployment_id") == dep_id and d.get("handle") == x
+        if key and d.get("deployment_id") == dep_id and _key(d.get("handle") or "") == key
     ]
     if len(matches) > 1:
         raise RuntimeError(f"{x}@{dep}: more than one device has that handle")

{remoterf-2.3.0 → remoterf-2.3.1/src/remoterf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.3.0
+Version: 2.3.1
 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.3.0 → remoterf-2.3.1}/tests/test_device_routes.py

@@ -182,6 +182,7 @@ def test_a_handle_is_exchanged_once_at_the_active_lab(monkeypatch, routes):
 @pytest.mark.parametrize("reply, wire, printed", [
     ({"Token": "Zm9vYmFy"}, "Zm9vYmFy", False),  # not a handle: the lab hands it back
     ({"Token": "SuperTok_3_force"}, "SuperTok_3_force", False),  # <super token>@<lab>: same path
+    ({"Token": "Zm9v__YmFy"}, "Zm9v__YmFy", False),  # a token is never keyed
     ({"Token": "PlutoA", "why": "no active reservation of yours on PlutoA right now"}, "PlutoA", True),
     ({"ace": "No matching server function to call: device_token"}, "PlutoA", False),  # old server
 ])
@@ -191,6 +192,7 @@ def test_the_lab_decides_handle_or_token(monkeypatch, routes, capsys, reply, wir
     t = f"{reply.get('Token', 'PlutoA')}@ucla" if "why" not in reply else "PlutoA@ucla"
     for _ in range(2):
         grpc_client.rpc_client(function_name=GET, args={"a": map_arg(t)})
+    assert routes.calls[0] == ("ACC:device_token", {"un": "jdoe", "pw": "s3cret", "h": t[:-len("@ucla")]})
     assert [c for c in routes.calls if c[0] == GET] == [(GET, {"a": wire})] * 2
     err = capsys.readouterr().err
     if printed:
@@ -338,6 +340,12 @@ def test_a_global_user_handle_maps_to_the_listed_device(monkeypatch, routes):
     monkeypatch.setattr(grpc_client, "federated_backend", lambda: SimpleNamespace(devices=lambda: listing))
     monkeypatch.setattr(homes, "discover", lambda host: {"deployment_id": DEST})
     assert grpc_client.device_route("PlutoA@ucla") == grpc_client.DeviceRoute(REF, "global")
+    # The handle is the name: spaces and underscores are one.
+    assert grpc_client._key("pluto A") == grpc_client._key("pluto_A") == grpc_client._key(" pluto\tA ") \
+        == grpc_client._key("pluto__A") == "pluto_A"
+    listing["devices"][1]["handle"] = "pluto_A"
+    for typed in ("pluto A@ucla", "pluto__A@ucla"):
+        assert grpc_client.device_route(typed) == grpc_client.DeviceRoute(REF, "global")
     with pytest.raises(RuntimeError) as exc:
         grpc_client.device_route("PlutoB@ucla")
     assert str(exc.value) == _unreachable("ucla")
@@ -436,7 +444,7 @@ def test_a_lab_reservation_shows_the_token_and_the_handle(monkeypatch):
     account.install_reserved_driver.assert_called_once_with("Zm9vYmFy", 3)
 
 
-def test_a_device_without_a_handle_shows_only_the_token(monkeypatch):
+def test_an_untagged_device_is_reached_by_its_name(monkeypatch):
     import datetime
     import remoterf.core.app as client_app
 
@@ -448,10 +456,9 @@ def test_a_device_without_a_handle_shows_only_the_token(monkeypatch):
     monkeypatch.setattr(client_app, "home_name", "ucla")
     client_app._native_reserve_slot(4, datetime.date(2026, 1, 1), (0, 1), "10:00", "11:00",
                                     device_label="USRP B210 (online)")
-    assert "Reservation successful on USRP B210 @ucla for 2026-01-01 10:00-11:00." in lines
-    assert _row(lines, "Token", "Zm9vYmFy@ucla") and not any("Device handle" in line for line in lines)
-    assert any("This device has no handle" in line for line in lines)
-    assert '  sdr = uhd.usrp.MultiUSRP(token="Zm9vYmFy@ucla")' in lines
+    assert "Reservation successful on USRP_B210 @ucla for 2026-01-01 10:00-11:00." in lines
+    assert _row(lines, "Token", "Zm9vYmFy@ucla") and _row(lines, "Device", "handle", "USRP_B210@ucla")
+    assert '  sdr = uhd.usrp.MultiUSRP(token="USRP_B210@ucla")' in lines
     # A failed driver install: the token is still shown, just no usage lines.
     lines.clear()
     account.install_reserved_driver.return_value = None
@@ -514,6 +521,7 @@ def test_a_global_listing_shows_the_handle():
 
     assert client_app._handle_tag({"handle": "PlutoA"}) == " [PlutoA]"
     assert client_app._handle_tag({}) == ""
+    assert client_app._handle_tag({"display_name": "pluto A", "handle": "pluto_A"}) == ""
 
 
 def test_install_after_a_global_reservation_uses_the_ref():
@@ -598,7 +606,9 @@ def test_a_handle_is_the_last_bracketed_word():
 
     assert client_app._name_and_handle("SimSDR-0 [Lab]A]") == ("SimSDR-0", "Lab]A")
     assert client_app._name_and_handle("Bench [x] [B1]") == ("Bench [x]", "B1")
-    assert client_app._name_and_handle("Bench [a b]") == ("Bench [a b]", None)
+    assert client_app._name_and_handle("Bench [a b]") == ("Bench [a b]", "Bench_[a_b]")
+    assert client_app._name_and_handle("pluto A") == ("pluto A", "pluto_A")
+    assert [client_app._name_and_handle(n)[1] for n in ("a@b", "rfg_x", "bridge-x", " _ ")] == [None] * 4
 
 
 def test_a_shell_without_a_home_shows_the_profiles_lab(monkeypatch):