change the method format_request kernel_language dependent instead of kernel_name

Author: B1nj0y

kernel_gateway/notebook_http/__init__.py

@@ -122,7 +122,8 @@ def create_request_handlers(self):
             handler_args = { 'sources' : verb_source_map,
                 'response_sources' : response_source_map,
                 'kernel_pool' : self.kernel_pool,
-                'kernel_name' : self.parent.kernel_manager.seed_kernelspec
+                'kernel_name' : self.parent.kernel_manager.seed_kernelspec,
+                'kernel_language' : getattr(self.parent.kernel_spec_manager.get_kernel_spec(self.parent.kernel_manager.seed_kernelspec), 'language', 'no_spec')
             }
             handlers.append((parameterized_path, NotebookAPIHandler, handler_args))
 

kernel_gateway/notebook_http/handlers.py

@@ -35,6 +35,8 @@ class NotebookAPIHandler(TokenAuthorizationMixin,
     kernel_name
         Kernel spec name used to launch the kernel pool. Identifies the
         language of the source code cells.
+    kernel_language
+        Kernel spec language used to make language specific operations
 
     Attributes
     ----------
@@ -45,11 +47,12 @@ class NotebookAPIHandler(TokenAuthorizationMixin,
     services.cell.parser.APICellParser for detail about how the source cells
     are identified, parsed, and associated with HTTP verbs and paths.
     """
-    def initialize(self, sources, response_sources, kernel_pool, kernel_name):
+    def initialize(self, sources, response_sources, kernel_pool, kernel_name, kernel_language='no_spec'):
         self.kernel_pool = kernel_pool
         self.sources = sources
         self.kernel_name = kernel_name
         self.response_sources = response_sources
+        self.kernel_language = kernel_language
 
     def finish_future(self, future, result_accumulator):
         """Resolves the promise to respond to a HTTP request handled by a
@@ -184,7 +187,7 @@ def _handle_request(self):
                 'headers' : headers_to_dict(self.request.headers)
             })
             # Turn the request string into a valid code string
-            request_code = format_request(request, self.kernel_name)
+            request_code = format_request(request, self.kernel_language)
 
             # Run the request and source code and yield until there's a result
             access_log.debug('Request code for notebook cell is: {}'.format(request_code))

kernel_gateway/notebook_http/request_utils.py

@@ -12,17 +12,17 @@
 APPLICATION_JSON = 'application/json'
 TEXT_PLAIN = 'text/plain'
 
-def format_request(bundle, kernel_name):
+def format_request(bundle, kernel_language='no_spec'):
     """Creates an assignment statement of bundle JSON-encoded to a variable
-    named `REQUEST`.
+    named `REQUEST` by default or kernel_language specific.
 
     Returns
     -------
     str
         `REQUEST = "<json-encoded expression>"`
     """
     bundle = json.dumps(bundle)
-    if kernel_name == 'iperl':
+    if kernel_language.lower() == 'perl':
         statement = "my $REQUEST = {}".format(bundle)
     else:
         statement = "REQUEST = {}".format(bundle)

kernel_gateway/tests/notebook_http/test_request_utils.py

@@ -128,7 +128,7 @@ def test_format_request_code_not_escaped(self):
         test_request = ('''{"body": "", "headers": {"Accept-Language": "en-US,en;q=0.8",
                         "If-None-Match": "9a28a9262f954494a8de7442c63d6d0715ce0998",
                         "Accept-Encoding": "gzip, deflate, sdch"}, "args": {}, "path": {}}''')
-        request_code = format_request(test_request, 'python')
+        request_code = format_request(test_request)
         #Get the value of REQUEST = "{ to test for equality
         test_request_js_value = request_code[request_code.index("\"{"):]
         self.assertEqual(test_request, json.loads(test_request_js_value), "Request code without escaped quotes was not formatted correctly")
@@ -138,7 +138,7 @@ def test_format_request_code_escaped(self):
         test_request = ('''{"body": "", "headers": {"Accept-Language": "en-US,en;q=0.8",
                         "If-None-Match": "\"\"9a28a9262f954494a8de7442c63d6d0715ce0998\"\"",
                         "Accept-Encoding": "gzip, deflate, sdch"}, "args": {}, "path": {}}''')
-        request_code = format_request(test_request, 'python')
+        request_code = format_request(test_request)
         #Get the value of REQUEST = "{ to test for equality
         test_request_js_value = request_code[request_code.index("\"{"):]
         self.assertEqual(test_request, json.loads(test_request_js_value), "Escaped Request code was not formatted correctly")