Merge branch 'main' into restricted-feedback

Author: veluca93

cms/grading/steps/stats.py

@@ -103,19 +103,40 @@ def merge_execution_stats(
     if first_stats is None:
         return second_stats.copy()
 
+    Stat = typing.TypeVar('Stat', int, float)
+
+    def safe_sum(x: Stat | None, y: Stat | None) -> Stat | None:
+        if x is None:
+            return y
+        elif y is None:
+            return x
+        else:
+            return x + y
+
+    def safe_max(x: Stat | None, y: Stat | None) -> Stat | None:
+        if x is None:
+            return y
+        elif y is None:
+            return x
+        else:
+            return max(x, y)
+
     ret = first_stats.copy()
-    ret["execution_time"] += second_stats["execution_time"]
+    ret["execution_time"] = safe_sum(ret["execution_time"],
+                                     second_stats["execution_time"])
 
     if concurrent:
-        ret["execution_wall_clock_time"] = max(
+        ret["execution_wall_clock_time"] = safe_max(
             ret["execution_wall_clock_time"],
             second_stats["execution_wall_clock_time"])
-        ret["execution_memory"] += second_stats["execution_memory"]
+        ret["execution_memory"] = safe_sum(ret["execution_memory"],
+                                           second_stats["execution_memory"])
     else:
-        ret["execution_wall_clock_time"] += \
-            second_stats["execution_wall_clock_time"]
-        ret["execution_memory"] = max(ret["execution_memory"],
-                                      second_stats["execution_memory"])
+        ret["execution_wall_clock_time"] = safe_sum(
+            ret["execution_wall_clock_time"],
+            second_stats["execution_wall_clock_time"])
+        ret["execution_memory"] = safe_max(ret["execution_memory"],
+                                           second_stats["execution_memory"])
 
     if first_stats["exit_status"] == Sandbox.EXIT_OK:
         ret["exit_status"] = second_stats["exit_status"]

cms/log.py

@@ -393,16 +393,16 @@ def process(self, msg: str, kwargs: dict):
 
 
 # Install a shell handler.
-shell_handler = StreamHandler(sys.stdout)
+shell_handler = StreamHandler(sys.stderr)
 shell_handler.setLevel(logging.INFO)
-shell_handler.setFormatter(CustomFormatter(has_color_support(sys.stdout)))
+shell_handler.setFormatter(CustomFormatter(has_color_support(sys.stderr)))
 root_logger.addHandler(shell_handler)
 
 
 def set_detailed_logs(detailed: bool):
     """Set or unset the shell logs to detailed."""
     global shell_handler
-    color = has_color_support(sys.stdout)
+    color = has_color_support(sys.stderr)
     formatter = DetailedFormatter(color) \
         if detailed else CustomFormatter(color)
     shell_handler.setFormatter(formatter)

cmsranking/Logger.py

@@ -243,9 +243,9 @@ def format(self, record):
 root_logger.setLevel(logging.DEBUG)
 
 # Define the stream handler to output on stderr.
-shell_handler = StreamHandler(sys.stdout)
+shell_handler = StreamHandler(sys.stderr)
 shell_handler.setLevel(logging.INFO)
-shell_handler.setFormatter(CustomFormatter(has_color_support(sys.stdout)))
+shell_handler.setFormatter(CustomFormatter(has_color_support(sys.stderr)))
 root_logger.addHandler(shell_handler)