chore: address co-pilot readability comments

Author: allenporter

roborock/diagnostics.py

@@ -132,9 +132,6 @@ def redact_device_data(data: T) -> T | dict[str, Any]:
 def redact_topic_name(topic: str) -> str:
     """Redact potentially identifying information from a topic name."""
     parts = topic.split("/")
-    if len(parts) < 5:
-        return topic
-
     redacted_parts = parts[:4]
     for part in parts[4:]:
         if len(part) <= 5:
@@ -146,6 +143,4 @@ def redact_topic_name(topic: str) -> str:
 
 def redact_device_uid(duid: str) -> str:
     """Redact a device UID to hide identifying information."""
-    if len(duid) <= 5:
-        return "*****"
     return "******" + duid[-5:]

roborock/mqtt/roborock_session.py

@@ -18,7 +18,7 @@
 from aiomqtt import MqttCodeError, MqttError, TLSParameters
 
 from roborock.callbacks import CallbackMap
-from roborock.diagnostics import Diagnostics
+from roborock.diagnostics import Diagnostics, redact_topic_name
 
 from .health_manager import HealthManager
 from .session import MqttParams, MqttSession, MqttSessionException, MqttSessionUnauthorized
@@ -241,7 +241,7 @@ async def _mqtt_client(self, params: MqttParams) -> aiomqtt.Client:
                     self._client = client
                     for topic in self._client_subscribed_topics:
                         self._diagnostics.increment("resubscribe")
-                        _LOGGER.debug("Re-establishing subscription to topic %s", topic)
+                        _LOGGER.debug("Re-establishing subscription to topic %s", redact_topic_name(topic))
                         # TODO: If this fails it will break the whole connection. Make
                         # this retry again in the background with backoff.
                         await client.subscribe(topic)
@@ -261,13 +261,13 @@ async def subscribe(self, topic: str, callback: Callable[[bytes], None]) -> Call
         unsubscription for the idle timeout period. If a new subscription comes in during the
         timeout, the timer is cancelled and the subscription is reused.
         """
-        _LOGGER.debug("Subscribing to topic %s", topic)
+        _LOGGER.debug("Subscribing to topic %s", redact_topic_name(topic))
 
         # If there is an idle timer for this topic, cancel it (reuse subscription)
         if idle_timer := self._idle_timers.pop(topic, None):
             self._diagnostics.increment("unsubscribe_idle_cancel")
             idle_timer.cancel()
-            _LOGGER.debug("Cancelled idle timer for topic %s (reused subscription)", topic)
+            _LOGGER.debug("Cancelled idle timer for topic %s (reused subscription)", redact_topic_name(topic))
 
         unsub = self._listeners.add_callback(topic, callback)
 

tests/test_diagnostics.py

@@ -90,8 +90,8 @@ def test_redact_topic_name(topic: str, expected: str) -> None:
     "duid,expected",
     [
         ("3zQRtuIfY14BrRTivxxcMd", "******xxcMd"),
-        ("3zQ", "*****"),
-        ("", "*****"),
+        ("3zQ", "******3zQ"),
+        ("", "******"),
     ],
 )
 def test_redact_device(duid: str, expected: str) -> None: