remoteRF-server-testing 0.0.11__tar.gz → 0.0.13__tar.gz

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.11
+Version: 0.0.13
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/pyproject.toml

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

remoterf_server_testing-0.0.13/src/remoteRF_server/drivers/adalm_pluto/pluto_schema.py

@@ -0,0 +1,228 @@
+# SAMPLE schema for ADI Pluto SDR.
+# Place into -> ~/.config/remoterf/drivers and restart server to utilize!
+
+
+from remoteRF_server.common.idl import DeviceSchema, idl_register, idl_expose
+
+import subprocess
+import re
+import adi
+
+# == PLUTO Connection Logic ==
+
+def connect_pluto(*, serial: str):
+    serial = (serial or "").strip()
+    if not serial:
+        print("A Pluto serial must be provided")
+        return None
+
+    try:
+        out = subprocess.check_output(
+            ["iio_info", "-s"],
+            text=True,
+            stderr=subprocess.STDOUT
+        )
+
+        usb = None
+        for line in out.splitlines():
+            if (f"serial={serial}" in line) or (f"hw_serial={serial}" in line):
+                m = re.search(r"\[usb:([^\]]+)\]", line)
+                if m:
+                    usb = m.group(1).strip()
+                    break
+
+        if not usb:
+            print(f"No device found with serial {serial}")
+            return None
+
+        dev = adi.Pluto(f"usb:{usb}")
+        print(f"Connected to Pluto serial={serial} via usb:{usb}")
+        return dev
+
+    except Exception as e:
+        print(f"Failed to connect to Pluto serial={serial}: {e}")
+        return None
+
+# ========================= PLUTO Schema =========================
+
+@idl_register("pluto")
+class PlutoSchema(DeviceSchema):
+
+    device_type = "pluto"
+    driver_version = "0.0.1"
+
+    @staticmethod
+    def make_device(**kwargs):
+        serial = kwargs.get("serial")
+        return connect_pluto(serial=serial)
+
+    # region ad9364
+
+    @idl_expose(kind="get")
+    def get_filter(self):
+        return self.device.filter
+
+    @idl_expose(kind="set")
+    def set_filter(self, value):
+        self.device.filter = value
+
+    @idl_expose(kind="get")
+    def get_loopback(self):
+        return self.device.loopback
+
+    @idl_expose(kind="set")
+    def set_loopback(self, value):
+        self.device.loopback = value
+
+    @idl_expose(kind="get")
+    def get_gain_control_mode_chan0(self):
+        return self.device.gain_control_mode_chan0
+
+    @idl_expose(kind="set")
+    def set_gain_control_mode_chan0(self, value):
+        self.device.gain_control_mode_chan0 = value
+
+    @idl_expose(kind="get")
+    def get_hardwaregain_chan0(self):
+        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
+        return self.device.hardwaregain_chan0
+
+    @idl_expose(kind="set")
+    def set_hardwaregain_chan0(self, value):
+        """RX hardware gain (dB). pyadi-iio attribute: hardwaregain_chan0"""
+        self.device.hardwaregain_chan0 = value
+
+    @idl_expose(kind="get")
+    def get_tx_hardwaregain_chan0(self):
+        return self.device.tx_hardwaregain_chan0
+
+    @idl_expose(kind="set")
+    def set_tx_hardwaregain_chan0(self, value):
+        self.device.tx_hardwaregain_chan0 = value
+
+    @idl_expose(kind="get")
+    def get_rx_rf_bandwidth(self):
+        return self.device.rx_rf_bandwidth
+
+    @idl_expose(kind="set")
+    def set_rx_rf_bandwidth(self, value):
+        self.device.rx_rf_bandwidth = value
+
+    @idl_expose(kind="get")
+    def get_tx_rf_bandwidth(self):
+        return self.device.tx_rf_bandwidth
+
+    @idl_expose(kind="set")
+    def set_tx_rf_bandwidth(self, value):
+        self.device.tx_rf_bandwidth = value
+
+    @idl_expose(kind="get")
+    def get_sample_rate(self):
+        return self.device.sample_rate
+
+    @idl_expose(kind="set")
+    def set_sample_rate(self, value):
+        self.device.sample_rate = value
+
+    @idl_expose(kind="get")
+    def get_rx_lo(self):
+        return self.device.rx_lo
+
+    @idl_expose(kind="set")
+    def set_rx_lo(self, value):
+        self.device.rx_lo = value
+
+    @idl_expose(kind="get")
+    def get_tx_lo(self):
+        return self.device.tx_lo
+
+    @idl_expose(kind="set")
+    def set_tx_lo(self, value):
+        self.device.tx_lo = value
+
+    @idl_expose(kind="get")
+    def get_tx_cyclic_buffer(self):
+        return self.device.tx_cyclic_buffer
+
+    @idl_expose(kind="set")
+    def set_tx_cyclic_buffer(self, value):
+        self.device.tx_cyclic_buffer = value
+
+    # region RX/TX
+
+    @idl_expose(kind="call")
+    def call_rx(self):
+        return self.device.rx()
+
+    @idl_expose(kind="get")
+    def get_rx_buffer_size(self):
+        return self.device.rx_buffer_size
+
+    @idl_expose(kind="set")
+    def set_rx_buffer_size(self, value):
+        self.device.rx_buffer_size = value
+
+    @idl_expose(kind="call")
+    def call_rx_destroy_buffer(self):
+        self.device.rx_destroy_buffer()
+
+    @idl_expose(kind="call")
+    def call_tx(self, value):
+        self.device.tx(value)
+
+    @idl_expose(kind="call")
+    def call_tx_destroy_buffer(self):
+        self.device.tx_destroy_buffer()
+
+    @idl_expose(kind="call")
+    def call_disable_dds(self):
+        """Disable the internal DDS tone generator."""
+        self.device.disable_dds()
+
+    # endregion
+
+    # region ip / repr
+
+    @idl_expose(kind="call")
+    def call_ip(self):
+        """Return a connection identifier for this device (ping / verify)."""
+        try:
+            return str(self.device.uri)
+        except AttributeError:
+            return str(self.device._uri_auto)
+
+    @idl_expose(kind="get")
+    def get_repr(self):
+        """Return repr() of the underlying device object."""
+        return repr(self.device)
+
+    # endregion
+
+    # region _dec_int_fpga_filter
+
+    @idl_expose(kind="get")
+    def get_rx_dec8_filter_en(self):
+        """rx_dec8_filter_en: Enable decimate-by-8 filter in FPGA"""
+        return bool(self.device.rx_dec8_filter_en)
+
+    @idl_expose(kind="set")
+    def set_rx_dec8_filter_en(self, value):
+        """rx_dec8_filter_en: Enable decimate-by-8 filter in FPGA"""
+        self.device.rx_dec8_filter_en = value
+
+    @idl_expose(kind="get")
+    def get_tx_int8_filter_en(self):
+        """tx_int8_filter_en: Enable interpolate-by-8 filter in FPGA"""
+        return bool(self.device.tx_int8_filter_en)
+
+    @idl_expose(kind="set")
+    def set_tx_int8_filter_en(self, value):
+        """tx_int8_filter_en: Enable interpolate-by-8 filter in FPGA"""
+        self.device.tx_int8_filter_en = value
+
+    @idl_expose(kind="get")
+    def get_rates(self):
+        """Get decimation/interpolation rates from the FPGA filter block."""
+        return self.device._get_rates(self.device._rxadc, False)
+
+    # endregion

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/src/remoteRF_server/server/device_manager.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import os
 import re
+import shutil
 import time
 import yaml
 import threading
@@ -12,7 +13,7 @@ from pathlib import Path
 from typing import Dict, Tuple, Optional, Any, List, Iterator
 from contextlib import contextmanager
 
-from ..common.utils import validate_token, get_remoterf_root
+from ..common.utils import validate_token, get_remoterf_root, get_drivers_dir
 from ..common.idl.schema import get_driver_class, load_drivers
 from ..host import host_tunnel_server as hts
 
@@ -245,10 +246,19 @@ def _get_master_token() -> str:
         return ""
 
 def _devices_yaml_path() -> Path:
-    p1 = _cfg_dir() / "devices.yml"
+    cfg_dir = _cfg_dir()
+    p1 = cfg_dir / "devices.yml"
     if p1.exists():
         return p1
-    return _cfg_dir() / "devices.yaml"
+    p2 = cfg_dir / "devices.yaml"
+    if p2.exists():
+        return p2
+    try:
+        cfg_dir.mkdir(parents=True, exist_ok=True)
+        p1.touch(exist_ok=True)
+    except OSError as e:
+        print(f"Warning: could not create empty devices config {p1}: {e}")
+    return p1
 
 def _load_device_records() -> Dict[int, Dict[str, str]]:
     path = _devices_yaml_path()
@@ -376,7 +386,48 @@ def _init_from_env() -> None:
 
 # Load built-in drivers, then any user-supplied drivers from the config dir.
 # Importing the module triggers @idl_register, which adds the class to the registry.
+def _packaged_pluto_schema_path() -> Path:
+    return Path(__file__).resolve().parents[1] / "drivers" / "adalm_pluto" / "pluto_schema.py"
+
+def _driver_registers_pluto(path: Path) -> bool:
+    try:
+        text = path.read_text(encoding="utf-8")
+    except OSError:
+        return False
+    return re.search(r"(?:idl_register|register_driver)\(\s*['\"]pluto['\"]\s*\)", text) is not None
+
+def _seed_default_pluto_driver() -> None:
+    drivers_dir = get_drivers_dir()
+    target = drivers_dir / "pluto_schema.py"
+    if target.exists() or target.is_symlink():
+        return
+
+    try:
+        drivers_dir.mkdir(parents=True, exist_ok=True)
+    except OSError as e:
+        print(f"Warning: could not create drivers directory {drivers_dir}: {e}")
+        return
+
+    for driver_file in drivers_dir.glob("*.py"):
+        if driver_file.name.startswith("_"):
+            continue
+        if _driver_registers_pluto(driver_file):
+            return
+
+    source = _packaged_pluto_schema_path()
+    if not source.exists():
+        print(f"Warning: default Pluto schema source is missing: {source}")
+        return
+
+    try:
+        shutil.copy2(source, target)
+        print(f"Created default Pluto driver config at {target}")
+    except OSError as e:
+        print(f"Warning: could not create default Pluto driver config {target}: {e}")
+
 def _load_all_drivers() -> None:
+    _seed_default_pluto_driver()
+
     try:
         from ..common.idl import pluto_schema as _  # noqa: F401
     except Exception as e:

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/src/remoteRF_server/serverrf_cli.py

@@ -5,6 +5,8 @@ import os
 import subprocess
 import shutil
 import re
+import ssl
+import ipaddress
 from pathlib import Path
 from typing import Optional, Dict, List, Tuple
 from datetime import datetime, timezone
@@ -53,6 +55,59 @@ def _fmt_remaining(na_utc: datetime) -> str:
     return f"{days}d {hours}h {mins}m"
 
 
+_STATIC_IP_ENV_KEYS: Tuple[str, ...] = ("STATIC_IP", "SERVER_IP")
+
+
+def _is_ip_address(value: str) -> bool:
+    try:
+        ipaddress.ip_address((value or "").strip())
+        return True
+    except ValueError:
+        return False
+
+
+def _x509_static_ip(cert_path: Path) -> str:
+    if not cert_path.exists():
+        raise FileNotFoundError(f"server cert not found: {cert_path}")
+
+    try:
+        cert = ssl._ssl._test_decode_cert(str(cert_path))
+    except FileNotFoundError:
+        raise
+    except Exception as e:
+        raise ValueError(f"could not parse server cert {cert_path}: {e}") from e
+
+    for name, value in cert.get("subjectAltName", []):
+        if name.lower() == "ip address":
+            ip = (value or "").strip()
+            if ip:
+                return ip
+
+    for group in cert.get("subject", []):
+        for name, value in group:
+            if name.lower() != "commonname":
+                continue
+            cn = (value or "").strip()
+            if _is_ip_address(cn):
+                return cn
+
+    raise ValueError(f"server cert does not contain an IP SAN or IP common name: {cert_path}")
+
+
+def _resolve_static_ip(kv: Dict[str, str]) -> Tuple[Optional[str], str, Optional[str]]:
+    env_path = _server_env_path()
+    for key in _STATIC_IP_ENV_KEYS:
+        value = (kv.get(key, "") or "").strip()
+        if value:
+            return value, f"{env_path} ({key})", None
+
+    cert_path = _certs_dir() / "server.crt"
+    try:
+        return _x509_static_ip(cert_path), str(cert_path), None
+    except (FileNotFoundError, ValueError) as e:
+        return None, str(cert_path), str(e)
+
+
 # -----------------------------
 # Repo-local server config locations
 # -----------------------------
@@ -126,7 +181,7 @@ def print_help() -> None:
         "Port options:\n"
         "  --main-port <int>                  Set GRPC_PORT\n"
         "  --cert-port <int>                  Set CERT_PORT\n"
-        "  --show | -s                        Show current ports\n"
+        "  --show | -s                        Show current ports and static IP\n"
         "  -w | --wipe [-y]                   Wipe ONLY port config (server.env)\n"
         "\n"
         "Hosts:\n"
@@ -139,12 +194,12 @@ def print_help() -> None:
         "Devices:\n"
         "  serverrf -d | --device [options]\n"
         "\n"
-        "Device options:\n"
-        "  --add --pluto <id:name:iio_serial>  Add device (fails if gid OR serial already used)\n"
-        "  --remove <id>                       Remove device\n"
-        "  --edit-name <id> <name>             Override device NAME for existing device\n"
-        "  --show | -s                          Show all devices\n"
-        "  -w | --wipe [-y]                     Wipe ONLY device config (devices.env)\n"
+        # "Device options:\n"
+        # "  --add --pluto <id:name:iio_serial>  Add device (fails if gid OR serial already used)\n"
+        # "  --remove <id>                       Remove device\n"
+        # "  --edit-name <id> <name>             Override device NAME for existing device\n"
+        # "  --show | -s                         Show all devices\n"
+        # "  -w | --wipe [-y]                    Wipe ONLY device config (devices.env)\n"
 
         "\n"
         "Cert options (for --gen-certs):\n"
@@ -525,20 +580,27 @@ def _gen_certs(
 
 def _config_show_ports() -> int:
     p = _server_env_path()
-    if not p.exists():
-        print(f"No port config found (missing {p}).")
-        return 0
-
     kv = _read_env_kv(p)
-    if not kv:
-        print("Port config is empty.")
-        return 0
 
     print(f"Port config: {p}")
+    if not p.exists():
+        print("  (missing)")
+    elif not kv:
+        print("  (empty)")
+
     if "GRPC_PORT" in kv:
-        print(f"  GRPC_PORT={kv['GRPC_PORT']}")
+        print(f"  MAIN_PORT={kv['GRPC_PORT']}")
     if "CERT_PORT" in kv:
         print(f"  CERT_PORT={kv['CERT_PORT']}")
+
+    static_ip, source, err = _resolve_static_ip(kv)
+    if static_ip:
+        print(f"  STATIC_IP={static_ip}")
+        if source != f"{p} (STATIC_IP)":
+            print(f"  STATIC_IP_SOURCE={source}")
+    else:
+        print("  STATIC_IP=(not set)")
+        print(f"  STATIC_IP_ERROR={err or f'could not resolve from {source}'}")
     return 0
 
 
@@ -766,8 +828,12 @@ def _wipe_devices_only(*, yes: bool) -> int:
 def main() -> int:
     argv = list(sys.argv[1:])
 
+    if len(argv) == 0:
+        print("invalid args, expect serverrf <args>, run serverrf --help for more info", file=sys.stderr)
+        return 2
+
     # help
-    if len(argv) == 0 or argv[0] in ("--help", "-h", "-help", "--h"):
+    if argv[0] in ("--help", "-h", "-help", "--h"):
         print_help()
         return 0
 
@@ -1256,7 +1322,7 @@ def main() -> int:
             return 2
 
         print("Host token created and stored at ~/.config/remoterf/db/hosts_auth.env")
-        print(f'To config host:\n  hostrf --config --host {host_token_create_id} "{token}"')
+        print(f'On the host you want to setup, run the following:\n  hostrf --config --host {host_token_create_id} "{token}"')
         return 0
 
     # ----------------

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/src/remoteRF_server/tools/gist_status.py

@@ -111,7 +111,7 @@ def start_status_publisher() -> None:
             return
 
         if _load_gist_env() is None:
-            print("[gist_status] off (not configured; see README gist docs)", file=sys.stderr)
+            # print("[gist_status] off (not configured; see README gist docs)", file=sys.stderr)
             return
 
         t = threading.Thread(

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/src/remoteRF_server_testing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.11
+Version: 0.0.13
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{remoterf_server_testing-0.0.11 → remoterf_server_testing-0.0.13}/src/remoteRF_server_testing.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/remoteRF_server/common/utils/process_arg.py
 src/remoteRF_server/drivers/__init__.py
 src/remoteRF_server/drivers/adalm_pluto/__init__.py
 src/remoteRF_server/drivers/adalm_pluto/pluto_remote_server.py
+src/remoteRF_server/drivers/adalm_pluto/pluto_schema.py
 src/remoteRF_server/host/__init__.py
 src/remoteRF_server/host/host_auth_token.py
 src/remoteRF_server/host/host_directory_store.py