finalsa-common-models 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

finalsa/common/models/__init__.py

@@ -1,14 +1,18 @@
 from finalsa.common.models.models import (
     Meta,
     SqsReponse,
-    parse_message_attributes,
-    to_message_attributes
+    parse_sns_message_attributes,
+    parse_sqs_message_attributes,
+    to_sqs_message_attributes,
+    to_sns_message_attributes,
 )
 
 
 __all__ = [
     "Meta",
     "SqsReponse",
-    "parse_message_attributes",
-    "to_message_attributes",
+    "parse_sns_message_attributes",
+    "parse_sqs_message_attributes",
+    "to_sqs_message_attributes",
+    "to_sns_message_attributes",
 ]

finalsa/common/models/models/__init__.py

@@ -1,10 +1,12 @@
-from .functions import parse_message_attributes, to_message_attributes
+from .functions import parse_sns_message_attributes, parse_sqs_message_attributes, to_sqs_message_attributes, to_sns_message_attributes
 from .sqs_response import SqsReponse
 from .meta import Meta
 
 __all__ = [
     "Meta",
     "SqsReponse",
-    "parse_message_attributes",
-    "to_message_attributes",
+    "parse_sns_message_attributes",
+    "parse_sqs_message_attributes",
+    "to_sqs_message_attributes",
+    "to_sns_message_attributes"
 ]

finalsa/common/models/models/functions.py

@@ -4,7 +4,7 @@ from decimal import Decimal
 from uuid import UUID
 
 
-def parse_message_attributes(attributes: Dict) -> Dict:
+def parse_sns_message_attributes(attributes: Dict) -> Dict:
     message_attributes = {}
     if not attributes:
         return message_attributes
@@ -17,8 +17,20 @@ def parse_message_attributes(attributes: Dict) -> Dict:
             message_attributes[key] = bytes(value['Value'], 'utf-8')
     return message_attributes
 
+def parse_sqs_message_attributes(attributes: Dict) -> Dict:
+    message_attributes = {}
+    if not attributes:
+        return message_attributes
+    for key, value in attributes.items():
+        if value['DataType'] == 'String':
+            message_attributes[key] = value['StringValue']
+        elif value['DataType'] == 'Number':
+            message_attributes[key] = int(value['StringValue'])
+        elif value['DataType'] == 'Binary':
+            message_attributes[key] = bytes(value['StringValue'], 'utf-8')
+    return message_attributes
 
-def to_message_attributes(attributes: Dict) -> Dict:
+def to_sqs_message_attributes(attributes: Dict) -> Dict:
     att_dict = {}
     for key, value in attributes.items():
         if isinstance(value, str):
@@ -40,3 +52,28 @@ def to_message_attributes(attributes: Dict) -> Dict:
             att_dict[key] = {
                 'DataType': 'Binary', 'BinaryValue': value}
     return att_dict
+
+
+
+def to_sns_message_attributes(attributes: Dict) -> Dict:
+    att_dict = {}
+    for key, value in attributes.items():
+        if isinstance(value, str):
+            att_dict[key] = {
+                'Type': 'String', 'Value': value}
+        elif isinstance(value, Decimal):
+            att_dict[key] = {
+                'Type': 'Number', 'Value': str(value)}
+        elif isinstance(value, UUID):
+            att_dict[key] = {
+                'Type': 'String', 'Value': str(value)}
+        elif isinstance(value, datetime):
+            att_dict[key] = {
+                'Type': 'String', 'Value': value.isoformat()}
+        elif isinstance(value, int):
+            att_dict[key] = {
+                'Type': 'Number', 'Value': str(value)}
+        elif isinstance(value, bytes):
+            att_dict[key] = {
+                'Type': 'Binary', 'Value': value}
+    return att_dict

finalsa/common/models/models/sqs_response.py

@@ -1,7 +1,7 @@
 from typing import Dict, Optional, Union
 from pydantic import BaseModel
 from orjson import loads
-from .functions import parse_message_attributes
+from .functions import parse_sqs_message_attributes, parse_sns_message_attributes
 
 
 class SqsReponse(BaseModel):
@@ -26,7 +26,7 @@ class SqsReponse(BaseModel):
 
     def __parse_from_sns__(self, payload: Dict) -> Union[str, Dict]:
         self.topic = str(payload['TopicArn'].split(':')[-1]).lower()
-        self.message_attributes = parse_message_attributes(
+        self.message_attributes = parse_sns_message_attributes(
             payload.get('MessageAttributes', {}))
         try:
             return loads(payload['Message'])
@@ -59,6 +59,6 @@ class SqsReponse(BaseModel):
             attributes=response['Attributes'],
             md5_of_message_attributes=response.get(
                 'MD5OfMessageAttributes', ''),
-            message_attributes=parse_message_attributes(
+            message_attributes=parse_sqs_message_attributes(
                 response.get('MessageAttributes', {}))
         )

{finalsa_common_models-2.0.0.dist-info → finalsa_common_models-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finalsa-common-models
-Version: 2.0.0
+Version: 2.0.1
 Summary: Common models for Finalsa
 Project-URL: Homepage, https://github.com/finalsa/finalsa-common-models
 Author-email: Luis Jimenez <luis@finalsa.com>

finalsa_common_models-2.0.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+finalsa/common/models/__init__.py,sha256=FgaW3-ykBoS6QVLLvTdje5zz85Ei0Pe8M7LtB2QOMiU,385
+finalsa/common/models/models/__init__.py,sha256=75LSf90upIL2qlxyHQ_7QFUhKGHM6b3n1RE7-qEWDpk,378
+finalsa/common/models/models/functions.py,sha256=vKUrhl3AVfnYBqqKYpZbZevrBpUx7ywqhtU3KKPqWUE,2983
+finalsa/common/models/models/meta.py,sha256=YX62zKeu_3McVJUhGDrub897XfuGxDDKGw5AejEL48g,213
+finalsa/common/models/models/sqs_response.py,sha256=GKkDyWYeYEUCRHp2H8MjxvzFuwWL1ngzpf5zILhVUNg,2258
+finalsa_common_models-2.0.1.dist-info/METADATA,sha256=6ttMktELBnzxnQoT_SH9_Qf4rMl4G2hND65Qw4cOxq4,3054
+finalsa_common_models-2.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+finalsa_common_models-2.0.1.dist-info/licenses/LICENSE.md,sha256=yqzhfnTBr2S4lUBx-yibVPOIXRUDPrSUN9-_7AsC6OU,1084
+finalsa_common_models-2.0.1.dist-info/RECORD,,

finalsa_common_models-2.0.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-finalsa/common/models/__init__.py,sha256=dpbPa6l-MEYqNegIV813SZz2yKU8fI-kcmS8ZuSzQAs,234
-finalsa/common/models/models/__init__.py,sha256=B3PmLZ4CUgrCIXNlBvfRMbfroiX1xgL4-TS-2D2-Tv8,237
-finalsa/common/models/models/functions.py,sha256=4bA57p5ar0btRlygzzLIlImQxOTypH3EQUyzys-ryE8,1551
-finalsa/common/models/models/meta.py,sha256=YX62zKeu_3McVJUhGDrub897XfuGxDDKGw5AejEL48g,213
-finalsa/common/models/models/sqs_response.py,sha256=CIK02um2Cl8spIORbu7uZn6g6YkILvjcCN3OWTTF-xo,2216
-finalsa_common_models-2.0.0.dist-info/METADATA,sha256=Z_p-YJewJdQtIaegzSdv70iSupiy-FxFAeiLGrchovs,3054
-finalsa_common_models-2.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-finalsa_common_models-2.0.0.dist-info/licenses/LICENSE.md,sha256=yqzhfnTBr2S4lUBx-yibVPOIXRUDPrSUN9-_7AsC6OU,1084
-finalsa_common_models-2.0.0.dist-info/RECORD,,