Upstream
/
aioesphomeapi
mirror of https://github.com/esphome/aioesphomeapi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use converter_field

This commit is contained in:
Jesse Hills 2022-09-28 13:11:19 +13:00
parent 805413f957
commit 9e95e63972
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
aioesphomeapi/model.py
View File

@ -817,7 +817,7 @@ class BluetoothGATTRead(APIModelBase):
@dataclass(frozen=True)
class BluetoothGATTDescriptor(APIModelBase):
uuid: str = ""
uuid: str = converter_field(default="", converter=_long_uuid)
handle: int = 0
description: str = ""
@ -825,15 +825,16 @@ class BluetoothGATTDescriptor(APIModelBase):
def convert_list(cls, value: List[Any]) -> List["BluetoothGATTDescriptor"]:
ret = []
for x in value:
instance = cls.from_dict(x) if isinstance(x, dict) else cls.from_pb(x)
instance.uuid = _long_uuid(instance.uuid)
ret.append(instance)
if isinstance(x, dict):
ret.append(cls.from_dict(x))
else:
ret.append(cls.from_pb(x))
return ret
@dataclass(frozen=True)
class BluetoothGATTCharacteristic(APIModelBase):
uuid: str = ""
uuid: str = converter_field(default="", converter=_long_uuid)
handle: int = 0
properties: int = 0
@ -845,15 +846,16 @@ class BluetoothGATTCharacteristic(APIModelBase):
def convert_list(cls, value: List[Any]) -> List["BluetoothGATTCharacteristic"]:
ret = []
for x in value:
instance = cls.from_dict(x) if isinstance(x, dict) else cls.from_pb(x)
instance.uuid = _long_uuid(instance.uuid)
ret.append(instance)
if isinstance(x, dict):
ret.append(cls.from_dict(x))
else:
ret.append(cls.from_pb(x))
return ret
@dataclass(frozen=True)
class BluetoothGATTService(APIModelBase):
uuid: str = ""
uuid: str = converter_field(default="", converter=_long_uuid)
handle: int = 0
characteristics: List[BluetoothGATTCharacteristic] = converter_field(
default_factory=list, converter=BluetoothGATTCharacteristic.convert_list
@ -863,9 +865,10 @@ class BluetoothGATTService(APIModelBase):
def convert_list(cls, value: List[Any]) -> List["BluetoothGATTService"]:
ret = []
for x in value:
instance = cls.from_dict(x) if isinstance(x, dict) else cls.from_pb(x)
instance.uuid = _long_uuid(instance.uuid)
ret.append(instance)
if isinstance(x, dict):
ret.append(cls.from_dict(x))
else:
ret.append(cls.from_pb(x))
return ret