finalsa-common-models 0.1.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

finalsa/common/models/__init__.py

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

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/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.get('timestamp', datetime.now(timezone.utc).isoformat())
             )
-        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.1.0.dist-info → finalsa_common_models-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finalsa-common-models
-Version: 0.1.0
+Version: 1.0.1
 Summary: An utils package for using finalsa common models.
 Home-page: https://github.com/finalsa/finalsa-common-models
 Author: Luis Jimenez

finalsa_common_models-1.0.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+finalsa/common/models/__init__.py,sha256=t7xlW2QlpKdaTLjg_LzBkDODCyJzBUXonyD9B-hZ80g,268
+finalsa/common/models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+finalsa/common/models/models/__init__.py,sha256=Bm0KxSyueMwLkiN4W3sX5oXgLbfyQ8ZhKPD0WLhZepA,144
+finalsa/common/models/models/functions.py,sha256=4bA57p5ar0btRlygzzLIlImQxOTypH3EQUyzys-ryE8,1551
+finalsa/common/models/models/sqs_message.py,sha256=0E2dx_Ml55rNn6dG7jMQH9jL28bLECiZDAgNprBGSpM,742
+finalsa/common/models/models/sqs_response.py,sha256=k5yK6Q2g2mx_nwam4ma1w2SN4VrNnRYWA73aCcoulrc,4301
+finalsa_common_models-1.0.1.data/data/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
+finalsa_common_models-1.0.1.dist-info/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
+finalsa_common_models-1.0.1.dist-info/METADATA,sha256=bQS7iUthb32aQxkOkjm6FZYT0NIhyiFtnRDY0DFbXhE,853
+finalsa_common_models-1.0.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+finalsa_common_models-1.0.1.dist-info/top_level.txt,sha256=P7YD1HSd4CVujGFG9Vl9hJlg5OVCGN2J_ZsSQezWZAs,51
+finalsa_common_models-1.0.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+finalsa_common_models-1.0.1.dist-info/RECORD,,

{finalsa_common_models-0.1.0.dist-info → finalsa_common_models-1.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

finalsa_common_models-0.1.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-finalsa/common/models/__init__.py,sha256=2d5aXz0YBGglzsArN_8v55BepVozdZ-fnz-1jzNcPhs,268
-finalsa/common/models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-finalsa/common/models/models/__init__.py,sha256=Bm0KxSyueMwLkiN4W3sX5oXgLbfyQ8ZhKPD0WLhZepA,144
-finalsa/common/models/models/functions.py,sha256=4bA57p5ar0btRlygzzLIlImQxOTypH3EQUyzys-ryE8,1551
-finalsa/common/models/models/sqs_message.py,sha256=TR1gjkXirLchxm_O1wxckryIdcrE2vjux7q5EdpptCc,626
-finalsa/common/models/models/sqs_response.py,sha256=SCoxuvfMuEpwxtZguptNqkLcD_b-bjG8umfVLklJQBc,3762
-finalsa_common_models-0.1.0.data/data/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
-finalsa_common_models-0.1.0.dist-info/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
-finalsa_common_models-0.1.0.dist-info/METADATA,sha256=Fmq445q2xnuL6fq6QWyyEs71QLO-jCsIzHEy4mNjhvs,853
-finalsa_common_models-0.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-finalsa_common_models-0.1.0.dist-info/top_level.txt,sha256=P7YD1HSd4CVujGFG9Vl9hJlg5OVCGN2J_ZsSQezWZAs,51
-finalsa_common_models-0.1.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-finalsa_common_models-0.1.0.dist-info/RECORD,,