remoteRF-server 1.1.0.dev33__py3-none-any.whl → 1.1.0.dev35__py3-none-any.whl

remoteRF_server/server/commands.py

@@ -153,8 +153,8 @@ def _table() -> list[Command]:
         Command(("cluster invite",), "Invite code for a lab: cluster invite <name>", _federation("invite"), "Clusters"),
         Command(("cluster join",), "Join with a code: cluster join <code>", _federation("join"), "Clusters"),
         Command(("cluster remove",), "Leave or disband: cluster remove <name>", _federation("remove"), "Clusters"),
-        Command(("cluster groups",), "Groups you share: cluster groups <name> [add|remove <group>]", _federation("groups"), "Clusters"),
-        Command(("cluster codes",), "Student codes for a cluster: cluster codes <name> [count]", _federation("codes"), "Clusters"),
+        Command(("cluster groups",), "Choose which of your groups a cluster shares (interactive)", _federation("groups"), "Clusters"),
+        Command(("cluster codes",), "Codes for your users to join a cluster: cluster codes [count]", _federation("codes"), "Clusters"),
         Command(("cluster accept",), "", _federation("accept"), "Clusters", hidden=True),
         Command(("global cluster",), "", _federation("cluster"), "Global", hidden=True),
         # ---- gist ----

remoteRF_server/server/federation/cli.py

@@ -17,6 +17,7 @@
 
 from __future__ import annotations
 
+import re
 import sys
 from pathlib import Path
 
@@ -106,7 +107,7 @@ def _ask_for(verb: str) -> str:
     what = {"create": "Name for the new cluster (short slug, e.g. ucla-lab)",
             "invite": "Which cluster to invite a lab into",
             "accept": "Which cluster's pending join to accept",
-            "groups": "Which cluster's shared groups to show",
+            "groups": "Which cluster to share groups with",
             "codes": "Which cluster to make student codes for",
             "remove": "Which cluster to leave (revokes the contract)"}[verb]
     if verb != "create" and names:
@@ -115,6 +116,40 @@ def _ask_for(verb: str) -> str:
     return _input(f"{what}{f' [{default}]' if default else ''}: ") or default
 
 
+def _share_groups(name: str) -> int:
+    """Pick, by number, which of this server's groups the cluster shares.
+    Toggling: a shared group chosen again is unshared."""
+    from ...common.utils.ansi_codes import Sty
+    from ..user_group_handler import user_group_handler
+    from . import cluster
+
+    all_groups = user_group_handler.get_all_user_groups(include_users=False) or []
+    if not all_groups:
+        _print("  No user groups yet: make one with `groups create`, then share it here.", Sty.WARNING)
+        return 1
+    shared = {g["group_id"] for g in cluster.groups(name)}
+    print(f"  Groups on this server (shared with {name} are marked):")
+    for index, group in enumerate(all_groups, 1):
+        mark = "*" if int(group["group_id"]) in shared else " "
+        devices = group.get("devices_whitelist") or []
+        print(f"   {mark} {index:>2}  {group['group_name']}  ({len(devices)} device{'s' if len(devices) != 1 else ''})")
+    answer = _input("Toggle by number, e.g. 2 or 1,3 (Enter to leave as is): ")
+    picks = [part for part in re.split(r"[\s,]+", answer) if part]
+    if not picks:
+        return 0
+    for pick in picks:
+        if not pick.isdigit() or not 1 <= int(pick) <= len(all_groups):
+            _print(f"  {pick} is not a number in the list.", Sty.WARNING)
+            continue
+        group = all_groups[int(pick) - 1]
+        if int(group["group_id"]) in shared:
+            _print(f"  {cluster.detach_group(name, str(group['group_id']))} is no longer shared with {name}.", Sty.GRAY)
+        else:
+            _print(f"  {cluster.attach_group(name, str(group['group_id']))} is now shared with {name}; "
+                   "everyone in the cluster gets it.", Sty.GRAY)
+    return 0
+
+
 def _input(prompt: str) -> str:
     # The console's own prompt session: a bare input() inside the running
     # server fights prompt_toolkit for the terminal and kills the process.
@@ -128,7 +163,7 @@ def _input(prompt: str) -> str:
 
 
 _USAGE = ("Usage: cluster list | cluster create|invite|remove <name> | cluster join <code> | "
-          "cluster groups <name> [add|remove <group>] | cluster codes <name> [count]")
+          "cluster groups [<name>] | cluster codes [<name>] [count]")
 
 
 def cmd_cluster(argv: list[str]) -> int:
@@ -140,6 +175,10 @@ def cmd_cluster(argv: list[str]) -> int:
     words = [a for a in argv[1:] if not a.startswith("--")]
     if verb == "list" and not words:
         return cmd_clusters()
+    if verb == "codes" and words and words[0].isdigit() and words[0] not in cluster.load():
+        words = [_ask_for(verb), words[0]]  # `cluster codes 3`: the count came first
+        if not words[0]:
+            return 2
     if not words and verb in ("create", "invite", "accept", "join", "remove", "groups", "codes"):
         # Leaving the argument out asks for it (docs/deployment-groups.md §8).
         answer = _ask_for(verb)
@@ -167,10 +206,8 @@ def cmd_cluster(argv: list[str]) -> int:
         elif verb == "remove" and arg:
             _print(f"  {arg}: {cluster.remove(arg)}.", Sty.GRAY)
         elif verb == "groups" and len(words) == 1:
-            shared = cluster.groups(arg)
-            _print(f"  {arg} shares: " + (", ".join(g["group_name"] for g in shared) or "nothing yet"), Sty.GRAY)
-            _print(f"  Attach one with `cluster groups {arg} add <group>`; students of every lab in the "
-                   "cluster get it. Group names stay on this server.", Sty.GRAY)
+            cluster._find(cluster.load(), arg)
+            return _share_groups(arg)
         elif verb == "groups" and len(words) == 3 and words[1] in ("add", "remove"):
             if words[1] == "add":
                 _print(f"  {cluster.attach_group(arg, words[2])} is now shared with {arg}.", Sty.GRAY)

remoteRF_server/server/federation/cluster.py

@@ -623,22 +623,28 @@ def _sync_contract(party: dict, peer: str, directory: list[dict]) -> str:
             parties = {terms.get("deployment_a"), terms.get("deployment_b")}
             if parties != {peer, store.local_deployment_id} or item["version"] != 1 or not item.get("events"):
                 continue
-            store.import_bundle(canonical_json({
-                "protocol_version": "2", "terms": terms, "events": item["events"],
-            }))
-            if store.show(item["contract_id"], 1)["state"] != "revoked":
+            if _import(store, terms, item["events"]) != "revoked":
                 candidates.append((terms["valid_from"], item["contract_id"]))
         if not candidates:
             return party["state"]
         party["contract_id"] = max(candidates)[1]
     for item in directory:
         if item["contract_id"] == party["contract_id"] and item.get("terms"):
-            store.import_bundle(canonical_json({
-                "protocol_version": "2", "terms": item["terms"], "events": item["events"],
-            }))
+            _import(store, item["terms"], item["events"])
     return store.show(party["contract_id"], 1)["state"]
 
 
+def _import(store: ContractStore, terms: dict, events: list) -> str:
+    """Import a directory entry; a contract already revoked here (an earlier
+    cluster between the same labs) is simply reported as such."""
+    try:
+        store.import_bundle(canonical_json({"protocol_version": "2", "terms": terms, "events": events}))
+    except ContractError as exc:
+        if exc.code not in ("contract_revoked", "contract_terminal", "invalid_transition"):
+            raise
+    return store.show(terms["contract_id"], 1)["state"]
+
+
 def _advance(party: dict, peer: str, directory: list[dict], *, label: str, notify, is_member: bool) -> None:
     """Move one bilateral contract one step; notify on active / revoked."""
     before = party.get("state")

{remoterf_server-1.1.0.dev33.dist-info → remoterf_server-1.1.0.dev35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.1.0.dev33
+Version: 1.1.0.dev35
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.1.0.dev33.dist-info → remoterf_server-1.1.0.dev35.dist-info}/RECORD

@@ -52,7 +52,7 @@ remoteRF_server/host/host_tunnel_server.py,sha256=sz06xOtFbaDZSy1UQfw6faKhJmuOy5
 remoteRF_server/server/__init__.py,sha256=-1h_xQjiE66oiWRO-vnLGJ4smpgUNhFuV-ZreW9_tD4,667
 remoteRF_server/server/acc_perms.py,sha256=2loCvstVu8uvsb2uCv2Sk7iNQ5GyO_sBIkPQFzqOaRI,13334
 remoteRF_server/server/cert_provider.py,sha256=CRDrZL4DSf-eL6wzPJzwucrzPLOr2PvNRq5V--oZtr0,6272
-remoteRF_server/server/commands.py,sha256=9ExGTi3nG7wqgSAyOEIFMDz0iBFLwC8QJdXrKNZNB5A,17277
+remoteRF_server/server/commands.py,sha256=xG_RAYm0nHDqN74b-QPHizw2OodfrYAvdYlVNNi7tGE,17279
 remoteRF_server/server/console.py,sha256=J91LfwPVmBgielOxfE740NOYduekggyZkqi-47y_A4w,4472
 remoteRF_server/server/control.py,sha256=Uq1Fk0zIoHHX_EXfz3OuNle8urvO_UhAiB5Lk5cs2e4,5177
 remoteRF_server/server/device_manager.py,sha256=nRTvk_jeZFU3QnlM6qf3DIckU2V2e_gyDeD5gW14KQI,38802
@@ -70,8 +70,8 @@ remoteRF_server/server/deployment/__init__.py,sha256=YV86uafd8XiGD7sLaqNfO5xxmt5
 remoteRF_server/server/deployment/capabilities.py,sha256=20RxmGG03VoQQZnV3jGhc-3i9B5hOl5fCopnsErFjPk,872
 remoteRF_server/server/federation/__init__.py,sha256=auqdGiGnEGIKQiXX2jFVt8iWmfyZ-V3w4dUmtWDKAZE,735
 remoteRF_server/server/federation/admin.py,sha256=t3F17FIytekzclPICmaFJEA4-F5OuWcDx3rgmFga17A,9187
-remoteRF_server/server/federation/cli.py,sha256=nFlUGmhpndw0RafjeRQjz7cYieKtKy7U60_n738g-s0,9021
-remoteRF_server/server/federation/cluster.py,sha256=dsraUf7wKG4GdqcyhdO195v1ypwSRpFcJdyY5uatHCM,32932
+remoteRF_server/server/federation/cli.py,sha256=m3fzURqmnZH1pO7wHyqg5EUoo4ZPiw7P3K_9q8SXQu8,10703
+remoteRF_server/server/federation/cluster.py,sha256=yKGFRAI-RHB_xZivJkxaK_Fniz2XGRUfArJXM_DH2WQ,33207
 remoteRF_server/server/federation/contracts.py,sha256=NYh7lb_9etJHFfzXwevjC4HfSBUypLxg5xGeBgydLF4,29305
 remoteRF_server/server/federation/destination.py,sha256=XawmGCiVbL_MfNNn8xwV9_bYxUDW1L7efCpL11K2JAc,35909
 remoteRF_server/server/federation/devices.py,sha256=n5MvnD0UZyl4sFpiekG9ProanWXTYizYq6YchCflLgY,18061
@@ -90,9 +90,9 @@ remoteRF_server/tools/gen_certs.py,sha256=Vbyu8JjRu__UYPVmyCRXt5SOw0Za1HV7g1md3G
 remoteRF_server/tools/gist_status.py,sha256=SFv2iQgQrIKT9gxKrU-_Dr7S0p0rE4wQM6J3OC6FcoM,4649
 remoteRF_server/tools/gist_status_testing.py,sha256=IYw7UkPjAUpKDTtIlnYGb5g6SJkwz4TRGUfJJ6f4LhQ,2690
 remoteRF_server/tools/introspect_uhd.py,sha256=vUpPb0rM9tsHPxWadS3EfMDE-gMd-TvNV0TjrZOQqBY,4531
-remoterf_server-1.1.0.dev33.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev33.dist-info/METADATA,sha256=4m84njQmG2sgUH0guTvQ-t5pjjbnq7nrcPj7EMKqxmU,42069
-remoterf_server-1.1.0.dev33.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev33.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev33.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev33.dist-info/RECORD,,
+remoterf_server-1.1.0.dev35.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev35.dist-info/METADATA,sha256=meRywJNeTPy2Yol5Gc-G6zGPXnvPdyIkH-JlIe9H93Y,42069
+remoterf_server-1.1.0.dev35.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev35.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev35.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev35.dist-info/RECORD,,