Added rate limits processing for attributes datapoints

Author: imbeacon

setup.py

@@ -21,7 +21,7 @@
 with open(path.join(this_directory, 'README.md')) as f:
     long_description = f.read()
 
-VERSION = "1.13.5"
+VERSION = "1.13.6"
 
 setup(
     version=VERSION,

tb_device_mqtt.py

@@ -1050,13 +1050,14 @@ def _wait_until_current_queued_messages_processed(self):
 
     def _send_request(self, _type, kwargs, timeout=DEFAULT_TIMEOUT, device=None,
                       msg_rate_limit=None, dp_rate_limit=None):
+        topic = kwargs['topic']
         if msg_rate_limit is None:
-            if kwargs.get('topic') == TELEMETRY_TOPIC:
+            if topic == TELEMETRY_TOPIC or topic ==ATTRIBUTES_TOPIC:
                 msg_rate_limit = self._telemetry_rate_limit
             else:
                 msg_rate_limit = self._messages_rate_limit
         if dp_rate_limit is None:
-            if kwargs.get('topic') == TELEMETRY_TOPIC:
+            if topic == TELEMETRY_TOPIC or topic ==ATTRIBUTES_TOPIC:
                 dp_rate_limit = self._telemetry_dp_rate_limit
             else:
                 dp_rate_limit = self.EMPTY_RATE_LIMIT
@@ -1101,7 +1102,7 @@ def __send_publish_with_limitations(self, kwargs, timeout, device=None, msg_rate
         data = kwargs.get("payload")
         if isinstance(data, str):
             data = loads(data)
-        topic = kwargs.get("topic", '')
+        topic = kwargs["topic"]
         attributes_format = topic.endswith('attributes')
         if topic.endswith('telemetry') or attributes_format:
             if device is None or data.get(device) is None:

tb_gateway_mqtt.py

@@ -191,9 +191,10 @@ def __request_attributes(self, device, keys, callback, type_is_client=False):
 
     def _send_device_request(self, _type, device_name, **kwargs):
         if _type == TBSendMethod.PUBLISH:
+            topic = kwargs['topic']
             device_msg_rate_limit = self._devices_connected_through_gateway_messages_rate_limit
             device_dp_rate_limit = self.EMPTY_RATE_LIMIT
-            if kwargs.get('topic') == GATEWAY_TELEMETRY_TOPIC:
+            if topic == GATEWAY_TELEMETRY_TOPIC or topic == GATEWAY_ATTRIBUTES_TOPIC:
                 device_msg_rate_limit = self._devices_connected_through_gateway_telemetry_messages_rate_limit
                 device_dp_rate_limit = self._devices_connected_through_gateway_telemetry_datapoints_rate_limit
             info = self._publish_data(**kwargs, device=device_name,