Including submission output content if error

data/2022_1/execution_2022_1.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2ba8f6e7489572f1adba56e178f497ea79068d23edc3e3d3f423742513e03fd
-size 214975993
+oid sha256:d326974c7c60809c127743bb84fc5915ef73b0b35a47cf35a91d58a166662224
+size 216790595

data/2022_2/execution_2022_2.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6bc3bca89ebd2bc8fb79a27b599a312c253fa221f21c2fc4e21e13851c12269
-size 149451225
+oid sha256:381cea3acdd03e906a28057e3050dd7bd9f0b6b994d2ac9dc192ba794ebfb7a4
+size 150986252

data/2023_1/execution_2023_1.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8229e3a760469930226cbb44e0423599e324c88519a1b794b4da64efee5b561d
-size 239178319
+oid sha256:d800a4007244e5907b71486afa3061bf51e82614582dcd12584401e7a206010d
+size 241671163

data/2023_2/execution_2023_2.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dbf83d5c05be49a09cd5e5776a6ac2d88fd0ffd8f2e4771f3c54e0efdfd305c
-size 210315046
+oid sha256:ef359cc9bc49642f70216f39e937bd2a6e5aeaeb7633e8150986e62bf691d096
+size 212906617

data/2024_1/execution_2024_1.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:800786fda852d641e5d34a6398f431ca913a49e8d7d706fac708257a7c56b8ee
-size 229555285
+oid sha256:3999adc837c91942af8a083f1d689ef3ff5bdd2af6225a9bdd564137407277dc
+size 232638959

src/execution.py

@@ -72,8 +72,9 @@ def _extract_submission(block: str):
     Extract from a SUBMISSION/SUBMITION block:
       - execution_time (float, seconds)
       - grade (float, percent 0..100)
-      - testcases (list of dicts with index, input, correct_output, user_output)
-      - output_content (string dump of test cases + grades, stdout-like)
+      - testcases (list of dicts with index, input, correct_output, user_output) OR None
+      - output_type: "stdout" (for test cases) or "stderr" (for error trace)
+      - output_content: raw text of test cases+grade or the error message
     """
     lines = block.splitlines()
     _, after_code_idx = _extract_code(block)
@@ -82,7 +83,8 @@ def _extract_submission(block: str):
     execution_time = None
     grade = None
     testcases = []
-    output_lines = []   # new: collect for output_content
+    output_lines = []
+    output_type, output_content = None, None
 
     i = scan_start
     while i < len(lines):
@@ -100,6 +102,21 @@ def _extract_submission(block: str):
             i += 1
             continue
 
+        # -- ERROR:
+        if low.startswith("-- error:"):
+            output_type = "stderr"
+            # collect everything until next "-- " section or end
+            j = i + 1
+            err_lines = []
+            while j < len(lines):
+                if lines[j].strip().startswith("-- "):
+                    break
+                err_lines.append(lines[j])
+                j += 1
+            output_content = "\n".join(err_lines).strip()
+            i = j
+            continue
+
         # -- TEST CASE N:
         if low.startswith("-- test case"):
             idx = None
@@ -112,27 +129,20 @@ def _extract_submission(block: str):
             j = i + 1
             current = {"index": idx, "input": "", "correct_output": "", "user_output": ""}
             active = None
-
             output_lines.append(lines[i])  # keep the "-- TEST CASE ..." line
 
             while j < len(lines):
                 sraw = lines[j].rstrip("\n")
                 slow = sraw.strip().lower()
-
                 if slow.startswith("-- test case") or slow.startswith("-- grade:"):
                     break
-
                 output_lines.append(sraw)
-
                 if slow.startswith("---- input:"):
-                    active = "input"
-                    current["input"] = ""
+                    active = "input"; current["input"] = ""
                 elif slow.startswith("---- correct output:"):
-                    active = "correct_output"
-                    current["correct_output"] = ""
+                    active = "correct_output"; current["correct_output"] = ""
                 elif slow.startswith("---- user output:"):
-                    active = "user_output"
-                    current["user_output"] = ""
+                    active = "user_output"; current["user_output"] = ""
                 else:
                     if active:
                         current[active] += (sraw + "\n")
@@ -143,6 +153,7 @@ def _extract_submission(block: str):
 
             testcases.append(current)
             i = j
+            output_type = "stdout"
             continue
 
         # -- GRADE:
@@ -155,17 +166,17 @@ def _extract_submission(block: str):
                 except:
                     pass
             output_lines.append(lines[i])
-            if val:
-                output_lines.append(val)
+            if val: output_lines.append(val)
             i += 1
             continue
 
         i += 1
 
-    # new: join collected lines
-    output_content = "\n".join(output_lines).strip() or None
+    if output_type == "stdout":
+        output_content = "\n".join(output_lines).strip() or None
+
+    return execution_time, grade, testcases or None, output_type, output_content
 
-    return execution_time, grade, testcases, output_content
 
 
 def parse_execution_data(full_path):
@@ -211,9 +222,7 @@ def parse_execution_data(full_path):
         if tnorm == "test":
             output_type, output_content = _extract_test_output(block)
         elif tnorm in ("submission", "submition", "submit"):
-            execution_time, grade, testcases, output_content = _extract_submission(block)
-            output_type = "stdout" if output_content else None
-
+            execution_time, grade, testcases, output_type, output_content = _extract_submission(block)
 
         rows.append({
             "user":           user,