RemoteRF 0.0.7.47__tar.gz → 0.0.7.48__tar.gz

{remoterf-0.0.7.47/src/remoteRF.egg-info → remoterf-0.0.7.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 0.0.7.47
+Version: 0.0.7.48
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoterf",
-    version="0.0.7.47",
+    version="0.0.7.48",
     author="Ethan Ge",
     author_email="ethoGalaxy@gmail.com",
     description="A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.",
@@ -25,11 +25,21 @@ setup(
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.10',
+    # entry_points={
+    #     'console_scripts': [
+    #         'remoterf-login=remoteRF.core.acc_login:main',
+    #         'remoterf-v=remoteRF.core.version:main',
+    #         'remoterf-config=remoteRF.config.config_cli:main',
+    #     ],
+    # },
+    
     entry_points={
-        'console_scripts': [
-            'remoterf-login=remoteRF.core.acc_login:main',
-            'remoterf-v=remoteRF.core.version:main',
-            'remoterf-config=remoteRF.config.config_cli:main',
-        ],
-    },
+    "console_scripts": [
+        "remoterf=remoteRF.cli:main",
+        "remoterf-login=remoteRF.core.acc_login:main",
+        "remoterf-v=remoteRF.core.version:main",
+        "remoterf-config=remoteRF.config.config_cli:main",
+    ],
+},
+
 )

remoterf-0.0.7.48/src/remoteRF/cli.py

@@ -0,0 +1,141 @@
+# src/remoteRF/cli.py
+from __future__ import annotations
+
+import argparse
+import sys
+from typing import Optional, Sequence
+
+from remoteRF.core.acc_login import main as login_main
+from remoteRF.core.version import main as version_main
+from remoteRF.config.config_cli import main as config_main
+
+
+def build_parser() -> argparse.ArgumentParser:
+    p = argparse.ArgumentParser(
+        prog="remoterf",
+        formatter_class=argparse.RawTextHelpFormatter,
+        add_help=True,
+        description=(
+            "RemoteRF unified CLI\n\n"
+            "Examples:\n"
+            "  remoterf --login\n"
+            "  remoterf -l\n"
+            "  remoterf --config --addr 164.67.195.207:61005\n"
+            "  remoterf -c -a 164.67.195.207:61005\n"
+            "  remoterf --config --wipe\n"
+            "  remoterf -v\n"
+        ),
+    )
+
+    mode = p.add_mutually_exclusive_group()
+
+    mode.add_argument("-l", "--login", action="store_true", help="Login / register (interactive).")
+    mode.add_argument("-c", "--config", action="store_true", help="Configure server target / CA cert.")
+    mode.add_argument("-v", "--version", action="store_true", help="Print version and exit.")
+
+    # These are only meaningful with --config, but we accept them at top-level
+    # so your UX works as requested.
+    p.add_argument(
+        "-a", "--addr", "-addr",
+        dest="addr",
+        default=None,
+        help="Server address (host:port). Used with --config / -c.",
+    )
+
+    p.add_argument(
+        "-w", "--wipe",
+        action="store_true",
+        help="Wipe local config (~/.config/remoterf). Used with --config / -c.",
+    )
+
+    p.add_argument(
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompts (use with --config --wipe).",
+    )
+
+    return p
+
+
+def main(argv: Optional[Sequence[str]] = None) -> int:
+    argv = list(sys.argv[1:] if argv is None else argv)
+
+    parser = build_parser()
+
+    # No args => help panel
+    if len(argv) == 0:
+        parser.print_help()
+        return 0
+
+    args, extra = parser.parse_known_args(argv)
+
+    # --- Version ---
+    if args.version:
+        if extra:
+            parser.error(f"Unexpected arguments for --version: {' '.join(extra)}")
+        # If your version_main supports argv, pass [].
+        try:
+            version_main([])
+        except TypeError:
+            version_main()
+        return 0
+
+    # --- Login ---
+    if args.login:
+        if extra:
+            parser.error(f"Unexpected arguments for --login: {' '.join(extra)}")
+        try:
+            login_main([])
+        except TypeError:
+            login_main()
+        return 0
+
+    # --- Config ---
+    if args.config:
+        cfg_argv: list[str] = []
+
+        # Normalize to whatever config_cli expects.
+        # If your config_cli supports --wipe/--yes, pass them through.
+        if args.wipe:
+            cfg_argv.append("--wipe")
+            if args.yes:
+                cfg_argv.append("--yes")
+
+        # Address handling
+        if args.addr:
+            # If config_cli expects a positional addr, pass it positionally:
+            cfg_argv.append(args.addr)
+            # If your config_cli instead expects --addr, switch to:
+            # cfg_argv += ["--addr", args.addr]
+
+        # Preserve any extra args for config_cli (if you want)
+        cfg_argv += extra
+
+        # If neither addr nor wipe was supplied, show config help-like message.
+        if not args.addr and not args.wipe and len(extra) == 0:
+            # Call config_cli with --help if it supports it; otherwise print ours.
+            try:
+                config_main(["--help"])
+            except Exception:
+                parser.error("Config mode requires --addr <host:port> or --wipe.")
+            return 0
+
+        try:
+            config_main(cfg_argv)
+        except TypeError:
+            # Fallback if config_main does not accept argv; last resort:
+            old = sys.argv[:]
+            try:
+                sys.argv = ["remoterf-config", *cfg_argv]
+                config_main()
+            finally:
+                sys.argv = old
+        return 0
+
+    # If user passed only -a/-w without -c/--config, show help
+    parser.print_help()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF/config/cert_fetcher.py

@@ -1,26 +1,4 @@
 # cert_fetcher.py
-"""
-RemoteRF Client-Side Cert Fetcher (bootstrap)
-
-Purpose:
-- Fetch the public CA certificate (ca.crt) from a server's bootstrap endpoint
-  (your cert_provider) and save it locally for later use in:
-      grpc.ssl_channel_credentials(root_certificates=ca_bytes)
-
-Security note (TOFU):
-- This fetch is typically done over plaintext HTTP (or raw TCP). The CA cert is public,
-  but authenticity is not guaranteed on first fetch. If you want TOFU done "right",
-  you should display the SHA256 fingerprint and require user confirmation elsewhere.
-  This module focuses only on: fetch + save + return success.
-
-Behavior:
-- Attempts HTTP GET first: http://{host}:{port}/ca.crt
-- If HTTP fails, falls back to raw TCP (reads until EOF).
-- Saves to a per-profile file under ~/.config/remoterf/certs/ by default.
-
-Exported API:
-- fetch_and_save_ca_cert(host, port, *, out_path=None, profile=None, timeout_sec=3.0) -> bool
-"""
 
 from __future__ import annotations
 

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF/config/config_cli.py

@@ -2,19 +2,18 @@
 
 from __future__ import annotations
 
-import argparse
 import os
 import sys
+import shutil
 from pathlib import Path
 from typing import Tuple
 
-from .cert_fetcher import fetch_and_save_ca_cert  # your earlier module
+from .cert_fetcher import fetch_and_save_ca_cert
 
 # -----------------------------
 # Local config locations
 # -----------------------------
 def _config_root() -> Path:
-    # Keep it simple and consistent with earlier suggestions.
     return Path(os.path.expanduser("~")) / ".config" / "remoterf"
 
 def _env_path() -> Path:
@@ -40,16 +39,10 @@ def _parse_hostport(s: str) -> Tuple[str, int]:
         raise ValueError("Port out of range")
     return host, port
 
-
 def _write_env_kv(path: Path, kv: dict[str, str]) -> None:
-    """
-    Writes/overwrites a simple dotenv-style file.
-    (We overwrite the whole file for simplicity and correctness.)
-    """
     path.parent.mkdir(parents=True, exist_ok=True)
-    lines = []
+    lines: list[str] = []
     for k, v in kv.items():
-        # Quote only if needed; keep simple and safe.
         if any(c.isspace() for c in v) or any(c in v for c in ['"', "'"]):
             v = v.replace('"', '\\"')
             lines.append(f'{k}="{v}"')
@@ -57,9 +50,29 @@ def _write_env_kv(path: Path, kv: dict[str, str]) -> None:
             lines.append(f"{k}={v}")
     path.write_text("\n".join(lines) + "\n", encoding="utf-8")
 
-def main() -> None:
+def _confirm_wipe(root: Path) -> bool:
+    prompt = (
+        f"This will permanently delete ALL RemoteRF config at:\n"
+        f"  {root}\n\n"
+        f"Type 'wipe' to confirm: "
+    )
+    try:
+        return input(prompt).strip().lower() == "wipe"
+    except KeyboardInterrupt:
+        print("\nCancelled.")
+        return False
+
+def _wipe_config(root: Path) -> None:
+    if not root.exists():
+        print(f"No config found at: {root}")
+        return
+    if not root.is_dir():
+        raise RuntimeError(f"Config root exists but is not a directory: {root}")
+    shutil.rmtree(root)
+    print(f"Wiped RemoteRF config: {root}")
+
+def main(argv=None) -> None:
     import argparse
-    import sys
 
     parser = argparse.ArgumentParser(
         prog="remoterf-config",
@@ -77,13 +90,41 @@ def main() -> None:
         help="Server address in host:port form. Example: 164.67.195.207:61005",
     )
 
+    parser.add_argument(
+        "--wipe",
+        action="store_true",
+        help="Delete ALL existing RemoteRF config at ~/.config/remoterf and exit.",
+    )
+
+    parser.add_argument(
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompts (use with --wipe).",
+    )
+
     args = parser.parse_args()
 
+    # ----- Wipe mode -----
+    if args.wipe:
+        root = _config_root()
+        if not args.yes:
+            if not _confirm_wipe(root):
+                print("Wipe aborted.")
+                sys.exit(1)
+        try:
+            _wipe_config(root)
+            sys.exit(0)
+        except Exception as e:
+            print(f"Error wiping config: {e}", file=sys.stderr)
+            sys.exit(1)
+
+    # ----- Normal configure mode -----
     if not args.addr:
         print(
             "\nError: missing required argument: host:port\n\n"
             "Usage:\n"
-            "  remoterf-config <host:port>\n\n"
+            "  remoterf-config <host:port>\n"
+            "  remoterf-config --wipe [--yes]\n\n"
             "Example:\n"
             "  remoterf-config 164.67.195.207:61005\n"
         )
@@ -95,8 +136,7 @@ def main() -> None:
         print(f"Error: invalid addr '{args.addr}': {e}", file=sys.stderr)
         sys.exit(2)
 
-    # Single-arg policy
-    cert_port = grpc_port + 1      # cert-provider convention
+    cert_port = grpc_port + 1
     profile = "default"
     timeout_sec = 3.0
     overwrite = True

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF/core/acc_login.py

@@ -1,4 +1,4 @@
 from . import app as client
 
-def main():
+def main(argv=None):
     pass

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF/core/version.py

@@ -1,6 +1,6 @@
 from importlib.metadata import version, PackageNotFoundError
 
-def main():
+def main(argv=None):
     try:
         v = version("remoterf")
     except PackageNotFoundError:

{remoterf-0.0.7.47 → remoterf-0.0.7.48/src/remoteRF.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 0.0.7.47
+Version: 0.0.7.48
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 setup.py
 src/remoteRF/__init__.py
+src/remoteRF/cli.py
 src/remoteRF.egg-info/PKG-INFO
 src/remoteRF.egg-info/SOURCES.txt
 src/remoteRF.egg-info/dependency_links.txt

{remoterf-0.0.7.47 → remoterf-0.0.7.48}/src/remoteRF.egg-info/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
+remoterf = remoteRF.cli:main
 remoterf-config = remoteRF.config.config_cli:main
 remoterf-login = remoteRF.core.acc_login:main
 remoterf-v = remoteRF.core.version:main