rbx.cp 0.5.17__tar.gz → 0.5.19__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.17
+Version: 0.5.19
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0
@@ -27,6 +27,7 @@ Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: questionary (>=2.1.0,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=13.9.4,<14.0.0)
+Requires-Dist: ruyaml (>=0.91.0,<0.92.0)
 Requires-Dist: textual (>=0.79.1,<0.80.0)
 Requires-Dist: typer (>=0.15.1,<0.16.0)
 Description-Content-Type: text/markdown

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.17"
+version = "0.5.19"
 description = ""
 packages = [
   {include = "rbx"}
@@ -30,6 +30,7 @@ pyte = "^0.8.2"
 questionary = "^2.1.0"
 lark = "^1.2.2"
 chardet = "^5.2.0"
+ruyaml = "^0.91.0"
 
 [tool.poetry.scripts]
 rbc = "rbx.main:app"

{rbx_cp-0.5.17 → 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.17 → rbx_cp-0.5.19}/rbx/box/code.py

@@ -124,6 +124,14 @@ def compile_item(
     if sanitized.should_sanitize():
         commands = add_sanitizer_flags(commands)
 
+        # Remove any memory constraints for a sanitized executable.
+        # Sanitizers are known to be memory-hungry.
+        sandbox_params.address_space = None
+
+        # Reset timeout configs since sanitizers are known to be time-hungry.
+        sandbox_params.timeout = None
+        sandbox_params.wallclock_timeout = None
+
     compiled_digest = DigestHolder()
 
     artifacts = GradingArtifacts()
@@ -214,12 +222,6 @@ def run_item(
         # Reset timeout configs since sanitizers are known to be time-hungry.
         sandbox_params.timeout = None
         sandbox_params.wallclock_timeout = None
-        orig_execution_config = get_execution_config(language)
-        if orig_execution_config.sandbox is not None:
-            sandbox_params.timeout = orig_execution_config.sandbox.timeLimit
-            sandbox_params.wallclock_timeout = (
-                orig_execution_config.sandbox.wallTimeLimit
-            )
         sanitized = True
 
     sandbox_params.set_stdall(

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/contest/build_contest_statements.py

@@ -7,8 +7,7 @@ from typing import List, Optional, Tuple
 import typer
 
 from rbx import console, testing_utils
-from rbx.box import cd
-from rbx.box.contest import contest_utils
+from rbx.box import cd, package
 from rbx.box.contest.contest_package import get_problems
 from rbx.box.contest.schema import Contest, ContestProblem, ContestStatement
 from rbx.box.schema import Package, Testcase
@@ -60,7 +59,7 @@ class ExtractedProblem:
 
 def _get_samples(problem: ContestProblem) -> List[Testcase]:
     with cd.new_package_cd(problem.get_path()):
-        contest_utils.clear_package_cache()
+        package.clear_package_cache()
         return get_samples()
 
 
@@ -158,7 +157,7 @@ def _build_problem_statements(
             f'Building statement for problem {extracted_problem.problem.short_name}...'
         )
         with cd.new_package_cd(extracted_problem.problem.get_path()):
-            contest_utils.clear_package_cache()
+            package.clear_package_cache()
             # TODO: respect steps override
             content, _ = build_statements.build_statement_bytes(
                 extracted_problem.statement,

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/contest/contest_package.py

@@ -1,7 +1,8 @@
 import functools
 import pathlib
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
+import ruyaml
 import typer
 from pydantic import ValidationError
 
@@ -81,3 +82,14 @@ def get_problems(contest: Contest) -> List[Package]:
     for problem in contest.problems:
         problems.append(find_problem_package_or_die(problem.get_path()))
     return problems
+
+
+def get_ruyaml() -> Tuple[ruyaml.YAML, ruyaml.Any]:
+    contest_yaml_path = find_contest_yaml()
+    if contest_yaml_path is None:
+        console.console.print(
+            f'Contest not found in {pathlib.Path().absolute()}', style='error'
+        )
+        raise typer.Exit(1)
+    res = ruyaml.YAML()
+    return res, res.load(contest_yaml_path.read_text())

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/contest/contest_utils.py

@@ -2,15 +2,6 @@ from rbx.box import environment, package
 from rbx.box.contest import contest_package
 
 
-def clear_package_cache():
-    pkgs = [package]
-
-    for pkg in pkgs:
-        for fn in pkg.__dict__.values():
-            if hasattr(fn, 'cache_clear'):
-                fn.cache_clear()
-
-
 def clear_all_caches():
     pkgs = [package, environment, contest_package]
 

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

@@ -8,12 +8,11 @@ import typer
 
 from rbx import annotations, console, utils
 from rbx.box import cd, creation, presets
-from rbx.box.contest import contest_utils, statements
+from rbx.box.contest import contest_package, contest_utils, statements
 from rbx.box.contest.contest_package import (
     find_contest,
     find_contest_package_or_die,
     find_contest_yaml,
-    save_contest,
     within_contest,
 )
 from rbx.box.contest.schema import ContestProblem
@@ -145,16 +144,19 @@ def add(path: str, short_name: str, preset: Optional[str] = None):
     creation.create(name, preset=preset, path=pathlib.Path(path))
 
     contest = find_contest_package_or_die()
-    # Reassign mutable object before saving.
-    contest.problems = sorted(
-        [
-            *contest.problems,
-            ContestProblem(short_name=short_name, path=pathlib.Path(path)),
-        ],
-        key=lambda p: p.short_name,
+
+    ru, contest = contest_package.get_ruyaml()
+
+    contest['problems'].append(
+        {
+            'short_name': short_name,
+            'path': path,
+        }
     )
+    dest = find_contest_yaml()
+    assert dest is not None
+    utils.save_ruyaml(dest, ru, contest)
 
-    save_contest(contest)
     console.console.print(
         f'Problem [item]{name} ({short_name})[/item] added to contest at [item]{path}[/item].'
     )
@@ -165,25 +167,34 @@ def add(path: str, short_name: str, preset: Optional[str] = None):
 def remove(path_or_short_name: str):
     contest = find_contest_package_or_die()
 
-    kept_problems = []
-    removed_problems = []
-    for problem in contest.problems:
+    removed_problem_idx = None
+    removed_problem = None
+    for i, problem in enumerate(contest.problems):
         if (
             problem.path == pathlib.Path(path_or_short_name)
             or problem.short_name == path_or_short_name
         ):
-            removed_problems.append(problem)
-        else:
-            kept_problems.append(problem)
+            removed_problem_idx = i
+            removed_problem = problem
+            break
 
-    contest.problems = kept_problems
-    save_contest(contest)
-
-    for problem in removed_problems:
-        shutil.rmtree(str(problem.path), ignore_errors=True)
+    if removed_problem_idx is None or removed_problem is None:
         console.console.print(
-            f'Problem [item]{problem.short_name}[/item] removed from contest at [item]{problem.path}[/item].'
+            f'[error]Problem [item]{path_or_short_name}[/item] not found in contest.[/error]'
         )
+        raise typer.Exit(1)
+
+    ru, contest = contest_package.get_ruyaml()
+
+    del contest['problems'][removed_problem_idx]
+    dest = find_contest_yaml()
+    assert dest is not None
+    utils.save_ruyaml(dest, ru, contest)
+
+    shutil.rmtree(str(removed_problem.path), ignore_errors=True)
+    console.console.print(
+        f'Problem [item]{removed_problem.short_name}[/item] removed from contest at [item]{removed_problem.path}[/item].'
+    )
 
 
 @app.command(

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/contest/statements.py

@@ -3,8 +3,7 @@ from typing import Annotated, List, Optional
 import typer
 
 from rbx import annotations, console
-from rbx.box import builder, cd, environment
-from rbx.box.contest import contest_utils
+from rbx.box import builder, cd, environment, package
 from rbx.box.contest.build_contest_statements import build_statement
 from rbx.box.contest.contest_package import (
     find_contest_package_or_die,
@@ -50,7 +49,7 @@ def build(
                 f'Processing problem [item]{problem.short_name}[/item]...'
             )
             with cd.new_package_cd(problem.get_path()):
-                contest_utils.clear_package_cache()
+                package.clear_package_cache()
 
                 if not builder.build(
                     verification=verification, groups=set(['samples']), output=None

{rbx_cp-0.5.17 → 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,
         )
     )
@@ -508,10 +508,17 @@ def stress(
             groups_by_name[testgroup] = TestcaseGroup(
                 name=testgroup, generatorScript=CodeItem(path=new_script_path)
             )
-            console.console.print(
-                f'[warning]A testgroup for [item]{new_script_path}[/item] will not be automatically added to the problem.rbx.yml file for you.\n'
-                'Please add it manually. [/warning]'
+            ru, problem_yml = package.get_ruyaml()
+            problem_yml['testcases'].append(
+                {
+                    'name': testgroup,
+                    'generatorScript': new_script_path.name,
+                }
             )
+            dest = package.find_problem_yaml()
+            assert dest is not None
+            utils.save_ruyaml(dest, ru, problem_yml)
+            package.clear_package_cache()
 
         if testgroup not in groups_by_name:
             break

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/package.py

@@ -1,7 +1,9 @@
 import functools
 import pathlib
+import sys
 from typing import Dict, List, Optional, Tuple
 
+import ruyaml
 import typer
 from pydantic import ValidationError
 
@@ -119,6 +121,17 @@ def save_package(
     problem_yaml_path.write_text(utils.model_to_yaml(package))
 
 
+def get_ruyaml() -> Tuple[ruyaml.YAML, ruyaml.Any]:
+    problem_yaml_path = find_problem_yaml()
+    if problem_yaml_path is None:
+        console.console.print(
+            f'Problem not found in {pathlib.Path().absolute()}', style='error'
+        )
+        raise typer.Exit(1)
+    res = ruyaml.YAML()
+    return res, res.load(problem_yaml_path.read_text())
+
+
 @functools.cache
 def get_problem_cache_dir(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
     cache_dir = find_problem(root) / '.box'
@@ -328,3 +341,12 @@ def get_compilation_files(code: CodeItem) -> List[Tuple[pathlib.Path, pathlib.Pa
             )
         )
     return res
+
+
+def clear_package_cache():
+    pkgs = [sys.modules[__name__]]
+
+    for pkg in pkgs:
+        for fn in pkg.__dict__.values():
+            if hasattr(fn, 'cache_clear'):
+                fn.cache_clear()

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/box/packaging/contest_main.py

@@ -6,7 +6,7 @@ import typer
 
 from rbx import annotations, console
 from rbx.box import cd, environment, package
-from rbx.box.contest import build_contest_statements, contest_package, contest_utils
+from rbx.box.contest import build_contest_statements, contest_package
 from rbx.box.packaging.main import run_packager
 from rbx.box.packaging.packager import (
     BaseContestPackager,
@@ -33,7 +33,7 @@ def run_contest_packager(
             f'Processing problem [item]{problem.short_name}[/item]...'
         )
         with cd.new_package_cd(problem.get_path()):
-            contest_utils.clear_package_cache()
+            package.clear_package_cache()
             package_path = run_packager(packager_cls, verification=verification)
             built_packages.append(
                 BuiltProblemPackage(

{rbx_cp-0.5.17 → 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:
@@ -628,10 +646,12 @@ def _print_solution_outcome(
 
     if has_sanitizer_warnings:
         console.print(
-            '[warning]WARNING[/warning] The solution had sanitizer errors or warnings, marked with [item]*[/item]. See their stderr for more details.'
+            '[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} [item]*[/item]'
-                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
@@ -830,13 +866,13 @@ async def print_run_report(
                 console.print(f'{i}/', end='')
                 console.print(get_testcase_markup_verdict(eval), end='')
                 if eval.result.sanitizer_warnings:
-                    console.print('[item]*[/item]', end='')
+                    console.print('[warning]*[/warning]', end='')
                 console.print('', end=' ')
                 group_evals.append(eval)
                 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.17 → rbx_cp-0.5.19}/rbx/grading/judge/sandboxes/timeit.py

@@ -200,14 +200,14 @@ def main():
                 os.kill(sub_pid, 9)
                 return
 
-        signal.alarm(1)
+        signal.setitimer(signal.ITIMER_REAL, 0.3)
 
-    signal.alarm(1)
+    signal.setitimer(signal.ITIMER_REAL, 0.3)
     signal.signal(signal.SIGALRM, handle_alarm)
     wait_and_finish(sub_pid, options, start_time, alarm_msg=alarm_msg)
 
     # Cancel alarm before exiting to avoid surprises.
-    signal.alarm(0)
+    signal.setitimer(signal.ITIMER_REAL, 0)
 
     # Exit gracefully.
     sys.exit()

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

@@ -1,5 +1,6 @@
 import functools
 import pathlib
+import re
 import shlex
 import shutil
 import subprocess
@@ -435,6 +436,23 @@ 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:.*')
+
+
+def _check_for_compilation_warnings_in_line(line: str) -> bool:
+    if line.startswith('./'):
+        return False
+    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(
     sandbox: SandboxBase, stderr_file: Optional[pathlib.Path]
 ) -> bool:
@@ -443,7 +461,9 @@ def _check_for_compilation_warnings(
     if not sandbox.file_exists(stderr_file):
         return False
     with sandbox.get_file(stderr_file) as f:
-        return any(line.strip() for line in f)
+        return any(
+            _check_for_compilation_warnings_in_line(line.strip().decode()) for line in f
+        )
 
 
 def compile(

{rbx_cp-0.5.17 → rbx_cp-0.5.19}/rbx/utils.py

@@ -9,6 +9,7 @@ from typing import Any, Optional, Type, TypeVar
 import rich
 import rich.prompt
 import rich.status
+import ruyaml
 import typer
 import yaml
 from fastapi.encoders import jsonable_encoder
@@ -91,6 +92,12 @@ def validate_field(model: Type[T], field: str, value: Any):
     )
 
 
+def save_ruyaml(path: pathlib.Path, yml: ruyaml.YAML, data: ruyaml.Any):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with path.open('w') as f:
+        yml.dump(data, f)
+
+
 def confirm_on_status(status: Optional[rich.status.Status], *args, **kwargs) -> bool:
     if status:
         status.stop()