Make Job.operation an ESOperation rather than its exported dict

Author: lw

cms/grading/Job.py

@@ -83,8 +83,7 @@ def __init__(self, operation=None,
                  files=None, managers=None, executables=None):
         """Initialization.
 
-        operation (dict|None): the operation, in the format that
-            ESOperation.to_dict() uses.
+        operation (ESOperation|None): the operation.
         task_type (string|None): the name of the task type.
         task_type_parameters (object|None): the parameters for the
             creation of the correct task type.
@@ -108,8 +107,6 @@ def __init__(self, operation=None,
             in the compilation.
 
         """
-        if operation is None:
-            operation = {}
         if task_type is None:
             task_type = ""
         if sandboxes is None:
@@ -142,7 +139,9 @@ def __init__(self, operation=None,
     def export_to_dict(self):
         """Return a dict representing the job."""
         res = {
-            'operation': self.operation,
+            'operation': (self.operation.to_dict()
+                          if self.operation is not None
+                          else None),
             'task_type': self.task_type,
             'task_type_parameters': self.task_type_parameters,
             'language': self.language,
@@ -185,6 +184,8 @@ def import_from_dict_with_type(data):
     @classmethod
     def import_from_dict(cls, data):
         """Create a Job from the output of export_to_dict."""
+        if data['operation'] is not None:
+            data['operation'] = ESOperation.from_dict(data['operation'])
         data['files'] = dict(
             (k, File(k, v)) for k, v in iteritems(data['files']))
         data['managers'] = dict(
@@ -303,7 +304,7 @@ def from_submission(operation, submission, dataset):
         # dict() is required to detach the dictionary that gets added
         # to the Job from the control of SQLAlchemy
         return CompilationJob(
-            operation=operation.to_dict(),
+            operation=operation,
             task_type=dataset.task_type,
             task_type_parameters=dataset.task_type_parameters,
             language=submission.language,
@@ -382,7 +383,7 @@ def from_user_test(operation, user_test, dataset):
                         dataset.managers[manager_filename]
 
         return CompilationJob(
-            operation=operation.to_dict(),
+            operation=operation,
             task_type=dataset.task_type,
             task_type_parameters=dataset.task_type_parameters,
             language=user_test.language,
@@ -527,7 +528,7 @@ def from_submission(operation, submission, dataset):
         # dict() is required to detach the dictionary that gets added
         # to the Job from the control of SQLAlchemy
         return EvaluationJob(
-            operation=operation.to_dict(),
+            operation=operation,
             task_type=dataset.task_type,
             task_type_parameters=dataset.task_type_parameters,
             language=submission.language,
@@ -560,8 +561,7 @@ def to_submission(self, sr):
             execution_memory=self.plus.get('execution_memory'),
             evaluation_shard=self.shard,
             evaluation_sandbox=":".join(self.sandboxes),
-            testcase=sr.dataset.testcases[
-                self.operation["testcase_codename"]])]
+            testcase=sr.dataset.testcases[self.operation.testcase_codename])]
 
     @staticmethod
     def from_user_test(operation, user_test, dataset):
@@ -608,7 +608,7 @@ def from_user_test(operation, user_test, dataset):
                         dataset.managers[manager_filename]
 
         return EvaluationJob(
-            operation=operation.to_dict(),
+            operation=operation,
             task_type=dataset.task_type,
             task_type_parameters=dataset.task_type_parameters,
             language=user_test.language,

cms/grading/tasktypes/OutputOnly.py

@@ -107,7 +107,7 @@ def _uses_checker(self):
     @staticmethod
     def _get_user_output_filename(job):
         return OutputOnly.USER_OUTPUT_FILENAME_TEMPLATE % \
-            job.operation["testcase_codename"]
+            job.operation.testcase_codename
 
     def compile(self, job, file_cacher):
         """See TaskType.compile."""

cms/service/EvaluationService.py

@@ -440,7 +440,7 @@ def action_finished(self, data, shard, error=None):
 
         if job_group_success:
             for job in job_group.jobs:
-                operation = ESOperation.from_dict(job.operation)
+                operation = job.operation
                 if job.success:
                     logger.info("`%s' succeeded.", operation)
                 else:

cmstaskenv/Test.py

@@ -126,7 +126,7 @@ def test_testcases(base_dir, solution, language, assume=None):
             ESOperation.EVALUATION,
             None,
             dataset.id,
-            dataset.testcases[t].codename).to_dict(),
+            dataset.testcases[t].codename),
         language=language.name,
         task_type=dataset.task_type,
         task_type_parameters=dataset.task_type_parameters,

cmstestsuite/unit_tests/grading/tasktypes/OutputOnlyTest.py

@@ -61,7 +61,7 @@ def job(files):
         return EvaluationJob(input="digest of input",
                              output="digest of correct output",
                              files=files,
-                             operation=operation.to_dict(),
+                             operation=operation,
                              multithreaded_sandbox=True)
 
     def prepare(self, parameters, files):

cmstestsuite/unit_tests/service/WorkerTest.py

@@ -266,7 +266,7 @@ def new_jobs(number_of_jobs, prefix=None):
             job_params = [
                 ESOperation(ESOperation.EVALUATION,
                             unique_long_id(), unique_long_id(),
-                            unique_unicode_id()).to_dict(),
+                            unique_unicode_id()),
                 "fake_task_type",
                 "fake_parameters_%s%d" % (prefix, i)
             ]