Merge pull request #96 from ankitjavalkar/code-eval-refactor-clean2

Code evaluator refactor

1 files changed, 9 insertions, 14 deletions

diff --git a/yaksh/code_server.py b/yaksh/code_server.py
index faf9c0d..2d8567e 100755
--- a/yaksh/code_server.py
+++ b/yaksh/code_server.py
@@ -31,7 +31,7 @@ import re
 import json
 # Local imports.
 from settings import SERVER_PORTS, SERVER_POOL_PORT
-from language_registry import set_registry, get_registry
+from language_registry import create_evaluator_instance, unpack_json
 
 
 MY_DIR = abspath(dirname(__file__))
@@ -58,13 +58,17 @@ class CodeServer(object):
         self.queue = queue
 
     # Public Protocol ##########
-    def check_code(self, language, json_data, in_dir=None):
+    def check_code(self, language, test_case_type, json_data, in_dir=None):
         """Calls relevant EvaluateCode class based on language to check the
          answer code
         """
-        code_evaluator = self._create_evaluator_instance(language, json_data,
-                                                             in_dir)
-        result = code_evaluator.evaluate()
+        code_evaluator = create_evaluator_instance(language, 
+            test_case_type,
+            json_data,
+            in_dir
+        )
+        data = unpack_json(json_data)
+        result = code_evaluator.evaluate(**data)
 
         # Put us back into the server pool queue since we are free now.
         self.queue.put(self.port)
@@ -79,15 +83,6 @@ class CodeServer(object):
         self.queue.put(self.port)
         server.serve_forever()
 
-    # Private Protocol ##########
-    def _create_evaluator_instance(self, language, json_data, in_dir):
-        """Create instance of relevant EvaluateCode class based on language"""
-        set_registry()
-        registry = get_registry()
-        cls = registry.get_class(language)
-        instance = cls.from_json(language, json_data, in_dir)
-        return instance
-
 
 ###############################################################################
 # `ServerPool` class.