remoteRF-server 1.0.6__tar.gz → 1.0.8__tar.gz

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.0.6
+Version: 1.0.8
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -334,13 +334,13 @@ separate policy file. This includes transmit controls, transmit streaming,
 GPIO/register methods, and property-tree writes. `usrp_policy.yml` is not read
 or required by the current server.
 
-RemoteRF sets `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
+RemoteRF forces `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
 messages do not overwrite the interactive `serverrf` prompt. To temporarily
-restore UHD diagnostics, set a level such as `warning`, `info`, or `debug`
-before starting the server:
+restore UHD diagnostics, explicitly set `REMOTERF_UHD_CONSOLE_LEVEL` to a level
+such as `warning`, `info`, or `debug` before starting the server:
 
 ```bash
-UHD_LOG_CONSOLE_LEVEL=warning serverrf -s
+REMOTERF_UHD_CONSOLE_LEVEL=warning serverrf -s
 ```
 
 On every qualified target, generate the introspection record and enforce the

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/README.md

@@ -319,13 +319,13 @@ separate policy file. This includes transmit controls, transmit streaming,
 GPIO/register methods, and property-tree writes. `usrp_policy.yml` is not read
 or required by the current server.
 
-RemoteRF sets `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
+RemoteRF forces `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
 messages do not overwrite the interactive `serverrf` prompt. To temporarily
-restore UHD diagnostics, set a level such as `warning`, `info`, or `debug`
-before starting the server:
+restore UHD diagnostics, explicitly set `REMOTERF_UHD_CONSOLE_LEVEL` to a level
+such as `warning`, `info`, or `debug` before starting the server:
 
 ```bash
-UHD_LOG_CONSOLE_LEVEL=warning serverrf -s
+REMOTERF_UHD_CONSOLE_LEVEL=warning serverrf -s
 ```
 
 On every qualified target, generate the introspection record and enforce the

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.0.6"
+version = "1.0.8"
 description = "RemoteRF server-side control package"
 requires-python = ">=3.10"
 dependencies = [

{remoterf_server-1.0.6/src/remoteRF_server/drivers/adalm_pluto → remoterf_server-1.0.8/src/remoteRF_server/common/idl}/pluto_schema.py

@@ -8,6 +8,26 @@ import subprocess
 import re
 import adi
 
+
+def _normalize_channels(value):
+    """Restore channel lists after numeric lists cross the legacy RPC codec."""
+    if hasattr(value, "tolist"):
+        value = value.tolist()
+    if isinstance(value, tuple):
+        value = list(value)
+    if not isinstance(value, list):
+        return value
+
+    channels = []
+    for channel in value:
+        if not isinstance(channel, str):
+            integer = int(channel)
+            if channel == integer:
+                channel = integer
+        channels.append(channel)
+    return channels
+
+
 # == PLUTO Connection Logic ==
 
 def connect_pluto(*, serial: str):
@@ -50,7 +70,7 @@ class PlutoSchema(DeviceSchema):
 
     device_type = "adalm_pluto"
     client_class = "Pluto"
-    driver_version = "0.0.1"
+    driver_version = "0.0.2"
 
     @staticmethod
     def make_device(**kwargs):
@@ -85,13 +105,13 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="get")
     def get_rx_hardwaregain_chan0(self):
-        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
-        return self.device.hardwaregain_chan0
+        """RX hardware gain (dB). pyadi-iio attribute: rx_hardwaregain_chan0"""
+        return self.device.rx_hardwaregain_chan0
 
     @idl_expose(kind="set")
     def set_rx_hardwaregain_chan0(self, value):
-        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
-        self.device.hardwaregain_chan0 = value
+        """RX hardware gain (dB). pyadi-iio attribute: rx_hardwaregain_chan0"""
+        self.device.rx_hardwaregain_chan0 = value
 
     @idl_expose(kind="get")
     def get_tx_hardwaregain_chan0(self):
@@ -180,6 +200,109 @@ class PlutoSchema(DeviceSchema):
         """Disable the internal DDS tone generator."""
         self.device.disable_dds()
 
+    # region DDS
+
+    @idl_expose(kind="call")
+    def call_dds_single_tone(self, frequency, scale, channel=0):
+        """Generate one complex DDS tone on the selected TX channel."""
+        self.device.dds_single_tone(frequency, scale, channel)
+
+    @idl_expose(kind="call")
+    def call_dds_dual_tone(
+        self,
+        frequency1,
+        scale1,
+        frequency2,
+        scale2,
+        channel=0,
+    ):
+        """Generate two complex DDS tones on the selected TX channel."""
+        self.device.dds_dual_tone(
+            frequency1,
+            scale1,
+            frequency2,
+            scale2,
+            channel,
+        )
+
+    @idl_expose(kind="get")
+    def get_dds_frequencies(self):
+        return self.device.dds_frequencies
+
+    @idl_expose(kind="set")
+    def set_dds_frequencies(self, value):
+        self.device.dds_frequencies = value
+
+    @idl_expose(kind="get")
+    def get_dds_scales(self):
+        return self.device.dds_scales
+
+    @idl_expose(kind="set")
+    def set_dds_scales(self, value):
+        self.device.dds_scales = value
+
+    @idl_expose(kind="get")
+    def get_dds_phases(self):
+        return self.device.dds_phases
+
+    @idl_expose(kind="set")
+    def set_dds_phases(self, value):
+        self.device.dds_phases = value
+
+    @idl_expose(kind="get")
+    def get_dds_enabled(self):
+        return self.device.dds_enabled
+
+    @idl_expose(kind="set")
+    def set_dds_enabled(self, value):
+        self.device.dds_enabled = value
+
+    # endregion
+
+    # region channel configuration
+
+    @idl_expose(kind="get")
+    def get_rx_enabled_channels(self):
+        return self.device.rx_enabled_channels
+
+    @idl_expose(kind="set")
+    def set_rx_enabled_channels(self, value):
+        self.device.rx_enabled_channels = _normalize_channels(value)
+
+    @idl_expose(kind="get")
+    def get_tx_enabled_channels(self):
+        return self.device.tx_enabled_channels
+
+    @idl_expose(kind="set")
+    def set_tx_enabled_channels(self, value):
+        self.device.tx_enabled_channels = _normalize_channels(value)
+
+    @idl_expose(kind="get")
+    def get_rx_annotated(self):
+        return self.device.rx_annotated
+
+    @idl_expose(kind="set")
+    def set_rx_annotated(self, value):
+        self.device.rx_annotated = value
+
+    @idl_expose(kind="get")
+    def get_rx_output_type(self):
+        return self.device.rx_output_type
+
+    @idl_expose(kind="set")
+    def set_rx_output_type(self, value):
+        self.device.rx_output_type = value
+
+    @idl_expose(kind="get")
+    def get_rx_channel_names(self):
+        return self.device.rx_channel_names
+
+    @idl_expose(kind="get")
+    def get_tx_channel_names(self):
+        return self.device.tx_channel_names
+
+    # endregion
+
     # endregion
 
     # region ip / repr

{remoterf_server-1.0.6/src/remoteRF_server/common/idl → remoterf_server-1.0.8/src/remoteRF_server/drivers/adalm_pluto}/pluto_schema.py

@@ -8,6 +8,26 @@ import subprocess
 import re
 import adi
 
+
+def _normalize_channels(value):
+    """Restore channel lists after numeric lists cross the legacy RPC codec."""
+    if hasattr(value, "tolist"):
+        value = value.tolist()
+    if isinstance(value, tuple):
+        value = list(value)
+    if not isinstance(value, list):
+        return value
+
+    channels = []
+    for channel in value:
+        if not isinstance(channel, str):
+            integer = int(channel)
+            if channel == integer:
+                channel = integer
+        channels.append(channel)
+    return channels
+
+
 # == PLUTO Connection Logic ==
 
 def connect_pluto(*, serial: str):
@@ -50,7 +70,7 @@ class PlutoSchema(DeviceSchema):
 
     device_type = "adalm_pluto"
     client_class = "Pluto"
-    driver_version = "0.0.1"
+    driver_version = "0.0.2"
 
     @staticmethod
     def make_device(**kwargs):
@@ -85,13 +105,13 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="get")
     def get_rx_hardwaregain_chan0(self):
-        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
-        return self.device.hardwaregain_chan0
+        """RX hardware gain (dB). pyadi-iio attribute: rx_hardwaregain_chan0"""
+        return self.device.rx_hardwaregain_chan0
 
     @idl_expose(kind="set")
     def set_rx_hardwaregain_chan0(self, value):
-        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
-        self.device.hardwaregain_chan0 = value
+        """RX hardware gain (dB). pyadi-iio attribute: rx_hardwaregain_chan0"""
+        self.device.rx_hardwaregain_chan0 = value
 
     @idl_expose(kind="get")
     def get_tx_hardwaregain_chan0(self):
@@ -180,6 +200,109 @@ class PlutoSchema(DeviceSchema):
         """Disable the internal DDS tone generator."""
         self.device.disable_dds()
 
+    # region DDS
+
+    @idl_expose(kind="call")
+    def call_dds_single_tone(self, frequency, scale, channel=0):
+        """Generate one complex DDS tone on the selected TX channel."""
+        self.device.dds_single_tone(frequency, scale, channel)
+
+    @idl_expose(kind="call")
+    def call_dds_dual_tone(
+        self,
+        frequency1,
+        scale1,
+        frequency2,
+        scale2,
+        channel=0,
+    ):
+        """Generate two complex DDS tones on the selected TX channel."""
+        self.device.dds_dual_tone(
+            frequency1,
+            scale1,
+            frequency2,
+            scale2,
+            channel,
+        )
+
+    @idl_expose(kind="get")
+    def get_dds_frequencies(self):
+        return self.device.dds_frequencies
+
+    @idl_expose(kind="set")
+    def set_dds_frequencies(self, value):
+        self.device.dds_frequencies = value
+
+    @idl_expose(kind="get")
+    def get_dds_scales(self):
+        return self.device.dds_scales
+
+    @idl_expose(kind="set")
+    def set_dds_scales(self, value):
+        self.device.dds_scales = value
+
+    @idl_expose(kind="get")
+    def get_dds_phases(self):
+        return self.device.dds_phases
+
+    @idl_expose(kind="set")
+    def set_dds_phases(self, value):
+        self.device.dds_phases = value
+
+    @idl_expose(kind="get")
+    def get_dds_enabled(self):
+        return self.device.dds_enabled
+
+    @idl_expose(kind="set")
+    def set_dds_enabled(self, value):
+        self.device.dds_enabled = value
+
+    # endregion
+
+    # region channel configuration
+
+    @idl_expose(kind="get")
+    def get_rx_enabled_channels(self):
+        return self.device.rx_enabled_channels
+
+    @idl_expose(kind="set")
+    def set_rx_enabled_channels(self, value):
+        self.device.rx_enabled_channels = _normalize_channels(value)
+
+    @idl_expose(kind="get")
+    def get_tx_enabled_channels(self):
+        return self.device.tx_enabled_channels
+
+    @idl_expose(kind="set")
+    def set_tx_enabled_channels(self, value):
+        self.device.tx_enabled_channels = _normalize_channels(value)
+
+    @idl_expose(kind="get")
+    def get_rx_annotated(self):
+        return self.device.rx_annotated
+
+    @idl_expose(kind="set")
+    def set_rx_annotated(self, value):
+        self.device.rx_annotated = value
+
+    @idl_expose(kind="get")
+    def get_rx_output_type(self):
+        return self.device.rx_output_type
+
+    @idl_expose(kind="set")
+    def set_rx_output_type(self, value):
+        self.device.rx_output_type = value
+
+    @idl_expose(kind="get")
+    def get_rx_channel_names(self):
+        return self.device.rx_channel_names
+
+    @idl_expose(kind="get")
+    def get_tx_channel_names(self):
+        return self.device.tx_channel_names
+
+    # endregion
+
     # endregion
 
     # region ip / repr

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/src/remoteRF_server/drivers/usrp/usrp_schema.py

@@ -11,7 +11,10 @@ import os
 
 def _configure_uhd_console_logging():
     """Keep native UHD logs out of the interactive server console by default."""
-    os.environ.setdefault("UHD_LOG_CONSOLE_LEVEL", "off")
+    os.environ["UHD_LOG_CONSOLE_LEVEL"] = os.getenv(
+        "REMOTERF_UHD_CONSOLE_LEVEL",
+        "off",
+    )
 
 
 _configure_uhd_console_logging()
@@ -95,6 +98,31 @@ def _payload_type(value):
     return None
 
 
+def _tune_request_policy(value, current):
+    """Translate a portable policy name back to UHD's native enum value."""
+    if not isinstance(value, str):
+        return value
+    name = value.rsplit(".", 1)[-1].upper()
+    policy_types = (
+        type(current),
+        getattr(getattr(uhd, "types", None), "TuneRequestPolicy", None),
+        getattr(getattr(uhd, "types", None), "tune_request_policy", None),
+        getattr(
+            getattr(getattr(uhd, "libpyuhd", None), "types", None),
+            "tune_request_policy",
+            None,
+        ),
+    )
+    for policy_type in policy_types:
+        if policy_type is None:
+            continue
+        for candidate in (name, name.lower(), f"POLICY_{name}"):
+            native = getattr(policy_type, candidate, None)
+            if native is not None:
+                return native
+    return value
+
+
 def _require_dict(value, method):
     if not isinstance(value, dict):
         raise TypeError(
@@ -156,7 +184,16 @@ def _construct(value):
         return uhd.usrp.SubdevSpec(value["spec"])
 
     if kind == "TuneRequest":
-        args = [_construct(item) for item in value.get("args", ())]
+        # Older generated clients used ``args`` for constructor arguments.
+        # Current TuneRequest snapshots use that same key for UHD's DeviceAddr
+        # field, so only sequences may be interpreted as constructor arguments.
+        raw_args = value.get("args", ())
+        legacy_constructor_args = isinstance(raw_args, (list, tuple))
+        args = (
+            [_construct(item) for item in raw_args]
+            if legacy_constructor_args
+            else []
+        )
         kwargs = {
             key: _construct(item)
             for key, item in value.get("kwargs", {}).items()
@@ -171,10 +208,18 @@ def _construct(value):
         obj = constructor(*args, **kwargs)
         for field in (
             "rf_freq", "dsp_freq", "rf_freq_policy", "dsp_freq_policy",
-            "target_freq", "lo_offset", "args",
+            "args",
         ):
+            if field == "args" and legacy_constructor_args:
+                continue
             if field in value and hasattr(obj, field):
-                setattr(obj, field, _construct(value[field]))
+                converted = _construct(value[field])
+                if field in {"rf_freq_policy", "dsp_freq_policy"}:
+                    converted = _tune_request_policy(
+                        converted,
+                        getattr(obj, field),
+                    )
+                setattr(obj, field, converted)
         return obj
 
     if kind == "DeviceAddr":

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/src/remoteRF_server/server/device_manager.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import os
 import re
 import shutil
+import hashlib
 import time
 import yaml
 import threading
@@ -419,10 +420,60 @@ def _driver_registers_type(path: Path, device_type: str) -> bool:
     pattern = rf"(?:idl_register|register_driver)\(\s*['\"]{re.escape(device_type)}['\"]\s*\)"
     return re.search(pattern, text) is not None
 
-def _seed_default_driver(filename: str, *device_types: str) -> None:
+def _driver_sha256(path: Path) -> str:
+    digest = hashlib.sha256()
+    with path.open("rb") as handle:
+        for chunk in iter(lambda: handle.read(1024 * 1024), b""):
+            digest.update(chunk)
+    return digest.hexdigest()
+
+
+def _managed_driver_marker(target: Path) -> Path:
+    return target.with_name(f".{target.name}.remoterf-managed")
+
+
+def _refresh_managed_driver(
+    target: Path,
+    source: Path,
+    *,
+    legacy_hashes: tuple[str, ...] = (),
+) -> bool:
+    """Refresh an unmodified RemoteRF-managed schema and preserve user edits."""
+    marker = _managed_driver_marker(target)
+    try:
+        target_hash = _driver_sha256(target)
+        marker_hash = marker.read_text(encoding="utf-8").strip() if marker.exists() else ""
+    except OSError:
+        return False
+
+    if target_hash != marker_hash and target_hash not in legacy_hashes:
+        return False
+
+    try:
+        source_hash = _driver_sha256(source)
+        if target_hash != source_hash:
+            shutil.copy2(source, target)
+        marker.write_text(source_hash + "\n", encoding="utf-8")
+    except OSError:
+        return False
+    return True
+
+
+def _seed_default_driver(
+    filename: str,
+    *device_types: str,
+    legacy_hashes: tuple[str, ...] = (),
+) -> None:
     drivers_dir = get_drivers_dir()
     target = drivers_dir / filename
+    source = _packaged_driver_schema_path(filename)
     if target.exists() or target.is_symlink():
+        if target.is_file() and source.exists():
+            _refresh_managed_driver(
+                target,
+                source,
+                legacy_hashes=legacy_hashes,
+            )
         return
 
     try:
@@ -437,13 +488,16 @@ def _seed_default_driver(filename: str, *device_types: str) -> None:
         if any(_driver_registers_type(driver_file, device_type) for device_type in device_types):
             return
 
-    source = _packaged_driver_schema_path(filename)
     if not source.exists():
         print(f"Warning: default driver schema source is missing: {source}")
         return
 
     try:
         shutil.copy2(source, target)
+        _managed_driver_marker(target).write_text(
+            _driver_sha256(source) + "\n",
+            encoding="utf-8",
+        )
         print(f"Created default driver config at {target}")
     except OSError as e:
         print(f"Warning: could not create default driver config {target}: {e}")
@@ -453,7 +507,19 @@ def _seed_default_pluto_drivers() -> None:
     _seed_default_driver("pluto_mimo_schema.py", "adalm_pluto_mimo")
 
 def _seed_default_usrp_driver() -> None:
-    _seed_default_driver("usrp_schema.py", "usrp")
+    _seed_default_driver(
+        "usrp_schema.py",
+        "usrp",
+        legacy_hashes=(
+            # Previously shipped built-in copies. These are safe to refresh;
+            # any edited/custom schema has a different digest and is preserved.
+            "ec30aaadb1e8edec289de01e4f997aa3c8b59d3fd0a69c5ac94b37b05dac7a65",
+            "baf29cd0f22e84891b546c30c963cddb02bc93db0efb50fe32cc743c8600c227",
+            "01360d017359d6cb65761b78b5c2bb570b8f2f55e8ab280ba23d6813deddb233",
+            "ca32b958759a5f7933e10426a320ca74e7546734524749ea510de83cf5084397",
+            "0d185cd24571bae2d5f75d6c28164694918a86b20854b96fe9b77c475ca28ed1",
+        ),
+    )
 
 def _load_all_drivers() -> None:
     _seed_default_pluto_drivers()

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/src/remoteRF_server/serverrf_cli.py

@@ -339,8 +339,13 @@ def _serve(*, headless: bool = False) -> int:
 
     # UHD writes native log messages to stderr/std::clog. Set this before the
     # server imports device drivers so those messages cannot corrupt the
-    # interactive prompt. An explicit administrator setting still wins.
-    os.environ.setdefault("UHD_LOG_CONSOLE_LEVEL", "off")
+    # interactive prompt. RemoteRF keeps this off even when the surrounding
+    # shell has a noisy UHD default; diagnostics require an explicit RemoteRF
+    # opt-in.
+    os.environ["UHD_LOG_CONSOLE_LEVEL"] = os.getenv(
+        "REMOTERF_UHD_CONSOLE_LEVEL",
+        "off",
+    )
 
     from remoteRF_server.server.grpc_server import (
         headless_main,

{remoterf_server-1.0.6 → remoterf_server-1.0.8}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.0.6
+Version: 1.0.8
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -334,13 +334,13 @@ separate policy file. This includes transmit controls, transmit streaming,
 GPIO/register methods, and property-tree writes. `usrp_policy.yml` is not read
 or required by the current server.
 
-RemoteRF sets `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
+RemoteRF forces `UHD_LOG_CONSOLE_LEVEL=off` before importing UHD so native UHD
 messages do not overwrite the interactive `serverrf` prompt. To temporarily
-restore UHD diagnostics, set a level such as `warning`, `info`, or `debug`
-before starting the server:
+restore UHD diagnostics, explicitly set `REMOTERF_UHD_CONSOLE_LEVEL` to a level
+such as `warning`, `info`, or `debug` before starting the server:
 
 ```bash
-UHD_LOG_CONSOLE_LEVEL=warning serverrf -s
+REMOTERF_UHD_CONSOLE_LEVEL=warning serverrf -s
 ```
 
 On every qualified target, generate the introspection record and enforce the