MambuPy 2.0.0b48__tar.gz → 2.0.0b50__tar.gz

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy/__init__.py

@@ -9,7 +9,6 @@
     MambuPy.orm
     MambuPy.api
     MambuPy.api.connector
-    MambuPy.rest1to2
 
 
 Currently, there are two different ways to access Mambu objects:
@@ -35,5 +34,5 @@ TODOS
           to achive TDD when implementing features or correcting bugs.
 """
 
-__version__ = "2.0.0b48"
+__version__ = "2.0.0b50"
 """The version of this module."""

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy/api/__init__.py

@@ -10,13 +10,16 @@ Objects using `Mambu REST API <https://api.mambu.com/?python>`_
     MambuPy.api.interfaces
     MambuPy.api.vos
     MambuPy.api.mambustruct
+    MambuPy.api.mambuproduct
     MambuPy.api.mambuloan
+    MambuPy.api.mambutransaction
     MambuPy.api.mambugroup
     MambuPy.api.mambuclient
     MambuPy.api.mambubranch
     MambuPy.api.mambucentre
     MambuPy.api.mambuuser
-    MambuPy.api.mambuproduct
+    MambuPy.api.mambutask
+    MambuPy.api.mambucustomfield
 
 Entities use the Mixin pattern to acquire functionality.
 """

{MambuPy-2.0.0b48/mambupy → MambuPy-2.0.0b50/MambuPy}/api/connector/rest.py

@@ -10,7 +10,6 @@ Currently supports REST.
 import base64
 import copy
 import json
-import logging
 import mimetypes
 import os
 import re
@@ -36,11 +35,11 @@ from MambuPy.mambuutil import (
     apipwd,
     apiurl,
     apiuser,
+    setup_logging,
 )
 
 
-logger = logging.getLogger(__name__)
-logger.propagate = True
+logger = setup_logging(__name__)
 
 
 class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWriter):
@@ -143,7 +142,7 @@ url %s, params %s, data %s, headers %s",
                 method,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.error("HTTPError, resp content: %s", resp.content)
@@ -183,7 +182,7 @@ url %s, params %s, data %s, headers %s",
                 url,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             raise MambuCommError(
                 "COMM Error: I cannot communicate with Mambu: {}".format(rerr)
@@ -197,7 +196,7 @@ url %s, params %s, data %s, headers %s",
                 url,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.error("Exception, resp content: %s", resp.content)

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy/api/entities.py

@@ -8,7 +8,6 @@
 import copy
 from importlib import import_module
 import json
-import logging
 import time
 
 from .classes import GenericClass
@@ -22,11 +21,10 @@ from .interfaces import (
 from .connector.rest import MambuConnectorREST
 from .mambustruct import MambuStruct
 from .vos import MambuDocument, MambuComment, MambuValueObject
-from MambuPy.mambuutil import MambuError, MambuPyError
+from MambuPy.mambuutil import MambuError, MambuPyError, setup_logging
 
 
-logger = logging.getLogger(__name__)
-logger.propagate = True
+logger = setup_logging(__name__)
 
 
 class MambuEntity(MambuStruct):

{MambuPy-2.0.0b48/mambupy → MambuPy-2.0.0b50/MambuPy}/api/mambustruct.py

@@ -116,7 +116,8 @@ class MambuStruct(MambuMapObj):
                 if ent in self._attrs.keys():
                     entity = self._attrs[ent]
                     if entity.__class__.__name__ == self._cf_class.__name__:
-                        entity.get_mcf()
+                        if not entity.mcf:
+                            entity.get_mcf()
                         return self.__getattribute_for_cf(ent, entity)
                     return lambda **kwargs: entity
                 return lambda **kwargs: self.getEntities([ent], **kwargs)[0]

{MambuPy-2.0.0b48/mambupy → MambuPy-2.0.0b50/MambuPy}/mambuconfig.py

@@ -31,6 +31,8 @@ RC files must have the following format:
     dbhost=Database_host
     dbport=Database_port
     dbeng=Database_engine
+    [MAMBUPY]
+    loggingconf=Logging_conf_path
 
 You can use environment variables to override the previous behaviour for any
 option. The variable must be named as follows::
@@ -88,6 +90,8 @@ default_configs = {
     "dbhost": "localhost",
     "dbport": "3306",
     "dbeng": "mysql",
+    # MambuPy configurations
+    "loggingconf": "",  # empty string means default logging, path to a yaml for logging configuration
 }
 """ Defaults dictionary for the options configured here.
 
@@ -125,6 +129,7 @@ argparser.add_argument("--mambupy_dbpwd")
 argparser.add_argument("--mambupy_dbhost")
 argparser.add_argument("--mambupy_dbport")
 argparser.add_argument("--mambupy_dbeng")
+argparser.add_argument("--mambupy_loggingconf")
 args, unknown = argparser.parse_known_args()
 
 
@@ -191,3 +196,5 @@ dbport = get_conf(config, "DB", "dbport")
 """Port to connect to the host of the Mambu's DB backup"""
 dbeng = get_conf(config, "DB", "dbeng")
 """DB engine for the Mambu's DB backup"""
+loggingconf = get_conf(config, "MAMBUPY", "loggingconf")
+"""Directory where to store logs"""

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy/mambuutil.py

@@ -21,8 +21,15 @@ Exceptions, some API return codes, utility functions, a lot of urlfuncs
 
 .. todo:: status API V2: testing of EVERYTHING is required """
 
+import logging
+import logging.config as logging_config
+import os
+from codecs import open as copen
+
+import yaml
+
+from .mambuconfig import apipagination, apipwd, apiurl, apiuser, loggingconf
 from .mambugeturl import getmambuurl
-from .mambuconfig import apipwd, apiurl, apiuser, apipagination
 
 try:
     # python2
@@ -33,7 +40,6 @@ except NameError:
 
 import json
 import sys
-
 from datetime import datetime, timezone
 
 API_RETURN_CODES = {
@@ -325,13 +331,8 @@ from time import sleep
 import requests
 
 
-def _backup_db_previous_prep(callback, kwargs):
+def _backup_db_previous_prep(callback, logger, kwargs):
     list_ret = []
-    try:
-        verbose = kwargs["verbose"]
-    except KeyError:
-        verbose = False
-    list_ret.append(verbose)
     try:
         retries = kwargs["retries"]
     except KeyError:
@@ -355,13 +356,7 @@ def _backup_db_previous_prep(callback, kwargs):
         }
     list_ret.append(headers)
 
-    if verbose:
-        log = open("/tmp/log_mambu_backup", "a")
-        log.write(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + " - Mambu DB Backup\n")
-        log.flush()
-    else:
-        log = None
-    list_ret.append(log)
+    logger.info("Mambu DB Backup")
 
     user = kwargs.pop("user", apiuser)
     list_ret.append(user)
@@ -375,14 +370,12 @@ def _backup_db_previous_prep(callback, kwargs):
     return list_ret
 
 
-def _backup_db_request(justbackup, data, user, pwd, verbose=None, log=None):
+def _backup_db_request(justbackup, data, user, pwd, logger=None):
     try:
         if not justbackup:
             posturl = iri_to_uri(getmambuurl() + "database/backup")
-            if verbose:
-                log.write("open url: " + posturl + "\n")
-                log.write("data: " + str(data) + "\n")
-                log.flush()
+            logger.info("open url: " + posturl)
+            logger.info("data: " + str(data))
             resp = requests.post(
                 posturl,
                 data=json.dumps(data),
@@ -392,67 +385,35 @@ def _backup_db_request(justbackup, data, user, pwd, verbose=None, log=None):
                 },
                 auth=(user, pwd),
             )
-            if verbose:
-                log.write(
-                    datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    + " - "
-                    + str(resp.content)
-                    + "\n"
-                )
-                log.write(
-                    datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    + " - "
-                    + resp.request.url
-                    + "\n"
-                )
-                log.write(
-                    datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    + " - "
-                    + resp.request.body
-                    + "\n"
-                )
-                log.write(
-                    datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    + " - "
-                    + str(resp.request.headers)
-                    + "\n"
-                )
-                log.flush()
+            logger.info(str(resp.content))
+            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)
-        if verbose:
-            log.write(mess + "\n")
-            log.close()
+        logger.exception(mess)
         raise MambuError(mess)
 
     if not justbackup and resp.status_code != 202:
         mess = "Error posting request for backup: %s" % resp.content
-        if verbose:
-            log.write(mess + "\n")
-            log.close()
+        logger.error(mess)
         raise MambuCommError(mess)
 
 
 def _backup_db_timeout_mechanism(
-    justbackup, retries, bool_func, force_download_latest, verbose=None, log=None
+    justbackup, retries, bool_func, force_download_latest, logger=None
 ):
     value_to_latest = True
     while not justbackup and retries and not bool_func():
-        if verbose:
-            log.write("waiting...\n")
-            log.flush()
+        logger.info("waiting...")
         sleep(10)
         retries -= 1
         if retries < 0:
             retries = -1
     if not justbackup and not retries:
         mess = "Tired of waiting, giving up..."
-        if verbose:
-            log.write(mess + "\n")
-            log.flush()
+        logger.warning(mess)
         if not force_download_latest:
-            if verbose:
-                log.close()
             raise MambuError(mess)
         else:
             value_to_latest = False
@@ -461,27 +422,21 @@ def _backup_db_timeout_mechanism(
     return value_to_latest
 
 
-def _backup_db_request_download_backup(user, pwd, headers, verbose=None, log=None):
+def _backup_db_request_download_backup(user, pwd, headers, logger=None):
     geturl = iri_to_uri(getmambuurl() + "database/backup/LATEST")
-    if verbose:
-        log.write("open url: " + geturl + "\n")
-        log.flush()
+    logger.info("open url: " + geturl)
     resp = requests.get(geturl, auth=(user, pwd), headers=headers)
 
     if resp.status_code != 200:
         mess = "Error getting database backup: %s" % resp.content
-        if verbose:
-            log.write(mess + "\n")
-            log.close()
+        logger.error(mess)
         raise MambuCommError(mess)
 
     return resp
 
 
-def _backup_db_post_processing(resp, output_fname, verbose=None, log=None):
-    if verbose:
-        log.write("saving...\n")
-        log.flush()
+def _backup_db_post_processing(resp, output_fname, logger=None):
+    logger.info("saving...")
     with open(output_fname, "wb") as fw:
         fw.write(resp.content)
 
@@ -516,8 +471,6 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
     * user, pwd and url allow you to change the Mambu permissions for
       the getmambuurl internally called here.
 
-    * verbose is a boolean flag for verbosity.
-
     * retries number of retries for bool_func or -1 for keep waiting.
 
     * just_backup bool if True, skip asking for backup, just download LATEST
@@ -531,37 +484,54 @@ def backup_db(callback, bool_func, output_fname, *args, **kwargs):
 
     .. todo:: status API V2: compatible
     """
-
+    logger = setup_logging("mambupy.backup_db")
     # previous preparation
     (
-        verbose,
         retries,
         justbackup,
         force_download_latest,
         headers,
-        log,
         user,
         pwd,
         data,
-    ) = _backup_db_previous_prep(callback, kwargs)
+    ) = _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, verbose, log)
+    _backup_db_request(justbackup, data, user, pwd, logger)
 
     # wait & timeout mechanism
     data["latest"] = _backup_db_timeout_mechanism(
-        justbackup, retries, bool_func, force_download_latest, verbose, log
+        justbackup, retries, bool_func, force_download_latest, logger
     )
 
     # GET request to download LATEST Mambu's DB backup
-    resp = _backup_db_request_download_backup(user, pwd, headers, verbose, log)
+    resp = _backup_db_request_download_backup(user, pwd, headers, logger)
 
     # post-processing
-    _backup_db_post_processing(resp, output_fname, verbose, log)
+    _backup_db_post_processing(resp, output_fname, logger)
 
     # no refactor
-    if verbose:
-        log.write("DONE!\n")
-        log.close()
+    logger.info("DONE!")
 
     return data
+
+
+def setup_logging(
+        loggername,
+        default_level=logging.INFO,
+) -> logging.Logger:
+    """ Get a logger configured with a yaml file. """
+    if os.path.exists(loggingconf):
+        with copen(loggingconf, "r", "utf-8") as f:
+            config = yaml.full_load(f.read())
+        logging_config.dictConfig(config)
+        loggr = logging.getLogger(loggername)
+    else:
+        loggr = logging.getLogger(loggername)
+        loggr.setLevel(default_level)
+        loggr.propagate = True
+    return loggr
+
+
+logger = setup_logging("mambupy")
+"""Default logger for mambupy module"""

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b48
+Version: 2.0.0b50
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.
 Author-email: jstitch@gmail.com
 License: GPLv3
 Keywords: mambu
-Requires-Python: >=2.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/MambuPy.egg-info/requires.txt

@@ -1,4 +1,5 @@
-future
+PyYAML==6.0.1
+future==0.18.3
 requests==2.31.0
 requests_toolbelt==1.0.0
 dateutils==0.6.12

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b48
+Version: 2.0.0b50
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.
 Author-email: jstitch@gmail.com
 License: GPLv3
 Keywords: mambu
-Requires-Python: >=2.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/mambupy/__init__.py

@@ -9,7 +9,6 @@
     MambuPy.orm
     MambuPy.api
     MambuPy.api.connector
-    MambuPy.rest1to2
 
 
 Currently, there are two different ways to access Mambu objects:
@@ -35,5 +34,5 @@ TODOS
           to achive TDD when implementing features or correcting bugs.
 """
 
-__version__ = "2.0.0b48"
+__version__ = "2.0.0b50"
 """The version of this module."""

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/mambupy/api/__init__.py

@@ -10,13 +10,16 @@ Objects using `Mambu REST API <https://api.mambu.com/?python>`_
     MambuPy.api.interfaces
     MambuPy.api.vos
     MambuPy.api.mambustruct
+    MambuPy.api.mambuproduct
     MambuPy.api.mambuloan
+    MambuPy.api.mambutransaction
     MambuPy.api.mambugroup
     MambuPy.api.mambuclient
     MambuPy.api.mambubranch
     MambuPy.api.mambucentre
     MambuPy.api.mambuuser
-    MambuPy.api.mambuproduct
+    MambuPy.api.mambutask
+    MambuPy.api.mambucustomfield
 
 Entities use the Mixin pattern to acquire functionality.
 """

{MambuPy-2.0.0b48/MambuPy → MambuPy-2.0.0b50/mambupy}/api/connector/rest.py

@@ -10,7 +10,6 @@ Currently supports REST.
 import base64
 import copy
 import json
-import logging
 import mimetypes
 import os
 import re
@@ -36,11 +35,11 @@ from MambuPy.mambuutil import (
     apipwd,
     apiurl,
     apiuser,
+    setup_logging,
 )
 
 
-logger = logging.getLogger(__name__)
-logger.propagate = True
+logger = setup_logging(__name__)
 
 
 class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWriter):
@@ -143,7 +142,7 @@ url %s, params %s, data %s, headers %s",
                 method,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.error("HTTPError, resp content: %s", resp.content)
@@ -183,7 +182,7 @@ url %s, params %s, data %s, headers %s",
                 url,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             raise MambuCommError(
                 "COMM Error: I cannot communicate with Mambu: {}".format(rerr)
@@ -197,7 +196,7 @@ url %s, params %s, data %s, headers %s",
                 url,
                 params,
                 data,
-                [(k, v) for k, v in headers.items()],
+                [(k, v) for k, v in headers.items() if k != "Authorization"],
             )
             if hasattr(resp, "content"):  # pragma: no cover
                 logger.error("Exception, resp content: %s", resp.content)

{MambuPy-2.0.0b48 → MambuPy-2.0.0b50}/mambupy/api/entities.py

@@ -8,7 +8,6 @@
 import copy
 from importlib import import_module
 import json
-import logging
 import time
 
 from .classes import GenericClass
@@ -22,11 +21,10 @@ from .interfaces import (
 from .connector.rest import MambuConnectorREST
 from .mambustruct import MambuStruct
 from .vos import MambuDocument, MambuComment, MambuValueObject
-from MambuPy.mambuutil import MambuError, MambuPyError
+from MambuPy.mambuutil import MambuError, MambuPyError, setup_logging
 
 
-logger = logging.getLogger(__name__)
-logger.propagate = True
+logger = setup_logging(__name__)
 
 
 class MambuEntity(MambuStruct):

{MambuPy-2.0.0b48/MambuPy → MambuPy-2.0.0b50/mambupy}/api/mambustruct.py

@@ -116,7 +116,8 @@ class MambuStruct(MambuMapObj):
                 if ent in self._attrs.keys():
                     entity = self._attrs[ent]
                     if entity.__class__.__name__ == self._cf_class.__name__:
-                        entity.get_mcf()
+                        if not entity.mcf:
+                            entity.get_mcf()
                         return self.__getattribute_for_cf(ent, entity)
                     return lambda **kwargs: entity
                 return lambda **kwargs: self.getEntities([ent], **kwargs)[0]

{MambuPy-2.0.0b48/MambuPy → MambuPy-2.0.0b50/mambupy}/mambuconfig.py

@@ -31,6 +31,8 @@ RC files must have the following format:
     dbhost=Database_host
     dbport=Database_port
     dbeng=Database_engine
+    [MAMBUPY]
+    loggingconf=Logging_conf_path
 
 You can use environment variables to override the previous behaviour for any
 option. The variable must be named as follows::
@@ -88,6 +90,8 @@ default_configs = {
     "dbhost": "localhost",
     "dbport": "3306",
     "dbeng": "mysql",
+    # MambuPy configurations
+    "loggingconf": "",  # empty string means default logging, path to a yaml for logging configuration
 }
 """ Defaults dictionary for the options configured here.
 
@@ -125,6 +129,7 @@ argparser.add_argument("--mambupy_dbpwd")
 argparser.add_argument("--mambupy_dbhost")
 argparser.add_argument("--mambupy_dbport")
 argparser.add_argument("--mambupy_dbeng")
+argparser.add_argument("--mambupy_loggingconf")
 args, unknown = argparser.parse_known_args()
 
 
@@ -191,3 +196,5 @@ dbport = get_conf(config, "DB", "dbport")
 """Port to connect to the host of the Mambu's DB backup"""
 dbeng = get_conf(config, "DB", "dbeng")
 """DB engine for the Mambu's DB backup"""
+loggingconf = get_conf(config, "MAMBUPY", "loggingconf")
+"""Directory where to store logs"""