remoteRF-server 1.7.3__tar.gz → 1.7.6__tar.gz

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.3
+Version: 1.7.6
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.7.3"
+version = "1.7.6"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/src/remoteRF_server/server/device_manager.py

@@ -86,7 +86,10 @@ def _name_handle(name: str) -> str:
 
 def _is_connected(st: _DeviceState) -> bool:
     if st.origin == "local":
-        return st.dev is not None
+        # Drivers that survive an unplug (e.g. GPS reconnect loop) expose device.connected.
+        # Read __dict__ directly: PoePluto's __getattr__ would power the board on.
+        dev = getattr(st.dev, "device", None)
+        return st.dev is not None and getattr(dev, "__dict__", {}).get("connected", True) is not False
     # host
     return bool(st.online)
 

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/src/remoteRF_server/server/federation/cluster.py

@@ -1303,13 +1303,22 @@ def _walk_in(pools: list[dict], notify) -> None:
     active. Any other open door (an older lab's own) is ignored."""
     from . import global_home
 
-    if GLOBAL in load():
-        return
     state = global_home.load()
     home = (state.get("identity") or {}).get("deployment_id")
     party = state.get("party") or {}
+    clusters = load()
+    if GLOBAL in clusters and (clusters[GLOBAL].get("peer") == home or not home):
+        return
     if not home or party.get("state") != "active":
         return
+    if GLOBAL in clusters:
+        # Joined under an earlier Global home (this lab's state outlived a Global
+        # reset): drop it and rejoin the current one, keeping what it shared.
+        stale = clusters.pop(GLOBAL)
+        queued = state.setdefault("public_groups", [])
+        queued += [group_id for group_id in stale.get("groups", []) if group_id not in queued]
+        save(clusters)
+        global_home.save(state)
     for pool in pools:
         owner = (pool.get("owner") or {}).get("identity") or {}
         if pool.get("cluster_name") != GLOBAL or owner.get("deployment_id") != home:

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/src/remoteRF_server/server/grpc_server.py

@@ -65,6 +65,7 @@ from ..common.grpc import grpc_host_pb2_grpc as host_tunnel_pb2_grpc
 
 from pathlib import Path
 from prompt_toolkit import PromptSession
+from prompt_toolkit.input import DummyInput
 from prompt_toolkit.output import DummyOutput
 
 from ..tools.gist_status import start_status_publisher
@@ -120,15 +121,20 @@ def _get_port(name: str, *, default: int | None = None) -> int:
         raise SystemExit(f"{name} out of range (1..65535): {n}")
     return n
 
-try:
-    session = PromptSession()
-except Exception as exc:
-    if type(exc).__name__ != "NoConsoleScreenBufferError":
-        raise
-    # Importing the server in a headless process (tests, services, containers)
-    # may not provide a real console screen buffer. The interactive serve path
-    # still gets the normal output whenever one is available.
-    session = PromptSession(output=DummyOutput())
+if sys.stdin is not None and sys.stdin.isatty():
+    try:
+        session = PromptSession()
+    except Exception as exc:
+        if type(exc).__name__ != "NoConsoleScreenBufferError":
+            raise
+        # Importing the server in a headless process (tests, services, containers)
+        # may not provide a real console screen buffer. The interactive serve path
+        # still gets the normal output whenever one is available.
+        session = PromptSession(output=DummyOutput())
+else:
+    # No terminal on stdin (systemd, --headless, pipes): avoid prompt_toolkit's
+    # "Input is not a terminal" warning. Prompts hit EOF immediately.
+    session = PromptSession(input=DummyInput(), output=DummyOutput())
 BANNER_CREDIT = "Created by the Wireless Lab at UCLA"
 
 from dotenv import load_dotenv, find_dotenv

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.3
+Version: 1.7.6
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_contrib_drivers.py

@@ -236,3 +236,23 @@ def test_a_renumbered_csr_is_found_again_when_bluez_forgets_it(bt, sysfs):
     # A pinned adapter is not swapped for another one, and an error is no success.
     assert bt._run_coroutine_sync(pinned.set_powered_async, True) is False
     assert pinned.adapter_name == "hci1"
+
+
+# -- simulated SDR ----------------------------------------------------------
+
+
+def test_sim_sdr_matches_bundled_client_and_returns_tone():
+    import re
+
+    import numpy as np
+
+    sim = _load("sim_sdr_schema", {})
+    client = Path(__file__).resolve().parents[2] / "client/src/remoterf/drivers/sim_sdr/sim_sdr_remote.py"
+    bundled = re.search(r'_SCHEMA_HASH = "([^"]+)"', client.read_text()).group(1)
+    assert sim.SimSdrSchema().get_idl_hash() == bundled
+
+    dev = sim.SimSdrSchema.make_device()
+    dev.rx_buffer_size = 4096
+    iq = dev.rx()
+    assert iq.shape == (4096,) and iq.dtype == np.complex64
+    assert int(np.argmax(np.abs(np.fft.fft(iq)))) == 512

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_deployment_capabilities.py

@@ -35,8 +35,8 @@ class CapabilityTests(unittest.TestCase):
     def test_protected_proto_bytes(self):
         root=Path(__file__).resolve().parents[1]
         path='src/remoteRF_server/common/grpc/grpc.proto'
-        base=subprocess.check_output(['git','show','1452ad042782c659a2891e84e8d72f9d1ba3d9a1:'+path],cwd=root)
-        core=root/'packages/remoterf-device-core/src/remoterf_device_core/grpc/grpc.proto'  # moved here, same bytes
+        base=subprocess.check_output(['git','show','c2b5a414e1c316406b020c6731fdf91d8ad8bfac:./'+path],cwd=root)
+        core=root.parent/'packages/remoterf-device-core/src/remoterf_device_core/grpc/grpc.proto'  # moved here, same bytes
         self.assertEqual(base,core.read_bytes())
         fields=pb.DeploymentCapabilitiesResponse.DESCRIPTOR.fields_by_name
         self.assertEqual(fields['capabilities_json'].number,1)

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_gate_e_proto.py

@@ -7,7 +7,7 @@ from remoteRF_server.common.grpc import federation_pb2
 def test_federation_proto_source_hash_and_descriptor_are_canonical():
     root = Path(__file__).resolve().parents[1]
     proto = root / "src/remoteRF_server/common/grpc/federation.proto"
-    protected = root / "packages/remoterf-device-core/src/remoterf_device_core/grpc/grpc.proto"
+    protected = root.parent / "packages/remoterf-device-core/src/remoterf_device_core/grpc/grpc.proto"
     assert hashlib.sha256(proto.read_bytes()).hexdigest() == (
         "e890c399b61e8eb92e67762661c0ce99f3daacdb06b0139b34f26a749ff736c1"
     )

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_gate_i_direct_path.py

@@ -114,7 +114,7 @@ class PeerClassificationTests(unittest.TestCase):
             for host in ("127.0.0.1", "::1", "fe80::1", "10.4.5.6", "192.168.1.20",
                          "::ffff:192.168.1.20", "164.67.195.7"):
                 self.assertFalse(is_offsite(host), host)
-            for host in ("142.129.140.254", "164.67.196.1", "100.64.0.1", "2607:f8b0::1",
+            for host in ("8.8.4.4", "164.67.196.1", "100.64.0.1", "2607:f8b0::1",
                          "fd7a:115c:a1e0::8601:f120", "bogus"):
                 self.assertTrue(is_offsite(host), host)
 
@@ -194,12 +194,12 @@ class DispatchTests(unittest.TestCase):
 
     def test_control_plane_is_refused(self):
         for name in ("ACC:login", "ACC:get_dev", "echo", "RemoteAdmin:x"):
-            results, seen = self._run(name, "142.129.140.254")
+            results, seen = self._run(name, "8.8.4.4")
             self.assertIn("not available on the direct path", unmap_arg(results["a"]), name)
             self.assertEqual(seen, {})
 
     def test_device_plane_sets_relayed_from_the_peer(self):
-        results, seen = self._run("adalm_pluto:rx_lo:GET", "142.129.140.254")
+        results, seen = self._run("adalm_pluto:rx_lo:GET", "8.8.4.4")
         self.assertEqual(unmap_arg(results["echo"]), "adalm_pluto:rx_lo:GET")
         self.assertTrue(seen["relayed"])
         _, seen = self._run("IDL:get_drivers", "192.168.4.2")

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_global_home.py

@@ -81,6 +81,21 @@ class GlobalHomeContractTests(unittest.TestCase):
         self.assertEqual([c["contract_id"] for c in self.broker.call("GET", "/v2/broker/contracts")["contracts"]],
                          [party["contract_id"]])
 
+    def test_a_global_cluster_joined_under_an_earlier_home_is_rejoined_with_its_groups(self):
+        with self.server(H):
+            home_identity = cluster._identity()
+            cluster._public_note(cluster.GLOBAL, "open")
+        self._standing(B, home_identity)
+        with self.server(B):
+            # State from before a Global reset: the cluster names a home that is gone.
+            cluster.save({cluster.GLOBAL: {"role": "member", "state": "active", "public": True, "peer": C,
+                                           "contract_id": "8a2e3f10-0000-4000-8000-0000000000ff",
+                                           "published": [], "groups": [7]}})
+            cluster.tick(self.notes.append)
+            item = cluster.load()[cluster.GLOBAL]
+            self.assertEqual((item["peer"], item["contract_id"], item["groups"]), (H, global_home.contract_id(), [7]))
+            self.assertNotIn("public_groups", global_home.load())
+
     def _standing(self, lab, home_identity):
         """The lab proposes its standing contract; the home accepts; the lab sees it active."""
         with self.server(lab), mock.patch.object(global_home, "fetch_identity", return_value=home_identity):

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_usrp_client_server_hardware.py

@@ -41,7 +41,7 @@ def _add_client_source() -> None:
     if configured:
         candidates.append(Path(configured).expanduser())
     candidates.append(
-        Path(__file__).resolve().parents[2] / "RemoteRF-Client" / "src"
+        Path(__file__).resolve().parents[2] / "client" / "src"
     )
     for candidate in candidates:
         if (candidate / "remoteRF").is_dir():

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_usrp_client_server_localhost.py

@@ -43,7 +43,7 @@ def _add_client_source() -> None:
     if configured:
         candidates.append(Path(configured).expanduser())
     candidates.append(
-        Path(__file__).resolve().parents[2] / "RemoteRF-Client" / "src"
+        Path(__file__).resolve().parents[2] / "client" / "src"
     )
     for candidate in candidates:
         if (candidate / "remoteRF").is_dir():

{remoterf_server-1.7.3 → remoterf_server-1.7.6}/tests/test_usrp_n210_client_server_hardware.py

@@ -41,7 +41,7 @@ def _add_client_source() -> None:
     if configured:
         candidates.append(Path(configured).expanduser())
     candidates.append(
-        Path(__file__).resolve().parents[2] / "RemoteRF-Client" / "src"
+        Path(__file__).resolve().parents[2] / "client" / "src"
     )
     for candidate in candidates:
         if (candidate / "remoteRF").is_dir():