RemoteRF 2.2.2__py3-none-any.whl → 2.2.4__py3-none-any.whl

remoterf/core/acc_login.py

@@ -14,7 +14,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 def main(*, register=False, enrollment_code=None, server_label=None, show_banner=True,
-         home=None, route=None):
+         home=None, route=None, username=None):
     from .app import run
     return run(
         register=register,
@@ -23,4 +23,5 @@ def main(*, register=False, enrollment_code=None, server_label=None, show_banner
         show_banner=show_banner,
         home=home,
         route=route,
+        username=username,
     )

remoterf/core/app.py

@@ -116,6 +116,8 @@ def _password_confirmation(*, enforce_policy=False):
 
 # The code typed at `remoterf -r`, used once for this registration.
 pending_enrollment_code = None
+# A username already given (`name@lab` at `-l`): the login asks only the password.
+pending_username = None
 # The saved home this shell is attached to (None on a bare direct profile).
 home_name = None
 # The route it was reached over (None on a bare direct profile or an HTTPS home).
@@ -207,6 +209,9 @@ def _account_command(command):
             account.email = _ask('Email') if policy['email_required'] else ''
             if not account.create_user():
                 raise AccountBackendError('Registration failed')
+            if account.is_https_home:
+                from ..deployment import homes
+                printf(f"Log in from anywhere as {account.username}@{homes.GLOBAL_ACCOUNTS}", Sty.GRAY)
         except BaseException:
             # The code was fine; only the details failed. Keep it for the retry.
             pending_enrollment_code = account.enrollment_code or None
@@ -249,7 +254,14 @@ def _account_command(command):
         return False
     if command in ('l', 'login'):
         printf(f"Login to {_home_name()}", (Sty.BOLD, Sty.BLUE))
-        account.username = _ask('Username or Email' if account.is_https_home else 'Username')
+        global pending_username
+        from ..deployment import homes
+        typed = pending_username or _ask('Username or Email' if account.is_https_home else 'Username')
+        pending_username = None
+        # `ethan@ucla` typed at ucla is `ethan` there.
+        name, where = homes.split_account(typed)
+        here = homes.GLOBAL_ACCOUNTS if account.is_https_home else home_name
+        account.username = name if where == here else typed
         account.password = _ask('Password (Hidden)', hidden=True)
         ok = bool(account.login_user(remember=not account.is_https_home))
         if ok:
@@ -1585,8 +1597,9 @@ def interactive_reserve_next_days_auto():
 
 
 def run(backend=None, *, register=False, enrollment_code=None, server_label=None,
-        show_banner=True, home=None, route=None):
-    global account, session, server_addr, pending_enrollment_code, home_name, current_route
+        show_banner=True, home=None, route=None, username=None):
+    global account, session, server_addr, pending_enrollment_code, home_name, current_route, pending_username
+    pending_username = username
     home_name = home
     current_route = route
     from ..deployment.backend import selected_backend

remoterf/deployment/homes.py

@@ -268,6 +268,20 @@ def connect(name: str) -> dict:
     return route
 
 
+# An account is `name@<deployment>`; Global's own accounts are `name@global`.
+GLOBAL_ACCOUNTS = "global"
+
+
+def split_account(text: str) -> tuple[str, str | None]:
+    """`ethan@ucla` -> ("ethan", "ucla"). A bare name, or an email (a dot
+    after the @; deployment names never have one), names no deployment."""
+    text = text.strip()
+    name, at, where = text.rpartition("@")
+    if not at or not name or not where or "." in where:
+        return text, None
+    return name, where.lower()
+
+
 def register_home(host: str) -> tuple[str, dict, dict]:
     """Learn a deployment from its code, save it, and connect to it."""
     document = discover(host)

remoterf/remoterf_cli.py

@@ -150,7 +150,7 @@ def print_help() -> None:
     printf("  remoterf -h | --help", Sty.CYAN, "              Show this help", Sty.DEFAULT)
     print()
     printf("Commands:", (Sty.BOLD, Sty.MAGENTA))
-    printf("  remoterf -l | --login [target]", Sty.CYAN, "    Login: last used, 'global', or a home name", Sty.DEFAULT)
+    printf("  remoterf -l | --login [target]", Sty.CYAN, "    Login: last used, 'global', a home name, or an account (ethan@ucla)", Sty.DEFAULT)
     printf("  remoterf -r | --register [global]", Sty.CYAN, " Register with an enrollment code (or a RemoteRF Global account)", Sty.DEFAULT)
     printf("  remoterf homes", Sty.CYAN, "                    List saved deployment homes", Sty.DEFAULT)
     printf("  remoterf -v | --version", Sty.CYAN, "           Print version", Sty.DEFAULT)
@@ -171,6 +171,7 @@ def print_help() -> None:
     printf("  remoterf --login", Sty.GREEN)
     printf("  remoterf --login ucla", Sty.GREEN)
     printf("  remoterf --login global", Sty.GREEN)
+    printf("  remoterf --login ethan@ucla", Sty.GREEN)
     printf("  remoterf homes", Sty.GREEN)
     printf("  remoterf --version", Sty.GREEN)
     printf("  remoterf --config --addr 203.0.113.10:12321", Sty.GREEN)
@@ -180,7 +181,8 @@ def print_help() -> None:
 
 def _account_shell(*, register: bool, enrollment_code: str | None = None,
                    server_label: str | None = None, show_banner: bool = True,
-                   home: str | None = None, route: dict | None = None) -> int:
+                   home: str | None = None, route: dict | None = None,
+                   username: str | None = None) -> int:
     ok, _ = _ensure_config_present()
     if not ok:
         _print_server_unavailable()
@@ -198,6 +200,7 @@ def _account_shell(*, register: bool, enrollment_code: str | None = None,
                 show_banner=show_banner,
                 home=home,
                 route=route,
+                username=username,
             )
             or 0
         )
@@ -212,7 +215,7 @@ def _global_origin() -> str:
     return os.getenv('REMOTERF_GLOBAL_ORIGIN', 'https://global.remoterf.net')
 
 
-def _use_global(*, register: bool, show_banner: bool = True) -> int:
+def _use_global(*, register: bool, show_banner: bool = True, username: str | None = None) -> int:
     """Register or log in with the RemoteRF Global identity itself.
 
     A Global-native account is complete on its own: it needs no deployment
@@ -238,7 +241,7 @@ def _use_global(*, register: bool, show_banner: bool = True) -> int:
     except (RuntimeError, ValueError) as exc:
         print(f'Could not reach RemoteRF Global: {exc}')
         return 2
-    return _account_shell(register=register, show_banner=show_banner)
+    return _account_shell(register=register, show_banner=show_banner, username=username)
 
 
 @contextmanager
@@ -293,7 +296,8 @@ def _reason(exc: BaseException) -> str:
     return str(exc)
 
 
-def _use_home(name: str, *, register: bool, enrollment_code: str | None = None) -> int:
+def _use_home(name: str, *, register: bool, enrollment_code: str | None = None,
+              username: str | None = None) -> int:
     from remoterf.deployment import homes
 
     try:
@@ -309,6 +313,7 @@ def _use_home(name: str, *, register: bool, enrollment_code: str | None = None)
         server_label=f'{name} ({_route_label(route)})',
         home=name,
         route={**route, 'home': home},
+        username=username,
     )
 
 
@@ -382,6 +387,8 @@ def _login(target: str | None) -> int:
     if not require_tos_for_login():
         return 1
     homes.migrate_legacy_target()
+    if target is not None and '@' in target:
+        return _login_as(target)
     if target is None:
         last = homes.last_target()
         saved = sorted(homes.homes())
@@ -397,7 +404,7 @@ def _login(target: str | None) -> int:
             # Nothing saved. A legacy address in .env still logs in there;
             # a fresh install has nothing to log in to, so `-l` is `-r`.
             if not _ensure_config_present()[0]:
-                return _register()
+                return _login_by_username()
             return _account_shell(register=False)
     if target == 'global':
         # Global's address is built in, so a fresh install can log in to an
@@ -409,6 +416,41 @@ def _login(target: str | None) -> int:
     return _use_home(target, register=False)
 
 
+def _login_by_username() -> int:
+    """A fresh install: an account says where it lives (`ethan@ucla`), so
+    asking for it is enough. Enter registers, as `-l` here always did."""
+    try:
+        name = input('Account, e.g. ethan@ucla (Enter to register): ').strip()
+    except (EOFError, KeyboardInterrupt):
+        print()
+        return 1
+    if not name:
+        return _register()
+    return _login_as(name)
+
+
+def _login_as(account: str) -> int:
+    """Log in to `name@lab` at that lab; a bare name or an email is Global."""
+    from remoterf.deployment import homes
+
+    name, lab = homes.split_account(account)
+    if lab is None or lab == homes.GLOBAL_ACCOUNTS:
+        return _use_global(register=False, username=name)
+    if lab in homes.homes():
+        return _use_home(lab, register=False, username=name)
+    host = f'{lab}.{homes.GLOBAL_DOMAIN}'
+    try:
+        with _working(f"Looking up {host}…"):
+            lab, home, route = homes.register_home(host)
+    except (RuntimeError, ValueError) as exc:
+        printf(f'Could not reach {host}: {_reason(exc)}', Sty.WARNING)
+        return 2
+    return _account_shell(
+        register=False, server_label=f'{lab} ({_route_label(route)})',
+        home=lab, route={**route, 'home': home}, username=name,
+    )
+
+
 def _print_pick_a_target() -> int:
     _print_homes()
     printf('Choose one: ', Sty.GRAY, 'remoterf --login <name>', Sty.CYAN)

{remoterf-2.2.2.dist-info → remoterf-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.2.2
+Version: 2.2.4
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later

{remoterf-2.2.2.dist-info → remoterf-2.2.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 remoterf.py,sha256=3fQ4zYeDo4Q8n5stT0H5ol8t2njckfY-FDuTZ2yEx5w,1843
 remoterf/__init__.py,sha256=-1h_xQjiE66oiWRO-vnLGJ4smpgUNhFuV-ZreW9_tD4,667
-remoterf/remoterf_cli.py,sha256=yqCypQAefP4C120G9848gZMsZXCM4W1HRyJWb6zX7eY,22034
+remoterf/remoterf_cli.py,sha256=VG-56Ncs2r8HMWPUa0wg98rhbIcW-z_aHqkaFnzCNcI,23682
 remoterf/version.py,sha256=NWzcPOAdd567IvC8ei1yyPdeS7w0kt99oKwL6oWAQSc,850
 remoterf/common/__init__.py,sha256=ey1IjkAaXFL1sZBnBwuWVlHhA_n0bu_uxgkDV_KOxYg,708
 remoterf/common/tos_notice.txt,sha256=fUHXV6U9uhZDvVs8BcRi4kWbU1PeU9mkxML0n5DDQp8,334
@@ -22,8 +22,8 @@ remoterf/config/__init__.py,sha256=-1h_xQjiE66oiWRO-vnLGJ4smpgUNhFuV-ZreW9_tD4,6
 remoterf/config/cert_fetcher.py,sha256=_m4CiYxJPTckDrdynwUjwnehD_gd6yZoly5etfT83JY,6986
 remoterf/config/config.py,sha256=xuwYXS7zLgG77nSEn6br4X0vXK7Z2rlmBKedyDVI7Fc,9353
 remoterf/core/__init__.py,sha256=1E9ARnxVICp4uCpGNQT3Fb-jD9TvUYbJmctuUqPy8hU,1206
-remoterf/core/acc_login.py,sha256=Qct7vEsc0OIdVwmikOv2mVv9-ehH4CMVw7QWHe2yOsg,1010
-remoterf/core/app.py,sha256=bOdy0nuJC4r3ubB5_cAz48XV24YHDwn_0MjVBXpbOws,73373
+remoterf/core/acc_login.py,sha256=i-uKtN2LPaGbPy0ngUzR1fIXWTxSMUwyDHF3ProEKz4,1052
+remoterf/core/app.py,sha256=ILWi3RLr9svP7D2nMnOntoXLvp--bv0Q3UI5uYpDHp0,74087
 remoterf/core/banner_note.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remoterf/core/direct_path.py,sha256=PeqagybrFESHO9-LKwR8F8t14T0dJTZHIlRxepTQtoo,32291
 remoterf/core/dynamic_v2_transport.py,sha256=rR0Mfjh3Kcz4QJKJen2gsUNjYtHy22PfsZg2KLDIptI,22052
@@ -34,7 +34,7 @@ remoterf/core/v2_errors.py,sha256=Xmuta24cfQEy4FGG7HZk7B9hD5g4pGT5Hz8Eguy42lU,29
 remoterf/deployment/__init__.py,sha256=aEl9z32KMUBfRRm6Ho0-fM-VUtiKIRq4bQBU2_u29-c,69
 remoterf/deployment/backend.py,sha256=FNj3wYk0NSpt4LZnBNwU4OHSCFGLNGYmmuSuFZ6rIcQ,16155
 remoterf/deployment/direct.py,sha256=uD72drR0Z21cNG7xSZUeDiQ80OSspFLj9BS_vj9Dapk,1048
-remoterf/deployment/homes.py,sha256=BSdBMpS4DveL35lS-YLlKKdSvNxJrjaGeRyQZAfQb6g,12358
+remoterf/deployment/homes.py,sha256=HhfKuKw_Ul540rLVy2Bu_txxeP_3OqWXv8z14_Y3_v4,12852
 remoterf/deployment/http.py,sha256=ePwOyRrkwNiciIOImqMiS1VoJCw51j6MeLEcaMavgh0,4564
 remoterf/deployment/state.py,sha256=rXHEMf-kJP1sYCJn-VD84ZNalkYUaNAiYaoaVu4uo3U,6541
 remoterf/drivers/__init__.py,sha256=DXjon8E0R1X27fDQDy6IrwzqTFwrT6-suC5VSDXUP8Y,1250
@@ -59,9 +59,9 @@ remoterf/drivers/ti_mmwave/ti_mmwave_remote.py,sha256=hYUJUtPz3yRgGsmXzwo95ZYnvJ
 remoterf/drivers/usrp/__init__.py,sha256=y79nl50_4dV9-AI3cfDptOAWeR58fAaihHObqJI9HJM,780
 remoterf/drivers/usrp/usrp_remote.py,sha256=hBh_CmGOAoEkkdQQ8uPFAsBA6LVeZsPSlpPGgo1c7sM,115018
 remoterf/drivers/usrp/usrp_remote.pyi,sha256=MG7rMJdjyT0hLLoJmnS1emDQjgepWz695GbFED3v-T4,11810
-remoterf-2.2.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf-2.2.2.dist-info/METADATA,sha256=ao6P--YcXdeAseHEKKbiuZ9j_0LQxE5Cilb4zZ5LlOQ,12778
-remoterf-2.2.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf-2.2.2.dist-info/entry_points.txt,sha256=83-XNRsKpeQK8A0rzkPfjwb4zF4m3l3cCRhxWm_Er0w,56
-remoterf-2.2.2.dist-info/top_level.txt,sha256=BUtCT3KOhL-A4r6WL4RslW53rsZflOhHwq77RODYhlk,9
-remoterf-2.2.2.dist-info/RECORD,,
+remoterf-2.2.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf-2.2.4.dist-info/METADATA,sha256=RP019PUTxHjFKaxn7v7q5hORP5RBF7OQM3cxZJQMv1c,12778
+remoterf-2.2.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf-2.2.4.dist-info/entry_points.txt,sha256=83-XNRsKpeQK8A0rzkPfjwb4zF4m3l3cCRhxWm_Er0w,56
+remoterf-2.2.4.dist-info/top_level.txt,sha256=BUtCT3KOhL-A4r6WL4RslW53rsZflOhHwq77RODYhlk,9
+remoterf-2.2.4.dist-info/RECORD,,