Skip to content

Commit

Permalink
QA fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@akadlec
akadlec committed Jun 7, 2022
1 parent d0b8994 commit 641d20b
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 96 deletions.
44 changes: 22 additions & 22 deletions fastybird_fb_bus_connector/clients/apiv1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ def handle(self) -> None:
if not device.enabled:
continue

if device.id.__str__() not in self.__processed_devices:
if str(device.id) not in self.__processed_devices:
self.__process_device(device=device)

self.__processed_devices.append(device.id.__str__())
self.__processed_devices.append(str(device.id))

return

Expand All @@ -200,7 +200,7 @@ def __process_device( # pylint: disable=too-many-return-statements,too-many-bra
"Device address could not be fetched from registry. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand All @@ -218,7 +218,7 @@ def __process_device( # pylint: disable=too-many-return-statements,too-many-bra
device_address,
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
"address": device_address,
},
Expand All @@ -233,7 +233,7 @@ def __process_device( # pylint: disable=too-many-return-statements,too-many-bra
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand All @@ -249,7 +249,7 @@ def __process_device( # pylint: disable=too-many-return-statements,too-many-bra
device_address,
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
"address": device_address,
},
Expand All @@ -264,7 +264,7 @@ def __process_device( # pylint: disable=too-many-return-statements,too-many-bra
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand Down Expand Up @@ -411,7 +411,7 @@ def __send_read_device_state_handler(self, device: DeviceRecord, device_address:
"Device state attribute register could not be fetched from registry",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand Down Expand Up @@ -466,13 +466,13 @@ def __read_registers_handler( # pylint: disable=too-many-return-statements,too-
RegisterType.OUTPUT,
RegisterType.ATTRIBUTE,
]:
if device.id.__str__() not in self.__processed_devices_registers:
self.__processed_devices_registers[device.id.__str__()] = {}
if str(device.id) not in self.__processed_devices_registers:
self.__processed_devices_registers[str(device.id)] = {}

if registers_type.value not in self.__processed_devices_registers[device.id.__str__()]:
self.__processed_devices_registers[device.id.__str__()][registers_type.value] = set()
if registers_type.value not in self.__processed_devices_registers[str(device.id)]:
self.__processed_devices_registers[str(device.id)][registers_type.value] = set()

processed_length = len(self.__processed_devices_registers[device.id.__str__()][registers_type.value])
processed_length = len(self.__processed_devices_registers[str(device.id)][registers_type.value])

registers = self.__registers_registry.get_all_for_device(
device_id=device.id,
Expand All @@ -495,17 +495,17 @@ def __read_registers_handler( # pylint: disable=too-many-return-statements,too-
)

for register in registers:
self.__processed_devices_registers[device.id.__str__()][registers_type.value].add(
register.id.__str__(),
self.__processed_devices_registers[str(device.id)][registers_type.value].add(
str(register.id),
)

return

# Registers have to be read one by one
for register in registers:
if (
register.id.__str__()
in self.__processed_devices_registers[device.id.__str__()][registers_type.value]
str(register.id)
in self.__processed_devices_registers[str(device.id)][registers_type.value]
):
continue

Expand All @@ -516,8 +516,8 @@ def __read_registers_handler( # pylint: disable=too-many-return-statements,too-
register_address=register.address,
)

self.__processed_devices_registers[device.id.__str__()][registers_type.value].add(
register.id.__str__(),
self.__processed_devices_registers[str(device.id)][registers_type.value].add(
str(register.id),
)

return
Expand All @@ -530,7 +530,7 @@ def __read_registers_handler( # pylint: disable=too-many-return-statements,too-
RegisterType.OUTPUT,
RegisterType.ATTRIBUTE,
]:
self.__processed_devices_registers[device.id.__str__()][registers_type.value] = set()
self.__processed_devices_registers[str(device.id)][registers_type.value] = set()

# -----------------------------------------------------------------------------

Expand Down Expand Up @@ -688,7 +688,7 @@ def __write_value_to_single_register(
"Value couldn't be written into register",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
},
"register": {
"address": register.address,
Expand Down Expand Up @@ -1033,7 +1033,7 @@ def __finalize_discovered_device(
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device_record.id.__str__(),
"id": str(device_record.id),
"serial_number": device_record.serial_number,
},
},
Expand Down
14 changes: 7 additions & 7 deletions fastybird_fb_bus_connector/connector.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def remove_device_channel(self, device: FbBusDeviceEntity, channel_id: uuid.UUID
if (
isinstance(register, (OutputRegisterRecord, InputRegisterRecord))
and register.channel_id is not None
and register.channel_id.__eq__(channel_id)
and register.channel_id == channel_id
):
self.__registers_registry.remove(register_id=register.id)

Expand Down Expand Up @@ -323,10 +323,10 @@ def initialize_device_channel_property(
"Channel identifier is not as expected. Register couldn't be mapped",
extra={
"device": {
"id": channel.device.id.__str__(),
"id": str(channel.device.id),
},
"channel": {
"id": channel.device.id.__str__(),
"id": str(channel.device.id),
},
},
)
Expand Down Expand Up @@ -363,10 +363,10 @@ def initialize_device_channel_property(
"Channel identifier is not as expected. Register couldn't be mapped",
extra={
"device": {
"id": channel.device.id.__str__(),
"id": str(channel.device.id),
},
"channel": {
"id": channel.device.id.__str__(),
"id": str(channel.device.id),
},
},
)
Expand Down Expand Up @@ -413,7 +413,7 @@ async def start(self) -> None:
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand Down Expand Up @@ -451,7 +451,7 @@ def stop(self) -> None:
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device.id.__str__(),
"id": str(device.id),
"serial_number": device.serial_number,
},
},
Expand Down
6 changes: 3 additions & 3 deletions fastybird_fb_bus_connector/consumers/device.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def consume(self, entity: BaseEntity) -> None:
"Device state could not be updated. Device is disabled and have to be re-discovered",
extra={
"device": {
"id": device_record.id.__str__(),
"id": str(device_record.id),
"serial_number": device_record.serial_number,
},
},
Expand Down Expand Up @@ -182,7 +182,7 @@ def consume(self, entity: BaseEntity) -> None: # pylint: disable=too-many-branc
register_address,
extra={
"device": {
"id": device_record.id.__str__(),
"id": str(device_record.id),
},
},
)
Expand All @@ -206,7 +206,7 @@ def consume(self, entity: BaseEntity) -> None: # pylint: disable=too-many-branc
register_address,
extra={
"device": {
"id": device_record.id.__str__(),
"id": str(device_record.id),
},
},
)
Expand Down
Loading

0 comments on commit 641d20b

Please sign in to comment.