finalsa-common-models 0.0.4__tar.gz → 1.0.0__tar.gz

{finalsa-common-models-0.0.4/finalsa_common_models.egg-info → finalsa_common_models-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finalsa-common-models
-Version: 0.0.4
+Version: 1.0.0
 Summary: An utils package for using finalsa common models.
 Home-page: https://github.com/finalsa/finalsa-common-models
 Author: Luis Jimenez
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: boto3>=1.20.3

{finalsa-common-models-0.0.4 → finalsa_common_models-1.0.0}/finalsa/common/models/__init__.py

@@ -5,7 +5,7 @@ from finalsa.common.models.models import (
     to_message_attributes
 )
 
-__version__ = "0.0.4"
+__version__ = "1.0.0"
 
 __all__ = [
     "SqsMessage",

{finalsa-common-models-0.0.4 → finalsa_common_models-1.0.0}/finalsa/common/models/models/sqs_message.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timezone
-from typing import Optional
+from typing import Optional, Union, Dict
 from uuid import UUID
 from pydantic import BaseModel
 from json import loads
@@ -8,12 +8,14 @@ from json import loads
 class SqsMessage(BaseModel):
     id: UUID
     topic: str
-    payload: str
+    payload: Union[str, Dict]
     correlation_id: str
     timestamp: Optional[datetime] = datetime.now(timezone.utc)
 
-    def get_payload(self):
-        return loads(self.payload)
+    def get_payload(self) -> Dict:
+        if isinstance(self.payload, str):
+            self.payload = loads(self.payload)
+        return self.payload
 
     def to_dict(self):
         return {

{finalsa-common-models-0.0.4 → finalsa_common_models-1.0.0}/finalsa/common/models/models/sqs_response.py

@@ -17,9 +17,6 @@ class SqsReponse(BaseModel):
     md5_of_message_attributes: Optional[str] = ""
     message_attributes: Optional[Dict] = {}
 
-    def get_payload(self) -> Dict:
-        return loads(self.body)
-
     @staticmethod
     def correlation_id_from_attributes(attributes: Dict) -> Optional[str]:
         correlation_id = attributes.get('correlation_id', None)
@@ -31,60 +28,77 @@ class SqsReponse(BaseModel):
             return correlation_id["Value"]
         return None
 
-    def get_correlation_id(self) -> Union[str, UUID]:
+    def get_correlation_id(self, payload: Optional[Dict] = {}) -> Union[str, UUID]:
         correlation_id = self.correlation_id_from_attributes(self.message_attributes)
         if correlation_id:
             return correlation_id
         correlation_id = self.correlation_id_from_attributes(self.attributes)
         if correlation_id:
             return correlation_id
-        try:
-            s = self.get_payload()['correlation_id']
-            return s
-        except Exception:
-            return str(uuid4())
+        if 'correlation_id' in payload:
+            return payload['correlation_id']
+        return str(uuid4())
 
-    def parse_from_sns(self) -> Optional[Dict]:
-        payload = self.get_payload()
-        if 'Type' not in payload or payload['Type'] != 'Notification':
-            return None
+    @staticmethod
+    def __is_sns_message__(content: Dict) -> bool:
+        return 'Type' in content and content['Type'] == 'Notification'
+
+    @staticmethod
+    def __is_sqs_message__(content: Dict) -> bool:
+        return ('id' in content and
+                'topic' in content and
+                'payload' in content)
+
+    def parse_from_sns(self) -> Dict:
+        payload = loads(self.body)
+        if self.__is_sns_message__(payload):
+            return self.__parse_from_sns__(payload)
+        raise ValueError('The message is not a SNS message')
+
+    def __parse_from_sns__(self, payload: Dict) -> Union[str, Dict]:
         self.topic = str(payload['TopicArn'].split(':')[-1]).lower()
-        self.body = payload['Message']
         self.message_attributes = parse_message_attributes(
             payload.get('MessageAttributes', {}))
-        return self.get_payload()
+        try:
+            return loads(payload['Message'])
+        except Exception:
+            return payload['Message']
 
     def parse(self) -> Optional[Dict]:
-        sns_response = self.parse_from_sns()
-        if sns_response is not None:
-            return sns_response
-        return self.get_payload()
+        content = loads(self.body)
+        if self.__is_sns_message__(content):
+            content = self.__parse_from_sns__(content)
+        return content
 
-    def get_sqs_message(self) -> SqsMessage:
-        sns_payload = self.parse_from_sns()
-        if sns_payload:
-            if 'correlation_id' not in sns_payload:
-                sns_payload['correlation_id'] = str(self.get_correlation_id())
-            if 'timestamp' not in sns_payload:
-                sns_payload['timestamp'] = datetime.now(timezone.utc).isoformat()
+    def __get_sqs_message__(self, content: Union[str, Dict]) -> SqsMessage:
+
+        if isinstance(content, dict) and self.__is_sqs_message__(content):
+            if 'correlation_id' not in content:
+                content['correlation_id'] = str(self.get_correlation_id(content))
             return SqsMessage(
-                id=UUID(sns_payload['id']),
-                topic=sns_payload['topic'],
-                payload=sns_payload['payload'],
-                correlation_id=sns_payload['correlation_id'],
-                timestamp=sns_payload['timestamp']
+                id=UUID(content['id']),
+                topic=content['topic'],
+                payload=content['payload'],
+                correlation_id=content['correlation_id'],
+                timestamp=content['timestamp']
             )
-        payload = self.get_payload()
-        if 'correlation_id' not in payload:
-            payload['correlation_id'] = str(self.get_correlation_id())
         return SqsMessage(
-            id=UUID(payload['id']),
-            topic=payload['topic'],
-            payload=payload['payload'],
-            correlation_id=payload['correlation_id'],
-            timestamp=payload['timestamp']
+            id=uuid4(),
+            topic=self.topic,
+            payload=content,
+            correlation_id=self.get_correlation_id(content),
+            timestamp=datetime.now(timezone.utc).isoformat()
         )
 
+    def get_sqs_message(self) -> SqsMessage:
+        try:
+            content = loads(self.body)
+        except Exception:
+            return self.__get_sqs_message__(self.body)
+        if self.__is_sns_message__(content):
+            content = self.__parse_from_sns__(content)
+        return self.__get_sqs_message__(content)
+
     @classmethod
     def from_boto_response(cls, response: Dict):
         return cls(

{finalsa-common-models-0.0.4 → finalsa_common_models-1.0.0/finalsa_common_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finalsa-common-models
-Version: 0.0.4
+Version: 1.0.0
 Summary: An utils package for using finalsa common models.
 Home-page: https://github.com/finalsa/finalsa-common-models
 Author: Luis Jimenez
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: boto3>=1.20.3

{finalsa-common-models-0.0.4 → finalsa_common_models-1.0.0}/setup.py

@@ -54,7 +54,7 @@ setup(
     package_data={PACKAGE: ["py.typed"]},
     include_package_data=True,
     zip_safe=True,
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     data_files=[("", ["LICENSE.md"])],
     install_requires=[
         "boto3>=1.20.3",

finalsa_common_models-1.0.0/tests/test_client.py

@@ -0,0 +1,355 @@
+from finalsa.common.models import (
+    SqsMessage, SqsReponse, parse_message_attributes,
+    to_message_attributes, __version__)
+import os
+import sys
+import uuid
+import datetime
+import decimal
+
+from json import dumps
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../')))
+
+
+def test_version():
+    assert __version__ is not None
+
+
+def test_parse_message_attributes():
+    attributes = {
+        'string': {'Type': 'String', 'Value': 'test'},
+        'number': {'Type': 'Number', 'Value': '1'},
+        'binary': {'Type': 'Binary', 'Value': 'test'}
+    }
+    result = parse_message_attributes(attributes)
+    assert result['string'] == 'test'
+    assert result['number'] == 1
+    assert result['binary'] == b'test'
+
+
+def test_sqs_message():
+    message = SqsMessage(
+        id='123e4567-e89b-12d3-a456-426614174000',
+        topic='test',
+        payload='{"test": "test"}',
+        correlation_id='123e4567-e89b-12d3-a456-426614174000'
+    )
+    assert str(message.id) == '123e4567-e89b-12d3-a456-426614174000'
+    assert message.topic == 'test'
+    assert message.get_payload() == {'test': 'test'}
+    assert message.correlation_id == '123e4567-e89b-12d3-a456-426614174000'
+    assert message.timestamp is not None
+    assert message.to_dict() == {
+        'id': '123e4567-e89b-12d3-a456-426614174000',
+        'topic': 'test',
+        'payload': {'test': 'test'},
+        'correlation_id': '123e4567-e89b-12d3-a456-426614174000',
+        'timestamp': message.timestamp.isoformat()
+    }
+
+
+def test_sqs_message_str():
+    message = SqsMessage(
+        id='123e4567-e89b-12d3-a456-426614174000',
+        topic='test',
+        payload='{"test: "test"}',
+        correlation_id='123e4567-e89b-12d3-a456-426614174000'
+    )
+    assert str(message.id) == '123e4567-e89b-12d3-a456-426614174000'
+    assert message.topic == 'test'
+    assert message.correlation_id == '123e4567-e89b-12d3-a456-426614174000'
+    assert message.timestamp is not None
+    assert message.to_dict() == {
+        'id': '123e4567-e89b-12d3-a456-426614174000',
+        'topic': 'test',
+        'payload': '{"test: "test"}',
+        'correlation_id': '123e4567-e89b-12d3-a456-426614174000',
+        'timestamp': message.timestamp.isoformat()
+    }
+
+
+def test_sqs_response():
+    response = SqsReponse(
+        message_id='test',
+        receipt_handle='test',
+        md5_of_body='test',
+        body='test',
+        attributes={'test': 'test',
+                    'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        topic='test',
+        md5_of_message_attributes='test',
+        message_attributes={'correlation_id': {'Type': 'String',
+                                               'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+
+    )
+    assert response.body == 'test'
+    assert str(response.get_correlation_id()) == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == 'test'
+
+
+def test_sqs_response_from_boto_response():
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': 'test',
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == 'test'
+    assert str(response.get_correlation_id()) == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+
+
+def test_sqs_response_no_correlation_id():
+    response = SqsReponse(
+        message_id='test',
+        receipt_handle='test',
+        md5_of_body='test',
+        body='test',
+        attributes={'test': 'test'},
+        topic='test',
+        md5_of_message_attributes='test',
+    )
+    assert response.body == 'test'
+    assert response.get_correlation_id() is not None
+    assert response.topic == 'test'
+
+
+def test_sqs_message_from_dict():
+
+    message = SqsMessage(
+        id='123e4567-e89b-12d3-a456-426614174000',
+        topic='test',
+        payload='{"test": "test"}',
+        correlation_id='123e4567-e89b-12d3-a456-426614174000'
+    )
+    message_dict = message.to_dict()
+    assert str(message.id) == message_dict['id']
+    assert message.topic == message_dict['topic']
+    assert message.get_payload() == {'test': 'test'}
+    assert message.correlation_id == message_dict['correlation_id']
+
+
+def test_to_message_attributes():
+    attributes = {
+        'string': 'test',
+        'number': 1,
+        'binary': b'test',
+        'uuid': uuid.uuid4(),
+        'datetime': datetime.datetime.now(),
+        'decimal': decimal.Decimal('1.0')
+    }
+    result = to_message_attributes(attributes)
+    assert result['string']['DataType'] == 'String'
+    assert result['string']['StringValue'] == 'test'
+    assert result['number']['DataType'] == 'Number'
+    assert result['number']['StringValue'] == '1'
+    assert result['binary']['DataType'] == 'Binary'
+    assert result['binary']['BinaryValue'] == b'test'
+    assert result['uuid']['DataType'] == 'String'
+    assert result['uuid']['StringValue'] == str(attributes['uuid'])
+    assert result['datetime']['DataType'] == 'String'
+    assert result['datetime']['StringValue'] == attributes['datetime'].isoformat()
+    assert result['decimal']['DataType'] == 'Number'
+    assert result['decimal']['StringValue'] == '1.0'
+
+
+def test_parse_from_sns_response():
+    real_message_body = {
+        "test": "test"
+    }
+    body = dumps({
+        'Type': 'Notification',
+        'TopicArn': 'mytopic',
+        'Message': dumps(real_message_body),
+        'MessageAttributes': {'correlation_id': {
+            'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'
+        }}
+    })
+
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': body,
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == body
+    assert response.get_correlation_id() == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    assert response.parse_from_sns() == real_message_body
+    assert response.parse() == real_message_body
+
+
+def test_parse_from_sns_response_sqs_message():
+    real_message_body = {
+        "id": "123e4567-e89b-12d3-a456-426614174000",
+    }
+    sqs_message_payload = {
+        "id": "123e4567-e89b-12d3-a456-426614174000",
+        "topic": "test",
+        "payload": dumps(real_message_body),
+        "correlation_id": "123e4567-e89b-12d3-a456-426614174000",
+        "timestamp": datetime.datetime.now().isoformat()
+    }
+    body = dumps({
+        'Type': 'Notification',
+        'TopicArn': 'mytopic',
+        'Message': dumps(sqs_message_payload),
+        'MessageAttributes': {'correlation_id': {
+            'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'
+        }}
+    })
+
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': body,
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == body
+    assert response.get_correlation_id() == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    sqs_message = response.get_sqs_message()
+    assert sqs_message.id == uuid.UUID(sqs_message_payload['id'])
+    assert sqs_message.topic == sqs_message_payload['topic']
+    assert sqs_message.get_payload() == real_message_body
+    assert sqs_message.correlation_id == sqs_message_payload['correlation_id']
+    assert sqs_message.timestamp.isoformat() == sqs_message_payload['timestamp']
+
+
+def test_parse_from_sqs_response_sqs_message():
+    real_message_body = {
+        "id": "123e4567-e89b-12d3-a456-426614174000",
+    }
+    sqs_message_payload = {
+        "id": "123e4567-e89b-12d3-a456-426614174000",
+        "topic": "test",
+        "payload": dumps(real_message_body),
+        "correlation_id": "123e4567-e89b-12d3-a456-426614174000",
+        "timestamp": datetime.datetime.now().isoformat()
+    }
+    body = dumps(sqs_message_payload)
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': body,
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == body
+    assert response.get_correlation_id() == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    sqs_message = response.get_sqs_message()
+    assert sqs_message.id == uuid.UUID(sqs_message_payload['id'])
+    assert sqs_message.topic == sqs_message_payload['topic']
+    assert sqs_message.get_payload() == real_message_body
+    assert sqs_message.correlation_id == sqs_message_payload['correlation_id']
+    assert sqs_message.timestamp.isoformat() == sqs_message_payload['timestamp']
+
+
+def test_parse_from_sns_response_non_valid_sqs_message():
+    real_message_body = {
+        "id": "123e4567-e89b-12d3-a456-426614174000",
+    }
+
+    body = dumps({
+        'Type': 'Notification',
+        'TopicArn': 'mytopic',
+        'Message': dumps(real_message_body),
+        'MessageAttributes': {'correlation_id': {
+            'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'
+        }}
+    })
+
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': body,
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == body
+    assert response.get_correlation_id() == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    sqs_message = response.get_sqs_message()
+    assert sqs_message.id is not None
+    assert sqs_message.get_payload() == real_message_body
+    assert sqs_message.correlation_id == '123e4567-e89b-12d3-a456-426614174000'
+    assert sqs_message.timestamp is not None
+    assert sqs_message.topic == 'mytopic'
+
+
+
+def test_parse_from_sns_response_non_valid_str_sqs_message():
+    real_message_body = "a"
+    body = dumps({
+        'Type': 'Notification',
+        'TopicArn': 'mytopic',
+        'Message': real_message_body,
+        'MessageAttributes': {'correlation_id': {
+            'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'
+        }}
+    })
+
+    boto_response = {
+        'MessageId': 'test',
+        'ReceiptHandle': 'test',
+        'MD5OfBody': 'test',
+        'Body': body,
+        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
+        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
+    }
+
+    response = SqsReponse.from_boto_response(boto_response)
+    assert response.body == body
+    assert response.get_correlation_id() == '123e4567-e89b-12d3-a456-426614174000'
+    assert response.topic == ''
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    sqs_message = response.get_sqs_message()
+    assert sqs_message.id is not None
+    assert sqs_message.payload == real_message_body
+    assert sqs_message.correlation_id == '123e4567-e89b-12d3-a456-426614174000'
+    assert sqs_message.timestamp is not None
+    assert sqs_message.topic == 'mytopic'

finalsa-common-models-0.0.4/tests/test_client.py

@@ -1,141 +0,0 @@
-from finalsa.common.models import (
-    SqsMessage, SqsReponse, parse_message_attributes,
-    to_message_attributes, __version__)
-import os
-import sys
-import uuid
-import datetime
-import decimal
-
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../')))
-
-
-def test_version():
-    assert __version__ is not None
-
-
-def test_parse_message_attributes():
-    attributes = {
-        'string': {'Type': 'String', 'Value': 'test'},
-        'number': {'Type': 'Number', 'Value': '1'},
-        'binary': {'Type': 'Binary', 'Value': 'test'}
-    }
-    result = parse_message_attributes(attributes)
-    assert result['string'] == 'test'
-    assert result['number'] == 1
-    assert result['binary'] == b'test'
-
-
-def test_sqs_message():
-    message = SqsMessage(
-        id='123e4567-e89b-12d3-a456-426614174000',
-        topic='test',
-        payload='{"test": "test"}',
-        correlation_id='123e4567-e89b-12d3-a456-426614174000'
-    )
-    assert str(message.id) == '123e4567-e89b-12d3-a456-426614174000'
-    assert message.topic == 'test'
-    assert message.get_payload() == {'test': 'test'}
-    assert message.correlation_id == '123e4567-e89b-12d3-a456-426614174000'
-    assert message.timestamp is not None
-    assert message.to_dict() == {
-        'id': '123e4567-e89b-12d3-a456-426614174000',
-        'topic': 'test',
-        'payload': '{"test": "test"}',
-        'correlation_id': '123e4567-e89b-12d3-a456-426614174000',
-        'timestamp': message.timestamp.isoformat()
-    }
-
-
-def test_sqs_response():
-    response = SqsReponse(
-        message_id='test',
-        receipt_handle='test',
-        md5_of_body='test',
-        body='test',
-        attributes={'test': 'test',
-                    'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
-        topic='test',
-        md5_of_message_attributes='test',
-        message_attributes={'correlation_id': {'Type': 'String',
-                                               'Value': '123e4567-e89b-12d3-a456-426614174000'}}
-
-    )
-    assert response.body == 'test'
-    assert str(response.get_correlation_id()) == '123e4567-e89b-12d3-a456-426614174000'
-    assert response.topic == 'test'
-
-
-def test_sqs_response_from_boto_response():
-    boto_response = {
-        'MessageId': 'test',
-        'ReceiptHandle': 'test',
-        'MD5OfBody': 'test',
-        'Body': 'test',
-        'Attributes': {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'},
-        'MessageAttributes': {'correlation_id': {'Type': 'String', 'Value': '123e4567-e89b-12d3-a456-426614174000'}}
-
-    }
-
-    response = SqsReponse.from_boto_response(boto_response)
-    assert response.body == 'test'
-    assert str(response.get_correlation_id()) == '123e4567-e89b-12d3-a456-426614174000'
-    assert response.topic == ''
-    assert response.message_attributes == {
-        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
-    assert response.attributes == {
-        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
-
-
-def test_sqs_response_no_correlation_id():
-    response = SqsReponse(
-        message_id='test',
-        receipt_handle='test',
-        md5_of_body='test',
-        body='test',
-        attributes={'test': 'test'},
-        topic='test',
-        md5_of_message_attributes='test',
-    )
-    assert response.body == 'test'
-    assert response.get_correlation_id() is not None
-    assert response.topic == 'test'
-
-
-def test_sqs_message_from_dict():
-
-    message = SqsMessage(
-        id='123e4567-e89b-12d3-a456-426614174000',
-        topic='test',
-        payload='{"test": "test"}',
-        correlation_id='123e4567-e89b-12d3-a456-426614174000'
-    )
-    message_dict = message.to_dict()
-    assert str(message.id) == message_dict['id']
-    assert message.topic == message_dict['topic']
-    assert message.get_payload() == {'test': 'test'}
-    assert message.correlation_id == message_dict['correlation_id']
-
-
-def test_to_message_attributes():
-    attributes = {
-        'string': 'test',
-        'number': 1,
-        'binary': b'test',
-        'uuid': uuid.uuid4(),
-        'datetime': datetime.datetime.now(),
-        'decimal': decimal.Decimal('1.0')
-    }
-    result = to_message_attributes(attributes)
-    assert result['string']['DataType'] == 'String'
-    assert result['string']['StringValue'] == 'test'
-    assert result['number']['DataType'] == 'Number'
-    assert result['number']['StringValue'] == '1'
-    assert result['binary']['DataType'] == 'Binary'
-    assert result['binary']['BinaryValue'] == b'test'
-    assert result['uuid']['DataType'] == 'String'
-    assert result['uuid']['StringValue'] == str(attributes['uuid'])
-    assert result['datetime']['DataType'] == 'String'
-    assert result['datetime']['StringValue'] == attributes['datetime'].isoformat()
-    assert result['decimal']['DataType'] == 'Number'
-    assert result['decimal']['StringValue'] == '1.0'