MambuPy 2.3.0__tar.gz → 2.3.2__tar.gz

{mambupy-2.3.0 → mambupy-2.3.2}/MambuPy/__init__.py

@@ -37,7 +37,7 @@ import sys
 from importlib.abc import MetaPathFinder
 from importlib.util import spec_from_file_location
 
-__version__ = "2.3.0"
+__version__ = "2.3.2"
 """The version of this module."""
 
 

{mambupy-2.3.0/mambupy → mambupy-2.3.2/MambuPy}/api/connector/rest.py

@@ -9,11 +9,14 @@ Currently supports REST.
 
 import base64
 import copy
+import datetime
+import enum
 import json
 import mimetypes
 import os
 import re
 import uuid
+from decimal import Decimal
 
 import requests
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -43,6 +46,19 @@ from MambuPy.mambuutil import (
 logger = setup_logging(__name__)
 
 
+class _MambuJSONEncoder(json.JSONEncoder):
+    """JSON encoder that handles Python types not natively serializable by json.dumps."""
+
+    def default(self, obj):
+        if isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
+        if isinstance(obj, enum.Enum):
+            return obj.value
+        if isinstance(obj, Decimal):
+            return float(obj)
+        return super().default(obj)
+
+
 def _configure_retry_strategy(session, retries=5):
     """Configure retry strategy for a session.
 
@@ -154,11 +170,8 @@ class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWri
         return params
 
     def __request_data(self, data):
-        if data is not None:
-            try:
-                data = json.dumps(data)
-            except TypeError:
-                data = data
+        if isinstance(data, (dict, list)):
+            data = json.dumps(data, cls=_MambuJSONEncoder)
         return data
 
     def __request(self, method, url, params=None, data=None, content_type=None):

{mambupy-2.3.0/mambupy → mambupy-2.3.2/MambuPy}/api/entities.py

@@ -6,6 +6,8 @@
 """
 
 import copy
+import datetime
+import enum
 from importlib import import_module
 import json
 import time
@@ -503,6 +505,10 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             val = attrs[field]["value"]
         except (TypeError, KeyError):
             val = attrs[field]
+        if isinstance(val, (datetime.datetime, datetime.date)):
+            val = val.isoformat()
+        elif isinstance(val, enum.Enum):
+            val = val.value
         return (operation, path, val)
 
     def __patch_field_op(self, field, original_attrs):

{mambupy-2.3.0 → mambupy-2.3.2}/MambuPy/api/mambuloan.py

@@ -9,8 +9,6 @@ import copy
 import datetime
 import json
 
-from dateutil.tz import tzlocal
-
 from .entities import (
     MambuEntity,
     MambuEntityWritable,
@@ -184,32 +182,24 @@ class MambuLoan(
 
         if firstRepaymentDate:
             if not firstRepaymentDate.tzinfo:
-                timezone_firstRepaymentDate = datetime.timezone(
-                    datetime.timedelta(
-                        hours=int(
-                            self.disbursementDetails._tzattrs["firstRepaymentDate"][-6:-3]
-                        )
-                    )
-                )
-                firstRepaymentDate = firstRepaymentDate.astimezone(
-                    timezone_firstRepaymentDate
-                )
+                tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+                offset_str = tzname[3:] or "+00:00"
+                tz_info = datetime.datetime.fromisoformat(
+                    "2000-01-01T00:00:00" + offset_str
+                ).tzinfo
+                firstRepaymentDate = firstRepaymentDate.astimezone(tz_info)
             firstRepaymentDate = firstRepaymentDate.isoformat()
         else:
             firstRepaymentDate = self.disbursementDetails.firstRepaymentDate
 
         if disbursementDate:
             if not disbursementDate.tzinfo:
-                timezone_disbursementDate = datetime.timezone(
-                    datetime.timedelta(
-                        hours=int(
-                            self.disbursementDetails._tzattrs["expectedDisbursementDate"][
-                                -6:-3
-                            ]
-                        )
-                    )
-                )
-                disbursementDate = disbursementDate.astimezone(timezone_disbursementDate)
+                tzname = self.disbursementDetails._tzattrs["expectedDisbursementDate"]
+                offset_str = tzname[3:] or "+00:00"
+                tz_info = datetime.datetime.fromisoformat(
+                    "2000-01-01T00:00:00" + offset_str
+                ).tzinfo
+                disbursementDate = disbursementDate.astimezone(tz_info)
             disbursementDate = disbursementDate.isoformat()
         else:
             disbursementDate = self.disbursementDetails.expectedDisbursementDate
@@ -265,10 +255,14 @@ class MambuLoan(
                  structure defined at
                  :py:obj:`MambuPy.api.vos.MambuLoanTransactionDetailsInput._schema_fields`.
         """
-        valueDate = datetime.datetime.strptime(
-            valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
-        )
-        valueDate = valueDate.astimezone(tzlocal()).isoformat()
+        if not valueDate.tzinfo:
+            tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+            offset_str = tzname[3:] or "+00:00"
+            tz_info = datetime.datetime.fromisoformat(
+                "2000-01-01T00:00:00" + offset_str
+            ).tzinfo
+            valueDate = valueDate.astimezone(tz_info)
+        valueDate = valueDate.isoformat()
 
         self._connector.mambu_make_repayment(
             self.id,
@@ -312,10 +306,14 @@ class MambuLoan(
                  request. :py:obj:`MambuPy.api.vos.MambuFeeLoanTransactionInput._schema_fields`
                  has the allowed fields permitted for this operation
         """
-        valueDate = datetime.datetime.strptime(
-            valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
-        )
-        valueDate = valueDate.astimezone(tzlocal()).isoformat()
+        if not valueDate.tzinfo:
+            tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+            offset_str = tzname[3:] or "+00:00"
+            tz_info = datetime.datetime.fromisoformat(
+                "2000-01-01T00:00:00" + offset_str
+            ).tzinfo
+            valueDate = valueDate.astimezone(tz_info)
+        valueDate = valueDate.isoformat()
 
         self._connector.mambu_make_fee(
             self.id,

{mambupy-2.3.0 → mambupy-2.3.2}/MambuPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MambuPy
-Version: 2.3.0
+Version: 2.3.2
 Summary: A python library for using Mambu APIs.
 Author-email: "Javier Novoa C." <jstitch@gmail.com>
 License: LICENSE

{mambupy-2.3.0 → mambupy-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MambuPy
-Version: 2.3.0
+Version: 2.3.2
 Summary: A python library for using Mambu APIs.
 Author-email: "Javier Novoa C." <jstitch@gmail.com>
 License: LICENSE

{mambupy-2.3.0 → mambupy-2.3.2}/mambupy/__init__.py

@@ -37,7 +37,7 @@ import sys
 from importlib.abc import MetaPathFinder
 from importlib.util import spec_from_file_location
 
-__version__ = "2.3.0"
+__version__ = "2.3.2"
 """The version of this module."""
 
 

{mambupy-2.3.0/MambuPy → mambupy-2.3.2/mambupy}/api/connector/rest.py

@@ -9,11 +9,14 @@ Currently supports REST.
 
 import base64
 import copy
+import datetime
+import enum
 import json
 import mimetypes
 import os
 import re
 import uuid
+from decimal import Decimal
 
 import requests
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -43,6 +46,19 @@ from MambuPy.mambuutil import (
 logger = setup_logging(__name__)
 
 
+class _MambuJSONEncoder(json.JSONEncoder):
+    """JSON encoder that handles Python types not natively serializable by json.dumps."""
+
+    def default(self, obj):
+        if isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
+        if isinstance(obj, enum.Enum):
+            return obj.value
+        if isinstance(obj, Decimal):
+            return float(obj)
+        return super().default(obj)
+
+
 def _configure_retry_strategy(session, retries=5):
     """Configure retry strategy for a session.
 
@@ -154,11 +170,8 @@ class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWri
         return params
 
     def __request_data(self, data):
-        if data is not None:
-            try:
-                data = json.dumps(data)
-            except TypeError:
-                data = data
+        if isinstance(data, (dict, list)):
+            data = json.dumps(data, cls=_MambuJSONEncoder)
         return data
 
     def __request(self, method, url, params=None, data=None, content_type=None):

{mambupy-2.3.0/MambuPy → mambupy-2.3.2/mambupy}/api/entities.py

@@ -6,6 +6,8 @@
 """
 
 import copy
+import datetime
+import enum
 from importlib import import_module
 import json
 import time
@@ -503,6 +505,10 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             val = attrs[field]["value"]
         except (TypeError, KeyError):
             val = attrs[field]
+        if isinstance(val, (datetime.datetime, datetime.date)):
+            val = val.isoformat()
+        elif isinstance(val, enum.Enum):
+            val = val.value
         return (operation, path, val)
 
     def __patch_field_op(self, field, original_attrs):

{mambupy-2.3.0 → mambupy-2.3.2}/mambupy/api/mambuloan.py

@@ -9,8 +9,6 @@ import copy
 import datetime
 import json
 
-from dateutil.tz import tzlocal
-
 from .entities import (
     MambuEntity,
     MambuEntityWritable,
@@ -184,32 +182,24 @@ class MambuLoan(
 
         if firstRepaymentDate:
             if not firstRepaymentDate.tzinfo:
-                timezone_firstRepaymentDate = datetime.timezone(
-                    datetime.timedelta(
-                        hours=int(
-                            self.disbursementDetails._tzattrs["firstRepaymentDate"][-6:-3]
-                        )
-                    )
-                )
-                firstRepaymentDate = firstRepaymentDate.astimezone(
-                    timezone_firstRepaymentDate
-                )
+                tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+                offset_str = tzname[3:] or "+00:00"
+                tz_info = datetime.datetime.fromisoformat(
+                    "2000-01-01T00:00:00" + offset_str
+                ).tzinfo
+                firstRepaymentDate = firstRepaymentDate.astimezone(tz_info)
             firstRepaymentDate = firstRepaymentDate.isoformat()
         else:
             firstRepaymentDate = self.disbursementDetails.firstRepaymentDate
 
         if disbursementDate:
             if not disbursementDate.tzinfo:
-                timezone_disbursementDate = datetime.timezone(
-                    datetime.timedelta(
-                        hours=int(
-                            self.disbursementDetails._tzattrs["expectedDisbursementDate"][
-                                -6:-3
-                            ]
-                        )
-                    )
-                )
-                disbursementDate = disbursementDate.astimezone(timezone_disbursementDate)
+                tzname = self.disbursementDetails._tzattrs["expectedDisbursementDate"]
+                offset_str = tzname[3:] or "+00:00"
+                tz_info = datetime.datetime.fromisoformat(
+                    "2000-01-01T00:00:00" + offset_str
+                ).tzinfo
+                disbursementDate = disbursementDate.astimezone(tz_info)
             disbursementDate = disbursementDate.isoformat()
         else:
             disbursementDate = self.disbursementDetails.expectedDisbursementDate
@@ -265,10 +255,14 @@ class MambuLoan(
                  structure defined at
                  :py:obj:`MambuPy.api.vos.MambuLoanTransactionDetailsInput._schema_fields`.
         """
-        valueDate = datetime.datetime.strptime(
-            valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
-        )
-        valueDate = valueDate.astimezone(tzlocal()).isoformat()
+        if not valueDate.tzinfo:
+            tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+            offset_str = tzname[3:] or "+00:00"
+            tz_info = datetime.datetime.fromisoformat(
+                "2000-01-01T00:00:00" + offset_str
+            ).tzinfo
+            valueDate = valueDate.astimezone(tz_info)
+        valueDate = valueDate.isoformat()
 
         self._connector.mambu_make_repayment(
             self.id,
@@ -312,10 +306,14 @@ class MambuLoan(
                  request. :py:obj:`MambuPy.api.vos.MambuFeeLoanTransactionInput._schema_fields`
                  has the allowed fields permitted for this operation
         """
-        valueDate = datetime.datetime.strptime(
-            valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
-        )
-        valueDate = valueDate.astimezone(tzlocal()).isoformat()
+        if not valueDate.tzinfo:
+            tzname = self.disbursementDetails._tzattrs["firstRepaymentDate"]
+            offset_str = tzname[3:] or "+00:00"
+            tz_info = datetime.datetime.fromisoformat(
+                "2000-01-01T00:00:00" + offset_str
+            ).tzinfo
+            valueDate = valueDate.astimezone(tz_info)
+        valueDate = valueDate.isoformat()
 
         self._connector.mambu_make_fee(
             self.id,