rbx.cp 0.5.18__py3-none-any.whl → 0.5.19__py3-none-any.whl

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/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/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/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(

{rbx_cp-0.5.18.dist-info → rbx_cp-0.5.19.dist-info}/METADATA

@@ -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.dist-info → rbx_cp-0.5.19.dist-info}/RECORD

@@ -2,7 +2,7 @@ rbx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/annotations.py,sha256=Z3jBUyZoXkrz34jko3Rft0bnMME6nWb0vsV5I3HlgR0,3064
 rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/builder.py,sha256=Fz-3DpKg4kfciOz-ZcxpYPRjDqKVzKN9q2NtFsHA6Rc,3241
+rbx/box/builder.py,sha256=0TiRQJoHqLHAI8QwBrscbaJmhdcmialVtP_oEkfHcs0,3260
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
 rbx/box/checkers.py,sha256=VpgDzevOK7hrffG2zJGxquNiu-a9Fl3wquLn7xadcK0,6285
 rbx/box/code.py,sha256=XUyE8QY9qgKC6AwoRvnjo1TodchMzNL2EAXeXHT4mYM,9815
@@ -22,7 +22,7 @@ rbx/box/environment.py,sha256=GjwnJwtkTdkHmUh1b23zagjLsTiJQAOpP36A93mA-zc,11159
 rbx/box/extensions.py,sha256=gIC73VbF1897er3iIMhaIw6GE8o1t43M7q97Iz7-_lg,503
 rbx/box/generators.py,sha256=YpwtT-SmbiBMdnNSGsJ6kXuF4vOEoqXOq9MC9T92Sng,16157
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
-rbx/box/main.py,sha256=OzBKO7Ys87CRs_4Slm3u7e1TrJ4ZfLUa3I27qfNbL_8,21948
+rbx/box/main.py,sha256=oMwHflfh4Ei6fgJbmFeszza6TW76lCi0dwEhhZFpBbk,21986
 rbx/box/package.py,sha256=gaqqiRL2l91GydJc4nrLQvhFNcxt7Di7KquiNJq6AiQ,11129
 rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
 rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
@@ -39,7 +39,7 @@ rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,196
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
 rbx/box/schema.py,sha256=MerNqhIeOxRBUw0CEbtfNFsHEJVsILilAjEGwW0nujQ,13227
 rbx/box/setter_config.py,sha256=6nGTPMvnJ7y1sM-EBuI493NSZOIiOZ1DTypSXrL-HRY,3686
-rbx/box/solutions.py,sha256=oY6NpveOK1H7jU1sokCFAz4xJzo-8t-YQYcNzqLjMUc,31009
+rbx/box/solutions.py,sha256=ndx1O5ez_GSus70QvTBDgfLoNLW5DpAiMTMJRdnDwR0,32266
 rbx/box/solutions_test.py,sha256=Cx7Goon_0sz_PaUcD8qa8gmjgzOVub6VHss3CB0GaA0,1524
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/statements/build_statements.py,sha256=24ZUM5H33NhmqnDL0ofA1anUKWxuZG1paA1tCV4AKns,11911
@@ -81,7 +81,7 @@ rbx/grading/judge/sandboxes/timeit.py,sha256=xScfasI2lsSQGZVpIZ7qBZfi0IaKC-1k8wO
 rbx/grading/judge/storage.py,sha256=FirqjwDqb0m0h2OTFyWrZL7CQ4XjZNxhqB4JpnDIhZY,9485
 rbx/grading/judge/test.py,sha256=ll0Iw7zyOpGdKPD_PGH7dvUkb4stQLu-ikbQnqJvuAc,944
 rbx/grading/judge/testiso.py,sha256=v14DtkWiZFJ9AKMzrb0_vZKPWDt8jz8iIw1Z2O-Advk,1397
-rbx/grading/steps.py,sha256=w7dtT65Gu5uRzuBNxKDP5MnieMggJ1TkagNgS03tfSI,22660
+rbx/grading/steps.py,sha256=Qx5DC5tQfH_1tIlsTXQtmtyYRW9tEgGeKKhF_1YGbQQ,22710
 rbx/grading/steps_with_caching.py,sha256=5cI71VSjEaDzCPQikpamG_EjZqkkFKKdBtyJeA4QB7Q,1531
 rbx/grading/steps_with_caching_run_test.py,sha256=nRzB4OcXkb-kQ4WCj0iTGVfBACllxZ0Ek5RSwfoJRgo,15262
 rbx/grading_utils.py,sha256=lL2KtSkOsMElqrRoApQTbFcqVOeHVWUDTMCa3IsLpC4,4484
@@ -162,8 +162,8 @@ rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
 rbx/utils.py,sha256=WlmnF4whc0-6ksVZoOhmom2bR2spT6zETFHjnpJOCsA,4383
-rbx_cp-0.5.18.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.18.dist-info/METADATA,sha256=20P5Jn38-CFMSoYc1lpOC7UsJu9Q-oSXD3kROvB8_M4,3290
-rbx_cp-0.5.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.18.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.18.dist-info/RECORD,,
+rbx_cp-0.5.19.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.19.dist-info/METADATA,sha256=_BOq9SuxvkOSIc4FbRmoeQV_wjuB9l0ALHeZKBpYGtE,3290
+rbx_cp-0.5.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.19.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.19.dist-info/RECORD,,