diff --git a/fastybird_fb_bus_connector/clients/apiv1.py b/fastybird_fb_bus_connector/clients/apiv1.py index 17dd8ec..de8076b 100644 --- a/fastybird_fb_bus_connector/clients/apiv1.py +++ b/fastybird_fb_bus_connector/clients/apiv1.py @@ -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 @@ -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, }, }, @@ -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, }, @@ -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, }, }, @@ -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, }, @@ -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, }, }, @@ -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, }, }, @@ -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, @@ -495,8 +495,8 @@ 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 @@ -504,8 +504,8 @@ def __read_registers_handler( # pylint: disable=too-many-return-statements,too- # 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 @@ -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 @@ -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() # ----------------------------------------------------------------------------- @@ -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, @@ -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, }, }, diff --git a/fastybird_fb_bus_connector/connector.py b/fastybird_fb_bus_connector/connector.py index d6bc826..6d011c4 100644 --- a/fastybird_fb_bus_connector/connector.py +++ b/fastybird_fb_bus_connector/connector.py @@ -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) @@ -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), }, }, ) @@ -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), }, }, ) @@ -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, }, }, @@ -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, }, }, diff --git a/fastybird_fb_bus_connector/consumers/device.py b/fastybird_fb_bus_connector/consumers/device.py index 449145e..66a3900 100644 --- a/fastybird_fb_bus_connector/consumers/device.py +++ b/fastybird_fb_bus_connector/consumers/device.py @@ -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, }, }, @@ -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), }, }, ) @@ -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), }, }, ) diff --git a/fastybird_fb_bus_connector/events/listeners.py b/fastybird_fb_bus_connector/events/listeners.py index 4940376..0377c52 100644 --- a/fastybird_fb_bus_connector/events/listeners.py +++ b/fastybird_fb_bus_connector/events/listeners.py @@ -265,7 +265,7 @@ def __handle_create_or_update_device(self, event: Event) -> None: "Creating new device", extra={ "device": { - "id": device.id.__str__(), + "id": str(device.id), }, }, ) @@ -277,7 +277,7 @@ def __handle_create_or_update_device(self, event: Event) -> None: "Updating existing device", extra={ "device": { - "id": device.id.__str__(), + "id": str(device.id), }, }, ) @@ -314,10 +314,10 @@ def __handle_create_or_update_io_register(self, event: Event) -> None: "Creating new IO channel", extra={ "device": { - "id": channel.device.id.__str__(), + "id": str(channel.device.id), }, "channel": { - "id": channel.id.__str__(), + "id": str(channel.id), }, }, ) @@ -351,13 +351,13 @@ def __handle_create_or_update_io_register(self, event: Event) -> None: "Creating new channel property with state info", extra={ "device": { - "id": channel_property.channel.device.id.__str__(), + "id": str(channel_property.channel.device.id), }, "channel": { - "id": channel_property.channel.id.__str__(), + "id": str(channel_property.channel.id), }, "property": { - "id": channel_property.id.__str__(), + "id": str(channel_property.id), }, }, ) @@ -372,19 +372,19 @@ def __handle_create_or_update_io_register(self, event: Event) -> None: "Updating existing channel property with state info", extra={ "device": { - "id": channel_property.channel.device.id.__str__(), + "id": str(channel_property.channel.device.id), }, "channel": { - "id": channel_property.channel.id.__str__(), + "id": str(channel_property.channel.id), }, "property": { - "id": channel_property.id.__str__(), + "id": str(channel_property.id), }, }, ) # Add newly created channel identifier to register - if event.record.type.__eq__(RegisterType.OUTPUT): + if event.record.type == RegisterType.OUTPUT: self.__registers_registry.append_output_register( device_id=event.record.device_id, register_id=event.record.id, @@ -393,7 +393,7 @@ def __handle_create_or_update_io_register(self, event: Event) -> None: channel_id=channel.id, ) - if event.record.type.__eq__(RegisterType.INPUT): + if event.record.type == RegisterType.INPUT: self.__registers_registry.append_input_register( device_id=event.record.device_id, register_id=event.record.id, @@ -467,10 +467,10 @@ def __handle_create_or_update_attribute_register(self, event: Event) -> None: "Creating new device property", extra={ "device": { - "id": device_property.device.id.__str__(), + "id": str(device_property.device.id), }, "property": { - "id": device_property.id.__str__(), + "id": str(device_property.id), }, }, ) @@ -485,10 +485,10 @@ def __handle_create_or_update_attribute_register(self, event: Event) -> None: "Updating existing device property", extra={ "device": { - "id": device_property.device.id.__str__(), + "id": str(device_property.device.id), }, "property": { - "id": device_property.id.__str__(), + "id": str(device_property.id), }, }, ) @@ -522,10 +522,10 @@ def __handle_create_or_update_device_attribute(self, event: Event) -> None: "Creating new device attribute", extra={ "device": { - "id": device_attribute.device.id.__str__(), + "id": str(device_attribute.device.id), }, "attribute": { - "id": device_attribute.id.__str__(), + "id": str(device_attribute.id), }, }, ) @@ -540,10 +540,10 @@ def __handle_create_or_update_device_attribute(self, event: Event) -> None: "Updating existing device attribute", extra={ "device": { - "id": device_attribute.device.id.__str__(), + "id": str(device_attribute.device.id), }, "attribute": { - "id": device_attribute.id.__str__(), + "id": str(device_attribute.id), }, }, ) @@ -563,10 +563,10 @@ def __handle_delete_device_attribute(self, event: Event) -> None: "Removing existing device attribute", extra={ "device": { - "id": device_attribute.device.id.__str__(), + "id": str(device_attribute.device.id), }, "attribute": { - "id": device_attribute.id.__str__(), + "id": str(device_attribute.id), }, }, ) @@ -636,16 +636,16 @@ def __write_channel_property_actual_value( "Creating new channel property state", extra={ "device": { - "id": channel_property.channel.device.id.__str__(), + "id": str(channel_property.channel.device.id), }, "channel": { - "id": channel_property.channel.id.__str__(), + "id": str(channel_property.channel.id), }, "property": { - "id": channel_property.id.__str__(), + "id": str(channel_property.id), }, "state": { - "id": property_state.id.__str__(), + "id": str(property_state.id), "actual_value": property_state.actual_value, "expected_value": property_state.expected_value, "pending": property_state.pending, @@ -679,16 +679,16 @@ def __write_channel_property_actual_value( "Updating existing channel property state", extra={ "device": { - "id": channel_property.channel.device.id.__str__(), + "id": str(channel_property.channel.device.id), }, "channel": { - "id": channel_property.channel.id.__str__(), + "id": str(channel_property.channel.id), }, "property": { - "id": channel_property.id.__str__(), + "id": str(channel_property.id), }, "state": { - "id": property_state.id.__str__(), + "id": str(property_state.id), "actual_value": property_state.actual_value, "expected_value": property_state.expected_value, "pending": property_state.pending, @@ -706,8 +706,8 @@ def __write_device_property_value(self, register: AttributeRegisterRecord) -> No self.__logger.warning( "Device property couldn't be found in database", extra={ - "device": {"id": register.device_id.__str__()}, - "property": {"id": register.id.__str__()}, + "device": {"id": str(register.device_id)}, + "property": {"id": str(register.id)}, }, ) return @@ -755,13 +755,13 @@ def __write_device_property_value(self, register: AttributeRegisterRecord) -> No "Creating new device property state", extra={ "device": { - "id": device_property.device.id.__str__(), + "id": str(device_property.device.id), }, "property": { - "id": device_property.id.__str__(), + "id": str(device_property.id), }, "state": { - "id": property_state.id.__str__(), + "id": str(property_state.id), "actual_value": property_state.actual_value, "expected_value": property_state.expected_value, "pending": property_state.pending, @@ -795,13 +795,13 @@ def __write_device_property_value(self, register: AttributeRegisterRecord) -> No "Updating existing device property state", extra={ "device": { - "id": device_property.device.id.__str__(), + "id": str(device_property.device.id), }, "property": { - "id": device_property.id.__str__(), + "id": str(device_property.id), }, "state": { - "id": property_state.id.__str__(), + "id": str(property_state.id), "actual_value": property_state.actual_value, "expected_value": property_state.expected_value, "pending": property_state.pending, @@ -826,10 +826,10 @@ def __write_device_property_value(self, register: AttributeRegisterRecord) -> No "Updating existing device property", extra={ "device": { - "id": device_property.device.id.__str__(), + "id": str(device_property.device.id), }, "property": { - "id": device_property.id.__str__(), + "id": str(device_property.id), }, }, ) diff --git a/fastybird_fb_bus_connector/logger.py b/fastybird_fb_bus_connector/logger.py index f96664d..9075924 100644 --- a/fastybird_fb_bus_connector/logger.py +++ b/fastybird_fb_bus_connector/logger.py @@ -118,6 +118,6 @@ def __get_connector_extra(self) -> Dict: return { "connector": { "type": CONNECTOR_NAME, - "id": self.__connector_id.__str__(), + "id": str(self.__connector_id), }, } diff --git a/fastybird_fb_bus_connector/registry/model.py b/fastybird_fb_bus_connector/registry/model.py index 9fb3737..2300abd 100644 --- a/fastybird_fb_bus_connector/registry/model.py +++ b/fastybird_fb_bus_connector/registry/model.py @@ -109,7 +109,7 @@ def get_by_id(self, device_id: uuid.UUID) -> Optional[DeviceRecord]: items = self.__items.copy() return next( - iter([record for record in items.values() if device_id.__eq__(record.id)]), + iter([record for record in items.values() if device_id == record.id]), None, ) @@ -148,7 +148,7 @@ def append( # pylint: disable=too-many-arguments,too-many-locals enabled=device_enabled, ) - self.__items[device.id.__str__()] = device + self.__items[str(device.id)] = device return device @@ -181,9 +181,9 @@ def remove(self, device_id: uuid.UUID) -> None: items = self.__items.copy() for record in items.values(): - if device_id.__eq__(record.id): + if device_id == record.id: try: - del self.__items[record.id.__str__()] + del self.__items[str(record.id)] self.__registers_registry.reset(device_id=record.id) self.__attributes_registry.reset(device_id=record.id) @@ -401,7 +401,7 @@ def find_free_address(self) -> Optional[int]: def __update(self, updated_device: DeviceRecord) -> bool: """Update device record""" - self.__items[updated_device.id.__str__()] = updated_device + self.__items[str(updated_device.id)] = updated_device return True @@ -476,7 +476,7 @@ def get_by_id(self, register_id: uuid.UUID) -> Optional[RegisterRecord]: """Get register by identifier""" items = self.__items.copy() - return next(iter([record for record in items.values() if register_id.__eq__(record.id)]), None) + return next(iter([record for record in items.values() if register_id == record.id]), None) # ----------------------------------------------------------------------------- @@ -494,7 +494,7 @@ def get_by_address( [ record for record in items.values() - if device_id.__eq__(record.device_id) + if device_id == record.device_id and record.address == register_address and record.type == register_type ] @@ -519,7 +519,7 @@ def get_by_name( for record in items.values() if isinstance(record, AttributeRegisterRecord) and record.name == name - and device_id.__eq__(record.device_id) + and device_id == record.device_id ] ), None, @@ -551,7 +551,7 @@ def get_all_for_device( return [ record for record in items.values() - if device_id.__eq__(record.device_id) + if device_id == record.device_id and ( register_type is None or (isinstance(register_type, RegisterType) and record.type == register_type) @@ -604,7 +604,7 @@ def append_input_register( # pylint: disable=too-many-arguments register.expected_value = existing_register.expected_value register.expected_pending = existing_register.expected_pending - self.__items[register.id.__str__()] = register + self.__items[str(register.id)] = register return register @@ -653,7 +653,7 @@ def append_output_register( # pylint: disable=too-many-arguments register.expected_value = existing_register.expected_value register.expected_pending = existing_register.expected_pending - self.__items[register.id.__str__()] = register + self.__items[str(register.id)] = register return register @@ -719,7 +719,7 @@ def append_attribute_register( # pylint: disable=too-many-arguments register.expected_value = None register.expected_pending = None - self.__items[register.id.__str__()] = register + self.__items[str(register.id)] = register return register @@ -801,9 +801,9 @@ def remove(self, register_id: uuid.UUID) -> None: items = self.__items.copy() for record in items.values(): - if register_id.__eq__(record.id): + if register_id == record.id: try: - del self.__items[record.id.__str__()] + del self.__items[str(record.id)] except KeyError: pass @@ -818,7 +818,7 @@ def reset(self, device_id: Optional[uuid.UUID] = None, registers_type: Optional[ if device_id is not None or registers_type is not None: for record in items.values(): - if (device_id is None or device_id.__eq__(record.device_id)) and ( + if (device_id is None or device_id == record.device_id) and ( registers_type is None or record.type == registers_type ): self.remove(register_id=record.id) @@ -942,7 +942,7 @@ def __update(self, register: RegisterRecord) -> bool: for record in items.values(): if record.id == register.id: - self.__items[register.id.__str__()] = register + self.__items[str(register.id)] = register return True @@ -983,7 +983,7 @@ def get_by_id(self, attribute_id: uuid.UUID) -> Optional[DeviceAttributeRecord]: items = self.__items.copy() return next( - iter([record for record in items.values() if attribute_id.__eq__(record.id)]), + iter([record for record in items.values() if attribute_id == record.id]), None, ) @@ -998,7 +998,7 @@ def get_by_identifier(self, device_id: uuid.UUID, attribute_identifier: str) -> [ record for record in items.values() - if device_id.__eq__(record.device_id) and record.identifier == attribute_identifier + if device_id == record.device_id and record.identifier == attribute_identifier ] ), None, @@ -1010,7 +1010,7 @@ def get_all_for_device(self, device_id: uuid.UUID) -> List[DeviceAttributeRecord """Find attributes in registry by device unique identifier""" items = self.__items.copy() - return [record for record in items.values() if device_id.__eq__(record.device_id)] + return [record for record in items.values() if device_id == record.device_id] # ----------------------------------------------------------------------------- @@ -1031,7 +1031,7 @@ def append( # pylint: disable=too-many-arguments attribute_value=attribute_value, ) - self.__items[attribute_record.id.__str__()] = attribute_record + self.__items[str(attribute_record.id)] = attribute_record return attribute_record @@ -1068,9 +1068,9 @@ def remove(self, attribute_id: uuid.UUID, propagate: bool = True) -> None: items = self.__items.copy() for record in items.values(): - if attribute_id.__eq__(record.id): + if attribute_id == record.id: try: - del self.__items[record.id.__str__()] + del self.__items[str(record.id)] if propagate: self.__event_dispatcher.dispatch( @@ -1091,7 +1091,7 @@ def reset(self, device_id: Optional[uuid.UUID] = None) -> None: if device_id is not None: for record in items.values(): - if device_id.__eq__(record.device_id): + if device_id == record.device_id: self.remove(attribute_id=record.id) else: