Merge origin/main: the tree-wide ruff pass beside the Music reconnect work

1 files changed, 23 insertions, 19 deletions

diff --git a/packages/meshbay-node/src/meshbay_node/daemon.py b/packages/meshbay-node/src/meshbay_node/daemon.py
index 3492d03..bb50bcf 100644
--- a/packages/meshbay-node/src/meshbay_node/daemon.py
+++ b/packages/meshbay-node/src/meshbay_node/daemon.py
@@ -25,43 +25,43 @@ Usage:
 """
 
 import asyncio
-from dataclasses import asdict, replace
 import base64
-import json
 import logging
 import os
 import signal
 import sys
 import time
+from dataclasses import asdict, replace
 from pathlib import Path
 
 import uvicorn
-
+from meshbay_common import MNP_VERSION
 from meshbay_common.background import spawn
 from meshbay_common.paths import fold
-from meshbay_common import MNP_VERSION
 from meshbay_common.protocol import MNP
-from meshbay_node.audit import RETENTION_DAYS as AUDIT_RETENTION_DAYS, AuditStore
+
+from meshbay_node import uploads as uploads_mod
+from meshbay_node.audit import RETENTION_DAYS as AUDIT_RETENTION_DAYS
+from meshbay_node.audit import AuditStore
 from meshbay_node.bundle_store import BundleStore
 from meshbay_node.chat.store import ChatStore
-from meshbay_node.config import Config, DEFAULT_CONFIG_PATH, load_config, write_example_config
-from meshbay_node.roots import RootSet, RootError, entry_abs_path, off_disk
+from meshbay_node.config import DEFAULT_CONFIG_PATH, Config, load_config
 from meshbay_node.hub_client import HubClient, HubConfig
-from meshbay_node.indexer import DirectoryIndexer, IndexCache, GroupIndex
+from meshbay_node.indexer import DirectoryIndexer, GroupIndex, IndexCache
 from meshbay_node.indexer.enrich import Enricher
 from meshbay_node.indexer.enrich_audio import AudioEnricher
 from meshbay_node.indexer.enrich_photo import PhotoEnricher
+from meshbay_node.keystore import create_keystore, load_keystore, load_or_create_keystore
 from meshbay_node.media_cache import MediaCache
-from meshbay_node.tmdb import TmdbClient
-from meshbay_node import uploads as uploads_mod
 from meshbay_node.musicbrainz import MusicBrainzClient
-from meshbay_node.keystore import create_keystore, load_keystore, load_or_create_keystore
 from meshbay_node.platform import chmod_private, config_dir, data_dir, state_dir
+from meshbay_node.roots import RootError, RootSet, entry_abs_path, off_disk
 from meshbay_node.roster import Roster
+from meshbay_node.tmdb import TmdbClient
 from meshbay_node.transport import (
-    Denylist,
     QUIC_AVAILABLE,
     WEBRTC_AVAILABLE,
+    Denylist,
 )
 from meshbay_node.transport.wire import index_delta_message, index_sync_message
 
@@ -109,8 +109,8 @@ def _owning_directory(path: str, directories: list[str]) -> str | None:
 
 def calibrate_argon2(target_ms: int = 500) -> None:
     """Benchmark Argon2id and suggest parameters targeting ~target_ms."""
-    import time
     import os
+    import time
 
     print(f"Calibrating Argon2id (target: {target_ms}ms) ...")
     salt = os.urandom(16)
@@ -1938,8 +1938,7 @@ def _systemctl_user(verb: str, unit: str, *, not_running_hint: str,
 def main() -> None:
     import argparse
 
-    from meshbay_node.platform import (configure_event_loop, force_utf8_stdio,
-                                        load_node_env)
+    from meshbay_node.platform import configure_event_loop, force_utf8_stdio, load_node_env
     force_utf8_stdio()
     configure_event_loop()
     # Before anything reads the environment. On Linux systemd has usually loaded
@@ -2164,10 +2163,10 @@ def main() -> None:
                 print("Aborted.")
                 return
 
-        import subprocess as _sp
         import json as _json
-        import urllib.request
+        import subprocess as _sp
         import urllib.error
+        import urllib.request
 
         token_file = data_dir_ / "ui-token"
         if token_file.exists():
@@ -2244,7 +2243,8 @@ def main() -> None:
                 _GUIDANCE = {
                     "node_key_link": (
                         "Link node key",
-                        f"Copy the node key above and paste it in Settings → Link Node on {cfg.hub.url}"),
+                        f"Copy the node key above and paste it in "
+                        f"Settings → Link Node on {cfg.hub.url}"),
                     "group_add": (
                         "Add a group",
                         "meshbay-node group add <name> --dir /path/to/files"),
@@ -2475,7 +2475,11 @@ def main() -> None:
     if args.command == "restart-daemon":
         if sys.platform == "win32":
             from meshbay_node.platform import (
-                autostart_end, autostart_run, service_end, service_run, service_status,
+                autostart_end,
+                autostart_run,
+                service_end,
+                service_run,
+                service_status,
             )
             if service_status()["installed"]:
                 service_end()