Refactor: Add support for response interpretation for payload format v2 (#11)

Refactor: Add support for response interpretation for payload format v2
Refactor: Add install requires moesifapi and moesifpythonrequest libs
Refactor: Bump version to 1.0.9

Author: keyur9

moesif_aws_lambda/middleware.py

@@ -138,9 +138,26 @@ def build_uri(self, event, payload_format_version_1_0):
                     uri = uri + '?' + event['rawQueryString']
             return uri
 
+        def base64_body(cls, data):
+            """Function to transfer body into base64 encoded"""
+            body = base64.b64encode(str(data).encode("utf-8"))
+            if isinstance(body, str):
+                return str(body).encode("utf-8"), 'base64'
+            elif isinstance(body, (bytes, bytearray)):
+                return str(body, "utf-8"), 'base64'
+            else:
+                return str(body), 'base64'
+
         def process_body(self, body_wrapper):
             """Function to process body"""
-            if not (self.LOG_BODY and body_wrapper.get('body')):
+
+            if self.LOG_BODY and isinstance(body_wrapper, dict) and 'body' not in body_wrapper:
+                return body_wrapper, 'json'
+
+            if self.LOG_BODY and not isinstance(body_wrapper, dict) and 'body' not in body_wrapper and isinstance(body_wrapper, str):
+                return self.base64_body(body_wrapper)
+
+            if not (self.LOG_BODY and isinstance(body_wrapper, dict) and body_wrapper.get('body')):
                 return None, 'json'
 
             body = None
@@ -156,13 +173,7 @@ def process_body(self, body_wrapper):
                         body = body_wrapper.get('body')
                     transfer_encoding = 'json'
             except Exception as e:
-                body = base64.b64encode(str(body_wrapper['body']).encode("utf-8"))
-                if isinstance(body, str):
-                    return str(body).encode("utf-8"), 'base64'
-                elif isinstance(body, (bytes, bytearray)):
-                    return str(body, "utf-8"), 'base64'
-                else:
-                    return str(body), 'base64'
+                    return self.base64_body(body_wrapper['body'])
             return body, transfer_encoding
 
         def before(self, event, context):
@@ -308,8 +319,8 @@ def after(self, retval):
 
                 # Event Response object
                 event_rsp = EventResponseModel(time = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3],
-                    status = retval.get('statusCode', 599),
-                    headers = retval.get('headers', {}),
+                    status = retval.get('statusCode', 599) if 'statusCode' in retval else 200,
+                    headers = retval.get('headers', {}) if 'headers' in retval else {"content-type": "application/json" },
                     body = resp_body,
                     transfer_encoding = resp_transfer_encoding)
 

setup.py

@@ -28,7 +28,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.0.8',
+    version='1.0.9',
 
     description='Moesif Middleware to automatically log API calls from AWS Lambda functions',
     long_description=long_description,
@@ -84,7 +84,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['moesifapi', 'lambda_decorators', 'moesifpythonrequest'],
+    install_requires=['moesifapi>=1.4.0', 'lambda_decorators', 'moesifpythonrequest>=0.2.0'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,