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

finalsa/common/models/__init__.py

@@ -1,15 +1,18 @@
 from finalsa.common.models.models import (
-    SqsMessage,
+    Meta,
     SqsReponse,
-    parse_message_attributes,
-    to_message_attributes
+    parse_sns_message_attributes,
+    parse_sqs_message_attributes,
+    to_sqs_message_attributes,
+    to_sns_message_attributes,
 )
 
-__version__ = "1.0.1"
 
 __all__ = [
-    "SqsMessage",
+    "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,3 +1,12 @@
-from .functions import parse_message_attributes, to_message_attributes
-from .sqs_message import SqsMessage
+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_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/meta.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+from datetime import datetime
+from typing import Optional
+
+
+class Meta(BaseModel):
+    authorization: Optional[dict] = {}
+    timestamp: datetime
+    correlation_id: str
+    ip: str

finalsa/common/models/models/sqs_response.py

@@ -1,10 +1,7 @@
-from datetime import datetime, timezone
 from typing import Dict, Optional, Union
-from uuid import UUID, uuid4
 from pydantic import BaseModel
-from json import loads
-from .sqs_message import SqsMessage
-from .functions import parse_message_attributes
+from orjson import loads
+from .functions import parse_sqs_message_attributes, parse_sns_message_attributes
 
 
 class SqsReponse(BaseModel):
@@ -17,38 +14,10 @@ class SqsReponse(BaseModel):
     md5_of_message_attributes: Optional[str] = ""
     message_attributes: Optional[Dict] = {}
 
-    @staticmethod
-    def correlation_id_from_attributes(attributes: Dict) -> Optional[str]:
-        correlation_id = attributes.get('correlation_id', None)
-        if not correlation_id:
-            return None
-        if isinstance(correlation_id, str):
-            return correlation_id
-        if isinstance(correlation_id, dict) and 'Type' in correlation_id and 'Value' in correlation_id:
-            return correlation_id["Value"]
-        return None
-
-    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
-        if 'correlation_id' in payload:
-            return payload['correlation_id']
-        return str(uuid4())
-
     @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):
@@ -57,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'])
@@ -70,34 +39,15 @@ class SqsReponse(BaseModel):
             content = self.__parse_from_sns__(content)
         return content
 
-    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(content['id']),
-                topic=content['topic'],
-                payload=content['payload'],
-                correlation_id=content['correlation_id'],
-                timestamp=content.get('timestamp', datetime.now(timezone.utc).isoformat())
-            )
-        return SqsMessage(
-            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:
+    def get_payload(self) -> Union[str, Dict]:
         try:
             content = loads(self.body)
         except Exception:
-            return self.__get_sqs_message__(self.body)
+            return self.body
         if self.__is_sns_message__(content):
             content = self.__parse_from_sns__(content)
-        return self.__get_sqs_message__(content)
+            return content
+        return loads(self.body)
 
     @classmethod
     def from_boto_response(cls, response: Dict):
@@ -109,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.1.dist-info/METADATA

@@ -0,0 +1,87 @@
+Metadata-Version: 2.4
+Name: finalsa-common-models
+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>
+License: MIT License
+        
+        Copyright (c) 2025 Luis Diego Jiménez Delgado
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+License-File: LICENSE.md
+Keywords: common,finalsa,models
+Requires-Python: >=3.10
+Requires-Dist: orjson>=3.10.16
+Requires-Dist: pydantic>=2.11.1
+Requires-Dist: python-dateutil>=2.9.0.post0
+Description-Content-Type: text/markdown
+
+# Finalsa Async Models
+
+Finalsa Async Models is a Python library designed to simplify the implementation of asynchronous data models. It provides tools to handle asynchronous operations, making it easier to work with modern Python applications that rely on async/await patterns.
+
+## Features
+
+- **Asynchronous Data Models**: Define and manage data models with full async support.
+- **Ease of Use**: Simplified API for seamless integration into your projects.
+- **Extensibility**: Easily extend and customize models to fit your needs.
+- **Performance**: Optimized for high-performance asynchronous workflows.
+
+## Installation
+
+Install the library using pip:
+
+```bash
+pip install finalsa-async-models
+```
+
+## Usage
+
+Here's a quick example of how to use Finalsa Async Models:
+
+```python
+from finalsa_async_models import AsyncModel
+
+class User(AsyncModel):
+    async def save(self):
+        # Custom save logic
+        pass
+
+# Example usage
+async def main():
+    user = User()
+    await user.save()
+```
+
+## Documentation
+
+For detailed documentation, visit the [official documentation](#).
+
+## Contributing
+
+Contributions are welcome! Please follow the [contribution guidelines](CONTRIBUTING.md).
+
+## License
+
+This project is licensed under the [MIT License](LICENSE).
+
+## Contact
+
+For questions or support, please open an issue on the [GitHub repository](#).

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-1.0.1.dist-info → finalsa_common_models-2.0.1.dist-info}/WHEEL

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

{finalsa_common_models-1.0.1.data/data → finalsa_common_models-2.0.1.dist-info/licenses}/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Luis Diego Jiménez Delgado
+Copyright (c) 2025 Luis Diego Jiménez Delgado
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

finalsa/common/models/models/sqs_message.py

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

finalsa_common_models-1.0.1.dist-info/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Luis Diego Jiménez Delgado
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

finalsa_common_models-1.0.1.dist-info/METADATA

@@ -1,24 +0,0 @@
-Metadata-Version: 2.1
-Name: finalsa-common-models
-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
-Author-email: luis@finalsa.com
-License: MIT
-Keywords: dynamodb
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Programming Language :: Python :: 3
-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.10
-Description-Content-Type: text/markdown
-License-File: LICENSE.md
-Requires-Dist: boto3 >=1.20.3
-Requires-Dist: pydantic >=2.5.2
-

finalsa_common_models-1.0.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-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-1.0.1.dist-info/top_level.txt

@@ -1,2 +0,0 @@
-finalsa/common/models
-finalsa/common/models/models

finalsa_common_models-1.0.1.dist-info/zip-safe

@@ -1 +0,0 @@
-