use application data

Signed-off-by: Gabriele Santomaggio <[email protected]>

Author: Gsantomaggio

examples/getting_started/getting_started.py

@@ -24,7 +24,7 @@ def __init__(self):
         self._count = 0
 
     def on_amqp_message(self, event: Event):
-        print("received message: " + str(event.message.body))
+        print("received message: {} ".format(''.join(map(chr, event.message.body))))
 
         # accepting
         self.delivery_context.accept(event)
@@ -79,7 +79,6 @@ def create_connection(environment: Environment) -> Connection:
 
 
 def main() -> None:
-
     exchange_name = "test-exchange"
     queue_name = "example-queue"
     routing_key = "routing-key"
@@ -123,7 +122,7 @@ def main() -> None:
     # publish 10 messages
     for i in range(MESSAGES_TO_PUBLISH):
         print("publishing")
-        status = publisher.publish(Message(body="test"))
+        status = publisher.publish(Message(body=str.encode("test message {} ".format(i))))
         if status.remote_state == OutcomeState.ACCEPTED:
             print("message accepted")
         elif status.remote_state == OutcomeState.RELEASED:

rabbitmq_amqp_python_client/qpid/proton/_exceptions.py

@@ -58,6 +58,13 @@ class MessageException(ProtonException):
 
     pass
 
+class ArgumentOutOfRangeException(MessageException):
+    """
+    An exception class raised when an argument is out of range.
+    """
+
+    pass
+
 
 class DataException(ProtonException):
     """

rabbitmq_amqp_python_client/qpid/proton/_message.py

@@ -84,7 +84,7 @@
 from ._common import millis2secs, secs2millis
 from ._data import AnnotationDict, Data, char, symbol, ulong
 from ._endpoints import Link
-from ._exceptions import EXCEPTIONS, MessageException
+from ._exceptions import EXCEPTIONS, MessageException, ArgumentOutOfRangeException
 
 if TYPE_CHECKING:
     from proton._data import Described, PythonAMQPData
@@ -110,17 +110,26 @@ class Message(object):
     """ Default AMQP message priority"""
 
     def __init__(
-        self,
-        body: Union[
-            bytes, str, dict, list, int, float, "UUID", "Described", None
-        ] = None,
-        **kwargs
+            self,
+            body: Union[
+                bytes, dict, None
+            ] = None,
+            **kwargs
     ) -> None:
+        # validate the types
+
+        if not isinstance(body, (bytes, dict, type(None))):
+            raise ArgumentOutOfRangeException(
+                "Message body must be of type bytes, dict or None"
+            )
+
         self._msg = pn_message()
         self.instructions = None
         self.annotations = None
         self.properties = None
         self.body = body
+        self.inferred = True
+
         for k, v in kwargs.items():
             getattr(self, k)  # Raise exception if it's not a valid attribute.
             setattr(self, k, v)
@@ -236,7 +245,8 @@ def inferred(self) -> bool:
 
         :raise: :exc:`MessageException` if there is any Proton error when using the setter.
         """
-        return pn_message_is_inferred(self._msg)
+        x = pn_message_is_inferred(self._msg)
+        return x
 
     @inferred.setter
     def inferred(self, value: bool) -> None:
@@ -503,7 +513,7 @@ def instructions(self) -> Optional[AnnotationDict]:
 
     @instructions.setter
     def instructions(
-        self, instructions: Optional[Dict[Union[str, int], "PythonAMQPData"]]
+            self, instructions: Optional[Dict[Union[str, int], "PythonAMQPData"]]
     ) -> None:
         if isinstance(instructions, dict):
             self.instruction_dict = AnnotationDict(instructions, raise_on_error=False)
@@ -526,7 +536,7 @@ def annotations(self) -> Optional[AnnotationDict]:
 
     @annotations.setter
     def annotations(
-        self, annotations: Optional[Dict[Union[str, int], "PythonAMQPData"]]
+            self, annotations: Optional[Dict[Union[str, int], "PythonAMQPData"]]
     ) -> None:
         if isinstance(annotations, dict):
             self.annotation_dict = AnnotationDict(annotations, raise_on_error=False)
@@ -593,7 +603,8 @@ def send(self, sender: "Sender", tag: Optional[str] = None) -> "Delivery":
         return dlv
 
     @overload
-    def recv(self, link: "Sender") -> None: ...
+    def recv(self, link: "Sender") -> None:
+        ...
 
     def recv(self, link: "Receiver") -> Optional["Delivery"]:
         """
@@ -624,24 +635,24 @@ def recv(self, link: "Receiver") -> Optional["Delivery"]:
     def __repr__(self) -> str:
         props = []
         for attr in (
-            "inferred",
-            "address",
-            "reply_to",
-            "durable",
-            "ttl",
-            "priority",
-            "first_acquirer",
-            "delivery_count",
-            "id",
-            "correlation_id",
-            "user_id",
-            "group_id",
-            "group_sequence",
-            "reply_to_group_id",
-            "instructions",
-            "annotations",
-            "properties",
-            "body",
+                "inferred",
+                "address",
+                "reply_to",
+                "durable",
+                "ttl",
+                "priority",
+                "first_acquirer",
+                "delivery_count",
+                "id",
+                "correlation_id",
+                "user_id",
+                "group_id",
+                "group_sequence",
+                "reply_to_group_id",
+                "instructions",
+                "annotations",
+                "properties",
+                "body",
         ):
             value = getattr(self, attr)
             if value:

rabbitmq_amqp_python_client/qpid/proton/_utils.py

@@ -176,6 +176,7 @@ def send(
         :return: Delivery object for this message.
         """
 
+
         delivery = self.link.send(msg)
         self.connection.wait(
             lambda: _is_settled(delivery),