pyqttier 0.2.2__tar.gz → 0.2.4__tar.gz

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

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

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

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

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

@@ -110,14 +110,16 @@ class Mqtt5Connection(IBrokerConnection):
     def _on_message(self, client, userdata, msg):
         self._logger.debug("Got a message to %s : %s", msg.topic, msg.payload.decode())
         message = Message.from_paho_message(msg)
-        if message.subscription_id is not None:
-            sub_id = message.subscription_id
-            with self._message_handling_lock:
-                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)
+        if len(message.subscription_ids) > 0:
+            for sub_id in message.subscription_ids:
+                with self._message_handling_lock:
+                    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.debug("No matching subscription ID callbacks found for message.")
         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:

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

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Optional, Dict, Any
+from typing import Optional, Dict, Any, List
 from paho.mqtt.client import MQTTMessage
 from paho.mqtt.properties import Properties as MqttProperties
 from paho.mqtt.packettypes import PacketTypes
@@ -13,7 +13,7 @@ class Message:
     content_type: Optional[str] = None
     correlation_data: Optional[bytes] = None
     response_topic: Optional[str] = None
-    subscription_id: Optional[int] = None  # Ignored on publish
+    subscription_ids: List[int] = field(default_factory=list)  # Ignored on publish
     message_expiry_interval: Optional[int] = None
     user_properties: Optional[Dict[str, str]] = field(default_factory=dict)
 
@@ -64,5 +64,6 @@ class Message:
         if "MessageExpiryInterval" in properties:
             msg_obj.message_expiry_interval = properties["MessageExpiryInterval"]
         if "SubscriptionIdentifier" in properties:
-            msg_obj.subscription_id = properties["SubscriptionIdentifier"]
+            sub_ids = properties["SubscriptionIdentifier"] if isinstance(properties["SubscriptionIdentifier"], list) else [properties["SubscriptionIdentifier"]]
+            msg_obj.subscription_ids = sub_ids
         return msg_obj

{pyqttier-0.2.2 → pyqttier-0.2.4}/src/pyqttier/mock.py

@@ -74,7 +74,7 @@ class MockConnection(IBrokerConnection):
                 if self.is_topic_sub(message.topic, topic_filter):
                     if callback is not None:
                         receiving_msg = copy(message)
-                        receiving_msg.subscription_id = sub_id
+                        receiving_msg.subscription_ids = [sub_id]
                         callback(receiving_msg)
                         return
 
@@ -95,7 +95,7 @@ class MockConnection(IBrokerConnection):
         future.set_result(None)
         return future
 
-    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None) -> int:
+    def subscribe(self, topic: str, callback: Optional[MessageCallback] = None, qos: int = 1) -> int:
         """
         Registers a subscription and returns a subscription ID.
         """

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

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