RemoteRF 1.1.8__tar.gz → 2.0.1__tar.gz

remoterf-2.0.1/MANIFEST.in

@@ -0,0 +1,3 @@
+# Include all .crt, .key, and .pem files
+recursive-include src/remoteRF *.crt *.key *.pem
+recursive-include src/remoteRF *.txt

{remoterf-1.1.8/src/remoteRF.egg-info → remoterf-2.0.1}/PKG-INFO

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

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoterf",
-    version="1.1.8",
+    version="2.0.1",
     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.",

remoterf-2.0.1/src/remoteRF/common/tos_notice.txt

@@ -0,0 +1,9 @@
+RemoteRF 2026
+Terms of Service Acknowledgement
+
+By continuing, you confirm that you have reviewed and agree to the
+RemoteRF Terms of Service and understand that use of the client and
+service is at your own risk. RemoteRF is not liable for losses or
+damages arising from use of the platform.
+
+Terms of Service: https://remoterf.net/tos

remoterf-2.0.1/src/remoteRF/common/utils/ansi_codes.py

@@ -0,0 +1,178 @@
+import os
+import sys
+from enum import Enum
+
+from prompt_toolkit import print_formatted_text
+from prompt_toolkit.formatted_text import FormattedText
+
+class Sty(Enum):
+    # Basic colors
+    RED = 'red'
+    GREEN = 'green'
+    BLUE = 'blue'
+    YELLOW = 'yellow'
+    MAGENTA = 'magenta'
+    CYAN = 'cyan'
+    GRAY = 'gray'
+    
+    # Background colors
+    BG_RED = 'bg-red'
+    BG_GREEN = 'bg-green'
+    BG_BLUE = 'bg-blue'
+    
+    # Bright versions
+    BRIGHT_RED = 'bright-red'
+    BRIGHT_GREEN = 'bright-green'
+    BRIGHT_BLUE = 'bright-blue'
+    
+    # Formatting
+    BOLD = 'bold'
+    ITALIC = 'italic'
+    UNDERLINE = 'underline'
+    BLINK = 'blink'
+    REVERSE = 'reverse'
+    
+    # Combinations
+    ERROR = 'error'
+    WARNING = 'warning'
+    INFO = 'info'
+    
+    # Special
+    SELECTED = 'selected'
+    DEFAULT = 'default'
+
+_COLOR_STYLE_MAP = {
+    'red': 'fg:ansired',
+    'green': 'fg:ansigreen',
+    'blue': 'fg:ansiblue',
+    'yellow': 'fg:ansiyellow',
+    'magenta': 'fg:ansimagenta',
+    'cyan': 'fg:ansicyan',
+    'gray': 'fg:ansibrightblack',
+    'bg-red': 'bg:ansired',
+    'bg-green': 'bg:ansigreen',
+    'bg-blue': 'bg:ansiblue',
+    'bright-red': 'fg:ansibrightred',
+    'bright-green': 'fg:ansibrightgreen',
+    'bright-blue': 'fg:ansibrightblue',
+}
+
+_MONO_STYLES = {
+    'bold': 'bold',
+    'italic': 'italic',
+    'underline': 'underline',
+    'blink': 'blink',
+    'reverse': 'reverse',
+    'error': 'bold',
+    'warning': 'bold',
+    'info': 'italic underline',
+    'selected': 'reverse',
+    'default': '',
+}
+
+_COLOR_COMBINATIONS = {
+    'error': 'fg:ansired bold',
+    'warning': 'fg:ansiyellow bold',
+    'info': 'fg:ansiblue italic underline',
+    'selected': 'reverse',
+}
+
+
+def _env_flag(name: str) -> str:
+    return os.environ.get(name, '').strip().lower()
+
+
+def _supports_color() -> bool:
+    override = _env_flag('REMOTERF_COLOR')
+    if override in {'0', 'false', 'no', 'off'}:
+        return False
+    if override in {'1', 'true', 'yes', 'on'}:
+        return True
+
+    if _env_flag('NO_COLOR'):
+        return False
+
+    term = _env_flag('TERM')
+    if term == 'dumb':
+        return False
+
+    try:
+        if not sys.stdout.isatty():
+            return False
+    except Exception:
+        return False
+
+    if sys.platform != 'win32':
+        return True
+
+    # Only use color in Windows terminals that commonly support ANSI output.
+    return any([
+        bool(os.environ.get('WT_SESSION')),
+        bool(os.environ.get('ANSICON')),
+        os.environ.get('ConEmuANSI', '').upper() == 'ON',
+        bool(os.environ.get('COLORTERM')),
+        bool(os.environ.get('TERM_PROGRAM')),
+        term not in {'', 'dumb'},
+    ])
+
+
+def _style_string(styles) -> str:
+    parts = []
+    use_color = _supports_color()
+    for style_name in styles:
+        if use_color and style_name in _COLOR_COMBINATIONS:
+            style_value = _COLOR_COMBINATIONS[style_name]
+        elif use_color and style_name in _COLOR_STYLE_MAP:
+            style_value = _COLOR_STYLE_MAP[style_name]
+        else:
+            style_value = _MONO_STYLES.get(style_name, '')
+
+        if not style_value:
+            continue
+        parts.append(style_value)
+    return ' '.join(parts)
+
+def printf(*args) -> str:
+    if len(args) % 2 != 0:
+        raise ValueError('Arguments must be in pairs of two.')
+    
+    # Create formatted text using the defined style
+    formatted_text = []
+    
+    for i in range(0, len(args), 2):
+        message = args[i]
+        styles = args[i+1]
+        
+        if not isinstance(styles, tuple):
+            styles = (styles,)
+            
+        resolved_styles = (s.value if isinstance(s, Enum) else s for s in styles)
+        
+        formatted_text.append((_style_string(resolved_styles), message))
+    
+    # Create FormattedText object from pairs
+    text = FormattedText(formatted_text)
+    
+    print_formatted_text(text)
+    return text
+
+def stylize(*args):
+    """
+    Create a styled prompt text based on pairs of (text, (Sty, ...), ...).
+    """
+    if len(args) % 2 != 0:
+        raise ValueError("Arguments must be in pairs of (text, style_class).")
+    
+    styled_parts = []
+    for i in range(0, len(args), 2):
+        text = args[i]
+        styles = args[i + 1]
+        
+        if not isinstance(styles, tuple):
+            styles = (styles,)
+            
+        resolved_styles = (s.value if isinstance(s, Enum) else s for s in styles)
+        
+        styled_parts.append((_style_string(resolved_styles), text))
+    
+    return FormattedText(styled_parts)

{remoterf-1.1.8 → remoterf-2.0.1}/src/remoteRF/common/utils/process_arg.py

@@ -31,6 +31,8 @@ def map_arg(value):
         arg.string_value = value
     elif isinstance(value, bool):
         arg.bool_value = value
+    elif isinstance(value, (list, tuple)):
+        return map_arg(np.array(value))
     elif isinstance(value, np.ndarray):
         if np.iscomplexobj(value):
             complex_array = arg.complex_array

{remoterf-1.1.8 → remoterf-2.0.1}/src/remoteRF/config/cert_fetcher.py

@@ -12,7 +12,7 @@ from typing import Optional
 CERT_FILENAME_DEFAULT = "ca.crt"
 
 def _default_config_dir() -> Path:
-    return Path(os.path.expanduser("~")) / ".config" / "remoterf"
+    return Path(os.path.expanduser("~")) / ".config" / "remoterf-client"
 
 def _default_env_path() -> Path:
     return _default_config_dir() / ".env"
@@ -119,12 +119,12 @@ def fetch_and_save_ca_cert(
     env_path: Optional[str | Path] = None,
 ) -> bool:
     """
-    Fetch CA cert and save. Optionally writes REMOTERF_CA_CERT into ~/.config/remoterf/.env
+    Fetch CA cert and save. Optionally writes REMOTERF_CA_CERT into ~/.config/remoterf-client/.env
     WITHOUT quotes.
 
     Args:
         write_env: if True, updates REMOTERF_CA_CERT in env file to point at saved cert
-        env_path: override env file location; default ~/.config/remoterf/.env
+        env_path: override env file location; default ~/.config/remoterf-client/.env
     """
     try:
         if not isinstance(port, int):

{remoterf-1.1.8 → remoterf-2.0.1}/src/remoteRF/config/config.py

@@ -9,13 +9,26 @@ from pathlib import Path
 from typing import Optional, Sequence, Tuple
 import argparse
 
+from ..common.utils import Sty, printf
 from .cert_fetcher import fetch_and_save_ca_cert
 
+DEFAULT_TOS_NOTICE = (
+    "RemoteRF 2025\n"
+    "Terms of Service Acknowledgement\n"
+    "\n"
+    "By continuing, you confirm that you have reviewed and agree to the\n"
+    "RemoteRF Terms of Service and understand that use of the client and\n"
+    "service is at your own risk. RemoteRF is not liable for losses or\n"
+    "damages arising from use of the platform.\n"
+    "\n"
+    "Terms of Service: https://remoterf.net/tos\n"
+)
+
 # -----------------------------
 # Local config locations
 # -----------------------------
 def _config_root() -> Path:
-    return Path(os.path.expanduser("~")) / ".config" / "remoterf"
+    return Path(os.path.expanduser("~")) / ".config" / "remoterf-client"
 
 def _env_path() -> Path:
     return _config_root() / ".env"
@@ -72,6 +85,72 @@ def _wipe_config(root: Path) -> None:
     shutil.rmtree(root)
     print(f"Wiped RemoteRF config: {root}")
 
+
+def _tos_notice_path() -> Path:
+    return Path(__file__).resolve().parents[1] / "common" / "tos_notice.txt"
+
+
+def _read_tos_notice() -> str:
+    try:
+        text = _tos_notice_path().read_text(encoding="utf-8").strip()
+    except OSError:
+        return DEFAULT_TOS_NOTICE.strip()
+    return text or DEFAULT_TOS_NOTICE.strip()
+
+
+def _print_separator() -> None:
+    printf("=" * 60, Sty.GRAY)
+
+
+def _print_tos_notice() -> None:
+    for i, line in enumerate(_read_tos_notice().splitlines()):
+        stripped = line.strip()
+        if not stripped:
+            print()
+            continue
+
+        if i == 0:
+            printf(stripped, (Sty.BOLD, Sty.BLUE))
+            continue
+
+        if i == 1:
+            printf(stripped, (Sty.BOLD, Sty.MAGENTA))
+            continue
+
+        if stripped.lower().startswith("terms of service:"):
+            label, value = stripped.split(":", 1)
+            printf(f"{label}: ", (Sty.BOLD, Sty.DEFAULT), value.strip(), (Sty.CYAN, Sty.UNDERLINE))
+            continue
+
+        printf(stripped, Sty.DEFAULT)
+
+
+def _print_config_summary(host: str, grpc_port: int, cert_port: int, ca_out: Path, env_file: Path) -> None:
+    _print_separator()
+    printf("Configuration Complete!", (Sty.BOLD, Sty.GREEN))
+    printf("- Details:", Sty.BOLD)
+    printf("  gRPC target: ", (Sty.BOLD, Sty.DEFAULT), f"{host}:{grpc_port}", Sty.CYAN)
+    printf("  Cert port  : ", (Sty.BOLD, Sty.DEFAULT), f"{host}:{cert_port}", Sty.CYAN)
+    printf("  CA cert    : ", (Sty.BOLD, Sty.DEFAULT), f"{ca_out}", Sty.GRAY)
+    printf("  Env file   : ", (Sty.BOLD, Sty.DEFAULT), f"{env_file}", Sty.GRAY)
+    _print_separator()
+
+
+def _confirm_tos() -> bool:
+    _print_separator()
+    _print_tos_notice()
+    _print_separator()
+    try:
+        reply = input("Continue with configuration? [y/N]: ").strip().lower()
+    except KeyboardInterrupt:
+        print("\nConfiguration cancelled.")
+        return False
+    except EOFError:
+        print("\nConfiguration cancelled.")
+        return False
+    print()
+    return reply in {"y", "yes"}
+
 def configure(host: str, port: int, cert_port: int) -> int:
     # Basic validation
     host = (host or "").strip()
@@ -89,6 +168,10 @@ def configure(host: str, port: int, cert_port: int) -> int:
     timeout_sec = 3.0
     overwrite = True
 
+    if not _confirm_tos():
+        print("Configuration cancelled. Accept the Terms of Service to continue.")
+        return 1
+
     certs_dir = _certs_dir()
     certs_dir.mkdir(parents=True, exist_ok=True)
     ca_out = certs_dir / f"{profile}.crt"
@@ -111,11 +194,7 @@ def configure(host: str, port: int, cert_port: int) -> int:
         "REMOTERF_PROFILE": profile,
     })
 
-    print("RemoteRF configured successfully.")
-    print(f"  gRPC target : {host}:{grpc_port}")
-    print(f"  cert port   : {host}:{cert_port}")
-    print(f"  CA cert     : {ca_out}")
-    print(f"  env file    : {env_file}")
+    _print_config_summary(host, grpc_port, cert_port, ca_out, env_file)
 
 def wipe_config(*, yes: bool = False) -> int:
     """
@@ -130,4 +209,4 @@ def wipe_config(*, yes: bool = False) -> int:
         return 0
     except Exception as e:
         print(f"Error wiping config: {e}", file=sys.stderr)
-        return 1
+        return 1