RemoteRF 0.0.7.48__tar.gz → 0.0.7.52__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 0.0.7.48
+Version: 0.0.7.52
 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.48 → remoterf-0.0.7.52}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoterf",
-    version="0.0.7.48",
+    version="0.0.7.52",
     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.",
@@ -35,10 +35,10 @@ setup(
     
     entry_points={
     "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=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/config/config_cli.py → remoterf-0.0.7.52/src/remoteRF/config/config.py

@@ -6,10 +6,13 @@ import os
 import sys
 import shutil
 from pathlib import Path
-from typing import Tuple
+from typing import Optional, Sequence, Tuple
+import argparse
 
 from .cert_fetcher import fetch_and_save_ca_cert
 
+
+
 # -----------------------------
 # Local config locations
 # -----------------------------
@@ -71,72 +74,19 @@ def _wipe_config(root: Path) -> None:
     shutil.rmtree(root)
     print(f"Wiped RemoteRF config: {root}")
 
-def main(argv=None) -> None:
-    import argparse
-
-    parser = argparse.ArgumentParser(
-        prog="remoterf-config",
-        add_help=True,
-        formatter_class=argparse.RawTextHelpFormatter,
-        description=(
-            "Configure RemoteRF to talk to a server.\n"
-            "Fetches the server CA certificate and saves the gRPC target locally."
-        ),
-    )
-
-    parser.add_argument(
-        "addr",
-        nargs="?",
-        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"
-            "  remoterf-config --wipe [--yes]\n\n"
-            "Example:\n"
-            "  remoterf-config 164.67.195.207:61005\n"
-        )
-        sys.exit(2)
+def configure(host: str, port: int, cert_port: int) -> int:
+    # Basic validation
+    host = (host or "").strip()
+    if not host:
+        print("Error: host is empty", file=sys.stderr)
+        return 2
+    if port <= 0 or port > 65535:
+        print("Error: port out of range", file=sys.stderr)
+        return 2
 
-    try:
-        host, grpc_port = _parse_hostport(args.addr)
-    except Exception as e:
-        print(f"Error: invalid addr '{args.addr}': {e}", file=sys.stderr)
-        sys.exit(2)
+    grpc_port = int(port)
+    cert_port = int(cert_port)
 
-    cert_port = grpc_port + 1
     profile = "default"
     timeout_sec = 3.0
     overwrite = True
@@ -152,10 +102,9 @@ def main(argv=None) -> None:
         timeout_sec=timeout_sec,
         overwrite=overwrite,
     )
-
     if not fetched_ok:
         print(f"Failed to fetch CA cert from {host}:{cert_port}.", file=sys.stderr)
-        sys.exit(1)
+        return 1
 
     env_file = _env_path()
     _write_env_kv(env_file, {
@@ -170,5 +119,17 @@ def main(argv=None) -> None:
     print(f"  CA cert     : {ca_out}")
     print(f"  env file    : {env_file}")
 
-if __name__ == "__main__":
-    main()
+def wipe_config(*, yes: bool = False) -> int:
+    """
+    Optional helper if you want wipe behavior without argparse.
+    """
+    root = _config_root()
+    if not yes and not _confirm_wipe(root):
+        print("Wipe aborted.")
+        return 1
+    try:
+        _wipe_config(root)
+        return 0
+    except Exception as e:
+        print(f"Error wiping config: {e}", file=sys.stderr)
+        return 1

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

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

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

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

remoterf-0.0.7.52/src/remoteRF/remoterf_cli.py

@@ -0,0 +1,203 @@
+# src/remoteRF/cli.py
+from __future__ import annotations
+
+import argparse
+import sys
+from typing import Optional, Sequence
+
+import sys
+
+from pathlib import Path
+
+def _config_root() -> Path:
+    return Path.home() / ".config" / "remoterf"
+
+def _env_path() -> Path:
+    return _config_root() / ".env"
+
+def _read_dotenv_kv(path: Path) -> dict[str, str]:
+    """
+    Tiny dotenv reader (KEY=VALUE lines). Good enough for your use-case.
+    """
+    out: dict[str, str] = {}
+    if not path.exists():
+        return out
+
+    for raw in path.read_text(encoding="utf-8").splitlines():
+        line = raw.strip()
+        if not line or line.startswith("#") or "=" not in line:
+            continue
+        k, v = line.split("=", 1)
+        k = k.strip()
+        v = v.strip().strip('"').strip("'")
+        out[k] = v
+    return out
+
+def _ensure_config_present() -> tuple[bool, str]:
+    env_file = _env_path()
+    if not env_file.exists():
+        return (
+            False,
+            "RemoteRF is not configured.\n"
+            "Run:\n"
+            "  remoterf --config --addr <host:port>\n"
+            "Example:\n"
+            "  remoterf --config --addr 123.45.654.321:12321\n",
+        )
+
+    kv = _read_dotenv_kv(env_file)
+    addr = kv.get("REMOTERF_ADDR", "").strip()
+    ca = kv.get("REMOTERF_CA_CERT", "").strip()
+
+    if not addr or not ca:
+        return (
+            False,
+            "RemoteRF config is incomplete.\n"
+            f"Expected REMOTERF_ADDR and REMOTERF_CA_CERT in:\n  {env_file}\n"
+            "Fix by re-running:\n"
+            "  remoterf --config --addr <host:port>\n",
+        )
+
+    ca_path = Path(ca).expanduser()
+    if not ca_path.exists():
+        return (
+            False,
+            "RemoteRF config points to a missing CA certificate.\n"
+            f"REMOTERF_CA_CERT={ca}\n"
+            "Fix by re-running:\n"
+            "  remoterf --config --addr <host:port>\n",
+        )
+
+    return True, ""
+
+def print_help() -> None:
+    print(
+        "RemoteRF CLI Help\n"
+        "\n"
+        "Usage:\n"
+        "  remoterf                          Show this help\n"
+        "  remoterf -h | --help              Show this help\n"
+        "\n"
+        "  remoterf -l | --login             Login / register\n"
+        "  remoterf -v | --version           Print version\n"
+        "\n"
+        "  remoterf -c | --config [options]\n"
+        "    -a, --addr, -addr <host:port>   Set target server \n"
+        "    -w, --wipe, -wipe               Delete all local config\n"
+        "    -y, --yes, -yes                 Skip wipe confirmation\n"
+        "\n"
+        "Examples:\n"
+        "  remoterf --login\n"
+        "  remoterf --version\n"
+        "  remoterf --config --addr 123.45.654.321:12321\n"
+        "  remoterf --config --wipe\n"
+        "  remoterf --config --wipe --yes\n"
+    )
+
+def main() -> int:
+    argv = list(sys.argv[1:])
+
+    # ---- Debug ----
+    # print(f"argc={len(argv)}")
+    # for i, a in enumerate(argv):
+    #     print(f"argv[{i}] = {a!r}")
+
+    if len(argv) == 0 or argv[0] in ("--help", "-help", "-h"):
+        print_help()
+        return 0
+
+    if argv[0] in ("--login", "-login", "-l"):
+        ok, msg = _ensure_config_present()
+        if not ok:
+            print(msg)
+            return 2
+
+        from remoteRF.core.acc_login import main as _
+        return 0
+
+    if argv[0] in ("--version", "-version", "-v"):
+        from remoteRF.core.version import main as version_main
+        
+        print("RemoteRF version:", end=" ")
+        version_main()
+        return 0
+
+    if argv[0] in ("--config", "-config", "-c"):
+        from remoteRF.config.config import configure, wipe_config
+
+        addr = None
+        wipe = False
+        yes = False
+
+        i = 1
+        while i < len(argv):
+            tok = argv[i]
+
+            if tok in ("--addr", "-a", "-addr"):
+                if i + 1 >= len(argv):
+                    print("ERROR: missing required argument after --addr/-a/-addr")
+                    return 2
+                addr = argv[i + 1]
+                i += 2
+                continue
+
+            if tok in ("--wipe", "-w", "-wipe"):
+                wipe = True
+                i += 1
+                continue
+
+            if tok in ("--yes", "-y", "-yes"):
+                yes = True
+                i += 1
+                continue
+
+            print(f"ERROR: unknown config argument: {tok!r}")
+            return 2
+
+        # Mirror remoterf-config behavior:
+        if wipe and addr is not None:
+            print("ERROR: cannot use --wipe and --addr together")
+            return 2
+
+        if wipe:
+            # wipe_config returns the proper exit code
+            return int(wipe_config(yes=yes))
+
+        if addr is not None:
+            # parse host:port (minimal, strict)
+            s = addr.strip()
+            if "://" in s:
+                s = s.split("://", 1)[1]
+            if ":" not in s:
+                print("ERROR: addr must be in 'host:port' form")
+                return 2
+
+            host, port_str = s.rsplit(":", 1)
+            host = host.strip()
+            try:
+                port = int(port_str.strip())
+            except Exception:
+                print("ERROR: port must be an integer")
+                return 2
+
+            # configure returns the proper exit code
+            cert_port = port + 1
+            configure(host, port, cert_port)
+            return 0
+
+        # No args -> same behavior as remoterf-config missing addr (exit code 2)
+        print(
+            "\nError: missing required argument: host:port\n\n"
+            "Usage:\n"
+            "  remoterf --config --addr <host:port>\n"
+            "  remoterf -c -a <host:port>\n"
+            "  remoterf --config --wipe [--yes]\n\n"
+            "Example:\n"
+            "  remoterf --config --addr 123.45.678.901:12345\n"
+        )
+        return 2
+
+
+    # fallback
+    print(f"ERROR: unknown command: {argv[0]!r}")
+    return 2

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 0.0.7.48
+Version: 0.0.7.52
 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.48 → remoterf-0.0.7.52}/src/remoteRF.egg-info/SOURCES.txt

@@ -3,7 +3,7 @@ MANIFEST.in
 README.md
 setup.py
 src/remoteRF/__init__.py
-src/remoteRF/cli.py
+src/remoteRF/remoterf_cli.py
 src/remoteRF.egg-info/PKG-INFO
 src/remoteRF.egg-info/SOURCES.txt
 src/remoteRF.egg-info/dependency_links.txt
@@ -21,7 +21,7 @@ src/remoteRF/common/utils/list_string.py
 src/remoteRF/common/utils/process_arg.py
 src/remoteRF/config/__init__.py
 src/remoteRF/config/cert_fetcher.py
-src/remoteRF/config/config_cli.py
+src/remoteRF/config/config.py
 src/remoteRF/core/__init__.py
 src/remoteRF/core/acc_login.py
 src/remoteRF/core/app.py

remoterf-0.0.7.52/src/remoteRF.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+remoterf = remoteRF.remoterf_cli:main

remoterf-0.0.7.48/src/remoteRF/cli.py

@@ -1,141 +0,0 @@
-# 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.48/src/remoteRF.egg-info/entry_points.txt

@@ -1,5 +0,0 @@
-[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