pyqttier 0.2.0__tar.gz → 0.2.2__tar.gz

{pyqttier-0.2.0 → pyqttier-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqttier
-Version: 0.2.0
+Version: 0.2.2
 Summary: Convenient wrapper around Paho MQTT
 Author-email: Jacob Brunson <github@jacobbrunson.com>
 License-File: LICENSE

{pyqttier-0.2.0 → pyqttier-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyqttier"
-version = "0.2.0"
+version = "0.2.2"
 description = "Convenient wrapper around Paho MQTT"
 readme = "README.md"
 authors = [

{pyqttier-0.2.0 → pyqttier-0.2.2}/src/pyqttier/connection.py

@@ -23,6 +23,7 @@ class Mqtt5Connection(IBrokerConnection):
     class PendingSubscription:
         topic: str
         subscription_id: int
+        qos: int
 
     @dataclass
     class PendingPublish:
@@ -115,6 +116,10 @@ class Mqtt5Connection(IBrokerConnection):
                 if sub_id in self._subscription_callbacks:
                     self._subscription_callbacks[sub_id](message)
                     return
+                else:
+                    self._logger.debug("No specific callback for subscription ID %d", sub_id)
+        else:
+            self._logger.warning("No subscription ID found in message properties. This is not usual because we always provide one when subscribing.")
         with self._message_handling_lock:
             for callback in self._message_callbacks:
                 callback(message)
@@ -132,12 +137,12 @@ class Mqtt5Connection(IBrokerConnection):
                     break
                 else:
                     self._logger.debug(
-                        "Connected and subscribing to %s", pending_subscr.topic
+                        "Connected and subscribing to %s as subscription_id=%d", pending_subscr.topic, pending_subscr.subscription_id
                     )
                     sub_props = MqttProperties(PacketTypes.SUBSCRIBE)
                     sub_props.SubscriptionIdentifier = pending_subscr.subscription_id
                     self._client.subscribe(
-                        pending_subscr.topic, qos=1, properties=sub_props
+                        pending_subscr.topic, qos=pending_subscr.qos, properties=sub_props
                     )
             while not self._queued_messages.empty():
                 try:
@@ -179,7 +184,7 @@ class Mqtt5Connection(IBrokerConnection):
             self._queued_messages.put(pending_pub)
         return fut
 
-    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None) -> int:
+    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None, qos: int = 1) -> int:
         """Subscribes to a topic. If the connection is not established, the subscription is queued.
         Returns the subscription ID.
         """
@@ -188,12 +193,14 @@ class Mqtt5Connection(IBrokerConnection):
             self._logger.debug("Subscribing to %s", topic)
             sub_props = MqttProperties(PacketTypes.SUBSCRIBE)
             sub_props.SubscriptionIdentifier = sub_id
-            self._client.subscribe(topic, qos=1, properties=sub_props)
+            self._client.subscribe(topic, qos=qos, properties=sub_props)
         else:
             self._logger.debug("Pending subscription to %s", topic)
-            self._queued_subscriptions.put(self.PendingSubscription(topic, sub_id))
+            self._queued_subscriptions.put(self.PendingSubscription(topic, sub_id, qos))
         if callback is not None:
             self._subscription_callbacks[sub_id] = callback
+        else:
+            self._logger.warning("No callback provided for subscription to %s", topic)
         return sub_id
 
     def is_topic_sub(self, topic: str, sub: str) -> bool:

{pyqttier-0.2.0 → pyqttier-0.2.2}/src/pyqttier/interface.py

@@ -17,7 +17,7 @@ class IBrokerConnection(ABC):
         pass
 
     @abstractmethod
-    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None) -> int:
+    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None, qos: int = 1) -> int:
         """
         Subscribes to the provided topic.  May queue the subscription until the connection to the broker is established.
         When a message is received on the topic, the provided callback will be executed if provided.

{pyqttier-0.2.0 → pyqttier-0.2.2}/src/pyqttier/message.py

@@ -63,4 +63,6 @@ class Message:
             msg_obj.response_topic = properties["ResponseTopic"]
         if "MessageExpiryInterval" in properties:
             msg_obj.message_expiry_interval = properties["MessageExpiryInterval"]
+        if "SubscriptionIdentifier" in properties:
+            msg_obj.subscription_id = properties["SubscriptionIdentifier"]
         return msg_obj

{pyqttier-0.2.0 → pyqttier-0.2.2}/uv.lock

@@ -716,7 +716,7 @@ wheels = [
 
 [[package]]
 name = "pyqttier"
-version = "0.2.0"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "paho-mqtt" },