rbx.cp 0.5.48__py3-none-any.whl → 0.5.50__py3-none-any.whl

rbx/box/cli.py

@@ -747,6 +747,7 @@ async def validate(
     rich_help_panel='Testing',
     help='Run unit tests for the validator and checker.',
 )
+@package.within_problem
 def unit_tests():
     from rbx.box import unit
 

rbx/box/packaging/main.py

@@ -64,6 +64,7 @@ async def run_packager(
 
 
 @app.command('polygon', help='Build a package for Polygon.')
+@package.within_problem
 @syncer.sync
 async def polygon(
     verification: environment.VerificationParam,
@@ -74,6 +75,7 @@ async def polygon(
 
 
 @app.command('boca', help='Build a package for BOCA.')
+@package.within_problem
 @syncer.sync
 async def boca(
     verification: environment.VerificationParam,
@@ -84,6 +86,7 @@ async def boca(
 
 
 @app.command('moj', help='Build a package for MOJ.')
+@package.within_problem
 @syncer.sync
 async def moj(
     verification: environment.VerificationParam,

rbx/box/schema.py

@@ -356,8 +356,8 @@ 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.'
+    glob: str = Field(
+        description='A glob pattern for the input files to be used as unit test input for the validator.'
     )
     outcome: ValidatorOutcome = Field(
         default=ValidatorOutcome.VALID,
@@ -373,17 +373,12 @@ class ValidatorTest(BaseModel):
 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.',
+    glob: str = Field(
+        description="""
+A glob pattern for the files to be used as unit test input for the checker.
+This glob should simultaneously match the input, output, and answer files (.in, .out, .ans).
+If one of them is not present, an empty file will be used instead.
+""",
     )
 
     outcome: ExpectedOutcome = Field(

rbx/box/solutions.py

@@ -47,7 +47,12 @@ from rbx.box.tasks import (
     run_solution_on_testcase,
 )
 from rbx.box.testcase_extractors import extract_generation_testcases
-from rbx.box.testcase_utils import TestcaseEntry, find_built_testcases
+from rbx.box.testcase_utils import (
+    TestcaseEntry,
+    find_built_testcases,
+    parse_interaction,
+    print_interaction,
+)
 from rbx.grading.steps import (
     Evaluation,
     Outcome,
@@ -323,6 +328,19 @@ def _produce_solution_items(
     return res
 
 
+def print_best_output(output_files: List[pathlib.Path], empty_warning: bool = False):
+    for output_file in output_files:
+        if not output_file.is_file():
+            continue
+        if output_file.suffix == '.pio':
+            print_interaction(parse_interaction(output_file))
+        else:
+            console.console.print(output_file.read_text())
+        return
+    if empty_warning:
+        console.console.print('[warning]Solution produced no output.[/warning]')
+
+
 def run_solutions(
     progress: Optional[StatusProgress] = None,
     tracked_solutions: Optional[Set[str]] = None,
@@ -528,6 +546,7 @@ def _run_interactive_solutions(
                 output_dir=output_dir,
                 interactor_digest=interactor_digest,
                 verification=verification,
+                capture_pipes=True,
             )
 
         yield EvaluationItem(
@@ -589,18 +608,28 @@ async def run_and_print_interactive_solutions(
             )
 
         stdout_path = eval.log.stdout_absolute_path
-        if print:
+        if print and stdout_path is not None:
+            if pkg.type == TaskType.COMMUNICATION:
+                console.console.rule('Interaction', style='status')
+                output_files = [
+                    stdout_path.with_suffix('.pio'),
+                    stdout_path.with_suffix('.pout'),
+                ]
+                print_best_output(output_files, empty_warning=True)
+
             console.console.rule('Output', style='status')
-            if (
-                eval.testcase.output is not None
-                and stdout_path is not None
-                and stdout_path.is_file()
-            ):
-                console.console.print(stdout_path.read_text())
-            else:
-                console.console.print('[warning]Solution produced no output.[/warning]')
+            output_files = [stdout_path]
+            print_best_output(output_files, empty_warning=True)
         elif stdout_path is not None:
-            console.console.print(f'[status]Output:[/status] {stdout_path}')
+            if stdout_path.with_suffix('.pout').is_file():
+                stdout_path = stdout_path.with_suffix('.pout')
+
+            if stdout_path.is_file():
+                console.console.print(f'[status]Output:[/status] {stdout_path}')
+            if stdout_path.with_suffix('.pio').is_file():
+                console.console.print(
+                    f'[status]Interaction:[/status] {stdout_path.with_suffix(".pio")}'
+                )
             if eval.log.stderr_absolute_path is not None:
                 console.console.print(
                     f'[status]Stderr:[/status] {eval.log.stderr_absolute_path}'

rbx/box/testcase_utils.py

@@ -2,6 +2,8 @@ import pathlib
 import shutil
 from typing import List, Optional, Tuple
 
+import rich
+import rich.text
 import typer
 from pydantic import BaseModel
 
@@ -209,3 +211,13 @@ def parse_interaction(file: pathlib.Path) -> TestcaseInteraction:
         prefixes=(interactor_prefix, solution_prefix),
         entries=entries,
     )
+
+
+def print_interaction(interaction: TestcaseInteraction):
+    for entry in interaction.entries:
+        text = rich.text.Text(entry.data)
+        if entry.pipe == 0:
+            text.stylize('status')
+        else:
+            text.stylize('info')
+        console.console.print(text, end='')

rbx/box/testcases/main.py

@@ -90,6 +90,7 @@ async def _generate_for_editing(
 
 
 @app.command('view, v', help='View a testcase in your default editor.')
+@package.within_problem
 @syncer.sync
 async def view(
     tc: Annotated[
@@ -126,6 +127,7 @@ async def view(
 
 
 @app.command('info, i', help='Show information about testcases.')
+@package.within_problem
 @syncer.sync
 async def info(
     pattern: Annotated[

rbx/box/unit.py

@@ -1,14 +1,89 @@
-from typing import List, Optional
+import pathlib
+from typing import List, Optional, Set
 
 import syncer
+from pydantic import BaseModel
 
 from rbx import console
 from rbx.box import checkers, package, validators
-from rbx.box.schema import CodeItem, Testcase, ValidatorOutcome, ValidatorTest
+from rbx.box.schema import (
+    CheckerTest,
+    CodeItem,
+    ExpectedOutcome,
+    Testcase,
+    ValidatorOutcome,
+    ValidatorTest,
+)
 from rbx.utils import StatusProgress
 
 
-def _get_validator_for_test(test: ValidatorTest) -> Optional[CodeItem]:
+class ValidatorTestEntry(BaseModel):
+    input: pathlib.Path
+    outcome: ValidatorOutcome
+    validator: Optional[CodeItem]
+
+
+class CheckerTestEntry(BaseModel):
+    input: Optional[pathlib.Path] = None
+    output: Optional[pathlib.Path] = None
+    answer: Optional[pathlib.Path] = None
+    outcome: ExpectedOutcome
+
+    def running_tests_formatted_string(self) -> str:
+        res = []
+        if self.input:
+            res.append(f'[item]{self.input}[/item]')
+        if self.output:
+            res.append(f'[item]{self.output}[/item]')
+        if self.answer:
+            res.append(f'[item]{self.answer}[/item]')
+        return ', '.join(res)
+
+
+def _extract_validator_test_entries(
+    tests: List[ValidatorTest],
+) -> List[ValidatorTestEntry]:
+    res: List[ValidatorTestEntry] = []
+    for test in tests:
+        for input in pathlib.Path().glob(str(test.glob)):
+            if not input.is_file():
+                continue
+            res.append(
+                ValidatorTestEntry(
+                    input=input, outcome=test.outcome, validator=test.validator
+                )
+            )
+    return sorted(res, key=lambda x: x.input.name)
+
+
+def _extract_checker_test_entries(tests: List[CheckerTest]) -> List[CheckerTestEntry]:
+    res: List[CheckerTestEntry] = []
+    seen: Set[pathlib.Path] = set()
+    for test in tests:
+        for file in pathlib.Path().glob(str(test.glob)):
+            if not file.is_file():
+                continue
+            if file.suffix not in ['.in', '.out', '.ans']:
+                continue
+            basefile = file.with_suffix('')
+            if basefile in seen:
+                continue
+            seen.add(basefile)
+            input = basefile.with_suffix('.in')
+            output = basefile.with_suffix('.out')
+            answer = basefile.with_suffix('.ans')
+            res.append(
+                CheckerTestEntry(
+                    input=input if input.is_file() else None,
+                    output=output if output.is_file() else None,
+                    answer=answer if answer.is_file() else None,
+                    outcome=test.outcome,
+                )
+            )
+    return res
+
+
+def _get_validator_for_test(test: ValidatorTestEntry) -> Optional[CodeItem]:
     pkg = package.find_problem_package_or_die()
     if test.validator is not None:
         return test.validator
@@ -18,20 +93,25 @@ def _get_validator_for_test(test: ValidatorTest) -> Optional[CodeItem]:
 async def run_validator_unit_tests(progress: StatusProgress):
     pkg = package.find_problem_package_or_die()
 
+    entries = _extract_validator_test_entries(pkg.unitTests.validator)
+
     vals: List[CodeItem] = []
-    for test in pkg.unitTests.validator:
+    for test in entries:
         val = _get_validator_for_test(test)
         if val is not None:
             vals.append(val)
 
+    console.console.rule('Validator tests', style='info')
+    if not entries:
+        console.console.print(']No validator unit tests found.')
+        return
+
     compiled_validators = validators.compile_validators(vals, progress=progress)
 
     if progress:
         progress.update('Running validator unit tests...')
 
-    console.console.rule('Validator tests', style='info')
-
-    for i, test in enumerate(pkg.unitTests.validator):
+    for i, test in enumerate(entries):
         val = _get_validator_for_test(test)
         if val is None:
             console.console.print(
@@ -60,7 +140,10 @@ async def run_validator_unit_tests(progress: StatusProgress):
             if info.ok:
                 console.console.print('  [status]Actual[/status] VALID')
             else:
-                console.console.print(f'  [status]Actual[/status] {info.message}')
+                console.console.print('  [status]Actual[/status] INVALID')
+
+        if info.message:
+            console.console.print(f'  [status]Message[/status] {info.message}')
 
 
 async def run_checker_unit_tests(progress: StatusProgress):
@@ -74,16 +157,21 @@ async def run_checker_unit_tests(progress: StatusProgress):
         )
         return
 
+    console.console.rule('Checker tests', style='info')
+
+    entries = _extract_checker_test_entries(pkg.unitTests.checker)
+    if not entries:
+        console.console.print('No checker unit tests found.')
+        return
+
     compiled_digest = checkers.compile_checker(progress=progress)
 
     if progress:
         progress.update('Running checker unit tests...')
 
-    console.console.rule('Checker tests', style='info')
-
     empty_file = package.get_empty_sentinel_path()
 
-    for i, test in enumerate(pkg.unitTests.checker):
+    for i, test in enumerate(entries):
         result = await checkers.check(
             compiled_digest,
             run_log=None,
@@ -101,13 +189,15 @@ async def run_checker_unit_tests(progress: StatusProgress):
             else '[error]FAIL[/error]'
         )
 
-        console.console.print(f'{markup} Unit test [item]#{i + 1}[/item]')
+        console.console.print(
+            f'{markup} Unit test [item]#{i + 1}[/item] ({test.running_tests_formatted_string()})'
+        )
         console.console.print(f'  [status]Expected[/status] {test.outcome.name}')
 
         if not test.outcome.match(result.outcome):
             console.console.print(f'  [status]Actual[/status] {result.outcome.name}')
-            if result.message:
-                console.console.print(f'  [status]Message[/status] {result.message}')
+        if result.message:
+            console.console.print(f'  [status]Message[/status] {result.message}')
 
 
 @syncer.sync

{rbx_cp-0.5.48.dist-info → rbx_cp-0.5.50.dist-info}/METADATA

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

{rbx_cp-0.5.48.dist-info → rbx_cp-0.5.50.dist-info}/RECORD

@@ -5,7 +5,7 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=MDm2qqmhedAbhn3rWP6cDwbBsGhV6sz_2sg1zLkPDw0,3613
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
 rbx/box/checkers.py,sha256=eb4tqtVUJYlme_Vkj2TGkUABM7EMS0P1EswhMYjN7BI,11459
-rbx/box/cli.py,sha256=5SqJB4tE0vqWWyaweRpA7vSoIp34-AzH23ToR-yHmpk,26463
+rbx/box/cli.py,sha256=0JeJSVTK_5coijsm1b1zKQzuv7RBgexoM3klDeveabY,26487
 rbx/box/code.py,sha256=Cnts7noJaaoM35DZ9xcJAKXLwsKB4oBebMidqmMMO4M,18795
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
@@ -32,7 +32,7 @@ rbx/box/package.py,sha256=YuX_FS6yKx6FaFz0NF0cx3v6jzhqwvsLr3Oprx_TTJA,13645
 rbx/box/packaging/boca/extension.py,sha256=EQALNEOv4zVDXSKs_dk11n92y7cBZVn8TogIK683lE0,890
 rbx/box/packaging/boca/packager.py,sha256=CUMoQICrkQQBFElmI9SrvXlFFnpwkTiJ9qbOSJOy6AE,12512
 rbx/box/packaging/contest_main.py,sha256=nMdgPE4OK_tsnUMdRI1cJwLpgxGrwW_mJjox0oOALWw,2757
-rbx/box/packaging/main.py,sha256=RXGcpVZTwqkdLs4wHwoHSiFTXW62jIUS5fnvSKu3Ymw,2998
+rbx/box/packaging/main.py,sha256=WOW0JRYcZRuWOEsfd4AKX5wLqu8Br1TYaEfHjqWmu9Q,3070
 rbx/box/packaging/moj/packager.py,sha256=Ro_TO3RVCCRAxNcCio0u42TLfW8FnX9IohMChmGlrvo,8499
 rbx/box/packaging/packager.py,sha256=da2haC1L9cG30myneMrRIAdGubtid0Xmy38BHKPCZZ4,3633
 rbx/box/packaging/polygon/packager.py,sha256=qTGOUckevdOCt_ES63pN3uhmhDl9JuNcZ1XEnGNq-tU,10833
@@ -44,9 +44,9 @@ rbx/box/presets/lock_schema.py,sha256=6sRPnyePOC8yy-5WcD5JRZdDJHf8loqbvpQ1IPiOU9
 rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,1962
 rbx/box/retries.py,sha256=tRk2K1bXw2xnwkAj2CsktRHTEhw7YKcPxMQTT6mCy-E,4707
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
-rbx/box/schema.py,sha256=P1jVaeqe4OcotAJOqu3T5WD8DR-amZyyq3cau5rPiM8,17086
+rbx/box/schema.py,sha256=tOQ1tLHqc_5V-UgrzM44aS8ULAkq-IkeErxjLCFVA8I,16778
 rbx/box/setter_config.py,sha256=s53talhwM6FTGDCcBhY7IlZ6_6mJ3PMp6V4kTtaSs50,4262
-rbx/box/solutions.py,sha256=b4P6JN4eSDFiUKjBYvI38jsf8wLxS8Wi-YwBmm25Rcg,42684
+rbx/box/solutions.py,sha256=eTMpxIvhU3IUF1gfR_y20o_6NZ4hDtMGhTi4ookG9TY,43766
 rbx/box/solutions_test.py,sha256=TCowbxBG3SvDlFO5-qtBj_M_HrAHe0IJaI1XwoQ1d00,1718
 rbx/box/state.py,sha256=MMf3DvfQji0jKEliCHct2Tpp_0epL1tvP8HbHNArQIc,166
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -62,15 +62,15 @@ rbx/box/stressing/finder_parser.py,sha256=jXpYNa4FyugzmHi3r96Uv4rU1krRQJc5Ihr9jf
 rbx/box/stressing/generator_parser.py,sha256=oHZryjR3YohgaSO9WEirQ7b2e-98WgZStF0N99W4Thw,7380
 rbx/box/tasks.py,sha256=oyWtgZvIEIkVV6e-GcJx7x8Z3T5tIDFBZbp0638sLeY,10036
 rbx/box/testcase_extractors.py,sha256=T5vCW5qERlqitGrFP6RuITEVr9o8XQozNa4AsxfuV_Y,11871
-rbx/box/testcase_utils.py,sha256=eeE7pr0vwxTEdHcZcpr9bIQlgIY5qI4-HpqR041LKxQ,6697
+rbx/box/testcase_utils.py,sha256=Ppg_P1Nq48cuKo1XiIi4b8FZkMW8IBp_4Wf1Yf42YuI,7019
 rbx/box/testcases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/testcases/main.py,sha256=sLEgpVCDjRc3tJcU--DNWMmc58KgrkQe4zGzBorO-rk,5394
+rbx/box/testcases/main.py,sha256=_I7h_obRcpNLRQ6dDJDIE5NAvTyn5nBOhdsBhRA_PvU,5442
 rbx/box/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/ui/captured_log.py,sha256=ptICDPViVnz-_2NfrcB0SSBXNW5L74zI-vAZNN7kSok,11319
 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/unit.py,sha256=veyBuz_7AbDFbdWi02jq_zLwXEkmgt0djXgVJU-OYCU,3755
+rbx/box/unit.py,sha256=ySnosNg-b50mJU_9jEpRYm5wiiZxkdhKR9AVQXbtTOE,6478
 rbx/box/validators.py,sha256=oqlNhw7jivbbH5l8g3xwihPRy76AM7MA3G4A8nyI_V0,10416
 rbx/box/validators_test.py,sha256=WY4Ho-wlsPHc0YNuz0KFVd6KQ9ouuiou3w5_zMOZ4Fs,362
 rbx/checker.py,sha256=pj1jO3my48ru-qugbER5onccANCjoR0-PaFe3H3VGEY,4118
@@ -188,8 +188,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=ZXMysGXpTtvS1lfLL38FuD5iSIyxi3ARjQePDrUmEtc,2067
 rbx/utils.py,sha256=6e1eXRzNE-52D0UVtqclePxqR4Haiqt8qWCrSVjnGuE,4585
-rbx_cp-0.5.48.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.48.dist-info/METADATA,sha256=LDeC-APwbLHB8kxUUmbWjS_pwbTSfIbOweMWlYRTU-M,3261
-rbx_cp-0.5.48.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.48.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.48.dist-info/RECORD,,
+rbx_cp-0.5.50.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.50.dist-info/METADATA,sha256=ScwTLSdZ7ISYKsmPKdWkq1hT0AOfAm25GBzQT9c4u-E,3261
+rbx_cp-0.5.50.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.50.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.50.dist-info/RECORD,,