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

remoteRF_server/server/federation/cli.py

@@ -59,26 +59,32 @@ def cmd_clusters() -> int:
     items = cluster.list_clusters()
     if not items:
         rows.append("No clusters. Start one with `cluster create <name>`.")
+    me = {"display_name": config["display_name"], "deployment_id": state.deployment_id}
     for index, item in enumerate(items):
         if index:
             rows.append("")
         if item["role"] == "owner":
-            count = len(item["members"])
-            rows.append(f"{item['name']}  (yours)  {count} member lab{'s' if count != 1 else ''}"
-                        + (f", {item['open_invites']} open invite{'s' if item['open_invites'] != 1 else ''}"
-                           if item["open_invites"] else ""))
-            for member in item["members"]:
-                rows.append(f"    {_lab(member)}  {member['state'] or 'joining'}"
-                            + (f"  since {_day(member['joined_at'])}" if member.get("joined_at") else ""))
-            if not item["members"] and not item["open_invites"]:
+            invites = item["open_invites"]
+            rows.append(f"{item['name']}  (yours)" + (f"  {invites} open invite{'s' if invites != 1 else ''}" if invites else ""))
+            labs = [(me, "admin", "", None)] + [
+                (m, "member", m["state"] or "joining", m.get("joined_at")) for m in item["members"]]
+            if not item["members"] and not invites:
                 rows.append(f"    nobody yet: `cluster invite {item['name']}`")
         else:
-            owner = _lab({"display_name": item.get("peer_name"), "deployment_id": item["peer"]})
-            rows.append(f"{item['name']}  owned by {owner}  {item['state']}")
-            for peer in item.get("peers", []):
-                rows.append(f"    {_lab(peer)}  {peer['state'] or 'joining'}")
-        shared = ", ".join(group["group_name"] for group in item["groups"]) or "none"
-        rows.append(f"    sharing: {shared}" + ("" if item["groups"] else f"  (`cluster groups {item['name']} add <group>`)"))
+            owner = {"display_name": item.get("peer_name"), "deployment_id": item["peer"]}
+            rows.append(f"{item['name']}  {item['state']}")
+            labs = [(owner, "admin", "", None), (me, "member", "", None)] + [
+                (p, "member", p["state"] or "joining", None) for p in item.get("peers", [])]
+        for lab, role, lab_state, since in labs:
+            you = "  (you)" if lab["deployment_id"] == me["deployment_id"] else ""
+            line = f"    {_lab(lab)}  {role}{you}"
+            if lab_state and lab_state != "active":
+                line += f"  {lab_state}"
+            if since:
+                line += f"  since {_day(since)}"
+            rows.append(line)
+        if item["groups"]:
+            rows.append("    sharing: " + ", ".join(group["group_name"] for group in item["groups"]))
         rows.append(f"    {item['students']} of your users enrolled, {item['visitors']} visiting")
     print()
     print_panel("Clusters", rows, literal=True)

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

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

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

@@ -70,7 +70,7 @@ 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=hQt6tM2y42EzKE2WDzBat3pxEqLjreunogjI_kauxYk,8849
+remoteRF_server/server/federation/cli.py,sha256=nFlUGmhpndw0RafjeRQjz7cYieKtKy7U60_n738g-s0,9021
 remoteRF_server/server/federation/cluster.py,sha256=dsraUf7wKG4GdqcyhdO195v1ypwSRpFcJdyY5uatHCM,32932
 remoteRF_server/server/federation/contracts.py,sha256=NYh7lb_9etJHFfzXwevjC4HfSBUypLxg5xGeBgydLF4,29305
 remoteRF_server/server/federation/destination.py,sha256=XawmGCiVbL_MfNNn8xwV9_bYxUDW1L7efCpL11K2JAc,35909
@@ -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.dev32.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev32.dist-info/METADATA,sha256=E5JcHfXHeFhGNYFGR6kxbeehuNFsCStN4wJr9E6RrCk,42069
-remoterf_server-1.1.0.dev32.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev32.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev32.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev32.dist-info/RECORD,,
+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,,