Use tornado gzip support instead of doing it manually.

rishirelan · Feb 8, 2022 · 59eac3e · 59eac3e
1 parent 4d8d4ae
commit 59eac3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/tabpy/tabpy_server/app/app.py b/tabpy/tabpy_server/app/app.py
@@ -96,11 +96,15 @@ def run(self):
             logger.critical(msg)
             raise RuntimeError(msg)
 
+        settings = {}
+        if self.settings[SettingsParameters.GzipEnabled] == True:
+            settings["decompress_request"] = True
         application.listen(
             self.settings[SettingsParameters.Port],
             ssl_options=ssl_options,
             max_buffer_size=max_request_size,
             max_body_size=max_request_size,
+            **settings,
         )
 
         logger.info(

diff --git a/tabpy/tabpy_server/handlers/evaluation_plane_handler.py b/tabpy/tabpy_server/handlers/evaluation_plane_handler.py
@@ -8,7 +8,6 @@
 from tornado import gen
 from datetime import timedelta
 from tabpy.tabpy_server.handlers.util import AuthErrorStates
-import gzip
 
 
 class RestrictedTabPy:
@@ -65,13 +64,7 @@ def initialize(self, executor, app):
     @gen.coroutine
     def _post_impl(self):
 
-        self.logger.log(logging.DEBUG, f"PreProcessing POST request ...")
-        if self.settings[SettingsParameters.GzipEnabled] == True and 'Content-Encoding' in self.request.headers and 'gzip' in self.request.headers['Content-Encoding']:
-            self.logger.log(logging.DEBUG, f"Decoding Gzipped POST request ... '{self.request.body}'")
-            body = json.loads(gzip.decompress(self.request.body).decode("utf-8"))
-            self.logger.log(logging.DEBUG, f"Decoded Gzipped POST request ... '{body}'")
-        else:
-            body = json.loads(self.request.body)
+        body = json.loads(self.request.body.decode("utf-8"))
         self.logger.log(logging.DEBUG, f"Processing POST request '{body}'...")
         if "script" not in body:
             self.error_out(400, "Script is empty.")
@@ -121,11 +114,7 @@ def _post_impl(self):
             return
 
         if result is not None:
-            if self.settings[SettingsParameters.GzipEnabled] == True and 'Content-Encoding' in self.request.headers and 'gzip' in self.request.headers['Content-Encoding']:
-                self.write(gzip.compress(simplejson.dumps(result, ignore_nan=True).encode('utf-8')))
-                self.set_header("Content-Encoding", "gzip")
-            else:
-                self.write(simplejson.dumps(result, ignore_nan=True).encode('utf-8'))
+            self.write(simplejson.dumps(result, ignore_nan=True))
         else:
             self.write("null")
         self.finish()