rbx.cp 0.5.38__tar.gz → 0.5.40__tar.gz

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/PKG-INFO

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

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/pyproject.toml

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

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/checkers.py

@@ -17,11 +17,15 @@ from rbx.grading.steps import (
     Outcome,
     RunLog,
 )
+from rbx.utils import StatusProgress
 
 
-def compile_checker() -> str:
+def compile_checker(progress: Optional[StatusProgress] = None) -> str:
     checker = package.get_checker()
 
+    if progress:
+        progress.update('Compiling checker...')
+
     try:
         digest = compile_item(checker, sanitized=SanitizationLevel.PREFER)
     except Exception as e:

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/code.py

@@ -47,7 +47,7 @@ class SanitizationLevel(Enum):
 
     def should_sanitize(self) -> bool:
         cfg = setter_config.get_setter_config()
-        if cfg.sanitizers.enabled:
+        if cfg.sanitizers.enabled or state.STATE.sanitized:
             return self.value >= SanitizationLevel.PREFER.value
         return self.value >= SanitizationLevel.FORCE.value
 

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/main.py

@@ -55,43 +55,70 @@ app.add_typer(
     setter_config.app,
     name='config, cfg',
     cls=annotations.AliasGroup,
-    help='Manage setter configuration.',
+    help='Manage setter configuration (sub-command).',
+    rich_help_panel='Configuration',
 )
 app.add_typer(
     build_statements.app,
     name='statements, st',
     cls=annotations.AliasGroup,
-    help='Manage statements.',
+    help='Manage statements (sub-command).',
+    rich_help_panel='Deploying',
 )
 app.add_typer(
     download.app,
     name='download',
     cls=annotations.AliasGroup,
-    help='Download an asset from supported repositories.',
+    help='Download an asset from supported repositories (sub-command).',
+    rich_help_panel='Management',
 )
 app.add_typer(
-    presets.app, name='presets', cls=annotations.AliasGroup, help='Manage presets.'
+    presets.app,
+    name='presets',
+    cls=annotations.AliasGroup,
+    help='Manage presets (sub-command).',
+    rich_help_panel='Configuration',
 )
 app.add_typer(
     packaging.app,
     name='package, pkg',
     cls=annotations.AliasGroup,
-    help='Build problem packages.',
+    help='Build problem packages (sub-command).',
+    rich_help_panel='Deploying',
 )
 app.add_typer(
-    contest.app, name='contest', cls=annotations.AliasGroup, help='Contest management.'
+    contest.app,
+    name='contest',
+    cls=annotations.AliasGroup,
+    help='Manage contests (sub-command).',
+    rich_help_panel='Management',
 )
 app.add_typer(
     testcases.app,
     name='testcases, tc, t',
     cls=annotations.AliasGroup,
-    help='Testcase management.',
+    help='Manage testcases (sub-command).',
+    rich_help_panel='Management',
 )
 
 
 @app.callback()
-def main():
+def main(
+    sanitized: bool = typer.Option(
+        False,
+        '--sanitized',
+        '-s',
+        help='Whether to compile and run testlib components with sanitizers enabled. '
+        'If you want to run the solutions with sanitizers enabled, use the "-s" flag in the corresponding run command.',
+    ),
+):
     state.STATE.run_through_cli = True
+    state.STATE.sanitized = sanitized
+    if sanitized:
+        console.console.print(
+            '[warning]Sanitizers are running just for testlib components.\n'
+            'If you want to run the solutions with sanitizers enabled, use the [item]-s[/item] flag in the corresponding run command.[/warning]'
+        )
 
 
 # @app.command('ui', hidden=True)
@@ -100,7 +127,11 @@ def main():
 #     ui_pkg.start()
 
 
-@app.command('edit, e', help='Open problem.rbx.yml in your default editor.')
+@app.command(
+    'edit, e',
+    rich_help_panel='Configuration',
+    help='Open problem.rbx.yml in your default editor.',
+)
 @package.within_problem
 def edit():
     console.console.print('Opening problem definition in editor...')
@@ -110,7 +141,9 @@ def edit():
     config.open_editor(package.find_problem_yaml() or pathlib.Path())
 
 
-@app.command('build, b', help='Build all tests for the problem.')
+@app.command(
+    'build, b', rich_help_panel='Deploying', help='Build all tests for the problem.'
+)
 @package.within_problem
 def build(verification: environment.VerificationParam):
     from rbx.box import builder
@@ -118,7 +151,11 @@ def build(verification: environment.VerificationParam):
     builder.build(verification=verification)
 
 
-@app.command('run, r', help='Build and run solution(s).')
+@app.command(
+    'run, r',
+    rich_help_panel='Testing',
+    help='Build and run solution(s).',
+)
 @package.within_problem
 def run(
     verification: environment.VerificationParam,
@@ -299,6 +336,7 @@ def _time_impl(check: bool, detailed: bool) -> Optional[int]:
 
 @app.command(
     'time, t',
+    rich_help_panel='Testing',
     help='Estimate a time limit for the problem based on a time limit formula and timings of accepted solutions.',
 )
 @package.within_problem
@@ -333,7 +371,9 @@ def time(
 
 
 @app.command(
-    'irun, ir', help='Build and run solution(s) by passing testcases in the CLI.'
+    'irun, ir',
+    rich_help_panel='Testing',
+    help='Build and run solution(s) by passing testcases in the CLI.',
 )
 @package.within_problem
 def irun(
@@ -445,7 +485,11 @@ def irun(
         )
 
 
-@app.command('create, c', help='Create a new problem package.')
+@app.command(
+    'create, c',
+    rich_help_panel='Management',
+    help='Create a new problem package.',
+)
 def create(
     name: str,
     preset: Annotated[
@@ -467,7 +511,11 @@ def create(
     creation.create(name)
 
 
-@app.command('stress', help='Run a stress test.')
+@app.command(
+    'stress',
+    rich_help_panel='Testing',
+    help='Run a stress test.',
+)
 @package.within_problem
 def stress(
     name: Annotated[
@@ -621,7 +669,11 @@ def stress(
         break
 
 
-@app.command('compile', help='Compile an asset given its path.')
+@app.command(
+    'compile',
+    rich_help_panel='Testing',
+    help='Compile an asset given its path.',
+)
 @package.within_problem
 def compile_command(
     path: Annotated[
@@ -652,7 +704,11 @@ def compile_command(
     compile.any(path, sanitized, warnings)
 
 
-@app.command('validate', help='Run the validator in a one-off fashion, interactively.')
+@app.command(
+    'validate',
+    rich_help_panel='Testing',
+    help='Run the validator in a one-off fashion, interactively.',
+)
 @package.within_problem
 def validate(
     path: Annotated[
@@ -685,7 +741,23 @@ def validate(
     validators.print_validation_report([info])
 
 
-@app.command('environment, env', help='Set or show the current box environment.')
+@app.command(
+    'unit',
+    rich_help_panel='Testing',
+    help='Run unit tests for the validator and checker.',
+)
+def unit_tests():
+    from rbx.box import unit
+
+    with utils.StatusProgress('Running unit tests...') as s:
+        unit.run_unit_tests(s)
+
+
+@app.command(
+    'environment, env',
+    rich_help_panel='Configuration',
+    help='Set or show the current box environment.',
+)
 def environment_command(
     env: Annotated[Optional[str], typer.Argument()] = None,
     install_from: Annotated[
@@ -730,6 +802,7 @@ def environment_command(
 
 @app.command(
     'activate',
+    rich_help_panel='Configuration',
     help='Activate the environment of the current preset used by the package.',
 )
 @cd.within_closest_package
@@ -764,7 +837,11 @@ def activate():
     console.console.print(f'[success]Preset [item]{preset.name}[/item] is activated.')
 
 
-@app.command('languages', help='List the languages available in this environment')
+@app.command(
+    'languages',
+    rich_help_panel='Configuration',
+    help='List the languages available in this environment',
+)
 def languages():
     env = environment.get_environment()
 
@@ -780,7 +857,11 @@ def languages():
         console.console.print()
 
 
-@app.command('clear, clean', help='Clears cache and build directories.')
+@app.command(
+    'clear, clean',
+    rich_help_panel='Management',
+    help='Clears cache and build directories.',
+)
 @cd.within_closest_package
 def clear():
     console.console.print('Cleaning cache and build directories...')

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/packaging/main.py

@@ -70,3 +70,12 @@ def boca(
     from rbx.box.packaging.boca.packager import BocaPackager
 
     run_packager(BocaPackager, verification=verification)
+
+
+@app.command('moj', help='Build a package for MOJ.')
+def moj(
+    verification: environment.VerificationParam,
+):
+    from rbx.box.packaging.moj.packager import MojPackager
+
+    run_packager(MojPackager, verification=verification)

rbx_cp-0.5.40/rbx/box/packaging/moj/packager.py

@@ -0,0 +1,125 @@
+import pathlib
+import shutil
+from typing import List
+
+import typer
+
+from rbx import console
+from rbx.box import package
+from rbx.box.environment import get_extension_or_default
+from rbx.box.packaging.boca.extension import BocaExtension
+from rbx.box.packaging.boca.packager import BocaPackager
+from rbx.box.packaging.packager import BuiltStatement
+from rbx.config import get_default_app_path
+from rbx.grading.judge.digester import digest_cooperatively
+
+
+class MojPackager(BocaPackager):
+    def _get_problem_info(self) -> str:
+        statement = self._get_main_statement()
+        return (
+            f'basename={self._get_problem_name()}\n'
+            f'fullname={statement.title}\n'
+            f'descfile={self._get_problem_name()}.pdf\n'
+        )
+
+    def _get_limits(self) -> str:
+        extension = get_extension_or_default('boca', BocaExtension)
+
+        pkg = package.find_problem_package_or_die()
+        tl = pkg.timeLimit
+        ml = pkg.memoryLimit
+        ol = pkg.outputLimit
+        conf = f'ULIMITS[-f]={ol}\n' f'ULIMITS[-v]={ml}\n' f'TL[default]={tl / 1000}\n'
+        for language in extension.languages:
+            conf += f'TL[{language}]={self._get_pkg_timelimit(language) / 1000}\n'
+        return conf
+
+    def _get_compare(self) -> str:
+        extension = get_extension_or_default('boca', BocaExtension)
+
+        compare_path = (
+            get_default_app_path() / 'packagers' / 'moj' / 'scripts' / 'compare.sh'
+        )
+        if not compare_path.exists():
+            console.console.print(
+                '[error]MOJ template compare script not found.[/error]'
+            )
+            raise typer.Exit(1)
+        with package.get_checker().path.open('rb') as f:
+            checker_hash = digest_cooperatively(f)
+        return (
+            compare_path.read_text()
+            .replace('{{rbxFlags}}', extension.flags_with_defaults()['cc'])
+            .replace('{{checkerHash}}', checker_hash)
+        )
+
+    def _get_checker(self) -> str:
+        return package.get_checker().path.read_text()
+
+    def name(self) -> str:
+        return 'moj'
+
+    def package(
+        self,
+        build_path: pathlib.Path,
+        into_path: pathlib.Path,
+        built_statements: List[BuiltStatement],
+    ) -> pathlib.Path:
+        # Prepare dummy files
+        author_path = into_path / 'author'
+        author_path.parent.mkdir(parents=True, exist_ok=True)
+        author_path.write_text('Unknown\n')
+
+        tags_path = into_path / 'tags'
+        tags_path.parent.mkdir(parents=True, exist_ok=True)
+        tags_path.write_text('')
+
+        # Prepare limits
+        limits_path = into_path / 'conf'
+        limits_path.parent.mkdir(parents=True, exist_ok=True)
+        limits_path.write_text(self._get_limits())
+
+        # Prepare compare
+        compare_path = into_path / 'scripts' / 'compare.sh'
+        compare_path.parent.mkdir(parents=True, exist_ok=True)
+        compare_path.write_text(self._get_compare())
+
+        # Prepare checker
+        checker_path = into_path / 'scripts' / 'checker.cpp'
+        checker_path.parent.mkdir(parents=True, exist_ok=True)
+        checker_path.write_text(self._get_checker())
+
+        # Problem statement
+        enunciado_path = into_path / 'docs' / 'enunciado.pdf'
+        enunciado_path.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copyfile(
+            self._get_main_built_statement(built_statements).path,
+            enunciado_path,
+        )
+
+        # Copy solutions
+        solutions_path = into_path / 'solutions'
+        solutions_path.mkdir(parents=True, exist_ok=True)
+        self._copy_solutions(solutions_path)
+
+        # Prepare IO
+        inputs_path = into_path / 'tests' / 'input'
+        inputs_path.mkdir(parents=True, exist_ok=True)
+        outputs_path = into_path / 'tests' / 'output'
+        outputs_path.mkdir(parents=True, exist_ok=True)
+
+        testcases = self.get_flattened_built_testcases()
+        for i, testcase in enumerate(testcases):
+            shutil.copyfile(testcase.inputPath, inputs_path / f'{i+1:03d}')
+            if testcase.outputPath is not None:
+                shutil.copyfile(testcase.outputPath, outputs_path / f'{i+1:03d}')
+            else:
+                (outputs_path / f'{i+1:03d}').touch()
+
+        # Zip all.
+        shutil.make_archive(
+            str(build_path / self._get_problem_name()), 'zip', into_path
+        )
+
+        return (build_path / self._get_problem_name()).with_suffix('.zip')

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/schema.py

@@ -148,6 +148,14 @@ class ExpectedOutcome(AutoEnum):
         return bool(set(self.get_matches()) & set(rhs.get_matches()))
 
 
+class ValidatorOutcome(AutoEnum):
+    VALID = alias('valid')  # type: ignore
+    """Expected outcome for valid tests."""
+
+    INVALID = alias('invalid')  # type: ignore
+    """Expected outcome for invalid tests."""
+
+
 class CodeItem(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
@@ -337,6 +345,59 @@ class LimitModifiers(BaseModel):
     )
 
 
+class ValidatorTest(BaseModel):
+    model_config = ConfigDict(extra='forbid')
+
+    input: pathlib.Path = Field(
+        description='The input file to be used as unit test input for the validator.'
+    )
+    outcome: ValidatorOutcome = Field(
+        default=ValidatorOutcome.VALID,
+        description='The expected outcome of the validator.',
+    )
+
+    validator: Optional[CodeItem] = Field(
+        default=None,
+        description='The validator to use for this test. If not specified, will use the package-level validator.',
+    )
+
+
+class CheckerTest(BaseModel):
+    model_config = ConfigDict(extra='forbid')
+
+    input: Optional[pathlib.Path] = Field(
+        default=None,
+        description='The input file to be used as unit test input for the checker. If not specified, will pass an empty file.',
+    )
+    output: Optional[pathlib.Path] = Field(
+        default=None,
+        description='The solution output file to be used as unit test output for the checker. If not specified, will pass an empty file.',
+    )
+    answer: Optional[pathlib.Path] = Field(
+        default=None,
+        description='The answer file to be used as unit test answer for the checker. If not specified, will pass an empty file.',
+    )
+
+    outcome: ExpectedOutcome = Field(
+        default=ExpectedOutcome.ACCEPTED,
+        description='The expected outcome of the checker.',
+    )
+
+
+class UnitTests(BaseModel):
+    model_config = ConfigDict(extra='forbid')
+
+    validator: List[ValidatorTest] = Field(
+        default=[],
+        description='Unit tests for the validator.',
+    )
+
+    checker: List[CheckerTest] = Field(
+        default=[],
+        description='Unit tests for the checker.',
+    )
+
+
 class Package(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
@@ -399,6 +460,11 @@ that is correct and used as reference -- and should have the `accepted` outcome.
         default={}, description='Variables to be re-used across the package.'
     )
 
+    unitTests: UnitTests = Field(
+        default_factory=UnitTests,
+        description='Unit tests for components of this problem.',
+    )
+
     @property
     def expanded_vars(self) -> Dict[str, Primitive]:
         return {key: expand_var(value) for key, value in self.vars.items()}

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/solutions.py

@@ -635,13 +635,22 @@ async def run_and_print_interactive_solutions(
 
     for item in items:
         sol = pkg.solutions[item.solution_index]
-        with utils.no_progress(progress):
-            _print_solution_header(sol, console.console, is_irun=True)
+
+        if progress:
+            progress.update(f'Running [item]{sol.path}[/item]...')
 
         eval = await item.eval()
 
+        with utils.no_progress(progress):
+            console.console.print(get_testcase_markup_verdict(eval), end=' ')
+            _print_solution_header(sol, console.console, is_irun=True)
+            _print_solution_outcome(
+                sol, [eval], console.console, verification, subset=True
+            )
+
         stdout_path = eval.log.stdout_absolute_path
         if print:
+            console.console.rule('Output', style='status')
             if (
                 eval.testcase.output is not None
                 and stdout_path is not None
@@ -780,14 +789,17 @@ def _print_solution_outcome(
     evals: List[Evaluation],
     console: rich.console.Console,
     verification: VerificationLevel = VerificationLevel.NONE,
+    subset: bool = False,
 ) -> bool:
     pkg = package.find_problem_package_or_die()
 
     has_plain_tle = False
+    all_verdicts = set()
     bad_verdicts = set()
     no_tle_bad_verdicts = set()
     has_sanitizer_warnings = False
     for eval in evals:
+        all_verdicts.add(eval.result.outcome)
         if eval.result.outcome != Outcome.ACCEPTED:
             bad_verdicts.add(eval.result.outcome)
         if (
@@ -808,18 +820,27 @@ def _print_solution_outcome(
     matched_bad_verdicts = bad_verdicts - unmatched_bad_verdicts
     expected_outcome_is_bad = not solution.outcome.match(Outcome.ACCEPTED)
 
-    if unmatched_bad_verdicts or (expected_outcome_is_bad and not matched_bad_verdicts):
+    has_failed = unmatched_bad_verdicts or (
+        expected_outcome_is_bad and not matched_bad_verdicts and not subset
+    )
+    if has_failed:
         console.print('[error]FAILED[/error]', end=' ')
     else:
         console.print('[success]OK[/success]', end=' ')
 
-    console.print(f'Expected: {solution.outcome}', end='')
-
-    if unmatched_bad_verdicts:
-        unmatched_bad_verdicts_names = set(v.name for v in unmatched_bad_verdicts)
-        console.print(f', got: {" ".join(unmatched_bad_verdicts_names)}', end='')
-    elif expected_outcome_is_bad and not matched_bad_verdicts:
-        console.print(f', got: {Outcome.ACCEPTED.name}', end='')
+    if has_failed or not subset:
+        console.print(f'Expected: {solution.outcome}', end='')
+    elif subset:
+        all_verdicts_names = ' '.join(v.name for v in all_verdicts)
+        console.print(f'Got: {all_verdicts_names}', end='')
+
+    if has_failed or not subset:
+        # Only print verdicts if not subset.
+        if unmatched_bad_verdicts:
+            unmatched_bad_verdicts_names = set(v.name for v in unmatched_bad_verdicts)
+            console.print(f', got: {" ".join(unmatched_bad_verdicts_names)}', end='')
+        elif expected_outcome_is_bad and not matched_bad_verdicts and not subset:
+            console.print(f', got: {Outcome.ACCEPTED.name}', end='')
 
     console.print()
     evals_time = _get_evals_time_in_ms(evals)

{rbx_cp-0.5.38 → rbx_cp-0.5.40}/rbx/box/state.py

@@ -4,6 +4,7 @@ import dataclasses
 @dataclasses.dataclass
 class State:
     run_through_cli: bool = False
+    sanitized: bool = False
 
 
 STATE = State()