bumble 0.0.220__py3-none-any.whl → 0.0.221__py3-none-any.whl

bumble/hci.py

@@ -24,17 +24,13 @@ import functools
 import logging
 import secrets
 import struct
-from collections.abc import Sequence
+from collections.abc import Callable, Iterable, Sequence
 from dataclasses import field
 from typing import (
     Any,
-    Callable,
     ClassVar,
-    Iterable,
     Literal,
-    Optional,
     TypeVar,
-    Union,
     cast,
 )
 
@@ -106,7 +102,7 @@ def map_class_of_device(class_of_device):
     )
 
 
-def phy_list_to_bits(phys: Optional[Iterable[Phy]]) -> int:
+def phy_list_to_bits(phys: Iterable[Phy] | None) -> int:
     if phys is None:
         return 0
 
@@ -119,7 +115,6 @@ def phy_list_to_bits(phys: Optional[Iterable[Phy]]) -> int:
 
 
 class SpecableEnum(utils.OpenIntEnum):
-
     @classmethod
     def type_spec(cls, size: int, byteorder: Literal['little', 'big'] = 'little'):
         return {
@@ -147,7 +142,6 @@ class SpecableEnum(utils.OpenIntEnum):
 
 
 class SpecableFlag(enum.IntFlag):
-
     @classmethod
     def type_spec(cls, size: int, byteorder: Literal['little', 'big'] = 'little'):
         return {
@@ -186,8 +180,8 @@ class SpecableFlag(enum.IntFlag):
 #   - "v" for variable length bytes with a leading length byte
 # - an integer [1, 4] for 1-byte, 2-byte or 4-byte unsigned little-endian integers
 # - an integer [-2, -1] for 1-byte, 2-byte signed little-endian integers
-FieldSpec = Union[dict[str, Any], Callable[[bytes, int], tuple[int, Any]], str, int]
-Fields = Sequence[Union[tuple[str, FieldSpec], 'Fields']]
+FieldSpec = dict[str, Any] | Callable[[bytes, int], tuple[int, Any]] | str | int
+Fields = Sequence['tuple[str, FieldSpec] | Fields']
 
 
 @dataclasses.dataclass
@@ -213,22 +207,44 @@ def metadata(
 
 HCI_VENDOR_OGF = 0x3F
 
-# HCI Version
-HCI_VERSION_BLUETOOTH_CORE_1_0B    = 0
-HCI_VERSION_BLUETOOTH_CORE_1_1     = 1
-HCI_VERSION_BLUETOOTH_CORE_1_2     = 2
-HCI_VERSION_BLUETOOTH_CORE_2_0_EDR = 3
-HCI_VERSION_BLUETOOTH_CORE_2_1_EDR = 4
-HCI_VERSION_BLUETOOTH_CORE_3_0_HS  = 5
-HCI_VERSION_BLUETOOTH_CORE_4_0     = 6
-HCI_VERSION_BLUETOOTH_CORE_4_1     = 7
-HCI_VERSION_BLUETOOTH_CORE_4_2     = 8
-HCI_VERSION_BLUETOOTH_CORE_5_0     = 9
-HCI_VERSION_BLUETOOTH_CORE_5_1     = 10
-HCI_VERSION_BLUETOOTH_CORE_5_2     = 11
-HCI_VERSION_BLUETOOTH_CORE_5_3     = 12
-HCI_VERSION_BLUETOOTH_CORE_5_4     = 13
-HCI_VERSION_BLUETOOTH_CORE_6_0     = 14
+# Specification Version
+class SpecificationVersion(utils.OpenIntEnum):
+    BLUETOOTH_CORE_1_0B    = 0
+    BLUETOOTH_CORE_1_1     = 1
+    BLUETOOTH_CORE_1_2     = 2
+    BLUETOOTH_CORE_2_0_EDR = 3
+    BLUETOOTH_CORE_2_1_EDR = 4
+    BLUETOOTH_CORE_3_0_HS  = 5
+    BLUETOOTH_CORE_4_0     = 6
+    BLUETOOTH_CORE_4_1     = 7
+    BLUETOOTH_CORE_4_2     = 8
+    BLUETOOTH_CORE_5_0     = 9
+    BLUETOOTH_CORE_5_1     = 10
+    BLUETOOTH_CORE_5_2     = 11
+    BLUETOOTH_CORE_5_3     = 12
+    BLUETOOTH_CORE_5_4     = 13
+    BLUETOOTH_CORE_6_0     = 14
+    BLUETOOTH_CORE_6_1     = 15
+    BLUETOOTH_CORE_6_2     = 16
+
+# For backwards compatibility only
+HCI_VERSION_BLUETOOTH_CORE_1_0B    = SpecificationVersion.BLUETOOTH_CORE_1_0B
+HCI_VERSION_BLUETOOTH_CORE_1_1     = SpecificationVersion.BLUETOOTH_CORE_1_1
+HCI_VERSION_BLUETOOTH_CORE_1_2     = SpecificationVersion.BLUETOOTH_CORE_1_2
+HCI_VERSION_BLUETOOTH_CORE_2_0_EDR = SpecificationVersion.BLUETOOTH_CORE_2_0_EDR
+HCI_VERSION_BLUETOOTH_CORE_2_1_EDR = SpecificationVersion.BLUETOOTH_CORE_2_1_EDR
+HCI_VERSION_BLUETOOTH_CORE_3_0_HS  = SpecificationVersion.BLUETOOTH_CORE_3_0_HS
+HCI_VERSION_BLUETOOTH_CORE_4_0     = SpecificationVersion.BLUETOOTH_CORE_4_0
+HCI_VERSION_BLUETOOTH_CORE_4_1     = SpecificationVersion.BLUETOOTH_CORE_4_1
+HCI_VERSION_BLUETOOTH_CORE_4_2     = SpecificationVersion.BLUETOOTH_CORE_4_2
+HCI_VERSION_BLUETOOTH_CORE_5_0     = SpecificationVersion.BLUETOOTH_CORE_5_0
+HCI_VERSION_BLUETOOTH_CORE_5_1     = SpecificationVersion.BLUETOOTH_CORE_5_1
+HCI_VERSION_BLUETOOTH_CORE_5_2     = SpecificationVersion.BLUETOOTH_CORE_5_2
+HCI_VERSION_BLUETOOTH_CORE_5_3     = SpecificationVersion.BLUETOOTH_CORE_5_3
+HCI_VERSION_BLUETOOTH_CORE_5_4     = SpecificationVersion.BLUETOOTH_CORE_5_4
+HCI_VERSION_BLUETOOTH_CORE_6_0     = SpecificationVersion.BLUETOOTH_CORE_6_0
+HCI_VERSION_BLUETOOTH_CORE_6_1     = SpecificationVersion.BLUETOOTH_CORE_6_1
+HCI_VERSION_BLUETOOTH_CORE_6_2     = SpecificationVersion.BLUETOOTH_CORE_6_2
 
 HCI_VERSION_NAMES = {
     HCI_VERSION_BLUETOOTH_CORE_1_0B:    'HCI_VERSION_BLUETOOTH_CORE_1_0B',
@@ -246,9 +262,10 @@ HCI_VERSION_NAMES = {
     HCI_VERSION_BLUETOOTH_CORE_5_3:     'HCI_VERSION_BLUETOOTH_CORE_5_3',
     HCI_VERSION_BLUETOOTH_CORE_5_4:     'HCI_VERSION_BLUETOOTH_CORE_5_4',
     HCI_VERSION_BLUETOOTH_CORE_6_0:     'HCI_VERSION_BLUETOOTH_CORE_6_0',
+    HCI_VERSION_BLUETOOTH_CORE_6_1:     'HCI_VERSION_BLUETOOTH_CORE_6_1',
+    HCI_VERSION_BLUETOOTH_CORE_6_2:     'HCI_VERSION_BLUETOOTH_CORE_6_2',
 }
 
-# LMP Version
 LMP_VERSION_NAMES = HCI_VERSION_NAMES
 
 # HCI Packet types
@@ -1786,20 +1803,20 @@ class HCI_Object:
 
     @classmethod
     def dict_and_offset_from_bytes(
-        cls, data: bytes, offset: int, fields: Fields
+        cls, data: bytes, offset: int, object_fields: Fields
     ) -> tuple[int, collections.OrderedDict[str, Any]]:
         result = collections.OrderedDict[str, Any]()
-        for field in fields:
-            if isinstance(field, list):
+        for object_field in object_fields:
+            if isinstance(object_field, list):
                 # This is an array field, starting with a 1-byte item count.
                 item_count = data[offset]
                 offset += 1
                 # Set fields first, because item_count might be 0.
-                for sub_field_name, _ in field:
+                for sub_field_name, _ in object_field:
                     result[sub_field_name] = []
 
                 for _ in range(item_count):
-                    for sub_field_name, sub_field_type in field:
+                    for sub_field_name, sub_field_type in object_field:
                         value, size = HCI_Object.parse_field(
                             data, offset, sub_field_type
                         )
@@ -1807,7 +1824,7 @@ class HCI_Object:
                         offset += size
                 continue
 
-            field_name, field_type = field
+            field_name, field_type = object_field
             assert isinstance(field_name, str)
             field_value, field_size = HCI_Object.parse_field(
                 data, offset, cast(FieldSpec, field_type)
@@ -1890,26 +1907,26 @@ class HCI_Object:
         return field_bytes
 
     @staticmethod
-    def dict_to_bytes(hci_object, fields):
+    def dict_to_bytes(hci_object, object_fields):
         result = bytearray()
-        for field in fields:
-            if isinstance(field, list):
+        for object_field in object_fields:
+            if isinstance(object_field, list):
                 # The field is an array. The serialized form starts with a 1-byte
                 # item count. We use the length of the first array field as the
                 # array count, since all array fields have the same number of items.
-                item_count = len(hci_object[field[0][0]])
+                item_count = len(hci_object[object_field[0][0]])
                 result += bytes([item_count]) + b''.join(
                     b''.join(
                         HCI_Object.serialize_field(
                             hci_object[sub_field_name][i], sub_field_type
                         )
-                        for sub_field_name, sub_field_type in field
+                        for sub_field_name, sub_field_type in object_field
                     )
                     for i in range(item_count)
                 )
                 continue
 
-            (field_name, field_type) = field
+            (field_name, field_type) = object_field
             result += HCI_Object.serialize_field(hci_object[field_name], field_type)
 
         return bytes(result)
@@ -1967,15 +1984,15 @@ class HCI_Object:
         )
 
     @staticmethod
-    def format_fields(hci_object, fields, indentation='', value_mappers=None):
-        if not fields:
+    def format_fields(hci_object, object_fields, indentation='', value_mappers=None):
+        if not object_fields:
             return ''
 
         # Build array of formatted key:value pairs
         field_strings = []
-        for field in fields:
-            if isinstance(field, list):
-                for sub_field in field:
+        for object_field in object_fields:
+            if isinstance(object_field, list):
+                for sub_field in object_field:
                     sub_field_name, sub_field_type = sub_field
                     item_count = len(hci_object[sub_field_name])
                     for i in range(item_count):
@@ -1993,7 +2010,7 @@ class HCI_Object:
                         )
                 continue
 
-            field_name, field_type = field
+            field_name, field_type = object_field
             field_value = hci_object[field_name]
             field_strings.append(
                 (
@@ -2016,16 +2033,16 @@ class HCI_Object:
     @classmethod
     def fields_from_dataclass(cls, obj: Any) -> list[Any]:
         stack: list[list[Any]] = [[]]
-        for field in dataclasses.fields(obj):
+        for object_field in dataclasses.fields(obj):
             # Fields without metadata should be ignored.
             if not isinstance(
-                (metadata := field.metadata.get("bumble.hci")), FieldMetadata
+                (metadata := object_field.metadata.get("bumble.hci")), FieldMetadata
             ):
                 continue
             if metadata.list_begin:
                 stack.append([])
             if metadata.spec:
-                stack[-1].append((field.name, metadata.spec))
+                stack[-1].append((object_field.name, metadata.spec))
             if metadata.list_end:
                 top = stack.pop()
                 stack[-1].append(top)
@@ -2158,7 +2175,7 @@ class Address:
 
     def __init__(
         self,
-        address: Union[bytes, str],
+        address: bytes | str,
         address_type: AddressType = RANDOM_DEVICE_ADDRESS,
     ) -> None:
         '''
@@ -2423,9 +2440,9 @@ class HCI_Command(HCI_Packet):
 
     def __init__(
         self,
-        parameters: Optional[bytes] = None,
+        parameters: bytes | None = None,
         *,
-        op_code: Optional[int] = None,
+        op_code: int | None = None,
         **kwargs,
     ) -> None:
         # op_code should be set in cls.
@@ -5716,7 +5733,7 @@ class HCI_Event(HCI_Packet):
     hci_packet_type = HCI_EVENT_PACKET
     event_names: dict[int, str] = {}
     event_classes: dict[int, type[HCI_Event]] = {}
-    vendor_factories: list[Callable[[bytes], Optional[HCI_Event]]] = []
+    vendor_factories: list[Callable[[bytes], HCI_Event | None]] = []
     event_code: int
     fields: Fields = ()
     _parameters: bytes = b''
@@ -5777,14 +5794,12 @@ class HCI_Event(HCI_Packet):
         return event_class
 
     @classmethod
-    def add_vendor_factory(
-        cls, factory: Callable[[bytes], Optional[HCI_Event]]
-    ) -> None:
+    def add_vendor_factory(cls, factory: Callable[[bytes], HCI_Event | None]) -> None:
         cls.vendor_factories.append(factory)
 
     @classmethod
     def remove_vendor_factory(
-        cls, factory: Callable[[bytes], Optional[HCI_Event]]
+        cls, factory: Callable[[bytes], HCI_Event | None]
     ) -> None:
         if factory in cls.vendor_factories:
             cls.vendor_factories.remove(factory)
@@ -5797,7 +5812,7 @@ class HCI_Event(HCI_Packet):
         if len(parameters) != length:
             raise InvalidPacketError('invalid packet length')
 
-        subclass: Optional[type[HCI_Event]]
+        subclass: type[HCI_Event] | None
         if event_code == HCI_LE_META_EVENT:
             # We do this dispatch here and not in the subclass in order to avoid call
             # loops
@@ -5835,9 +5850,9 @@ class HCI_Event(HCI_Packet):
 
     def __init__(
         self,
-        parameters: Optional[bytes] = None,
+        parameters: bytes | None = None,
         *,
-        event_code: Optional[int] = None,
+        event_code: int | None = None,
         **kwargs,
     ):
         if event_code is not None:
@@ -5946,9 +5961,7 @@ class HCI_Extended_Event(HCI_Event):
         cls.subevent_names.update(cls.subevent_map(symbols))
 
     @classmethod
-    def subclass_from_parameters(
-        cls, parameters: bytes
-    ) -> Optional[HCI_Extended_Event]:
+    def subclass_from_parameters(cls, parameters: bytes) -> HCI_Extended_Event | None:
         """
         Factory method that parses the subevent code, finds a registered subclass,
         and creates an instance if found.
@@ -5968,9 +5981,9 @@ class HCI_Extended_Event(HCI_Event):
 
     def __init__(
         self,
-        parameters: Optional[bytes] = None,
+        parameters: bytes | None = None,
         *,
-        subevent_code: Optional[int] = None,
+        subevent_code: int | None = None,
         **kwargs,
     ) -> None:
         if subevent_code is not None:
@@ -6966,7 +6979,7 @@ class HCI_Command_Complete_Event(HCI_Event):
     command_opcode: int = field(
         metadata=metadata({'size': 2, 'mapper': HCI_Command.command_name})
     )
-    return_parameters: Union[bytes, HCI_Object, int] = field(metadata=metadata("*"))
+    return_parameters: bytes | HCI_Object | int = field(metadata=metadata("*"))
 
     def map_return_parameters(self, return_parameters):
         '''Map simple 'status' return parameters to their named constant form'''
@@ -7550,20 +7563,20 @@ class HCI_IsoDataPacket(HCI_Packet):
     iso_sdu_fragment: bytes
     pb_flag: int
     ts_flag: int = 0
-    time_stamp: Optional[int] = None
-    packet_sequence_number: Optional[int] = None
-    iso_sdu_length: Optional[int] = None
-    packet_status_flag: Optional[int] = None
+    time_stamp: int | None = None
+    packet_sequence_number: int | None = None
+    iso_sdu_length: int | None = None
+    packet_status_flag: int | None = None
 
     def __post_init__(self) -> None:
         self.ts_flag = self.time_stamp is not None
 
     @staticmethod
     def from_bytes(packet: bytes) -> HCI_IsoDataPacket:
-        time_stamp: Optional[int] = None
-        packet_sequence_number: Optional[int] = None
-        iso_sdu_length: Optional[int] = None
-        packet_status_flag: Optional[int] = None
+        time_stamp: int | None = None
+        packet_sequence_number: int | None = None
+        iso_sdu_length: int | None = None
+        packet_status_flag: int | None = None
 
         pos = 1
         pdu_info, data_total_length = struct.unpack_from('<HH', packet, pos)
@@ -7646,7 +7659,7 @@ class HCI_IsoDataPacket(HCI_Packet):
 
 # -----------------------------------------------------------------------------
 class HCI_AclDataPacketAssembler:
-    current_data: Optional[bytes]
+    current_data: bytes | None
 
     def __init__(self, callback: Callable[[bytes], Any]) -> None:
         self.callback = callback

bumble/helpers.py

@@ -20,7 +20,7 @@ from __future__ import annotations
 import datetime
 import logging
 from collections.abc import Callable, MutableMapping
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 from bumble import avc, avctp, avdtp, avrcp, crypto, rfcomm, sdp
 from bumble.att import ATT_CID, ATT_PDU
@@ -70,7 +70,7 @@ AVCTP_PID_NAMES = {avrcp.AVRCP_PID: 'AVRCP'}
 class PacketTracer:
     class AclStream:
         psms: MutableMapping[int, int]
-        peer: Optional[PacketTracer.AclStream]
+        peer: PacketTracer.AclStream | None
         avdtp_assemblers: MutableMapping[int, avdtp.MessageAssembler]
         avctp_assemblers: MutableMapping[int, avctp.MessageAssembler]
 
@@ -201,7 +201,7 @@ class PacketTracer:
             self.label = label
             self.emit_message = emit_message
             self.acl_streams = {}  # ACL streams, by connection handle
-            self.packet_timestamp: Optional[datetime.datetime] = None
+            self.packet_timestamp: datetime.datetime | None = None
 
         def start_acl_stream(self, connection_handle: int) -> PacketTracer.AclStream:
             logger.info(
@@ -230,7 +230,7 @@ class PacketTracer:
                 self.peer.end_acl_stream(connection_handle)
 
         def on_packet(
-            self, timestamp: Optional[datetime.datetime], packet: HCI_Packet
+            self, timestamp: datetime.datetime | None, packet: HCI_Packet
         ) -> None:
             self.packet_timestamp = timestamp
             self.emit(packet)
@@ -262,7 +262,7 @@ class PacketTracer:
         self,
         packet: HCI_Packet,
         direction: int = 0,
-        timestamp: Optional[datetime.datetime] = None,
+        timestamp: datetime.datetime | None = None,
     ) -> None:
         if direction == 0:
             self.host_to_controller_analyzer.on_packet(timestamp, packet)

bumble/hfp.py

@@ -25,7 +25,8 @@ import enum
 import logging
 import re
 import traceback
-from typing import TYPE_CHECKING, Any, ClassVar, Iterable, Optional, Union
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, Any, ClassVar
 
 from typing_extensions import Self
 
@@ -80,7 +81,7 @@ class HfpProtocol:
 
         dlc.sink = self.feed
 
-    def feed(self, data: Union[bytes, str]) -> None:
+    def feed(self, data: bytes | str) -> None:
         # Convert the data to a string if needed
         if isinstance(data, bytes):
             data = data.decode('utf-8')
@@ -324,8 +325,8 @@ class CallInfo:
     status: CallInfoStatus
     mode: CallInfoMode
     multi_party: CallInfoMultiParty
-    number: Optional[str] = None
-    type: Optional[int] = None
+    number: str | None = None
+    type: int | None = None
 
 
 @dataclasses.dataclass
@@ -353,10 +354,10 @@ class CallLineIdentification:
 
     number: str
     type: int
-    subaddr: Optional[str] = None
-    satype: Optional[int] = None
-    alpha: Optional[str] = None
-    cli_validity: Optional[int] = None
+    subaddr: str | None = None
+    satype: int | None = None
+    alpha: str | None = None
+    cli_validity: int | None = None
 
     @classmethod
     def parse_from(cls, parameters: list[bytes]) -> Self:
@@ -584,7 +585,7 @@ class AgIndicatorState:
     indicator: AgIndicator
     supported_values: set[int]
     current_status: int
-    index: Optional[int] = None
+    index: int | None = None
     enabled: bool = True
 
     @property
@@ -597,7 +598,7 @@ class AgIndicatorState:
             supported_values_text = (
                 f'({",".join(str(v) for v in self.supported_values)})'
             )
-        return f'(\"{self.indicator.value}\",{supported_values_text})'
+        return f'("{self.indicator.value}",{supported_values_text})'
 
     @classmethod
     def call(cls: type[Self]) -> Self:
@@ -728,7 +729,7 @@ class HfProtocol(utils.EventEmitter):
     command_lock: asyncio.Lock
     if TYPE_CHECKING:
         response_queue: asyncio.Queue[AtResponse]
-        unsolicited_queue: asyncio.Queue[Optional[AtResponse]]
+        unsolicited_queue: asyncio.Queue[AtResponse | None]
     else:
         response_queue: asyncio.Queue
         unsolicited_queue: asyncio.Queue
@@ -820,7 +821,7 @@ class HfProtocol(utils.EventEmitter):
         cmd: str,
         timeout: float = 1.0,
         response_type: AtResponseType = AtResponseType.NONE,
-    ) -> Union[None, AtResponse, list[AtResponse]]:
+    ) -> None | AtResponse | list[AtResponse]:
         """
         Sends an AT command and wait for the peer response.
         Wait for the AT responses sent by the peer, to the status code.
@@ -1351,7 +1352,7 @@ class AgProtocol(utils.EventEmitter):
             logger.warning(f'AG indicator {indicator} is disabled')
 
         indicator_state.current_status = value
-        self.send_response(f'+CIEV: {index+1},{value}')
+        self.send_response(f'+CIEV: {index + 1},{value}')
 
     async def negotiate_codec(self, codec: AudioCodec) -> None:
         """Starts codec negotiation."""
@@ -1411,13 +1412,13 @@ class AgProtocol(utils.EventEmitter):
         self.emit(self.EVENT_VOICE_RECOGNITION, VoiceRecognitionState(int(vrec)))
 
     def _on_chld(self, operation_code: bytes) -> None:
-        call_index: Optional[int] = None
+        call_index: int | None = None
         if len(operation_code) > 1:
             call_index = int(operation_code[1:])
             operation_code = operation_code[:1] + b'x'
         try:
             operation = CallHoldOperation(operation_code.decode())
-        except:
+        except Exception:
             logger.error(f'Invalid operation: {operation_code.decode()}')
             self.send_cme_error(CmeError.OPERATION_NOT_SUPPORTED)
             return
@@ -1481,8 +1482,8 @@ class AgProtocol(utils.EventEmitter):
     def _on_cmer(
         self,
         mode: bytes,
-        keypad: Optional[bytes] = None,
-        display: Optional[bytes] = None,
+        keypad: bytes | None = None,
+        display: bytes | None = None,
         indicator: bytes = b'',
     ) -> None:
         if (
@@ -1589,7 +1590,7 @@ class AgProtocol(utils.EventEmitter):
 
     def _on_clcc(self) -> None:
         for call in self.calls:
-            number_text = f',\"{call.number}\"' if call.number is not None else ''
+            number_text = f',"{call.number}"' if call.number is not None else ''
             type_text = f',{call.type}' if call.type is not None else ''
             response = (
                 f'+CLCC: {call.index}'
@@ -1844,7 +1845,7 @@ def make_ag_sdp_records(
 
 async def find_hf_sdp_record(
     connection: device.Connection,
-) -> Optional[tuple[int, ProfileVersion, HfSdpFeature]]:
+) -> tuple[int, ProfileVersion, HfSdpFeature] | None:
     """Searches a Hands-Free SDP record from remote device.
 
     Args:
@@ -1864,9 +1865,9 @@ async def find_hf_sdp_record(
             ],
         )
         for attribute_lists in search_result:
-            channel: Optional[int] = None
-            version: Optional[ProfileVersion] = None
-            features: Optional[HfSdpFeature] = None
+            channel: int | None = None
+            version: ProfileVersion | None = None
+            features: HfSdpFeature | None = None
             for attribute in attribute_lists:
                 # The layout is [[L2CAP_PROTOCOL], [RFCOMM_PROTOCOL, RFCOMM_CHANNEL]].
                 if attribute.id == sdp.SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID:
@@ -1896,7 +1897,7 @@ async def find_hf_sdp_record(
 
 async def find_ag_sdp_record(
     connection: device.Connection,
-) -> Optional[tuple[int, ProfileVersion, AgSdpFeature]]:
+) -> tuple[int, ProfileVersion, AgSdpFeature] | None:
     """Searches an Audio-Gateway SDP record from remote device.
 
     Args:
@@ -1915,9 +1916,9 @@ async def find_ag_sdp_record(
             ],
         )
         for attribute_lists in search_result:
-            channel: Optional[int] = None
-            version: Optional[ProfileVersion] = None
-            features: Optional[AgSdpFeature] = None
+            channel: int | None = None
+            version: ProfileVersion | None = None
+            features: AgSdpFeature | None = None
             for attribute in attribute_lists:
                 # The layout is [[L2CAP_PROTOCOL], [RFCOMM_PROTOCOL, RFCOMM_CHANNEL]].
                 if attribute.id == sdp.SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID:

bumble/hid.py

@@ -21,8 +21,8 @@ import enum
 import logging
 import struct
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, Optional
 
 from typing_extensions import override
 
@@ -195,9 +195,9 @@ class SendHandshakeMessage(Message):
 
 # -----------------------------------------------------------------------------
 class HID(ABC, utils.EventEmitter):
-    l2cap_ctrl_channel: Optional[l2cap.ClassicChannel] = None
-    l2cap_intr_channel: Optional[l2cap.ClassicChannel] = None
-    connection: Optional[device.Connection] = None
+    l2cap_ctrl_channel: l2cap.ClassicChannel | None = None
+    l2cap_intr_channel: l2cap.ClassicChannel | None = None
+    connection: device.Connection | None = None
 
     EVENT_INTERRUPT_DATA = "interrupt_data"
     EVENT_CONTROL_DATA = "control_data"
@@ -212,7 +212,7 @@ class HID(ABC, utils.EventEmitter):
 
     def __init__(self, device: device.Device, role: Role) -> None:
         super().__init__()
-        self.remote_device_bd_address: Optional[Address] = None
+        self.remote_device_bd_address: Address | None = None
         self.device = device
         self.role = role
 
@@ -353,10 +353,10 @@ class Device(HID):
         data: bytes = b''
         status: int = 0
 
-    get_report_cb: Optional[Callable[[int, int, int], GetSetStatus]] = None
-    set_report_cb: Optional[Callable[[int, int, int, bytes], GetSetStatus]] = None
-    get_protocol_cb: Optional[Callable[[], GetSetStatus]] = None
-    set_protocol_cb: Optional[Callable[[int], GetSetStatus]] = None
+    get_report_cb: Callable[[int, int, int], GetSetStatus] | None = None
+    set_report_cb: Callable[[int, int, int, bytes], GetSetStatus] | None = None
+    get_protocol_cb: Callable[[], GetSetStatus] | None = None
+    set_protocol_cb: Callable[[int], GetSetStatus] | None = None
 
     def __init__(self, device: device.Device) -> None:
         super().__init__(device, HID.Role.DEVICE)