Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add BleakCharacteristicNotFoundError #1439

Merged
merged 4 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
`Unreleased`_
=============

Added
-----
* Added ``BleakCharacteristicNotFoundError`` which is raised if a device does not support a characteristic.

Changed
-------
* Updated PyObjC dependency on macOS to v10.x.
Expand Down
6 changes: 3 additions & 3 deletions bleak/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
get_platform_scanner_backend_type,
)
from .backends.service import BleakGATTServiceCollection
from .exc import BleakError
from .exc import BleakCharacteristicNotFoundError, BleakError
from .uuids import normalize_uuid_str

if TYPE_CHECKING:
Expand Down Expand Up @@ -766,7 +766,7 @@ async def write_gatt_char(
characteristic = self.services.get_characteristic(char_specifier)

if not characteristic:
raise BleakError(f"Characteristic {char_specifier} was not found!")
raise BleakCharacteristicNotFoundError(char_specifier)

if response is None:
# if not specified, prefer write-with-response over write-without-
Expand Down Expand Up @@ -819,7 +819,7 @@ def callback(sender: BleakGATTCharacteristic, data: bytearray):
characteristic = char_specifier

if not characteristic:
raise BleakError(f"Characteristic {char_specifier} not found!")
raise BleakCharacteristicNotFoundError(char_specifier)

if inspect.iscoroutinefunction(callback):

Expand Down
15 changes: 8 additions & 7 deletions bleak/backends/bluezdbus/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@
from dbus_fast.signature import Variant

from ... import BleakScanner
from ...exc import BleakDBusError, BleakError, BleakDeviceNotFoundError
from ...exc import (
BleakCharacteristicNotFoundError,
BleakDBusError,
BleakDeviceNotFoundError,
BleakError,
)
from ..characteristic import BleakGATTCharacteristic
from ..client import BaseBleakClient, NotifyCallback
from ..device import BLEDevice
Expand Down Expand Up @@ -725,11 +730,7 @@ async def read_gatt_char(
)
return value

raise BleakError(
"Characteristic with UUID {0} could not be found!".format(
char_specifier
)
)
raise BleakCharacteristicNotFoundError(char_specifier)

while True:
assert self._bus
Expand Down Expand Up @@ -977,7 +978,7 @@ async def stop_notify(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError("Characteristic {} not found!".format(char_specifier))
raise BleakCharacteristicNotFoundError(char_specifier)

reply = await self._bus.call(
Message(
Expand Down
10 changes: 7 additions & 3 deletions bleak/backends/corebluetooth/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
from Foundation import NSArray, NSData

from ... import BleakScanner
from ...exc import BleakError, BleakDeviceNotFoundError
from ...exc import (
BleakCharacteristicNotFoundError,
BleakDeviceNotFoundError,
BleakError,
)
from ..characteristic import BleakGATTCharacteristic
from ..client import BaseBleakClient, NotifyCallback
from ..device import BLEDevice
Expand Down Expand Up @@ -273,7 +277,7 @@ async def read_gatt_char(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError("Characteristic {} was not found!".format(char_specifier))
raise BleakCharacteristicNotFoundError(char_specifier)

output = await self._delegate.read_characteristic(
characteristic.obj, use_cached=use_cached
Expand Down Expand Up @@ -373,7 +377,7 @@ async def stop_notify(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError("Characteristic {} not found!".format(char_specifier))
raise BleakCharacteristicNotFoundError(char_specifier)

await self._delegate.stop_notifications(characteristic.obj)

Expand Down
8 changes: 3 additions & 5 deletions bleak/backends/p4android/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from android.broadcast import BroadcastReceiver
from jnius import java_method

from ...exc import BleakError
from ...exc import BleakCharacteristicNotFoundError, BleakError
from ..characteristic import BleakGATTCharacteristic
from ..client import BaseBleakClient, NotifyCallback
from ..device import BLEDevice
Expand Down Expand Up @@ -316,9 +316,7 @@ async def read_gatt_char(
characteristic = char_specifier

if not characteristic:
raise BleakError(
f"Characteristic with UUID {char_specifier} could not be found!"
)
raise BleakCharacteristicNotFoundError(char_specifier)

(value,) = await self.__callbacks.perform_and_wait(
dispatchApi=self.__gatt.readCharacteristic,
Expand Down Expand Up @@ -469,7 +467,7 @@ async def stop_notify(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError(f"Characteristic {char_specifier} not found!")
raise BleakCharacteristicNotFoundError(char_specifier)

await self.write_gatt_descriptor(
characteristic.notification_descriptor,
Expand Down
11 changes: 8 additions & 3 deletions bleak/backends/winrt/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@
from bleak_winrt.windows.storage.streams import Buffer as WinBuffer

from ... import BleakScanner
from ...exc import PROTOCOL_ERROR_CODES, BleakDeviceNotFoundError, BleakError
from ...exc import (
PROTOCOL_ERROR_CODES,
BleakCharacteristicNotFoundError,
BleakDeviceNotFoundError,
BleakError,
)
from ..characteristic import BleakGATTCharacteristic
from ..client import BaseBleakClient, NotifyCallback
from ..device import BLEDevice
Expand Down Expand Up @@ -820,7 +825,7 @@ async def read_gatt_char(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError(f"Characteristic {char_specifier} was not found!")
raise BleakCharacteristicNotFoundError(char_specifier)

value = bytearray(
_ensure_success(
Expand Down Expand Up @@ -1007,7 +1012,7 @@ async def stop_notify(
else:
characteristic = char_specifier
if not characteristic:
raise BleakError(f"Characteristic {char_specifier} not found!")
raise BleakCharacteristicNotFoundError(char_specifier)

_ensure_success(
await characteristic.obj.write_client_characteristic_configuration_descriptor_async(
Expand Down
21 changes: 20 additions & 1 deletion bleak/exc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from typing import Optional
import uuid
from typing import Optional, Union


class BleakError(Exception):
Expand All @@ -8,6 +9,24 @@ class BleakError(Exception):
pass


class BleakCharacteristicNotFoundError(BleakError):
"""
Exception which is raised if a device does not support a characteristic.

.. versionadded: 0.22.0
"""

char_specifier: Union[int, str, uuid.UUID]

def __init__(self, char_specifier: Union[int, str, uuid.UUID]) -> None:
"""
Args:
characteristic (str): handle or UUID of the characteristic which was not found
"""
super().__init__(f"Characteristic {char_specifier} was not found!", *args)
emontnemery marked this conversation as resolved.
Show resolved Hide resolved
self.char_specifier = char_specifier


class BleakDeviceNotFoundError(BleakError):
"""
Exception which is raised if a device can not be found by ``connect``, ``pair`` and ``unpair``.
Expand Down
Loading