Merge pull request #54 from ooemperor/dev

Adding Timeout Parameter to the execution for a task

.gitignore

@@ -1,4 +1,6 @@
 #gitignore for automatic code Grader
+# Ignore all python venv
+*venv*
 
 # IDE Files
 *.idea

codeGrader/backend/db/Task.py

@@ -61,6 +61,11 @@ class Task(Base):
         String, nullable=True
     )
 
+    # timeout param for the execution
+    timeout = Column(
+        Integer, nullable=True, default=60
+    )
+
     # Foreign Keys
     exercise_id = Column(
         Integer,
@@ -154,6 +159,7 @@ def toJson(self, recursive: bool = True) -> dict:
         out["id"] = self.id
         out["name"] = self.name
         out["tag"] = self.tag
+        out["timeout"] = self.timeout
 
         if self.description is not None:
             out["description"] = self.description

codeGrader/backend/execution/Execution.py

@@ -102,9 +102,10 @@ def execute(self) -> None:
                                          file.getFileContent())  # uploading the individual task file
 
                 start_time = time.time()
+                timeout = self.task.timeout
+                command = f"timeout {timeout}s python3 {config.executionFilePath}/{script_filename_hash} < {config.executionFilePath}/{testcase_file_hash}"
 
-                output, returncode = self.lxc.lxc_execute_command(
-                    f"python3 {config.executionFilePath}/{script_filename_hash} < {config.executionFilePath}/{testcase_file_hash}")  # TODO make better execution function. Not allowed to be hardcoded
+                output, returncode = self.lxc.lxc_execute_command(command)  # TODO make better execution function. Not allowed to be hardcoded
 
                 end_time = time.time()
 

codeGrader/frontend/admin/handlers/Task.py

@@ -121,6 +121,7 @@ def post(self, id_: int) -> Response:
             task_data["tag"] = self.get_value("tag")
             task_data["description"] = self.get_value("description")
             task_data["exercise_id"] = self.get_value("exercise")
+            task_data["timeout"] = self.get_value("timeout")
 
             # getting the data from the form provided in the request
             self.api.put(f"/task/{id_}", body=task_data)
@@ -175,6 +176,7 @@ def post(self) -> Response:
             task_data["tag"] = self.get_value("tag")
             task_data["description"] = self.get_value("description")
             task_data["exercise_id"] = self.get_value("exercise")
+            task_data["timeout"] = self.get_value("timeout")
 
             self.api.post("/task/add", body=task_data)
 

codeGrader/frontend/admin/templates/addTask.html

@@ -48,6 +48,12 @@ <h1 class="header1">Task</h1>
                                     cols="100">{{ description }}</textarea>
                             </td>
                         </tr>
+                        <tr>
+                            <td class=" data">Tag</td>
+                            <td>
+                                <input class="input" type="text" id="input_timeout" name="timeout" placeholder="Timeout in seconds">
+                            </td>
+                        </tr>
                         <tr>
                             <td class=" data">Tag</td>
                             <td>

codeGrader/frontend/admin/templates/task.html

@@ -65,6 +65,13 @@ <h1 class="header1">Task {{ name }}</h1>
                                       name="description" rows="3" cols="100">{{ description }}</textarea>
                         </td>
                     </tr>
+                    <tr>
+                        <td>Timeout</td>
+                        <td>
+                            <input class="input" {% if not editable %} readonly {% endif %} type="text" id="input_timeout"
+                                   name="timeout" value="{{ timeout }}">
+                        </td>
+                    </tr>
                     <tr>
                         <td>Tag</td>
                         <td>