rbx.cp 0.5.35__tar.gz → 0.5.37__tar.gz

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/PKG-INFO

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

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/pyproject.toml

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

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/builder.py

@@ -4,7 +4,6 @@ from rbx import console, utils
 from rbx.box import environment, package
 from rbx.box.environment import VerificationLevel
 from rbx.box.generators import (
-    extract_generation_testcases_from_groups,
     generate_outputs_for_testcases,
     generate_testcases,
 )
@@ -13,6 +12,7 @@ from rbx.box.solutions import (
     print_run_report,
     run_solutions,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases_from_groups
 from rbx.box.validators import (
     has_validation_errors,
     print_validation_report,
@@ -50,7 +50,10 @@ def build(
                 'Validated [item]{processed}[/item] testcases...',
                 keep=True,
             ) as s:
-                infos = validate_testcases(s, groups=groups)
+                infos = validate_testcases(
+                    s,
+                    groups=groups,
+                )
                 print_validation_report(infos)
 
             if has_validation_errors(infos):

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/contest/main.py

@@ -128,7 +128,8 @@ def edit():
 @app.command('add, a', help='Add new problem to contest.')
 @within_contest
 def add(path: str, short_name: str, preset: Optional[str] = None):
-    name = pathlib.Path(path).stem
+    problem_path = pathlib.Path(path)
+    name = problem_path.stem
     utils.validate_field(ContestProblem, 'short_name', short_name)
     utils.validate_field(Package, 'name', name)
 

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/creation.py

@@ -4,9 +4,8 @@ from typing import Annotated, Optional
 
 import typer
 
-from rbx import console
-from rbx.box import presets
-from rbx.box.contest.contest_package import find_contest_yaml
+from rbx import console, utils
+from rbx.box import package, presets
 from rbx.box.presets.fetch import get_preset_fetch_info
 
 
@@ -27,15 +26,6 @@ def create(
     ] = None,
     path: Optional[pathlib.Path] = None,
 ):
-    if find_contest_yaml() is not None:
-        console.console.print(
-            '[error]Cannot [item]rbx create[/item] a problem inside a contest.[/error]'
-        )
-        console.console.print(
-            '[error]Instead, use [item]rbx contest add[/item] to add a problem to a contest.[/error]'
-        )
-        raise typer.Exit(1)
-
     preset = preset or 'default'
     console.console.print(f'Creating new problem [item]{name}[/item]...')
 
@@ -80,4 +70,9 @@ def create(
     for lock in dest_path.rglob('.preset-lock.yml'):
         lock.unlink(missing_ok=True)
 
+    # Change problem name.
+    ru, problem = package.get_ruyaml(dest_path)
+    problem['name'] = name
+    utils.save_ruyaml(dest_path / 'problem.rbx.yml', ru, problem)
+
     presets.generate_lock(preset, root=dest_path)

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/generators.py

@@ -1,12 +1,8 @@
-import abc
 import pathlib
-import shlex
 import shutil
-from pathlib import PosixPath
-from typing import Dict, Iterable, List, Optional, Set, Tuple
+from typing import Dict, List, Optional, Set
 
 import typer
-from pydantic import BaseModel
 
 from rbx import console
 from rbx.box import checkers, package, testcase_utils, validators
@@ -19,10 +15,20 @@ from rbx.box.schema import (
     CodeItem,
     GeneratorCall,
     Testcase,
-    TestcaseSubgroup,
 )
 from rbx.box.stressing import generator_parser
-from rbx.box.testcase_utils import TestcaseEntry, TestcasePattern, find_built_testcases
+from rbx.box.testcase_extractors import (
+    GenerationMetadata,
+    GenerationTestcaseEntry,
+    TestcaseGroupVisitor,
+    extract_generation_testcases,
+    run_testcase_visitor,
+)
+from rbx.box.testcase_utils import (
+    TestcaseEntry,
+    fill_output_for_defined_testcase,
+    find_built_testcases,
+)
 from rbx.grading.steps import (
     DigestHolder,
     DigestOrDest,
@@ -35,33 +41,11 @@ def _compile_generator(generator: CodeItem) -> str:
     return compile_item(generator, sanitized=SanitizationLevel.PREFER)
 
 
-def _get_group_input(
-    group_path: pathlib.Path, subgroup_prefix: str, i: int
-) -> pathlib.Path:
-    return group_path / f'{subgroup_prefix}{i:03d}.in'
-
-
-def _get_group_output(
-    group_path: pathlib.Path, subgroup_prefix: str, i: int
-) -> pathlib.Path:
-    return group_path / f'{subgroup_prefix}{i:03d}.out'
-
-
-def _fill_output_for_defined_testcase(testcase: Testcase) -> Testcase:
-    res = testcase.model_copy()
-    if res.outputPath is not None:
-        return res
-    output_path = res.inputPath.with_suffix('.ans')
-    if output_path.is_file():
-        res.outputPath = output_path
-    return res
-
-
 def _copy_testcase_over(
     testcase: Testcase,
     dest: Testcase,
 ):
-    testcase = _fill_output_for_defined_testcase(testcase)
+    testcase = fill_output_for_defined_testcase(testcase)
     dest.inputPath.parent.mkdir(parents=True, exist_ok=True)
     shutil.copy(
         str(testcase.inputPath),
@@ -90,230 +74,6 @@ def get_call_from_string(call_str: str) -> GeneratorCall:
     return GeneratorCall(name=name, args=args)
 
 
-def _run_generator_script(testcase: TestcaseSubgroup) -> str:
-    assert testcase.generatorScript is not None
-
-    cacher = package.get_file_cacher()
-
-    if not testcase.generatorScript.path.is_file():
-        console.console.print(
-            f'[error]Generator script not found: [item]{testcase.generatorScript.path}[/item][/error]'
-        )
-        raise typer.Exit(1)
-
-    script_digest = DigestHolder()
-    if testcase.generatorScript.path.suffix == '.txt':
-        script_digest.value = cacher.put_file_from_path(testcase.generatorScript.path)
-    else:
-        try:
-            compiled_digest = compile_item(testcase.generatorScript)
-        except:
-            console.console.print(
-                f'[error]Failed compiling generator script for group [item]{testcase.name}[/item].[/error]'
-            )
-            raise
-
-        run_stderr = DigestHolder()
-        run_log = run_item(
-            testcase.generatorScript,
-            DigestOrSource.create(compiled_digest),
-            stdout=DigestOrDest.create(script_digest),
-            stderr=DigestOrDest.create(run_stderr),
-        )
-
-        if run_log is None or run_log.exitcode != 0:
-            console.console.print(
-                f'Could not run generator script for group {testcase.name}'
-            )
-            if run_log is not None:
-                console.console.print(
-                    f'[error]Summary:[/error] {run_log.get_summary()}'
-                )
-            if run_stderr.value is not None:
-                console.console.print('[error]Stderr:[/error]')
-                console.console.print(
-                    package.get_digest_as_string(run_stderr.value) or ''
-                )
-            raise typer.Exit(1)
-
-    assert script_digest.value
-    script = cacher.get_file_content(script_digest.value).decode()
-    return script
-
-
-def _extract_script_lines(script: str) -> Iterable[Tuple[str, str, int]]:
-    lines = script.splitlines()
-    for i, line in enumerate(lines):
-        line = line.strip()
-        if not line:
-            continue
-        if line.startswith('#'):
-            continue
-        yield shlex.split(line)[0], shlex.join(shlex.split(line)[1:]), i + 1
-
-
-class GeneratorScriptEntry(BaseModel):
-    path: pathlib.Path
-    line: int
-
-
-class GenerationMetadata(BaseModel):
-    copied_to: Testcase
-
-    copied_from: Optional[Testcase] = None
-    generator_call: Optional[GeneratorCall] = None
-    generator_script: Optional[GeneratorScriptEntry] = None
-
-
-class GenerationTestcaseEntry(BaseModel):
-    group_entry: TestcaseEntry
-    subgroup_entry: TestcaseEntry
-
-    metadata: GenerationMetadata
-
-
-class TestcaseVisitor(abc.ABC):
-    @abc.abstractmethod
-    def visit(self, entry: GenerationTestcaseEntry):
-        pass
-
-    def should_visit_group(self, group_name: str) -> bool:
-        return True
-
-    def should_visit_subgroup(self, subgroup_path: str) -> bool:
-        return True
-
-    def should_visit_generator_scripts(
-        self, group_name: str, subgroup_path: str
-    ) -> bool:
-        return True
-
-
-class TestcaseGroupVisitor(TestcaseVisitor):
-    def __init__(self, groups: Optional[Set[str]] = None):
-        self.groups = groups
-
-    def should_visit_group(self, group_name: str) -> bool:
-        return self.groups is None or group_name in self.groups
-
-
-def run_testcase_visitor(visitor: TestcaseVisitor):
-    pkg = package.find_problem_package_or_die()
-
-    def _explore_subgroup(
-        subgroup: TestcaseSubgroup, subgroup_index: Optional[int], prefix: List[str]
-    ):
-        assert prefix and len(prefix) >= 1 and len(prefix) <= 2
-        group_path = prefix[0]
-        subgroup_path = '/'.join(prefix)
-        if not visitor.should_visit_subgroup(subgroup_path):
-            return
-
-        def _entry(i: int) -> TestcaseEntry:
-            return TestcaseEntry(group=group_path, index=i)
-
-        def _sub_entry(i: int) -> TestcaseEntry:
-            return TestcaseEntry(group=subgroup_path, index=i)
-
-        def _copied_to(i: int) -> Testcase:
-            group_fs_path = package.get_build_testgroup_path(group_path)
-            group_prefix = ''
-            if subgroup_index is not None:
-                group_prefix = f'{subgroup_index}-'
-            if len(prefix) == 2:
-                group_prefix += f'{prefix[1]}-'
-            return Testcase(
-                inputPath=_get_group_input(group_fs_path, group_prefix, i),
-                outputPath=_get_group_output(group_fs_path, group_prefix, i),
-            )
-
-        # Go through testcases.
-        i = 0
-        # Individual testcases.
-        for tc in subgroup.testcases or []:
-            visitor.visit(
-                GenerationTestcaseEntry(
-                    group_entry=_entry(i),
-                    subgroup_entry=_sub_entry(i),
-                    metadata=GenerationMetadata(
-                        copied_from=_fill_output_for_defined_testcase(tc),
-                        copied_to=_copied_to(i),
-                    ),
-                )
-            )
-            i += 1
-
-        # Glob testcases.
-        if subgroup.testcaseGlob:
-            matched_inputs = sorted(PosixPath().glob(subgroup.testcaseGlob))
-
-            for input_path in matched_inputs:
-                if not input_path.is_file() or input_path.suffix != '.in':
-                    continue
-
-                tc = Testcase(inputPath=input_path)
-                visitor.visit(
-                    GenerationTestcaseEntry(
-                        group_entry=_entry(i),
-                        subgroup_entry=_sub_entry(i),
-                        metadata=GenerationMetadata(
-                            copied_from=_fill_output_for_defined_testcase(tc),
-                            copied_to=_copied_to(i),
-                        ),
-                    )
-                )
-                i += 1
-
-        # Single generators.
-        for generator_call in subgroup.generators:
-            visitor.visit(
-                GenerationTestcaseEntry(
-                    group_entry=_entry(i),
-                    subgroup_entry=_sub_entry(i),
-                    metadata=GenerationMetadata(
-                        generator_call=generator_call,
-                        copied_to=_copied_to(i),
-                    ),
-                )
-            )
-            i += 1
-
-        if not visitor.should_visit_generator_scripts(group_path, subgroup_path):
-            return
-
-        # Run generator script.
-        if subgroup.generatorScript is not None:
-            script = _run_generator_script(subgroup)
-
-            # Run each line from generator script.
-            for generator_name, args, line_number in _extract_script_lines(script):
-                call = GeneratorCall(name=generator_name, args=args)
-                visitor.visit(
-                    GenerationTestcaseEntry(
-                        group_entry=_entry(i),
-                        subgroup_entry=_sub_entry(i),
-                        metadata=GenerationMetadata(
-                            generator_call=call,
-                            generator_script=GeneratorScriptEntry(
-                                path=subgroup.generatorScript.path,
-                                line=line_number,
-                            ),
-                            copied_to=_copied_to(i),
-                        ),
-                    )
-                )
-                i += 1
-
-    for group in pkg.testcases:
-        if not visitor.should_visit_group(group.name):
-            continue
-
-        _explore_subgroup(group, 0 if group.subgroups else None, [group.name])
-
-        for i, subgroup in enumerate(group.subgroups):
-            _explore_subgroup(subgroup, i + 1, [group.name, subgroup.name])
-
-
 def _get_necessary_generators_for_groups(
     groups: Optional[Set[str]] = None,
 ) -> Set[str]:
@@ -439,14 +199,14 @@ def generate_standalone(
             _, validator_digest = validator_tp
         if progress:
             progress.update('Validating test...')
-        ok, message, *_ = validators.validate_test(
+        validation_info = validators.validate_one_off(
             spec.copied_to.inputPath,
             validator,
             validator_digest,
         )
-        if not ok:
+        if not validation_info.ok:
             _print_error_header('failed validating testcase.')
-            console.console.print(f'[error]Message:[/error] {message}')
+            console.console.print(f'[error]Message:[/error] {validation_info.message}')
             console.console.print(
                 f'Testcase written at [item]{spec.copied_to.inputPath}[/item]'
             )
@@ -552,67 +312,6 @@ def generate_output_for_testcase(
         raise typer.Exit(1)
 
 
-def extract_generation_testcases(
-    entries: List[TestcaseEntry],
-) -> List[GenerationTestcaseEntry]:
-    # TODO: support subgroups.
-    groups = set(entry.group for entry in entries)
-    entry_keys = set(entry.key() for entry in entries)
-
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseVisitor):
-        def should_visit_group(self, group_name: str) -> bool:
-            return group_name in groups
-
-        def visit(self, entry: GenerationTestcaseEntry):
-            # TODO: support subgroups.
-            if entry.group_entry.key() not in entry_keys:
-                return
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor())
-    return res
-
-
-def extract_generation_testcases_from_groups(
-    groups: Optional[Set[str]] = None,
-) -> List[GenerationTestcaseEntry]:
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseGroupVisitor):
-        def visit(self, entry: GenerationTestcaseEntry):
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor(groups))
-    return res
-
-
-def extract_generation_testcases_from_patterns(
-    patterns: List[TestcasePattern],
-) -> List[GenerationTestcaseEntry]:
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseVisitor):
-        def should_visit_group(self, group_name: str) -> bool:
-            return any(pattern.intersecting_group(group_name) for pattern in patterns)
-
-        def should_visit_subgroup(self, subgroup_path: str) -> bool:
-            return any(
-                pattern.intersecting_group(subgroup_path) for pattern in patterns
-            )
-
-        def visit(self, entry: GenerationTestcaseEntry):
-            if not any(
-                pattern.match(entry.group_entry) for pattern in patterns
-            ) and not any(pattern.match(entry.subgroup_entry) for pattern in patterns):
-                return
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor())
-    return res
-
-
 def generate_outputs_for_testcases(
     entries: List[TestcaseEntry],
     progress: Optional[StatusProgress] = None,

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/generators_test.py

@@ -4,10 +4,10 @@ import pytest
 
 from rbx.box import package
 from rbx.box.generators import (
-    extract_generation_testcases_from_groups,
     generate_outputs_for_testcases,
     generate_testcases,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases_from_groups
 from rbx.testing_utils import print_directory_tree
 
 

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/main.py

@@ -37,6 +37,7 @@ from rbx.box import (
     validators,
 )
 from rbx.box.contest import main as contest
+from rbx.box.contest.contest_package import find_contest_yaml
 from rbx.box.environment import VerificationLevel, get_environment_path
 from rbx.box.packaging import main as packaging
 from rbx.box.testcases import main as testcases
@@ -448,6 +449,15 @@ def create(
         Optional[str], typer.Option(help='Preset to use when creating the problem.')
     ] = None,
 ):
+    if find_contest_yaml() is not None:
+        console.console.print(
+            '[error]Cannot [item]rbx create[/item] a problem inside a contest.[/error]'
+        )
+        console.console.print(
+            '[error]Instead, use [item]rbx contest add[/item] to add a problem to a contest.[/error]'
+        )
+        raise typer.Exit(1)
+
     if preset is not None:
         creation.create(name, preset=preset)
         return

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/package.py

@@ -121,8 +121,8 @@ 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()
+def get_ruyaml(root: pathlib.Path = pathlib.Path()) -> Tuple[ruyaml.YAML, ruyaml.Any]:
+    problem_yaml_path = find_problem_yaml(root)
     if problem_yaml_path is None:
         console.console.print(
             f'Problem not found in {pathlib.Path().absolute()}', style='error'

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/schema.py

@@ -232,6 +232,13 @@ A generator script to call to generate testcases for this group.
 """,
     )
 
+    extraValidators: List[CodeItem] = Field(
+        default=[],
+        description="""
+A list of extra validators to use to validate the testcases of this subgroup.
+""",
+    )
+
     @model_validator(mode='after')
     def check_oneof(self) -> 'TestcaseSubgroup':
         _check_oneof(
@@ -260,7 +267,7 @@ A list of test subgroups to define for this group.
         default=None,
         description="""
 A validator to use to validate the testcases of this group.
-If not specified, will use the package-level validator.
+If specified, will use this validator instead of the package-level validator.
 Useful in cases where the constraints vary across test groups.
 """,
     )

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/solutions.py

@@ -29,7 +29,6 @@ from rbx.box.formatting import get_formatted_memory, get_formatted_time
 from rbx.box.generators import (
     GenerationMetadata,
     expand_generator_call,
-    extract_generation_testcases,
     generate_output_for_testcase,
     generate_standalone,
 )
@@ -42,6 +41,7 @@ from rbx.box.schema import (
     Testcase,
     TestcaseGroup,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases
 from rbx.box.testcase_utils import TestcaseEntry, find_built_testcases
 from rbx.grading.steps import (
     DigestOrDest,

{rbx_cp-0.5.35 → rbx_cp-0.5.37}/rbx/box/solutions_test.py

@@ -5,7 +5,6 @@ import pytest
 
 from rbx.box.environment import VerificationLevel
 from rbx.box.generators import (
-    extract_generation_testcases_from_groups,
     generate_outputs_for_testcases,
     generate_testcases,
 )
@@ -13,6 +12,7 @@ from rbx.box.solutions import (
     convert_list_of_solution_evaluations_to_dict,
     run_solutions,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases_from_groups
 from rbx.grading.steps import Outcome