Merge branch 'main' into fix/mqtt-sample-not-working

pysesameos2/chsesame2.py

@@ -166,16 +166,6 @@ def setIntention(self, intent: CHSesame2Intention) -> None:
         logger.debug(f"setIntention: {intent}")
         self._intention = intent
 
-    def setDeviceStatusCallback(
-        self, callback: Optional[Callable[["CHSesame2"], None]]
-    ) -> None:
-        """Set a device status callback.
-
-        Args:
-            callback (Optional[Callable[[CHSesame2], None]]): The callback to be called on device status changing.
-        """
-        pass
-
     async def connect(self) -> None:
         adv = self.getAdvertisement()
         if not adv:

pysesameos2/chsesamebot.py

@@ -166,16 +166,6 @@ def setIntention(self, intent: CHSesame2Intention) -> None:
         logger.debug(f"setIntention: {intent}")
         self._intention = intent
 
-    def setDeviceStatusCallback(
-        self, callback: Optional[Callable[["CHSesameBot"], None]]
-    ) -> None:
-        """Set a device status callback.
-
-        Args:
-            callback (Optional[Callable[[CHSesameBot], None]]): The callback to be called on device status changing.
-        """
-        pass
-
     async def connect(self) -> None:
         adv = self.getAdvertisement()
         if not adv:

pysesameos2/device.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 import uuid
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
 
 from bleak.backends.characteristic import BleakGATTCharacteristic
 
@@ -82,6 +82,9 @@ def setSesame2PublicKey(self, key: Union[bytes, str]) -> None:
         self._sesame2PublicKey = key
 
 
+CHD = TypeVar("CHD", bound="CHDevices")
+
+
 class CHDevices:
     def __init__(self) -> None:
         """Generic Implementation for Candyhouse products."""
@@ -90,7 +93,7 @@ def __init__(self) -> None:
         self._registered: bool = False
         self._rssi: int = -100
         self._deviceStatus: CHSesame2Status = CHSesame2Status.NoBleSignal  # type: ignore
-        self._deviceStatus_callback: Optional[Callable[[CHDevices], None]] = None
+        self._deviceStatus_callback: Optional[Callable[[CHD], None]] = None
         self._advertisement: Optional[BLEAdvertisement] = None
         self._key: CHDeviceKey = CHDeviceKey()
         self._login_event = asyncio.Event()
@@ -264,7 +267,7 @@ def setAdvertisement(self, adv: Optional["BLEAdvertisement"] = None) -> None:
             self.setDeviceStatus(CHSesame2Status.ReceivedBle)
 
     def setDeviceStatusCallback(
-        self, callback: Optional[Callable[["CHDevices"], None]]
+        self, callback: Optional[Callable[[CHD], None]]
     ) -> None:
         """Set a device status callback.