MambuPy 2.3.1__tar.gz → 2.3.3__tar.gz

{mambupy-2.3.1 → mambupy-2.3.3}/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.1"
+__version__ = "2.3.3"
 """The version of this module."""
 
 

{mambupy-2.3.1 → mambupy-2.3.3}/MambuPy/api/classes.py

@@ -31,32 +31,31 @@ class MambuMapObj:
             for key, val in kwargs.items():
                 self._attrs[key] = val
 
-    def __getattribute__(self, name):
+    def __getattr__(self, name):
         """Object-like get attribute
 
         When accessing an attribute, tries to find it in the _attrs
         dictionary, so now MambuMapObj may act not only as a dict-like
         structure, but as a full object-like too (this is the getter
         side).
+
+        Implemented as __getattr__ (not __getattribute__) so it only runs
+        after the normal attribute lookup already failed: a real
+        attribute/method always wins, and successful accesses keep the
+        native fast path instead of being intercepted on every access.
         """
-        try:
-            # first, try to read 'name' as if it's a property of the object
-            # if it doesn't exists as property, AttributeError raises
-            return object.__getattribute__(self, name)
-        except AttributeError:
-            # try to read the _attrs property
-            _attrs = object.__getattribute__(self, "_attrs")
-            if isinstance(_attrs, list) or name not in _attrs:
-                # magic won't happen when not a dict-like MambuMapObj or
-                # when _attrs has not the 'name' key (this last one means
-                # that if 'name' is not a property of the object too,
-                # AttributeError will raise by default)
-                return object.__getattribute__(self, name)
-            # all else, read the property from the _attrs dict, but with a . syntax
-            # if a cf_class, just return its value
-            if _attrs[name].__class__.__name__ == self._cf_class.__name__:
-                return _attrs[name]["value"]
-            return _attrs[name]
+        # try to read the _attrs property
+        _attrs = object.__getattribute__(self, "_attrs")
+        if isinstance(_attrs, list) or name not in _attrs:
+            # magic won't happen when not a dict-like MambuMapObj or
+            # when _attrs has not the 'name' key: this is a genuine
+            # missing attribute, so AttributeError raises by default
+            raise AttributeError(name)
+        # all else, read the property from the _attrs dict, but with a . syntax
+        # if a cf_class, just return its value
+        if _attrs[name].__class__.__name__ == self._cf_class.__name__:
+            return _attrs[name]["value"]
+        return _attrs[name]
 
     def __setattr__(self, name, value):
         """Object-like set attribute

{mambupy-2.3.1/mambupy → mambupy-2.3.3/MambuPy}/api/connector/rest.py

@@ -9,11 +9,15 @@ Currently supports REST.
 
 import base64
 import copy
+import datetime
+import enum
 import json
 import mimetypes
+import orjson
 import os
 import re
 import uuid
+from decimal import Decimal
 
 import requests
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -43,9 +47,27 @@ 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.
 
+    El HTTPAdapter se construye con pool_maxsize=50 para que los flujos
+    que despachan multiples requests concurrentes contra Mambu (p.ej.
+    fan-out de aprobaciones, cargar_datos paralelo) no queden encolados
+    sobre el default de urllib3 de 10 conexiones por host.
+
     Args:
         session (requests.Session): The session to configure
         retries (int, optional): Number of retries. Defaults to 5.
@@ -65,7 +87,11 @@ def _configure_retry_strategy(session, retries=5):
             "PATCH",
         ],
     )
-    adapter = HTTPAdapter(max_retries=retry_strategy)
+    adapter = HTTPAdapter(
+        max_retries=retry_strategy,
+        pool_connections=50,
+        pool_maxsize=50,
+    )
     session.mount("https://", adapter)
     session.mount("http://", adapter)
 
@@ -154,11 +180,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):
@@ -211,7 +234,7 @@ url %s, params %s, data %s, headers %s",
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.warning("HTTPError, resp content: %s", resp.content)
             try:
-                content = json.loads(resp.content.decode())
+                content = orjson.loads(resp.content.decode())
             except ValueError:
                 # in case resp.content doesn't conforms to json
                 content = {
@@ -287,7 +310,7 @@ url %s, params %s, data %s, headers %s",
     def __list_request_cat_response(self, list_resp, resp):
         if list_resp == b"":
             list_resp = resp
-        elif len(json.loads(resp.decode())) > 0:
+        elif len(orjson.loads(resp.decode())) > 0:
             list_resp = list_resp[:-1] + b"," + resp[1:]
 
         return list_resp
@@ -327,7 +350,7 @@ url %s, params %s, data %s, headers %s",
                 method, url, params=copy.copy(params), data=copy.copy(data)
             )
 
-            jsonresp = list(json.loads(resp.decode()))
+            jsonresp = list(orjson.loads(resp.decode()))
             if len(jsonresp) < limit:
                 window = False
 

{mambupy-2.3.1/mambupy → mambupy-2.3.3/MambuPy}/api/entities.py

@@ -6,8 +6,11 @@
 """
 
 import copy
+import datetime
+import enum
 from importlib import import_module
 import json
+import orjson
 import time
 
 from .classes import GenericClass
@@ -238,7 +241,7 @@ class MambuEntity(MambuStruct):
 
         logger.debug("request several entities %s", cls.__name__)
         list_resp = get_func(prefix, **params)
-        jsonresp = list(json.loads(list_resp.decode()))
+        jsonresp = list(orjson.loads(list_resp.decode()))
         logger.debug("%s, %s retrieved", cls.__name__, len(jsonresp))
 
         elements = []
@@ -310,8 +313,8 @@ class MambuEntity(MambuStruct):
         instance = cls.__build_object(
             connector=connector,
             resp=resp,
-            attrs=dict(json.loads(resp.decode())),
-            tzattrs=dict(json.loads(resp.decode())),
+            attrs=dict(orjson.loads(resp.decode())),
+            tzattrs=dict(orjson.loads(resp.decode())),
             get_entities=get_entities,
             detailsLevel=detailsLevel,
             debug=debug,
@@ -353,8 +356,8 @@ class MambuEntity(MambuStruct):
             self.id, prefix=self._prefix, detailsLevel=detailsLevel
         )
 
-        self._attrs.update(dict(json.loads(self._resp.decode())))
-        self._tzattrs = dict(json.loads(self._resp.decode()))
+        self._attrs.update(dict(orjson.loads(self._resp.decode())))
+        self._tzattrs = dict(orjson.loads(self._resp.decode()))
         self._convertDict2Attrs()
         self._extractCustomFields()
         self._extractVOs()
@@ -470,8 +473,8 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             self._resp = self._connector.mambu_create(
                 self._prefix, copy.deepcopy(self._attrs), **kwargs
             )
-            self._attrs.update(dict(json.loads(self._resp.decode())))
-            self._tzattrs = dict(json.loads(self._resp.decode()))
+            self._attrs.update(dict(orjson.loads(self._resp.decode())))
+            self._tzattrs = dict(orjson.loads(self._resp.decode()))
             self._detailsLevel = "FULL"
         except MambuError:
             raise
@@ -503,6 +506,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):
@@ -567,7 +574,7 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             # build fields_ops param with what detected using previous rules
             # strings: (OP, PATH) (remove) or (OP, PATH, VALUE) (all else)
             fields_ops = []
-            original_attrs = dict(json.loads(self._resp.decode()))
+            original_attrs = dict(orjson.loads(self._resp.decode()))
             self._extractCustomFields(original_attrs)
             self._updateVOs()
             for field in fields:
@@ -703,7 +710,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
             notes=notes,
         )
 
-        doc = MambuDocument(**dict(json.loads(response.decode())))
+        doc = MambuDocument(**dict(orjson.loads(response.decode())))
         self._attachments[str(doc["id"])] = doc
 
         return response
@@ -736,7 +743,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
             paginationDetails=paginationDetails,
         )
 
-        metadata_list = json.loads(response.decode())
+        metadata_list = orjson.loads(response.decode())
 
         for metadata in metadata_list:
             doc = MambuDocument(**metadata)
@@ -825,7 +832,7 @@ class MambuEntityCommentable(MambuStruct, MambuCommentable):
             paginationDetails=paginationDetails,
         )
 
-        comments_list = json.loads(response.decode())
+        comments_list = orjson.loads(response.decode())
 
         for comment in comments_list:
             comm = MambuComment(**comment)
@@ -848,7 +855,7 @@ class MambuEntityCommentable(MambuStruct, MambuCommentable):
             owner_id=self.id, owner_type=self._ownerType, text=comment
         )
 
-        comment = MambuComment(**dict(json.loads(response.decode())))
+        comment = MambuComment(**dict(orjson.loads(response.decode())))
         self._comments.insert(0, comment)
 
         return response

{mambupy-2.3.1 → mambupy-2.3.3}/MambuPy/api/mambuloan.py

@@ -8,6 +8,7 @@
 import copy
 import datetime
 import json
+import orjson
 
 from .entities import (
     MambuEntity,
@@ -117,7 +118,7 @@ class MambuLoan(
         """Retrieves the installments schedule."""
         resp = self._connector.mambu_loanaccount_getSchedule(self.id)
 
-        installments = json.loads(resp.decode())["installments"]
+        installments = orjson.loads(resp.decode())["installments"]
 
         self.schedule = []
         for installment in installments:
@@ -144,7 +145,7 @@ class MambuLoan(
             resp = self._connector.mambu_change_state(
                 entid=self.id, prefix=self._prefix, action=action, notes=notes,
             )
-            resp = json.loads(resp)
+            resp = orjson.loads(resp)
             self.accountState = resp["accountState"]
         else:
             raise MambuPyError(

{mambupy-2.3.1/mambupy → mambupy-2.3.3/MambuPy}/api/mambustruct.py

@@ -101,15 +101,21 @@ class MambuStruct(MambuMapObj):
             return self.__getattribute_for_loop(ent, entity.value, entity.mcf)
         return self.__getattribute_for_one_cf(ent, entity.value, entity.mcf)
 
-    def __getattribute__(self, name):
+    def __getattr__(self, name):
         """Object-like get attribute for MambuStructs.
 
         If the attribute is not present at the _attrs dict, tries to build a
         function that calls :py:meth:`getEntities`, which in turns will try
         to instantiate an entity according to the requested attribute name
+
+        Implemented as __getattr__ (not __getattribute__) so it only runs
+        after the normal lookup failed. We first delegate to the base
+        __getattr__ (the _attrs resolution), preserving precedence of
+        _attrs over the dynamic get_* magic, and only fall back to building
+        a getter when that raises AttributeError.
         """
         try:
-            return super().__getattribute__(name)
+            return super().__getattr__(name)
         except AttributeError as attr_err:
             if name[0:4] == "get_" and len(name) > 4:
                 ent = name[4:]

{mambupy-2.3.1 → mambupy-2.3.3}/MambuPy/mambuutil.py

@@ -321,13 +321,46 @@ def _backup_db_previous_prep(callback, logger, kwargs):
     data = {"callback": callback}
     list_ret.append(data)
 
+    try:
+        backup_in_progress_wait = kwargs["backup_in_progress_wait"]
+    except KeyError:
+        backup_in_progress_wait = 900
+    list_ret.append(backup_in_progress_wait)
+
+    try:
+        backup_in_progress_retries = kwargs["backup_in_progress_retries"]
+    except KeyError:
+        backup_in_progress_retries = 3
+    list_ret.append(backup_in_progress_retries)
+
     return list_ret
 
 
-def _backup_db_request(justbackup, data, user, pwd, logger=None):
+def _backup_db_in_progress(resp):
+    """True if Mambu rejected the backup POST because one is already running.
+
+    Mambu answers with errorCode 1201 / DATABASE_BACKUP_IN_PROGRESS when a
+    database backup job is already in progress. That is a transient, retryable
+    condition (the running job finishes in ~14 min), not a real failure.
+    """
     try:
-        if not justbackup:
-            posturl = iri_to_uri(getmambuurl() + "database/backup")
+        errors = json.loads(resp.content).get("errors", [])
+        return any(err.get("errorCode") == 1201 for err in errors)
+    except (ValueError, AttributeError):
+        return False
+
+
+def _backup_db_request(
+    justbackup, data, user, pwd, logger=None,
+    backup_in_progress_wait=900, backup_in_progress_retries=3,
+):
+    if justbackup:
+        return
+
+    posturl = iri_to_uri(getmambuurl() + "database/backup")
+    attempts_left = backup_in_progress_retries
+    while True:
+        try:
             logger.info("open url: " + posturl)
             logger.info("data: " + str(data))
             resp = requests.post(
@@ -343,12 +376,26 @@ def _backup_db_request(justbackup, data, user, pwd, logger=None):
             logger.info(resp.request.url)
             logger.info(resp.request.body)
             logger.info(str([(k, v) for k, v in resp.request.headers.items() if k != "Authorization"]))
-    except Exception as ex:
-        mess = "Error requesting backup: %s" % repr(ex)
-        logger.exception(mess)
-        raise MambuError(mess)
+        except Exception as ex:
+            mess = "Error requesting backup: %s" % repr(ex)
+            logger.exception(mess)
+            raise MambuError(mess)
+
+        if resp.status_code == 202:
+            return
+
+        # Only retry the POST when Mambu says a backup is already in progress.
+        # Any other non-202 is a real failure and fails fast, as before.
+        if _backup_db_in_progress(resp) and attempts_left > 0:
+            attempts_left -= 1
+            logger.warning(
+                "Mambu backup already in progress (errorCode 1201); waiting "
+                "%ss before retrying POST (%s retries left)"
+                % (backup_in_progress_wait, attempts_left)
+            )
+            sleep(backup_in_progress_wait)
+            continue
 
-    if not justbackup and resp.status_code != 202:
         mess = "Error posting request for backup: %s" % resp.content
         logger.error(mess)
         raise MambuCommError(mess)
@@ -433,6 +480,13 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
       callback is called. False to throw error if callback isn't received
       after retries.
 
+    * backup_in_progress_wait seconds to wait before retrying the POST when
+      Mambu rejects it with errorCode 1201 (a backup is already in progress).
+      Defaults to 900 (~the observed ~14 min a backup job takes).
+
+    * backup_in_progress_retries number of times to retry the POST on
+      errorCode 1201 before giving up and raising. Defaults to 3.
+
     * returns a dictionary with info about the download
         -latest     boolean flag, if the db downloaded was the latest or not
 
@@ -448,10 +502,16 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
         user,
         pwd,
         data,
+        backup_in_progress_wait,
+        backup_in_progress_retries,
     ) = _backup_db_previous_prep(callback, logger, kwargs)
 
     # POST to request Mambu to prepare backup of its own DB
-    _backup_db_request(justbackup, data, user, pwd, logger)
+    _backup_db_request(
+        justbackup, data, user, pwd, logger,
+        backup_in_progress_wait=backup_in_progress_wait,
+        backup_in_progress_retries=backup_in_progress_retries,
+    )
 
     # wait & timeout mechanism
     data["latest"] = _backup_db_timeout_mechanism(

{mambupy-2.3.1 → mambupy-2.3.3}/MambuPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MambuPy
-Version: 2.3.1
+Version: 2.3.3
 Summary: A python library for using Mambu APIs.
 Author-email: "Javier Novoa C." <jstitch@gmail.com>
 License: LICENSE
@@ -701,6 +701,7 @@ Requires-Dist: PyYAML==6.0.1
 Requires-Dist: requests==2.31.0
 Requires-Dist: requests_toolbelt==1.0.0
 Requires-Dist: dateutils==0.6.12
+Requires-Dist: orjson==3.9.7
 Provides-Extra: full
 Requires-Dist: SQLAlchemy==1.3.6; extra == "full"
 Requires-Dist: mysqlclient==2.1.0; extra == "full"

{mambupy-2.3.1 → mambupy-2.3.3}/MambuPy.egg-info/requires.txt

@@ -2,6 +2,7 @@ PyYAML==6.0.1
 requests==2.31.0
 requests_toolbelt==1.0.0
 dateutils==0.6.12
+orjson==3.9.7
 
 [deploy]
 build

{mambupy-2.3.1 → mambupy-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MambuPy
-Version: 2.3.1
+Version: 2.3.3
 Summary: A python library for using Mambu APIs.
 Author-email: "Javier Novoa C." <jstitch@gmail.com>
 License: LICENSE
@@ -701,6 +701,7 @@ Requires-Dist: PyYAML==6.0.1
 Requires-Dist: requests==2.31.0
 Requires-Dist: requests_toolbelt==1.0.0
 Requires-Dist: dateutils==0.6.12
+Requires-Dist: orjson==3.9.7
 Provides-Extra: full
 Requires-Dist: SQLAlchemy==1.3.6; extra == "full"
 Requires-Dist: mysqlclient==2.1.0; extra == "full"

{mambupy-2.3.1 → mambupy-2.3.3}/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.1"
+__version__ = "2.3.3"
 """The version of this module."""
 
 

{mambupy-2.3.1 → mambupy-2.3.3}/mambupy/api/classes.py

@@ -31,32 +31,31 @@ class MambuMapObj:
             for key, val in kwargs.items():
                 self._attrs[key] = val
 
-    def __getattribute__(self, name):
+    def __getattr__(self, name):
         """Object-like get attribute
 
         When accessing an attribute, tries to find it in the _attrs
         dictionary, so now MambuMapObj may act not only as a dict-like
         structure, but as a full object-like too (this is the getter
         side).
+
+        Implemented as __getattr__ (not __getattribute__) so it only runs
+        after the normal attribute lookup already failed: a real
+        attribute/method always wins, and successful accesses keep the
+        native fast path instead of being intercepted on every access.
         """
-        try:
-            # first, try to read 'name' as if it's a property of the object
-            # if it doesn't exists as property, AttributeError raises
-            return object.__getattribute__(self, name)
-        except AttributeError:
-            # try to read the _attrs property
-            _attrs = object.__getattribute__(self, "_attrs")
-            if isinstance(_attrs, list) or name not in _attrs:
-                # magic won't happen when not a dict-like MambuMapObj or
-                # when _attrs has not the 'name' key (this last one means
-                # that if 'name' is not a property of the object too,
-                # AttributeError will raise by default)
-                return object.__getattribute__(self, name)
-            # all else, read the property from the _attrs dict, but with a . syntax
-            # if a cf_class, just return its value
-            if _attrs[name].__class__.__name__ == self._cf_class.__name__:
-                return _attrs[name]["value"]
-            return _attrs[name]
+        # try to read the _attrs property
+        _attrs = object.__getattribute__(self, "_attrs")
+        if isinstance(_attrs, list) or name not in _attrs:
+            # magic won't happen when not a dict-like MambuMapObj or
+            # when _attrs has not the 'name' key: this is a genuine
+            # missing attribute, so AttributeError raises by default
+            raise AttributeError(name)
+        # all else, read the property from the _attrs dict, but with a . syntax
+        # if a cf_class, just return its value
+        if _attrs[name].__class__.__name__ == self._cf_class.__name__:
+            return _attrs[name]["value"]
+        return _attrs[name]
 
     def __setattr__(self, name, value):
         """Object-like set attribute

{mambupy-2.3.1/MambuPy → mambupy-2.3.3/mambupy}/api/connector/rest.py

@@ -9,11 +9,15 @@ Currently supports REST.
 
 import base64
 import copy
+import datetime
+import enum
 import json
 import mimetypes
+import orjson
 import os
 import re
 import uuid
+from decimal import Decimal
 
 import requests
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -43,9 +47,27 @@ 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.
 
+    El HTTPAdapter se construye con pool_maxsize=50 para que los flujos
+    que despachan multiples requests concurrentes contra Mambu (p.ej.
+    fan-out de aprobaciones, cargar_datos paralelo) no queden encolados
+    sobre el default de urllib3 de 10 conexiones por host.
+
     Args:
         session (requests.Session): The session to configure
         retries (int, optional): Number of retries. Defaults to 5.
@@ -65,7 +87,11 @@ def _configure_retry_strategy(session, retries=5):
             "PATCH",
         ],
     )
-    adapter = HTTPAdapter(max_retries=retry_strategy)
+    adapter = HTTPAdapter(
+        max_retries=retry_strategy,
+        pool_connections=50,
+        pool_maxsize=50,
+    )
     session.mount("https://", adapter)
     session.mount("http://", adapter)
 
@@ -154,11 +180,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):
@@ -211,7 +234,7 @@ url %s, params %s, data %s, headers %s",
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.warning("HTTPError, resp content: %s", resp.content)
             try:
-                content = json.loads(resp.content.decode())
+                content = orjson.loads(resp.content.decode())
             except ValueError:
                 # in case resp.content doesn't conforms to json
                 content = {
@@ -287,7 +310,7 @@ url %s, params %s, data %s, headers %s",
     def __list_request_cat_response(self, list_resp, resp):
         if list_resp == b"":
             list_resp = resp
-        elif len(json.loads(resp.decode())) > 0:
+        elif len(orjson.loads(resp.decode())) > 0:
             list_resp = list_resp[:-1] + b"," + resp[1:]
 
         return list_resp
@@ -327,7 +350,7 @@ url %s, params %s, data %s, headers %s",
                 method, url, params=copy.copy(params), data=copy.copy(data)
             )
 
-            jsonresp = list(json.loads(resp.decode()))
+            jsonresp = list(orjson.loads(resp.decode()))
             if len(jsonresp) < limit:
                 window = False
 

{mambupy-2.3.1/MambuPy → mambupy-2.3.3/mambupy}/api/entities.py

@@ -6,8 +6,11 @@
 """
 
 import copy
+import datetime
+import enum
 from importlib import import_module
 import json
+import orjson
 import time
 
 from .classes import GenericClass
@@ -238,7 +241,7 @@ class MambuEntity(MambuStruct):
 
         logger.debug("request several entities %s", cls.__name__)
         list_resp = get_func(prefix, **params)
-        jsonresp = list(json.loads(list_resp.decode()))
+        jsonresp = list(orjson.loads(list_resp.decode()))
         logger.debug("%s, %s retrieved", cls.__name__, len(jsonresp))
 
         elements = []
@@ -310,8 +313,8 @@ class MambuEntity(MambuStruct):
         instance = cls.__build_object(
             connector=connector,
             resp=resp,
-            attrs=dict(json.loads(resp.decode())),
-            tzattrs=dict(json.loads(resp.decode())),
+            attrs=dict(orjson.loads(resp.decode())),
+            tzattrs=dict(orjson.loads(resp.decode())),
             get_entities=get_entities,
             detailsLevel=detailsLevel,
             debug=debug,
@@ -353,8 +356,8 @@ class MambuEntity(MambuStruct):
             self.id, prefix=self._prefix, detailsLevel=detailsLevel
         )
 
-        self._attrs.update(dict(json.loads(self._resp.decode())))
-        self._tzattrs = dict(json.loads(self._resp.decode()))
+        self._attrs.update(dict(orjson.loads(self._resp.decode())))
+        self._tzattrs = dict(orjson.loads(self._resp.decode()))
         self._convertDict2Attrs()
         self._extractCustomFields()
         self._extractVOs()
@@ -470,8 +473,8 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             self._resp = self._connector.mambu_create(
                 self._prefix, copy.deepcopy(self._attrs), **kwargs
             )
-            self._attrs.update(dict(json.loads(self._resp.decode())))
-            self._tzattrs = dict(json.loads(self._resp.decode()))
+            self._attrs.update(dict(orjson.loads(self._resp.decode())))
+            self._tzattrs = dict(orjson.loads(self._resp.decode()))
             self._detailsLevel = "FULL"
         except MambuError:
             raise
@@ -503,6 +506,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):
@@ -567,7 +574,7 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             # build fields_ops param with what detected using previous rules
             # strings: (OP, PATH) (remove) or (OP, PATH, VALUE) (all else)
             fields_ops = []
-            original_attrs = dict(json.loads(self._resp.decode()))
+            original_attrs = dict(orjson.loads(self._resp.decode()))
             self._extractCustomFields(original_attrs)
             self._updateVOs()
             for field in fields:
@@ -703,7 +710,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
             notes=notes,
         )
 
-        doc = MambuDocument(**dict(json.loads(response.decode())))
+        doc = MambuDocument(**dict(orjson.loads(response.decode())))
         self._attachments[str(doc["id"])] = doc
 
         return response
@@ -736,7 +743,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
             paginationDetails=paginationDetails,
         )
 
-        metadata_list = json.loads(response.decode())
+        metadata_list = orjson.loads(response.decode())
 
         for metadata in metadata_list:
             doc = MambuDocument(**metadata)
@@ -825,7 +832,7 @@ class MambuEntityCommentable(MambuStruct, MambuCommentable):
             paginationDetails=paginationDetails,
         )
 
-        comments_list = json.loads(response.decode())
+        comments_list = orjson.loads(response.decode())
 
         for comment in comments_list:
             comm = MambuComment(**comment)
@@ -848,7 +855,7 @@ class MambuEntityCommentable(MambuStruct, MambuCommentable):
             owner_id=self.id, owner_type=self._ownerType, text=comment
         )
 
-        comment = MambuComment(**dict(json.loads(response.decode())))
+        comment = MambuComment(**dict(orjson.loads(response.decode())))
         self._comments.insert(0, comment)
 
         return response

{mambupy-2.3.1 → mambupy-2.3.3}/mambupy/api/mambuloan.py

@@ -8,6 +8,7 @@
 import copy
 import datetime
 import json
+import orjson
 
 from .entities import (
     MambuEntity,
@@ -117,7 +118,7 @@ class MambuLoan(
         """Retrieves the installments schedule."""
         resp = self._connector.mambu_loanaccount_getSchedule(self.id)
 
-        installments = json.loads(resp.decode())["installments"]
+        installments = orjson.loads(resp.decode())["installments"]
 
         self.schedule = []
         for installment in installments:
@@ -144,7 +145,7 @@ class MambuLoan(
             resp = self._connector.mambu_change_state(
                 entid=self.id, prefix=self._prefix, action=action, notes=notes,
             )
-            resp = json.loads(resp)
+            resp = orjson.loads(resp)
             self.accountState = resp["accountState"]
         else:
             raise MambuPyError(

{mambupy-2.3.1/MambuPy → mambupy-2.3.3/mambupy}/api/mambustruct.py

@@ -101,15 +101,21 @@ class MambuStruct(MambuMapObj):
             return self.__getattribute_for_loop(ent, entity.value, entity.mcf)
         return self.__getattribute_for_one_cf(ent, entity.value, entity.mcf)
 
-    def __getattribute__(self, name):
+    def __getattr__(self, name):
         """Object-like get attribute for MambuStructs.
 
         If the attribute is not present at the _attrs dict, tries to build a
         function that calls :py:meth:`getEntities`, which in turns will try
         to instantiate an entity according to the requested attribute name
+
+        Implemented as __getattr__ (not __getattribute__) so it only runs
+        after the normal lookup failed. We first delegate to the base
+        __getattr__ (the _attrs resolution), preserving precedence of
+        _attrs over the dynamic get_* magic, and only fall back to building
+        a getter when that raises AttributeError.
         """
         try:
-            return super().__getattribute__(name)
+            return super().__getattr__(name)
         except AttributeError as attr_err:
             if name[0:4] == "get_" and len(name) > 4:
                 ent = name[4:]

{mambupy-2.3.1 → mambupy-2.3.3}/mambupy/mambuutil.py

@@ -321,13 +321,46 @@ def _backup_db_previous_prep(callback, logger, kwargs):
     data = {"callback": callback}
     list_ret.append(data)
 
+    try:
+        backup_in_progress_wait = kwargs["backup_in_progress_wait"]
+    except KeyError:
+        backup_in_progress_wait = 900
+    list_ret.append(backup_in_progress_wait)
+
+    try:
+        backup_in_progress_retries = kwargs["backup_in_progress_retries"]
+    except KeyError:
+        backup_in_progress_retries = 3
+    list_ret.append(backup_in_progress_retries)
+
     return list_ret
 
 
-def _backup_db_request(justbackup, data, user, pwd, logger=None):
+def _backup_db_in_progress(resp):
+    """True if Mambu rejected the backup POST because one is already running.
+
+    Mambu answers with errorCode 1201 / DATABASE_BACKUP_IN_PROGRESS when a
+    database backup job is already in progress. That is a transient, retryable
+    condition (the running job finishes in ~14 min), not a real failure.
+    """
     try:
-        if not justbackup:
-            posturl = iri_to_uri(getmambuurl() + "database/backup")
+        errors = json.loads(resp.content).get("errors", [])
+        return any(err.get("errorCode") == 1201 for err in errors)
+    except (ValueError, AttributeError):
+        return False
+
+
+def _backup_db_request(
+    justbackup, data, user, pwd, logger=None,
+    backup_in_progress_wait=900, backup_in_progress_retries=3,
+):
+    if justbackup:
+        return
+
+    posturl = iri_to_uri(getmambuurl() + "database/backup")
+    attempts_left = backup_in_progress_retries
+    while True:
+        try:
             logger.info("open url: " + posturl)
             logger.info("data: " + str(data))
             resp = requests.post(
@@ -343,12 +376,26 @@ def _backup_db_request(justbackup, data, user, pwd, logger=None):
             logger.info(resp.request.url)
             logger.info(resp.request.body)
             logger.info(str([(k, v) for k, v in resp.request.headers.items() if k != "Authorization"]))
-    except Exception as ex:
-        mess = "Error requesting backup: %s" % repr(ex)
-        logger.exception(mess)
-        raise MambuError(mess)
+        except Exception as ex:
+            mess = "Error requesting backup: %s" % repr(ex)
+            logger.exception(mess)
+            raise MambuError(mess)
+
+        if resp.status_code == 202:
+            return
+
+        # Only retry the POST when Mambu says a backup is already in progress.
+        # Any other non-202 is a real failure and fails fast, as before.
+        if _backup_db_in_progress(resp) and attempts_left > 0:
+            attempts_left -= 1
+            logger.warning(
+                "Mambu backup already in progress (errorCode 1201); waiting "
+                "%ss before retrying POST (%s retries left)"
+                % (backup_in_progress_wait, attempts_left)
+            )
+            sleep(backup_in_progress_wait)
+            continue
 
-    if not justbackup and resp.status_code != 202:
         mess = "Error posting request for backup: %s" % resp.content
         logger.error(mess)
         raise MambuCommError(mess)
@@ -433,6 +480,13 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
       callback is called. False to throw error if callback isn't received
       after retries.
 
+    * backup_in_progress_wait seconds to wait before retrying the POST when
+      Mambu rejects it with errorCode 1201 (a backup is already in progress).
+      Defaults to 900 (~the observed ~14 min a backup job takes).
+
+    * backup_in_progress_retries number of times to retry the POST on
+      errorCode 1201 before giving up and raising. Defaults to 3.
+
     * returns a dictionary with info about the download
         -latest     boolean flag, if the db downloaded was the latest or not
 
@@ -448,10 +502,16 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
         user,
         pwd,
         data,
+        backup_in_progress_wait,
+        backup_in_progress_retries,
     ) = _backup_db_previous_prep(callback, logger, kwargs)
 
     # POST to request Mambu to prepare backup of its own DB
-    _backup_db_request(justbackup, data, user, pwd, logger)
+    _backup_db_request(
+        justbackup, data, user, pwd, logger,
+        backup_in_progress_wait=backup_in_progress_wait,
+        backup_in_progress_retries=backup_in_progress_retries,
+    )
 
     # wait & timeout mechanism
     data["latest"] = _backup_db_timeout_mechanism(

{mambupy-2.3.1 → mambupy-2.3.3}/pyproject.toml

@@ -11,6 +11,7 @@ dependencies = [
  "requests==2.31.0",
  "requests_toolbelt==1.0.0",
  "dateutils==0.6.12",
+ "orjson==3.9.7",
 ]
 keywords = ["mambu"]
 classifiers = [