Fix some frontend display/quality/doc issues

app/events.py

@@ -2,10 +2,10 @@
 
 import json
 import logging
-from typing import Any, Literal
+from typing import Any, Literal, NotRequired
 
 from pydantic import TypeAdapter
-from typing_extensions import NotRequired, TypedDict
+from typing_extensions import TypedDict
 
 from app.models import Channel, Contact, Message, MessagePath, RawPacketBroadcast
 from app.routers.health import HealthResponse

app/fanout/bot.py

@@ -164,7 +164,7 @@ class BotModule(FanoutModule):
                     ),
                     timeout=BOT_EXECUTION_TIMEOUT,
                 )
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 logger.warning("Bot '%s' execution timed out", self.name)
                 return
             except Exception:

app/fanout/community_mqtt.py

@@ -538,7 +538,7 @@ class CommunityMqttPublisher(BaseMqttPublisher):
             self._version_event.clear()
             try:
                 await asyncio.wait_for(self._version_event.wait(), timeout=30)
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 pass
             return False
         return True

app/fanout/manager.py

@@ -225,7 +225,7 @@ class FanoutManager:
             handler = getattr(module, handler_name)
             await asyncio.wait_for(handler(data), timeout=_DISPATCH_TIMEOUT_SECONDS)
             self._clear_module_error(config_id)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             timeout_error = f"{handler_name} timed out after {_DISPATCH_TIMEOUT_SECONDS:.1f}s"
             self._set_module_error(config_id, timeout_error)
             logger.error(

app/fanout/mqtt_base.py

@@ -196,7 +196,7 @@ class BaseMqttPublisher(ABC):
                             self._version_event.wait(),
                             timeout=self._not_configured_timeout,
                         )
-                except asyncio.TimeoutError:
+                except TimeoutError:
                     continue
                 except asyncio.CancelledError:
                     return
@@ -231,7 +231,7 @@ class BaseMqttPublisher(ABC):
                         self._version_event.clear()
                         try:
                             await asyncio.wait_for(self._version_event.wait(), timeout=60)
-                        except asyncio.TimeoutError:
+                        except TimeoutError:
                             elapsed = time.monotonic() - connect_time
                             await self._on_periodic_wake(elapsed)
                             if self._should_break_wait(elapsed):

app/keystore.py

@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
 
 NO_EVENT_RECEIVED_GUIDANCE = (
     "Radio command channel is unresponsive (no_event_received). Ensure that your firmware is not "
-    "incompatible, outdated, or wrong-mode (e.g. repeater, not client), and that"
+    "incompatible, outdated, or wrong-mode (e.g. repeater, not client), and that "
     "serial/TCP/BLE connectivity is successful (try another app and see if that one works?). The app cannot proceed because it cannot "
     "issue commands to the radio."
 )

app/radio.py

@@ -118,7 +118,7 @@ async def test_serial_device(port: str, baudrate: int, timeout: float = 3.0) ->
             return True
 
         return False
-    except asyncio.TimeoutError:
+    except TimeoutError:
         logger.debug("Device %s timed out", port)
         return False
     except Exception as e:

app/radio_sync.py

@@ -480,7 +480,7 @@ async def drain_pending_messages(mc: MeshCore) -> int:
             # Small delay between fetches
             await asyncio.sleep(0.1)
 
-        except asyncio.TimeoutError:
+        except TimeoutError:
             break
         except Exception as e:
             logger.warning("Error draining messages: %s", e, exc_info=True)
@@ -518,7 +518,7 @@ async def poll_for_messages(mc: MeshCore) -> int:
             # If we got a message, there might be more - drain them
             count += await drain_pending_messages(mc)
 
-    except asyncio.TimeoutError:
+    except TimeoutError:
         pass
     except Exception as e:
         logger.warning("Message poll exception: %s", e, exc_info=True)

app/routers/debug.py

@@ -4,7 +4,7 @@ import os
 import platform
 import struct
 import sys
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any, Literal
 
 from fastapi import APIRouter
@@ -390,7 +390,7 @@ async def debug_support_snapshot() -> DebugSnapshotResponse:
         is_reconnecting=is_reconnecting,
     )
     return DebugSnapshotResponse(
-        captured_at=datetime.now(timezone.utc).isoformat(),
+        captured_at=datetime.now(UTC).isoformat(),
         system=_build_system_info(),
         application=_build_application_info(),
         health=_build_debug_health_summary(health_data, radio_state=radio_state),

app/routers/radio.py

@@ -473,7 +473,7 @@ async def discover_mesh(request: RadioDiscoveryRequest) -> RadioDiscoveryRespons
                     break
                 try:
                     event = await asyncio.wait_for(events.get(), timeout=remaining)
-                except asyncio.TimeoutError:
+                except TimeoutError:
                     break
 
                 merged = _merge_discovery_result(
@@ -536,7 +536,7 @@ async def trace_path(request: RadioTraceRequest) -> RadioTraceResponse:
             timeout_seconds = _trace_timeout_seconds(send_result)
             try:
                 event = await asyncio.wait_for(response_task, timeout=timeout_seconds)
-            except asyncio.TimeoutError as exc:
+            except TimeoutError as exc:
                 raise HTTPException(status_code=504, detail="No trace response heard") from exc
         finally:
             if not response_task.done():

app/routers/server_control.py

@@ -94,7 +94,7 @@ async def fetch_contact_cli_response(
     while _monotonic() < deadline:
         try:
             result = await mc.commands.get_msg(timeout=2.0)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             continue
         except Exception as exc:
             logger.debug("get_msg() exception: %s", exc)
@@ -196,7 +196,7 @@ async def prepare_authenticated_contact_connection(
                 login_future,
                 timeout=response_timeout,
             )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             logger.warning(
                 "No login response from %s %s within %.1fs",
                 contact_label,

app/services/radio_lifecycle.py

@@ -1,6 +1,6 @@
 import asyncio
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 logger = logging.getLogger(__name__)
 
@@ -193,7 +193,7 @@ async def run_post_connect_setup(radio_manager) -> None:
                                 logger.info(
                                     "Radio clock at connect: epoch=%d utc=%s",
                                     radio_time,
-                                    datetime.fromtimestamp(radio_time, timezone.utc).strftime(
+                                    datetime.fromtimestamp(radio_time, UTC).strftime(
                                         "%Y-%m-%d %H:%M:%S UTC"
                                     ),
                                 )
@@ -274,7 +274,7 @@ async def prepare_connected_radio(radio_manager, *, broadcast_on_success: bool =
         try:
             await radio_manager.post_connect_setup()
             break
-        except asyncio.TimeoutError as exc:
+        except TimeoutError as exc:
             if attempt < POST_CONNECT_SETUP_MAX_ATTEMPTS:
                 logger.warning(
                     "Post-connect setup timed out after %ds on attempt %d/%d; retrying once",

app/version_info.py

@@ -13,13 +13,12 @@ import importlib.metadata
 import json
 import os
 import subprocess
+import tomllib
 from dataclasses import dataclass
 from functools import lru_cache
 from pathlib import Path
 from typing import Any
 
-import tomllib
-
 RELEASE_BUILD_INFO_FILENAME = "build_info.json"
 PROJECT_NAME = "remoteterm-meshcore"
 

app/websocket.py

@@ -59,7 +59,7 @@ class WebSocketManager:
             try:
                 # Timeout prevents blocking on slow/unresponsive clients
                 await asyncio.wait_for(connection.send_text(message), timeout=SEND_TIMEOUT_SECONDS)
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 logger.debug("Timeout sending to WebSocket client, marking disconnected")
                 disconnected.append(connection)
             except Exception as e: