rbx.cp 0.5.11__py3-none-any.whl → 0.5.13__py3-none-any.whl

rbx/box/builder.py

@@ -9,14 +9,23 @@ from rbx.box.solutions import (
     print_run_report,
     run_solutions,
 )
-from rbx.box.validators import print_validation_report, validate_testcases
+from rbx.box.validators import (
+    has_validation_errors,
+    print_validation_report,
+    validate_testcases,
+)
 
 
 def build(
     verification: environment.VerificationParam,
     groups: Optional[Set[str]] = None,
-    output: bool = True,
-) -> None:
+    output: Optional[bool] = True,
+) -> bool:
+    no_main_solution_report = False
+    if output is None:
+        output = package.get_main_solution() is not None
+        no_main_solution_report = not output
+
     with utils.StatusProgress(
         'Building testcases...',
         'Built [item]{processed}[/item] testcases...',
@@ -24,6 +33,28 @@ def build(
     ) as s:
         generate_testcases(s, groups=groups)
 
+    if verification > 0:
+        validator = package.get_validator_or_nil()
+        if validator is None:
+            console.console.print(
+                '[warning]No validator found, skipping validation.[/warning]'
+            )
+
+        if validator is not None:
+            with utils.StatusProgress(
+                'Validating testcases...',
+                'Validated [item]{processed}[/item] testcases...',
+                keep=True,
+            ) as s:
+                infos = validate_testcases(s, groups=groups)
+                print_validation_report(infos)
+
+        if has_validation_errors(infos):
+            console.console.print(
+                '[error]Validation failed, check the report above.[/error]'
+            )
+            return False
+
     with utils.StatusProgress(
         'Building outputs for testcases...',
         'Built [item]{processed}[/item] outputs...',
@@ -32,23 +63,22 @@ def build(
         if output:
             generate_outputs_for_testcases(s, groups=groups)
 
-    if verification > 0:
-        with utils.StatusProgress(
-            'Validating testcases...',
-            'Validated [item]{processed}[/item] testcases...',
-            keep=True,
-        ) as s:
-            infos = validate_testcases(s, groups=groups)
-            print_validation_report(infos)
-
     console.console.print(
         '[success]Problem built.[/success] '
         '[warning]Check the output for verification errors![/warning]'
     )
 
+    if no_main_solution_report:
+        console.console.print(
+            '[warning]No main solution found, skipping generating samples for the statement.[/warning]'
+        )
+
+    return True
+
 
 def verify(verification: environment.VerificationParam) -> bool:
-    build(verification=verification)
+    if not build(verification=verification):
+        return False
 
     if verification < VerificationLevel.FAST_SOLUTIONS.value:
         return True

rbx/box/cd.py

@@ -3,9 +3,8 @@ import pathlib
 from typing import Optional
 
 import typer
-from rich import console
 
-from rbx import utils
+from rbx import console, utils
 
 
 def find_package(root: pathlib.Path = pathlib.Path()) -> Optional[pathlib.Path]:

rbx/box/checkers.py

@@ -119,6 +119,31 @@ def check(
     )
     message = package.get_digest_as_string(error.value or '') or ''
 
+    if (
+        checker_run_log is not None
+        and checker_run_log.exitcode != 0
+        and (
+            checker_run_log.exitstatus != SandboxBase.EXIT_NONZERO_RETURN
+            or checker_run_log.exitcode not in [0, 1, 2, 3]
+        )
+    ):
+        console.console.print(
+            f'[error]Checker [item]{package.get_checker().path}[/item] failed unexpectedly.[/error]'
+        )
+        console.console.print(
+            f'[error]Summary:[/error] {checker_run_log.get_summary()}'
+        )
+        console.console.print(
+            f'[error]Testcase input:[/error] [item]{testcase.inputPath}[/item]'
+        )
+        console.console.print(
+            f'[error]Testcase output:[/error] [item]{testcase.outputPath}[/item]'
+        )
+        console.console.print(
+            f'[error]Program output:[/error] [item]{program_output}[/item]'
+        )
+        raise typer.Exit(1)
+
     if checker_run_log is None or checker_run_log.exitcode not in [0, 1, 2, 3]:
         return CheckerResult(outcome=Outcome.INTERNAL_ERROR)
 

rbx/box/compile.py

@@ -22,35 +22,29 @@ def _compile(item: CodeItem):
     out_path.chmod(0o755)
 
     console.console.print(
-        f'[success]Compiled file written at [item]{out_path}[/item].[/success]'
+        f'[success]Compiled file written at [item]{out_path}[/item][/success]'
     )
 
 
-@app.command('any, a', help='Compile an asset given its path.')
-@package.within_problem
 def any(path: str):
-    _compile(CodeItem(path=pathlib.Path(path)))
-
-
-@app.command('solution, s', help='Compile a solution given its path.')
-@package.within_problem
-def solution(path: str):
-    _compile(package.get_solution(path))
+    pkg = package.find_problem_package_or_die()
 
+    solution = package.get_solution_or_nil(path)
+    if solution is not None:
+        _compile(solution)
+        return
 
-@app.command('generator, gen, g', help='Compile a generator given its name.')
-@package.within_problem
-def generator(name: str):
-    _compile(package.get_generator(name))
+    for generator in pkg.generators:
+        if generator.path == pathlib.Path(path) or generator.name == path:
+            _compile(generator)
+            return
 
+    if pkg.checker is not None and pkg.checker.path == pathlib.Path(path):
+        _compile(pkg.checker)
+        return
 
-@app.command('checker, c', help='Compile the checker.')
-@package.within_problem
-def checker():
-    _compile(package.get_checker())
+    if pkg.validator is not None and pkg.validator.path == pathlib.Path(path):
+        _compile(pkg.validator)
+        return
 
-
-@app.command('validator, v', help='Compile the main validator.')
-@package.within_problem
-def validator():
-    _compile(package.get_validator())
+    _compile(CodeItem(path=pathlib.Path(path)))

rbx/box/contest/contest_package.py

@@ -3,6 +3,7 @@ import pathlib
 from typing import List, Optional
 
 import typer
+from pydantic import ValidationError
 
 from rbx import console, utils
 from rbx.box.contest.schema import Contest
@@ -30,7 +31,12 @@ def find_contest_package(root: pathlib.Path = pathlib.Path()) -> Optional[Contes
     contest_yaml_path = find_contest_yaml(root)
     if not contest_yaml_path:
         return None
-    return utils.model_from_yaml(Contest, contest_yaml_path.read_text())
+    try:
+        return utils.model_from_yaml(Contest, contest_yaml_path.read_text())
+    except ValidationError as e:
+        console.console.print(e)
+        console.console.print('[error]Error parsing contest.rbx.yml.[/error]')
+        raise typer.Exit(1) from e
 
 
 def find_contest_package_or_die(root: pathlib.Path = pathlib.Path()) -> Contest:

rbx/box/contest/main.py

@@ -160,6 +160,32 @@ def add(path: str, short_name: str, preset: Optional[str] = None):
     )
 
 
+@app.command('remove, r', help='Remove problem from contest.')
+@within_contest
+def remove(path_or_short_name: str):
+    contest = find_contest_package_or_die()
+
+    kept_problems = []
+    removed_problems = []
+    for problem in 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)
+
+    contest.problems = kept_problems
+    save_contest(contest)
+
+    for problem in removed_problems:
+        shutil.rmtree(str(problem.path), ignore_errors=True)
+        console.console.print(
+            f'Problem [item]{problem.short_name}[/item] removed from contest at [item]{problem.path}[/item].'
+        )
+
+
 @app.command(
     'each',
     help='Run a command for each problem in the contest.',

rbx/box/contest/statements.py

@@ -51,7 +51,14 @@ def build(
             )
             with utils.new_cd(problem.get_path()):
                 contest_utils.clear_package_cache()
-                builder.build(verification=verification, groups=set(['samples']))
+
+                if not builder.build(
+                    verification=verification, groups=set(['samples']), output=None
+                ):
+                    console.console.print(
+                        '[error]Failed to build statements with samples, aborting.[/error]'
+                    )
+                    raise typer.Exit(1)
 
     contest = find_contest_package_or_die()
     candidate_languages = languages

rbx/box/environment.py

@@ -4,7 +4,7 @@ from enum import Enum
 from typing import Annotated, List, Optional, Type, TypeVar
 
 import typer
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, ValidationError
 
 from rbx import config, console, utils
 from rbx.box.extensions import Extensions, LanguageExtensions
@@ -19,9 +19,8 @@ class VerificationLevel(Enum):
     NONE = 0
     VALIDATE = 1
     FAST_SOLUTIONS = 2
-    ASAN = 3
-    ALL_SOLUTIONS = 4
-    FULL = 5
+    ALL_SOLUTIONS = 3
+    FULL = 4
 
 
 VerificationParam = Annotated[
@@ -31,7 +30,7 @@ VerificationParam = Annotated[
         '--verification',
         '-v',
         help='Verification level to use when building package.',
-        default_factory=lambda: VerificationLevel.ALL_SOLUTIONS.value,
+        default_factory=lambda: VerificationLevel.FULL.value,
     ),
 ]
 
@@ -193,7 +192,14 @@ def get_environment(env: Optional[str] = None) -> Environment:
             f'Environment file [item]{env_path}[/item] not found.', style='error'
         )
         raise typer.Exit()
-    return utils.model_from_yaml(Environment, env_path.read_text())
+    try:
+        return utils.model_from_yaml(Environment, env_path.read_text())
+    except ValidationError as e:
+        console.console.print(e)
+        console.console.print(
+            f'[error]Error parsing environment file [item]{env_path}[/item].[/error]'
+        )
+        raise typer.Exit(1) from e
 
 
 @functools.cache

rbx/box/generators.py

@@ -82,6 +82,8 @@ def _run_generator(
         console.console.print(
             f'[error]Failed generating test {i} from group path {group_path}[/error]',
         )
+        if run_log is not None:
+            console.console.print(f'[error]Summary:[/error] {run_log.get_summary()}')
         if generation_stderr.value is not None:
             console.console.print('[error]Stderr:[/error]')
             console.console.print(
@@ -142,9 +144,7 @@ def generate_output_for_testcase(
             f'[error]Failed generating output for [item]{testcase.inputPath}[/item][/error]',
         )
         if run_log is not None:
-            console.console.print(
-                f'[error]Main solution exited with code [item]{-run_log.exitcode}[/item][/error]',
-            )
+            console.console.print(f'[error]Summary:[/error] {run_log.get_summary()}')
             checker_result = checkers.check_with_no_output(run_log)
             console.console.print(
                 f'[warning]Time: [item]{run_log.time:.2f}s[/item][/warning]',
@@ -238,7 +238,7 @@ def _run_generator_script(testcase: TestcaseSubgroup, cacher: FileCacher) -> str
             )
             if run_log is not None:
                 console.console.print(
-                    f'[error]Script exited with code [item]{-run_log.exitcode}[/item][/error]',
+                    f'[error]Summary:[/error] {run_log.get_summary()}'
                 )
             if run_stderr.value is not None:
                 console.console.print('[error]Stderr:[/error]')
@@ -341,6 +341,10 @@ def generate_standalone(
         console.console.print(
             f'[error]Failed generating test using generator call [info]{call.name} {expanded_args_str}[/info].[/error]',
         )
+        if generation_log is not None:
+            console.console.print(
+                f'[error]Summary:[/error] {generation_log.get_summary()}'
+            )
         if generation_stderr.value is not None:
             console.console.print('[error]Stderr:[/error]')
             console.console.print(

rbx/box/main.py

@@ -3,11 +3,12 @@ from gevent import monkey
 
 monkey.patch_all()
 
+import tempfile
 import shlex
 import sys
 import typing
 
-from rbx.box.schema import CodeItem, ExpectedOutcome
+from rbx.box.schema import CodeItem, ExpectedOutcome, TestcaseGroup
 
 
 import pathlib
@@ -31,6 +32,7 @@ from rbx.box import (
     compile,
     presets,
     stresses,
+    validators,
 )
 from rbx.box.contest import main as contest
 from rbx.box.environment import VerificationLevel, get_environment_path
@@ -69,9 +71,6 @@ app.add_typer(
 app.add_typer(
     contest.app, name='contest', cls=annotations.AliasGroup, help='Contest management.'
 )
-app.add_typer(
-    compile.app, name='compile', cls=annotations.AliasGroup, help='Compile assets.'
-)
 
 
 @app.command('ui', hidden=True)
@@ -96,13 +95,6 @@ def build(verification: environment.VerificationParam):
     builder.build(verification=verification)
 
 
-@app.command('verify, v', help='Build and verify all the tests for the problem.')
-@package.within_problem
-def verify(verification: environment.VerificationParam):
-    if not builder.verify(verification=verification):
-        console.console.print('[error]Verification failed, check the report.[/error]')
-
-
 @app.command('run, r', help='Build and run solution(s).')
 @package.within_problem
 def run(
@@ -139,7 +131,14 @@ def run(
         )
         check = False
 
-    builder.build(verification=verification, output=check)
+    if not builder.build(verification=verification, output=check):
+        return
+
+    if verification <= VerificationLevel.VALIDATE.value:
+        console.console.print(
+            '[warning]Verification level is set to [item]validate (-v1)[/item], so rbx only build tests and validated them.[/warning]'
+        )
+        return
 
     with utils.StatusProgress('Running solutions...') as s:
         tracked_solutions = None
@@ -206,6 +205,12 @@ def irun(
         console.console.print(
             '[warning]Outputs will be written to files. If you wish to print them to the terminal, use the "-p" parameter.'
         )
+    if verification < VerificationLevel.ALL_SOLUTIONS.value:
+        console.console.print(
+            '[warning]Verification level should be at least [item]all solutions (-v4)[/item] to run solutions interactively.'
+        )
+        return
+
     main_solution = package.get_main_solution()
     if check and main_solution is None:
         console.console.print(
@@ -248,7 +253,13 @@ def create(
 @app.command('stress', help='Run a stress test.')
 @package.within_problem
 def stress(
-    name: str,
+    name: Annotated[
+        str,
+        typer.Argument(
+            help='Name of the stress test to run (specified in problem.rbx.yml), '
+            'or the generator to run, in case -g is specified.'
+        ),
+    ],
     generator_args: Annotated[
         Optional[str],
         typer.Option(
@@ -325,9 +336,27 @@ def stress(
 
         testgroup = questionary.select(
             'Choose the testgroup to add the tests to.\nOnly test groups that have a .txt generatorScript are shown below: ',
-            choices=list(groups_by_name) + ['(skip)'],
+            choices=list(groups_by_name) + ['(create new script)', '(skip)'],
         ).ask()
 
+        if testgroup == '(create new script)':
+            new_script_name = questionary.text(
+                'Enter the name of the new .txt generatorScript file: '
+            ).ask()
+            new_script_path = pathlib.Path(new_script_name).with_suffix('.txt')
+            new_script_path.parent.mkdir(parents=True, exist_ok=True)
+            new_script_path.touch()
+
+            # Temporarily create a new testgroup with the new script.
+            testgroup = new_script_path.stem
+            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]'
+            )
+
         if testgroup not in groups_by_name:
             break
         try:
@@ -355,6 +384,47 @@ def stress(
         break
 
 
+@app.command('compile', help='Compile an asset given its path.')
+@package.within_problem
+def compile_command(
+    path: Annotated[str, typer.Argument(help='Path to the asset to compile.')],
+):
+    compile.any(path)
+
+
+@app.command('validate', help='Run the validator in a one-off fashion, interactively.')
+@package.within_problem
+def validate(
+    path: Annotated[
+        Optional[str],
+        typer.Option('--path', '-p', help='Path to the testcase to validate.'),
+    ] = None,
+):
+    validator_tuple = validators.compile_main_validator()
+    if validator_tuple is None:
+        console.console.print('[error]No validator found for this problem.[/error]')
+        raise typer.Exit(1)
+
+    validator, validator_digest = validator_tuple
+
+    input = console.multiline_prompt('Testcase input')
+
+    if path is None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmppath = pathlib.Path(tmpdir) / '000.in'
+            tmppath.write_text(input)
+
+            info = validators.validate_one_off(
+                pathlib.Path(tmppath), validator, validator_digest
+            )
+    else:
+        info = validators.validate_one_off(
+            pathlib.Path(path), validator, validator_digest
+        )
+
+    validators.print_validation_report([info])
+
+
 @app.command('environment, env', help='Set or show the current box environment.')
 def environment_command(
     env: Annotated[Optional[str], typer.Argument()] = None,
@@ -417,10 +487,17 @@ def activate():
             console.console.print(
                 '[error]Preset is not installed. Install it manually, or specify a URI in [item].preset-lock.yml[/item].[/error]'
             )
-            raise
+            raise typer.Exit(1)
         presets.install(preset_lock.uri)
 
     preset = presets.get_installed_preset(preset_lock.preset_name)
+
+    # Install the environment from the preset if it's not already installed.
+    presets.optionally_install_environment_from_preset(
+        preset, root=presets.get_preset_installation_path(preset_lock.name)
+    )
+
+    # Activate the environment.
     if preset.env is not None:
         environment_command(preset.name)
 

rbx/box/package.py

@@ -3,6 +3,7 @@ import pathlib
 from typing import Dict, List, Optional, Tuple
 
 import typer
+from pydantic import ValidationError
 
 from rbx import config, console, utils
 from rbx.box import environment
@@ -74,7 +75,12 @@ def find_problem_package(root: pathlib.Path = pathlib.Path()) -> Optional[Packag
     problem_yaml_path = find_problem_yaml(root)
     if not problem_yaml_path:
         return None
-    return utils.model_from_yaml(Package, problem_yaml_path.read_text())
+    try:
+        return utils.model_from_yaml(Package, problem_yaml_path.read_text())
+    except ValidationError as e:
+        console.console.print(e)
+        console.console.print('[error]Error parsing problem.rbx.yml.[/error]')
+        raise typer.Exit(1) from e
 
 
 def find_problem_package_or_die(root: pathlib.Path = pathlib.Path()) -> Package:

rbx/box/presets/__init__.py

@@ -294,6 +294,18 @@ def get_installed_preset(name: str, root: pathlib.Path = pathlib.Path()) -> Pres
     return preset
 
 
+def optionally_install_environment_from_preset(
+    preset: Preset, root: pathlib.Path = pathlib.Path()
+):
+    if preset.env is None:
+        return
+    env_path = get_environment_path(preset.name)
+    if env_path.is_file():
+        return
+    env_path.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copyfile(str(root / preset.env), env_path)
+
+
 def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
     preset = get_preset_yaml(root)
 

rbx/box/solutions.py

@@ -378,6 +378,7 @@ def _run_interactive_solutions(
     shutil.rmtree(str(irun_dir), ignore_errors=True)
     irun_dir.mkdir(parents=True, exist_ok=True)
     inputs_dir = irun_dir / 'inputs'
+    inputs_dir.mkdir(parents=True, exist_ok=True)
     input_path = inputs_dir / '000.in'
     output_path = input_path.with_suffix('.out')
 
@@ -479,10 +480,14 @@ def get_testcase_markup_verdict(eval: Evaluation) -> str:
 
 
 def _get_evals_time_in_ms(evals: List[Evaluation]) -> int:
+    if not evals:
+        return 0
     return max(int((eval.log.time or 0.0) * 1000) for eval in evals)
 
 
 def _get_evals_memory_in_mb(evals: List[Evaluation]) -> int:
+    if not evals:
+        return 0
     return max(int(eval.log.memory or 0) // (1024 * 1024) for eval in evals)
 
 
@@ -504,6 +509,7 @@ def _print_solution_outcome(
 ) -> bool:
     pkg = package.find_problem_package_or_die()
 
+    has_plain_tle = False
     bad_verdicts = set()
     no_tle_bad_verdicts = set()
     for eval in evals:
@@ -514,6 +520,10 @@ def _print_solution_outcome(
             and eval.result.no_tle_outcome != Outcome.ACCEPTED
         ):
             no_tle_bad_verdicts.add(eval.result.no_tle_outcome)
+        has_plain_tle = has_plain_tle or (
+            eval.result.outcome == Outcome.TIME_LIMIT_EXCEEDED
+            and eval.result.no_tle_outcome is None
+        )
 
     unmatched_bad_verdicts = set(
         v for v in bad_verdicts if not solution.outcome.match(v)
@@ -542,16 +552,27 @@ def _print_solution_outcome(
         verification.value >= VerificationLevel.FULL.value
         # Solution expects a TLE.
         and expected_outcome_is_tle
-        # A TLE (or similar) has happened.
-        and matched_bad_verdicts
-        # The solution has no other bad verdicts except for TLEs in double TL.
-        and not ((bad_verdicts | no_tle_bad_verdicts) - {Outcome.TIME_LIMIT_EXCEEDED})
-        # The solution passes in double TL.
+        # Solution does not have a plain TLE.
+        and not has_plain_tle
+        # A TLE has happened.
+        and Outcome.TIME_LIMIT_EXCEEDED in matched_bad_verdicts
+        # The solution runs in double TL.
         and evals_time < pkg.timelimit_for_language(solution.language) * 2
     ):
-        console.print(
-            '[yellow]WARNING[/yellow] The solution still passed in double TL.'
-        )
+        other_verdicts = (bad_verdicts | no_tle_bad_verdicts) - {
+            Outcome.TIME_LIMIT_EXCEEDED
+        }
+        if not other_verdicts:
+            # The solution has no other bad verdicts except for TLEs in double TL.
+            console.print(
+                '[yellow]WARNING[/yellow] The solution still passed in double TL.'
+            )
+        elif not (bad_verdicts - {Outcome.TIME_LIMIT_EXCEEDED}):
+            # The solution has other bad soft TLE outcomes.
+            other_verdicts_names = ' '.join(v.name for v in other_verdicts)
+            console.print(
+                f'[yellow]WARNING[/yellow] The solution could still run under double TL, but failed with [item]{other_verdicts_names}[/item].'
+            )
     console.print(f'Time: {get_evals_formatted_time(evals)}')
     console.print(f'Memory: {get_evals_formatted_memory(evals)}')
     return len(unmatched_bad_verdicts) == 0
@@ -787,6 +808,9 @@ def print_run_report(
     print_last_solution()
 
     items.seek(0)
-    _print_timing(console, result.skeleton, list(structured_evaluations)[-1])
+    structured_evaluations_list = list(structured_evaluations)
+
+    if structured_evaluations_list:
+        _print_timing(console, result.skeleton, structured_evaluations_list[-1])
 
     return ok

rbx/box/statements/build_statements.py

@@ -330,7 +330,15 @@ def build(
 ):
     # At most run the validators, only in samples.
     if samples:
-        builder.build(verification=verification, groups=set(['samples']))
+        if not builder.build(
+            verification=verification,
+            groups=set(['samples']),
+            output=None,
+        ):
+            console.console.print(
+                '[error]Failed to build statements with samples, aborting.[/error]'
+            )
+            raise typer.Exit(1)
 
     pkg = package.find_problem_package_or_die()
     candidate_languages = languages

rbx/box/stresses.py

@@ -104,6 +104,8 @@ def run_stress(
         if time.monotonic() - startTime > timeoutInSeconds:
             break
 
+        executed += 1
+
         if progress:
             seconds = timeoutInSeconds - int(time.monotonic() - startTime)
             progress.update(
@@ -259,7 +261,6 @@ def run_stress(
         )
 
         # Be cooperative.
-        executed += 1
         time.sleep(0.001)
 
     return StressReport(findings=findings, executed=executed)

rbx/box/validators.py

@@ -2,6 +2,7 @@ import pathlib
 import shlex
 from typing import Dict, List, Optional, Set, Tuple
 
+import typer
 from pydantic import BaseModel
 
 from rbx import console
@@ -9,6 +10,7 @@ from rbx.box import package
 from rbx.box.code import compile_item, run_item
 from rbx.box.schema import CodeItem, Primitive
 from rbx.box.testcases import find_built_testcase_inputs
+from rbx.grading.judge.sandbox import SandboxBase
 from rbx.grading.steps import (
     DigestHolder,
     DigestOrDest,
@@ -52,6 +54,9 @@ def _process_bounds(log: str) -> HitBounds:
         k, v = items
         v = v.strip()
 
+        if 'constant-bounds' in k:
+            continue
+
         hit = ('min-value-hit' in v, 'max-value-hit' in v)
         if k not in bounds:
             bounds[k] = hit
@@ -108,6 +113,18 @@ def _validate_testcase(
         ],
         extra_args=shlex.join(var_args) if var_args else None,
     )
+
+    if (
+        run_log is not None
+        and run_log.exitcode != 0
+        and run_log.exitstatus != SandboxBase.EXIT_NONZERO_RETURN
+    ):
+        console.console.print(
+            f'[error]Validator [item]{validator.path}[/item] failed unexpectedly.[/error]'
+        )
+        console.console.print(f'[error]Summary:[/error] {run_log.get_summary()}')
+        raise typer.Exit(1)
+
     log_overview = ''
     if log_digest.value is not None:
         log_overview = package.get_digest_as_string(log_digest.value or '')
@@ -138,6 +155,22 @@ def compile_main_validator() -> Optional[Tuple[CodeItem, str]]:
     return pkg.validator, _compile_validator(pkg.validator)
 
 
+def validate_one_off(
+    testcase: pathlib.Path,
+    validator: CodeItem,
+    validator_digest: str,
+) -> TestcaseValidationInfo:
+    ok, message, _ = validate_test(testcase, validator, validator_digest)
+    info = TestcaseValidationInfo(
+        group='interactive',
+        path=testcase,
+        ok=ok,
+        hit_bounds={},
+        message=message,
+    )
+    return info
+
+
 def compile_validators(
     progress: Optional[StatusProgress] = None,
 ) -> Dict[str, str]:
@@ -202,6 +235,10 @@ def validate_testcases(
     return validation_info
 
 
+def has_validation_errors(infos: List[TestcaseValidationInfo]) -> bool:
+    return any(not info.ok for info in infos)
+
+
 def print_validation_report(infos: List[TestcaseValidationInfo]):
     console.console.rule('Validation report', style='status')
     hit_bounds_per_group: Dict[str, HitBounds] = {}
@@ -218,6 +255,10 @@ def print_validation_report(infos: List[TestcaseValidationInfo]):
             [hit_bounds_per_group[info.group], info.hit_bounds]
         )
 
+    if not hit_bounds_per_group:
+        console.console.print()
+        return
+
     if not _has_group_specific_validator():
         hit_bounds_per_group = {None: _merge_hit_bounds(hit_bounds_per_group.values())}
 

rbx/grading/steps.py

@@ -1,5 +1,8 @@
+import functools
+import os
 import pathlib
 import shlex
+import shutil
 import subprocess
 from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -151,6 +154,13 @@ class RunLog(BaseModel):
             return None
         return self.metadata.language
 
+    def get_summary(self) -> str:
+        if self.exitcode == 0:
+            return 'OK'
+        time = self.time or 0.0
+        memory = self.memory or 0
+        return f'FAILED with exit code {self.exitcode} and sandbox status {self.exitstatus} (time: {time}s, memory: {memory//(1024*1024)}MB)'
+
 
 class TestcaseLog(RunLog):
     stdout_absolute_path: Optional[pathlib.Path] = None
@@ -250,10 +260,26 @@ def _split_and_expand(command: str, sandbox: SandboxBase) -> List[str]:
     return res
 
 
+def _is_c_command(exe_command: str) -> bool:
+    return exe_command.endswith('gcc') or exe_command.endswith('clang')
+
+
 def _is_cpp_command(exe_command: str) -> bool:
     return exe_command.endswith('g++') or exe_command.endswith('clang++')
 
 
+@functools.cache
+def _complain_about_clang() -> None:
+    console.print(
+        '[warning]Notice your C++ files are being compiled with [item]clang[/item] instead of [item]g++[/item].[/warning]'
+    )
+    console.print('[warning]This may lead to unexpected behavior.[/warning]')
+    console.print('[warning]Consider using [item]g++[/item] instead.[/warning]')
+    console.print(
+        '[warning]See [item]https://rsalesc.github.io/rbx/cpp-on-macos[/item] for instructions on how to use [item]g++[/item] on MacOS.'
+    )
+
+
 def _maybe_get_bits_stdcpp_for_clang(command: str) -> Optional[GradingFileInput]:
     cmds = shlex.split(command)
     if not cmds:
@@ -274,6 +300,7 @@ def _maybe_get_bits_stdcpp_for_clang(command: str) -> Optional[GradingFileInput]
     if 'clang' not in lines[0]:
         return None
 
+    _complain_about_clang()
     bits = get_bits_stdcpp()
     return GradingFileInput(src=bits, dest=pathlib.Path('bits/stdc++.h'))
 
@@ -288,12 +315,45 @@ def _maybe_get_bits_stdcpp_for_commands(
     return None
 
 
+@functools.cache
+def _try_following_alias_for_exe(exe: str) -> Optional[str]:
+    if _is_c_command(exe) and os.environ.get('RBX_C_PATH'):
+        return os.environ['RBX_C_PATH']
+    if _is_cpp_command(exe) and os.environ.get('RBX_CXX_PATH'):
+        return os.environ['RBX_CXX_PATH']
+    output = subprocess.run(
+        f'which {exe}', shell=True, executable=shutil.which('bash'), capture_output=True
+    )
+    if output.returncode != 0:
+        return None
+    return output.stdout.decode().strip()
+
+
+def _try_following_alias_for_command(command: str) -> str:
+    cmds = shlex.split(command)
+    if not cmds:
+        return command
+    exe = cmds[0]
+    new_exe = _try_following_alias_for_exe(exe)
+    if new_exe is None:
+        return command
+    return shlex.join([new_exe, *cmds[1:]])
+
+
+def _try_following_alias_for_commands(commands: List[str]) -> List[str]:
+    res: List[str] = []
+    for command in commands:
+        res.append(_try_following_alias_for_command(command))
+    return res
+
+
 def compile(
     commands: List[str],
     params: SandboxParams,
     sandbox: SandboxBase,
     artifacts: GradingArtifacts,
 ) -> bool:
+    commands = _try_following_alias_for_commands(commands)
     bits_artifact = _maybe_get_bits_stdcpp_for_commands(commands)
     if bits_artifact is not None:
         _process_input_artifacts(GradingArtifacts(inputs=[bits_artifact]), sandbox)

{rbx_cp-0.5.11.dist-info → rbx_cp-0.5.13.dist-info}/METADATA

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

{rbx_cp-0.5.11.dist-info → rbx_cp-0.5.13.dist-info}/RECORD

@@ -2,27 +2,27 @@ 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=rClPi3p4dYDHAjy8nE6YZtXwB19In1xvMBxvZQY0up4,2330
-rbx/box/cd.py,sha256=2MJjcO-4sxF7HoAI9Suxny7veR-27fA4pP1DxQNQkBI,972
-rbx/box/checkers.py,sha256=3luGMotNvDzqwbnYaxlAWzsUL7iW24gGG0wy28re0bo,4484
+rbx/box/builder.py,sha256=QVKp7VL7YC8xs4oevcsam8DT_tjkSqu76nUoad1EwVY,3229
+rbx/box/cd.py,sha256=NF0gqQso7a1IZzzZ6YJU8ip744AYAQ8Hp7vuzBRmZak,956
+rbx/box/checkers.py,sha256=u5Pk-xViWxb_-KqAdEvnydbfppkYg0lBYoRQl5m_U_4,5380
 rbx/box/code.py,sha256=0UfxzemrObXQq-cvAtSAImCm4sKV_4Xog-TMUZBRFwc,5761
-rbx/box/compile.py,sha256=2xc8c6yDcEof-z0XmUdQHN4PrR9fXDGWeHKuXxDUKj8,1436
+rbx/box/compile.py,sha256=DHf9MNhfigXufe3Q5LghuTNsAYcpCoFho-6nG8F0t38,1315
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/contest/build_contest_statements.py,sha256=qar6h5u1xAlOKHl3P7-A1d0aYtaqu4PspGw_DYUGOLY,11260
-rbx/box/contest/contest_package.py,sha256=-eHk6CfJ083jZptWCjR0F4x_r9qsmKeSOUvK0QnDyA4,2393
+rbx/box/contest/contest_package.py,sha256=GhZZSOC95wbypyeKFDgUIaaTjhldASudQBvjvurHbDw,2623
 rbx/box/contest/contest_utils.py,sha256=vWv4iNWdJT5motAznfdNzl8o-tEoCU4xmdyaPTPJZuY,490
-rbx/box/contest/main.py,sha256=BKq_n60BstfSHakvNDUP9lu5LNptx38EN8fYPduS8pU,6171
+rbx/box/contest/main.py,sha256=FeTe_Qz9t233dTe1QQ6DxMDq5mcXHx59x9vgaLM8vTY,6976
 rbx/box/contest/schema.py,sha256=rxzjJasMWPKKhvSJs4eW4A2oCiA4gXgfF-MzqsbPslQ,4914
-rbx/box/contest/statements.py,sha256=iG_E4bqhc7hof4LlAliw4m9VO8HcDzvnhsWmxzVRQM4,2690
+rbx/box/contest/statements.py,sha256=cRK5ndsywotUm66QqvtReqVAc-fW4c-2OZufK3Xd8_c,2947
 rbx/box/creation.py,sha256=mVHVVj8ozX9D5qpkLewE5WSjF6HtTm74Pkwubk-bATg,2259
 rbx/box/download.py,sha256=MFP-R26JiYGAP89I0TK-0fYc69Fsd20tsBqgtRCy5AE,2234
-rbx/box/environment.py,sha256=i-IGHDyFDaYF1fyr0QHdGZ3z4NWp5sj6nxsbnxhAYq4,10924
+rbx/box/environment.py,sha256=ocUKoVAxa-vAun0lv_BLJdYj4uqLh3mknHTxIssTDP0,11160
 rbx/box/extensions.py,sha256=p0iLaU28KswOBDX2HGVO_dR2gk-JSAWb6sXC6GZ1d0w,738
-rbx/box/generators.py,sha256=27Q8sVWTG4d8UT6Si-YJ83zZ3jEnu1Urmk-audRYoFk,16111
+rbx/box/generators.py,sha256=XiPg3uJuhBeJNN363_aSlvMwmrH5XNYSiTAEjL1GDYI,16304
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
-rbx/box/main.py,sha256=DA0B_OmWmeWj_xpNEKs5syQEmg2_zbOrTGZVVK3eW0o,13639
-rbx/box/package.py,sha256=UR3BxVbTZ6eYJfdsTTx4l8FfdZ1wsnaHAmAdMr07lww,10302
+rbx/box/main.py,sha256=2CcJ1xRk-VV7snd3zu1w58-3LP7Dlhn7ZJslmowWDA4,16441
+rbx/box/package.py,sha256=Hds0WIvhAWXnYOmIXGULcLLVeFM1YkllOPSKHB5QSkk,10532
 rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
 rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
 rbx/box/packaging/contest_main.py,sha256=ypiBS8dd0yCqoFJIqiK1Fo02dQmUB_G-Z7G926jomrk,2746
@@ -31,21 +31,21 @@ rbx/box/packaging/packager.py,sha256=suCT_SLnWa915rV2j8VFqzH43HGKRTr9mGGlrvj45aw
 rbx/box/packaging/polygon/packager.py,sha256=CcjHzDr4MwSyp270gsPY6RWoz8bUJeykDqXPvQ3XZ1U,10773
 rbx/box/packaging/polygon/test.py,sha256=bgEju5PwudgyfwxXJagm8fM6CJVlWM6l_-2q1V-oKaQ,3069
 rbx/box/packaging/polygon/xml_schema.py,sha256=-r24bCeRMGLrGGoT9FIgmqr87xHL-JzrFaR6bztbYtw,2703
-rbx/box/presets/__init__.py,sha256=6IHzqczfiuCdvuXWInimYd9sVMYUQR12BlFaxdr39hI,16721
+rbx/box/presets/__init__.py,sha256=ic-lLHXHeHKE7yov_pq_ec8pcfhMuik8HGHxeqE3Cvk,17072
 rbx/box/presets/fetch.py,sha256=F-BCOlvEBEyDqtOhiDuGPn4EDtA4Bwm-fqHJ7zZGlW8,1975
 rbx/box/presets/lock_schema.py,sha256=6sRPnyePOC8yy-5WcD5JRZdDJHf8loqbvpQ1IPiOU9s,349
 rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,1962
 rbx/box/schema.py,sha256=RBQmFxr35LfaRwbxR6WezeQQ3twqh9VS3tn20rlRm_I,12580
-rbx/box/solutions.py,sha256=snhPubO6TN3DkYD_51GAUbOZJ8iB863B43-mIQELNmY,26389
+rbx/box/solutions.py,sha256=3WRhLcD_xknQb6KSjNVj7L-QHtsAmqZzHQ-LaU9oobI,27358
 rbx/box/solutions_test.py,sha256=DetQj7ZVnV3tBXBpCrFeK_Yv3XUtdEf29y_6qnyeyfY,1496
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/statements/build_statements.py,sha256=YInK5Upc8rT-DCVCXe_3ZBosHn0Zw19m3Pv4wUmqKL4,11678
+rbx/box/statements/build_statements.py,sha256=24ZUM5H33NhmqnDL0ofA1anUKWxuZG1paA1tCV4AKns,11911
 rbx/box/statements/builders.py,sha256=W3VkmtjfzrT5MkIVXgfR9fM-OWK007ihm5hfzvp9cfc,10474
 rbx/box/statements/joiners.py,sha256=ZbxomnMjEFT8yf5WSWUB4tBa3DL3AhjGEuh8uqHyDdg,2837
 rbx/box/statements/latex.py,sha256=LkcHwXjMFxbw--Gj9T1VkFKQFsXhY9dN7xZHpZycNW8,1346
 rbx/box/statements/latex_jinja.py,sha256=7WBfn1h8DpqCAmSE6Av64HfURMnJ2AO4QX1CD72sz5E,7096
 rbx/box/statements/schema.py,sha256=g3KgBn4nIqx-0utH8R2FCqPmJP969chhYfn96chQgd4,3851
-rbx/box/stresses.py,sha256=mbKa70QyPOmgXfhGcArTKsdXjH0PFDVmydY3W8bgZlk,10596
+rbx/box/stresses.py,sha256=vENwbFO9QPR5MAarfW5D8g3CNr8AC_DewIP9EmT3he0,10597
 rbx/box/stressing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/stressing/finder_parser.py,sha256=Hw9m2viRGnVqVgO39D51s2qAEjZK1LKWe94rkqCx7VA,11919
 rbx/box/stressing/generator_parser.py,sha256=oHZryjR3YohgaSO9WEirQ7b2e-98WgZStF0N99W4Thw,7380
@@ -55,7 +55,7 @@ rbx/box/ui/captured_log.py,sha256=ptICDPViVnz-_2NfrcB0SSBXNW5L74zI-vAZNN7kSok,11
 rbx/box/ui/css/app.tcss,sha256=apd5PkPEvl5jK3kE2qrxPyVED1VnvSsj08QQwzUPwEA,786
 rbx/box/ui/main.py,sha256=b0rHcBF42W4AOCv7WhtiGf_rUnY0yxpqO5oj3wfR4R4,984
 rbx/box/ui/run.py,sha256=wMEXrEFdQvMHz2hRKAFIithTnTtaL0kNQZu0jKmb8jI,7060
-rbx/box/validators.py,sha256=KFpBFtyTfIwjQjW3_qvyBoGQqJ06ELo5kuQGNz4Pi0s,7222
+rbx/box/validators.py,sha256=RvDukBK_lA-321cDNIXS2dy9cv9iz-z_f4xcFMFE7a0,8310
 rbx/box/validators_test.py,sha256=hriR6rD32Ouu64eKYYTPLZVvqMxXj7Q2h1l_JAefL7U,344
 rbx/checker.py,sha256=pj1jO3my48ru-qugbER5onccANCjoR0-PaFe3H3VGEY,4118
 rbx/clone.py,sha256=Fyjnr3Bp0xmUIZH6DkAGcGc2n3P5PDdoVszIYJbUmwM,6745
@@ -78,7 +78,7 @@ rbx/grading/judge/sandboxes/timeit.py,sha256=rOQnxf90hhTrWOQ1Mt57HNhZAAn1jDULtMj
 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=VyJnbWl7S0rpkMupN2Os5zjfvEvI2XlcaSt8cNRjgUQ,16398
+rbx/grading/steps.py,sha256=s5oII5MPTSQgoYVOQsLeLoKkpCzbkzyDTgCkj5TAfHE,18466
 rbx/grading/steps_with_caching.py,sha256=C_IA_dStxp6poJyGggFFyEouU9y_739UOLKUiJITb8M,1489
 rbx/grading/steps_with_caching_run_test.py,sha256=nRzB4OcXkb-kQ4WCj0iTGVfBACllxZ0Ek5RSwfoJRgo,15262
 rbx/grading_utils.py,sha256=lL2KtSkOsMElqrRoApQTbFcqVOeHVWUDTMCa3IsLpC4,4484
@@ -157,8 +157,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=wy8zQRb97n3lptilK7UxM4A44KjXb1W5Z1tD61a-K4A,4173
-rbx_cp-0.5.11.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.11.dist-info/METADATA,sha256=nkpPrvqVmR4TjtcE-E_dV4GGbaewa0SBSF_170-8V6M,3254
-rbx_cp-0.5.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.11.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.11.dist-info/RECORD,,
+rbx_cp-0.5.13.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.13.dist-info/METADATA,sha256=cgpJkqgDicWnI2ApTi9-DFK-ulkKvg2ePYynguZL9wg,3254
+rbx_cp-0.5.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.13.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.13.dist-info/RECORD,,