Interpolation fix for sensor discovery messages

raetha · raetha · commit 7b6a84b85d0d · 2026-01-12T16:28:56.000-05:00
diff --git a/wyzesense2mqtt/wyzesense2mqtt.py b/wyzesense2mqtt/wyzesense2mqtt.py
@@ -521,7 +521,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                 'hw_version': attr['hw_version'],
                 'name': attr['name'],
                 'sw_version': attr['sw_version'],
-                'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
             }
         }
 
@@ -540,7 +540,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                     'hw_version': attr['hw_version'],
                     'name': attr['name'],
                     'sw_version': attr['sw_version'],
-                    'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                    'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
                 }
             }
 
@@ -558,7 +558,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                     'hw_version': attr['hw_version'],
                     'name': attr['name'],
                     'sw_version': attr['sw_version'],
-                    'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                    'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
                 }
             }
 
@@ -575,7 +575,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                     'hw_version': attr['hw_version'],
                     'name': attr['name'],
                     'sw_version': attr['sw_version'],
-                    'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                    'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
                 }
             }
 
@@ -593,7 +593,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                 'hw_version': attr['hw_version'],
                 'name': attr['name'],
                 'sw_version': attr['sw_version'],
-                'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
             }
         }
 
@@ -610,7 +610,7 @@ def send_discovery_topics(sensor_mac, wait=True):
                 'hw_version': attr['hw_version'],
                 'name': attr['name'],
                 'sw_version': attr['sw_version'],
-                'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+                'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
             }
         }
     else:
@@ -630,7 +630,7 @@ def send_discovery_topics(sensor_mac, wait=True):
             'hw_version': attr['hw_version'],
             'name': attr['name'],
             'sw_version': attr['sw_version'],
-            'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+            'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
         }
     }
     entity_payloads['battery'] = {
@@ -645,7 +645,7 @@ def send_discovery_topics(sensor_mac, wait=True):
             'hw_version': attr['hw_version'],
             'name': attr['name'],
             'sw_version': attr['sw_version'],
-            'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
+            'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`521`	`521`	`'hw_version': attr['hw_version'],`
`522`	`522`	`'name': attr['name'],`
`523`	`523`	`'sw_version': attr['sw_version'],`
`524`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`524`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`
`@@ -540,7 +540,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`540`	`540`	`'hw_version': attr['hw_version'],`
`541`	`541`	`'name': attr['name'],`
`542`	`542`	`'sw_version': attr['sw_version'],`
`543`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`543`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`544`	`544`	`}`
`545`	`545`	`}`
`546`	`546`
`@@ -558,7 +558,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`558`	`558`	`'hw_version': attr['hw_version'],`
`559`	`559`	`'name': attr['name'],`
`560`	`560`	`'sw_version': attr['sw_version'],`
`561`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`561`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
`@@ -575,7 +575,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`575`	`575`	`'hw_version': attr['hw_version'],`
`576`	`576`	`'name': attr['name'],`
`577`	`577`	`'sw_version': attr['sw_version'],`
`578`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`578`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`579`	`579`	`}`
`580`	`580`	`}`
`581`	`581`
`@@ -593,7 +593,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`593`	`593`	`'hw_version': attr['hw_version'],`
`594`	`594`	`'name': attr['name'],`
`595`	`595`	`'sw_version': attr['sw_version'],`
`596`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`596`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`597`	`597`	`}`
`598`	`598`	`}`
`599`	`599`
`@@ -610,7 +610,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`610`	`610`	`'hw_version': attr['hw_version'],`
`611`	`611`	`'name': attr['name'],`
`612`	`612`	`'sw_version': attr['sw_version'],`
`613`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`613`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`614`	`614`	`}`
`615`	`615`	`}`
`616`	`616`	`else:`
`@@ -630,7 +630,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`630`	`630`	`'hw_version': attr['hw_version'],`
`631`	`631`	`'name': attr['name'],`
`632`	`632`	`'sw_version': attr['sw_version'],`
`633`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`633`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`634`	`634`	`}`
`635`	`635`	`}`
`636`	`636`	`entity_payloads['battery'] = {`
`@@ -645,7 +645,7 @@ def send_discovery_topics(sensor_mac, wait=True):`
`645`	`645`	`'hw_version': attr['hw_version'],`
`646`	`646`	`'name': attr['name'],`
`647`	`647`	`'sw_version': attr['sw_version'],`
`648`		`- 'via_device': "wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
	`648`	`+ 'via_device': f"wyzesense2mqtt_bridge_{WYZESENSE_DONGLE.MAC}"`
`649`	`649`	`}`
`650`	`650`	`}`
`651`	`651`