Merge pull request #86 from deep-compute/pre_call_post_call_addition

pre_call_hook and post_call_hook addition

Author: jaswanth098

.travis.yml

@@ -16,8 +16,8 @@ deploy:
     - LICENSE
     - kwikapi/api.py
     - kwikapi/__init__.py
-  name: kwikapi-0.5.3
-  tag_name: 0.5.3
+  name: kwikapi-0.5.4
+  tag_name: 0.5.4
   on:
     repo: deep-compute/kwikapi
 - provider: pypi

kwikapi/api.py

@@ -347,11 +347,19 @@ class BaseRequestHandler(object):
     DEFAULT_ERROR_CODE = 50000
 
     def __init__(self, api,
-            default_version=None, default_protocol=DEFAULT_PROTOCOL,
+            default_version=None,
+            default_protocol=DEFAULT_PROTOCOL,
+            pre_call_hook=None,
+            post_call_hook=None,
             log=DUMMY_LOG):
         self.api = api
+
         self.default_version = default_version
         self.default_protocol = default_protocol
+
+        self.pre_call_hook = pre_call_hook
+        self.post_call_hook = post_call_hook
+
         self.log = log
 
         self._protocols = self.PROTOCOLS
@@ -476,6 +484,24 @@ def _wrap_stream(self, req, res):
         except Exception as e:
             yield self._handle_exception(req, e)
 
+    def _invoke_pre_call_hook(self, request):
+        if not self.pre_call_hook:
+            return
+
+        try:
+            self.pre_call_hook(request)
+        except Exception:
+            request.log.exception('_invoke_pre_call_hook')
+
+    def _invoke_post_call_hook(self, request, result=None, exception=None):
+        if not self.post_call_hook:
+            return
+
+        try:
+            self.post_call_hook(request, result=result, exception=exception)
+        except Exception:
+            request.log.exception('_invoke_post_call_hook')
+
     def handle_request(self, request):
         if self.api._auth:
             request.auth = self.api._auth.authenticate(request)
@@ -491,7 +517,11 @@ def handle_request(self, request):
             # invoke the API function
             tcompute = time.time()
             try:
+                self._invoke_pre_call_hook(request)
                 result = request.fn(**request.fn_params)
+
+                self._invoke_post_call_hook(request, result=result)
+
             except TypeError as e:
                 if 'got an unexpected keyword argument' in str(e): # FIXME: handle in better way
                     raise KeywordArgumentError(e.args[0])
@@ -519,6 +549,8 @@ def handle_request(self, request):
                     **request.metrics)
 
         except Exception as e:
+            self._invoke_post_call_hook(request, exception=e)
+
             m = self._handle_exception(request, e)
             response.write(m, protocol)
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.5.3'
+version = '0.5.4'
 setup(
     name="kwikapi",
     version=version,
@@ -18,7 +18,7 @@
     'deeputil==0.2.7',
     'numpy==1.15.1',
     'future==0.16.0',
-    'requests==2.18.4',
+    'requests>=2.18.4',
     ],
     extras_require={
         'django': ['kwikapi-django==0.2.5'],