Merge branch 'smagafurov-master'

Author: pavlov99

jsonrpc/base.py

@@ -69,6 +69,8 @@ def __init__(self, **kwargs):
         if 'result' not in kwargs and 'error' not in kwargs:
             raise ValueError("Either result or error should be used")
 
+        self.request = None  # type: JSONRPCBaseRequest
+
     @property
     def data(self):
         return self._data

jsonrpc/manager.py

@@ -80,7 +80,9 @@ def handle_request(cls, request, dispatcher):
             return
 
         if isinstance(request, JSONRPC20BatchRequest):
-            return JSONRPC20BatchResponse(*responses)
+            response = JSONRPC20BatchResponse(*responses)
+            response.request = request
+            return response
         else:
             return responses[0]
 
@@ -95,19 +97,21 @@ def _get_responses(cls, requests, dispatcher):
 
         """
         for request in requests:
-            def response(**kwargs):
-                return cls.RESPONSE_CLASS_MAP[request.JSONRPC_VERSION](
+            def make_response(**kwargs):
+                response = cls.RESPONSE_CLASS_MAP[request.JSONRPC_VERSION](
                     _id=request._id, **kwargs)
+                response.request = request
+                return response
 
             try:
                 method = dispatcher[request.method]
             except KeyError:
-                output = response(error=JSONRPCMethodNotFound()._data)
+                output = make_response(error=JSONRPCMethodNotFound()._data)
             else:
                 try:
                     result = method(*request.args, **request.kwargs)
                 except JSONRPCDispatchException as e:
-                    output = response(error=e.error._data)
+                    output = make_response(error=e.error._data)
                 except Exception as e:
                     data = {
                         "type": e.__class__.__name__,
@@ -119,13 +123,13 @@ def response(**kwargs):
 
                     if isinstance(e, TypeError) and is_invalid_params(
                             method, *request.args, **request.kwargs):
-                        output = response(
+                        output = make_response(
                             error=JSONRPCInvalidParams(data=data)._data)
                     else:
-                        output = response(
+                        output = make_response(
                             error=JSONRPCServerError(data=data)._data)
                 else:
-                    output = response(result=result)
+                    output = make_response(result=result)
             finally:
                 if not request.is_notification:
                     yield output

jsonrpc/tests/test_examples20.py

@@ -8,6 +8,7 @@
 import json
 
 from ..manager import JSONRPCResponseManager
+from ..jsonrpc2 import JSONRPC20Request, JSONRPC20BatchRequest
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest
@@ -171,3 +172,35 @@ def test_rpc_call_batch_all_notifications(self):
         ]"""
         response = JSONRPCResponseManager.handle(req, self.dispatcher)
         self.assertEqual(response, None)
+
+    def test_rpc_call_response_request(self):
+        req = '{"jsonrpc": "2.0", "method": "subtract", "params": [42, 23], "id": 1}'  # noqa
+        response = JSONRPCResponseManager.handle(req, self.dispatcher)
+        self.assertTrue(isinstance(
+            response.request,
+            JSONRPC20Request
+        ))
+        self.assertTrue(isjsonequal(
+            response.request.json,
+            req
+        ))
+
+    def test_rpc_call_response_request_batch(self):
+        req = """[
+            {"jsonrpc": "2.0", "method": "sum", "params": [1,2,4], "id": "1"},
+            {"jsonrpc": "2.0", "method": "notify_hello", "params": [7]},
+            {"jsonrpc": "2.0", "method": "subtract",
+            "params": [42,23], "id": "2"},
+            {"jsonrpc": "2.0", "method": "foo.get",
+            "params": {"name": "myself"}, "id": "5"},
+            {"jsonrpc": "2.0", "method": "get_data", "id": "9"}
+        ]"""
+        response = JSONRPCResponseManager.handle(req, self.dispatcher)
+        self.assertTrue(isinstance(
+            response.request,
+            JSONRPC20BatchRequest
+        ))
+        self.assertTrue(isjsonequal(
+            response.request.json,
+            req
+        ))