rbx.cp 0.5.18__tar.gz → 0.5.19__tar.gz

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.18
+Version: 0.5.19
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.18"
+version = "0.5.19"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/rbx/box/builder.py

@@ -103,5 +103,5 @@ async def verify(verification: environment.VerificationParam) -> bool:
     return await print_run_report(
         solution_result,
         console.console,
-        verification,
+        VerificationLevel(verification),
     )

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/rbx/box/main.py

@@ -215,7 +215,7 @@ def run(
         print_run_report(
             solution_result,
             console.console,
-            verification,
+            VerificationLevel(verification),
             detailed=detailed,
         )
     )
@@ -250,7 +250,7 @@ def _time_impl(check: bool, detailed: bool) -> Optional[int]:
         print_run_report(
             solution_result,
             console.console,
-            verification,
+            VerificationLevel(verification),
             detailed=detailed,
         )
     )

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/rbx/box/solutions.py

@@ -13,7 +13,7 @@ import rich.table
 from pydantic import BaseModel
 
 from rbx import console
-from rbx.box import checkers, environment, package
+from rbx.box import checkers, package
 from rbx.box.code import SanitizationLevel, compile_item, find_language_name, run_item
 from rbx.box.deferred import Deferred
 from rbx.box.environment import EnvironmentSandbox, ExecutionConfig, VerificationLevel
@@ -539,6 +539,24 @@ def get_evals_formatted_time(evals: List[Evaluation]) -> str:
     return f'{max_time} ms'
 
 
+def get_capped_evals_formatted_time(
+    solution: Solution, evals: List[Evaluation], verification: VerificationLevel
+) -> str:
+    pkg = package.find_problem_package_or_die()
+
+    max_time = _get_evals_time_in_ms(evals)
+    has_tle = any(eval.result.outcome == Outcome.TIME_LIMIT_EXCEEDED for eval in evals)
+    tl = pkg.timelimit_for_language(solution.language)
+
+    if verification.value >= VerificationLevel.FULL.value:
+        # Using double TL for verification.
+        tl = tl * 2
+
+    if has_tle and max_time > tl:
+        return f'>{tl} ms'
+    return f'{max_time} ms'
+
+
 def get_evals_formatted_memory(evals: List[Evaluation]) -> str:
     max_memory = _get_evals_memory_in_bytes(evals)
     if max_memory < 1024 * 1024:
@@ -631,7 +649,9 @@ def _print_solution_outcome(
             '[warning]WARNING[/warning] The solution had sanitizer errors or warnings, marked with [warning]*[/warning]. See their stderr for more details.'
         )
 
-    console.print(f'Time: {get_evals_formatted_time(evals)}')
+    console.print(
+        f'Time: {get_capped_evals_formatted_time(solution, evals, verification)}'
+    )
     console.print(f'Memory: {get_evals_formatted_memory(evals)}')
     return len(unmatched_bad_verdicts) == 0
 
@@ -698,6 +718,7 @@ async def _render_detailed_group_table(
     skeleton: SolutionReportSkeleton,
     structured_evaluations: StructuredEvaluation,
     console: rich.console.Console,
+    verification: VerificationLevel = VerificationLevel.NONE,
 ):
     group_skeleton = skeleton.find_group_skeleton(group.name)
     assert group_skeleton is not None
@@ -722,12 +743,16 @@ async def _render_detailed_group_table(
                     row.append('...')
                     continue
 
+                evals_per_solution[str(solution.path)].append(eval)
+
                 verdict = get_testcase_markup_verdict(eval)
-                time = get_evals_formatted_time([eval])
+                time = get_capped_evals_formatted_time(solution, [eval], verification)
+                memory = get_evals_formatted_memory([eval])
+                full_item = f'{verdict} {time} / {memory}'
                 if eval.result.sanitizer_warnings:
-                    time = f'{time} [warning]*[/warning]'
-                evals_per_solution[str(solution.path)].append(eval)
-                row.append(f'{verdict} {time}')
+                    full_item = f'{full_item} [warning]*[/warning]'
+
+                row.append(full_item)
             table.add_row(*row)
 
         if table.row_count > 0:
@@ -738,7 +763,11 @@ async def _render_detailed_group_table(
                 if not non_null_evals:
                     summary_row.append('...')
                     continue
-                summary_row.append('  ' + get_evals_formatted_time(non_null_evals))
+                formatted_time = get_capped_evals_formatted_time(
+                    solution, non_null_evals, verification
+                )
+                formatted_memory = get_evals_formatted_memory(non_null_evals)
+                summary_row.append(f' {formatted_time} / {formatted_memory}')
             table.add_section()
             table.add_row(*summary_row)
         return table
@@ -763,6 +792,7 @@ async def _print_detailed_run_report(
     console: rich.console.Console,
     structured_evaluations: StructuredEvaluation,
     timing: bool = True,
+    verification: VerificationLevel = VerificationLevel.NONE,
 ):
     for group in result.skeleton.groups:
         console.print(f'[bold][status]{group.name}[/status][/bold]')
@@ -772,6 +802,7 @@ async def _print_detailed_run_report(
             result.skeleton,
             structured_evaluations,
             console,
+            verification=verification,
         )
         continue
 
@@ -788,6 +819,7 @@ async def _print_detailed_run_report(
             solution,
             all_evals,
             console,
+            verification=verification,
         )
         ok = ok and cur_ok
         console.print()
@@ -802,7 +834,7 @@ async def _print_detailed_run_report(
 async def print_run_report(
     result: RunSolutionResult,
     console: rich.console.Console,
-    verification: environment.VerificationParam,
+    verification: VerificationLevel,
     detailed: bool = False,
     timing: bool = True,
 ) -> bool:
@@ -811,7 +843,11 @@ async def print_run_report(
     )
     if detailed:
         return await _print_detailed_run_report(
-            result, console, structured_evaluations, timing=timing
+            result,
+            console,
+            structured_evaluations,
+            verification=verification,
+            timing=timing,
         )
 
     ok = True
@@ -836,7 +872,7 @@ async def print_run_report(
                 solution_evals.append(eval)
 
             console.print(
-                f'({get_evals_formatted_time(group_evals)}, {get_evals_formatted_memory(group_evals)})',
+                f'({get_capped_evals_formatted_time(solution, group_evals, verification)}, {get_evals_formatted_memory(group_evals)})',
                 end='',
             )
             console.print()
@@ -845,7 +881,7 @@ async def print_run_report(
             solution,
             solution_evals,
             console,
-            verification=VerificationLevel(verification),
+            verification=verification,
         )
         console.print()
 

{rbx_cp-0.5.18 → rbx_cp-0.5.19}/rbx/grading/steps.py

@@ -436,19 +436,21 @@ def _check_for_sanitizer_warnings(
         return any(_check_for_sanitizer_warnings_in_line(line.decode()) for line in f)
 
 
-_WARNING_RE = re.compile(r'[^:]+:\d+:\d+:[ ]+warning:.*')
+_WARNING_RE = re.compile(r'([^:]+):\d+:\d+:[ ]+warning:.*')
 
 
 def _check_for_compilation_warnings_in_line(line: str) -> bool:
     if line.startswith('./'):
         return False
-    matched = _WARNING_RE.match(line) is not None
-    # if matched:
-    #     console.print(
-    #         '[warning]Compilation warning:[/warning]',
-    #         utils.highlight_json_obj(line),
-    #     )
-    return matched
+    match = _WARNING_RE.match(line)
+    if match is None:
+        return False
+    file = match.group(1).strip().lower()
+    if 'testlib' in file or 'jngen' in file or 'stresslib' in file:
+        return False
+    if file.endswith('.h'):
+        return False
+    return True
 
 
 def _check_for_compilation_warnings(