rbx.cp 0.5.47__py3-none-any.whl → 0.5.49__py3-none-any.whl

rbx/box/environment.py

@@ -343,7 +343,7 @@ def get_extension(name: str, _: Type[T]) -> Optional[T]:
     pkg = get_environment()
     if pkg.extensions is None:
         return None
-    if hasattr(pkg.extensions, name):
+    if not hasattr(pkg.extensions, name):
         return None
     return getattr(pkg.extensions, name)
 

rbx/box/naming.py

@@ -0,0 +1,22 @@
+from typing import Optional
+
+from rbx.box import package
+from rbx.box.contest import contest_package
+
+
+def get_problem_shortname() -> Optional[str]:
+    contest = contest_package.find_contest_package()
+    if contest is None:
+        return None
+    problem_path = package.find_problem()
+    contest_path = contest_package.find_contest()
+
+    for problem in contest.problems:
+        if problem.path is None:
+            continue
+        if (problem_path / 'problem.rbx.yml').samefile(
+            contest_path / problem.path / 'problem.rbx.yml'
+        ):
+            return problem.short_name
+
+    return None

rbx/box/packaging/boca/extension.py

@@ -11,6 +11,7 @@ class BocaExtension(BaseModel):
     languages: typing.List[BocaLanguage] = list(typing.get_args(BocaLanguage))
     flags: typing.Dict[BocaLanguage, str] = {}
     maximumTimeError: float = _MAX_REP_ERROR
+    preferContestLetter: bool = False
 
     def flags_with_defaults(self) -> typing.Dict[BocaLanguage, str]:
         res: typing.Dict[BocaLanguage, str] = {

rbx/box/packaging/boca/packager.py

@@ -6,7 +6,7 @@ from typing import List
 import typer
 
 from rbx import console
-from rbx.box import package
+from rbx.box import naming, package
 from rbx.box.environment import get_extension_or_default
 from rbx.box.packaging.boca.extension import BocaExtension, BocaLanguage
 from rbx.box.packaging.packager import BasePackager, BuiltStatement
@@ -52,14 +52,20 @@ class BocaPackager(BasePackager):
         raise typer.Exit(1)
 
     def _get_problem_name(self) -> str:
-        pkg = package.find_problem_package_or_die()
         # BOCA forces Java class names to be the name of the problem.
-        return pkg.name.replace('-', '_')
+        return self.package_basename().replace('-', '_')
+
+    def _get_problem_basename(self) -> str:
+        extension = get_extension_or_default('boca', BocaExtension)
+        shortname = naming.get_problem_shortname()
+        if extension.preferContestLetter and shortname is not None:
+            return shortname
+        return self._get_problem_name()
 
     def _get_problem_info(self) -> str:
         statement = self._get_main_statement()
         return (
-            f'basename={self._get_problem_name()}\n'
+            f'basename={self._get_problem_basename()}\n'
             f'fullname={statement.title}\n'
             f'descfile={self._get_problem_name()}.pdf\n'
         )

rbx/box/packaging/moj/packager.py

@@ -24,14 +24,6 @@ class MojPackager(BocaPackager):
     def task_types(cls) -> List[TaskType]:
         return [TaskType.COMMUNICATION, TaskType.BATCH]
 
-    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_tl(self) -> str:
         extension = get_extension_or_default('boca', BocaExtension)
 
@@ -237,8 +229,6 @@ class MojPackager(BocaPackager):
                 (outputs_path / f'{i + 1:03d}').touch()
 
         # Zip all.
-        shutil.make_archive(
-            str(build_path / self._get_problem_name()), 'zip', into_path
-        )
+        shutil.make_archive(str(build_path / self.package_basename()), 'zip', into_path)
 
-        return (build_path / self._get_problem_name()).with_suffix('.zip')
+        return (build_path / self.package_basename()).with_suffix('.zip')

rbx/box/packaging/packager.py

@@ -3,7 +3,7 @@ import pathlib
 from abc import ABC, abstractmethod
 from typing import List, Tuple
 
-from rbx.box import package
+from rbx.box import naming, package
 from rbx.box.contest import contest_package
 from rbx.box.contest.schema import ContestProblem, ContestStatement
 from rbx.box.generators import get_all_built_testcases
@@ -50,6 +50,13 @@ class BasePackager(ABC):
             res.add(statement.language)
         return list(res)
 
+    def package_basename(self):
+        pkg = package.find_problem_package_or_die()
+        shortname = naming.get_problem_shortname()
+        if shortname is not None:
+            return f'{shortname}-{pkg.name}'
+        return pkg.name
+
     def statement_types(self) -> List[StatementType]:
         return [StatementType.PDF]
 

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/statements/build_statements.py

@@ -7,7 +7,7 @@ import syncer
 import typer
 
 from rbx import annotations, console
-from rbx.box import environment, package
+from rbx.box import environment, naming, package
 from rbx.box.schema import Package
 from rbx.box.statements.builders import (
     BUILDER_LIST,
@@ -291,6 +291,7 @@ def build_statement(
         output_type=output_type,
         use_samples=use_samples,
         is_editorial=is_editorial,
+        short_name=naming.get_problem_shortname(),
     )
     statement_path = (
         package.get_build_path()

rbx/box/unit.py

@@ -1,14 +1,79 @@
-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 _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,8 +83,10 @@ 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)
@@ -31,7 +98,7 @@ async def run_validator_unit_tests(progress: StatusProgress):
 
     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(
@@ -82,8 +149,9 @@ async def run_checker_unit_tests(progress: StatusProgress):
     console.console.rule('Checker tests', style='info')
 
     empty_file = package.get_empty_sentinel_path()
+    entries = _extract_checker_test_entries(pkg.unitTests.checker)
 
-    for i, test in enumerate(pkg.unitTests.checker):
+    for i, test in enumerate(entries):
         result = await checkers.check(
             compiled_digest,
             run_log=None,

rbx/grading/steps.py

@@ -332,7 +332,7 @@ def _expand_part(part: str, sandbox: SandboxBase) -> List[str]:
 
 def _split_and_expand(command: str, sandbox: SandboxBase) -> List[str]:
     res = []
-    parts = shlex.split(command.format(memory=sandbox.params.address_space))
+    parts = shlex.split(command.format(memory=sandbox.params.address_space or 2048))
     for part in parts:
         res.extend(_expand_part(part, sandbox))
     return res

{rbx_cp-0.5.47.dist-info → rbx_cp-0.5.49.dist-info}/METADATA

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

{rbx_cp-0.5.47.dist-info → rbx_cp-0.5.49.dist-info}/RECORD

@@ -19,7 +19,7 @@ rbx/box/contest/statements.py,sha256=Or8gFb6P_oViGdeiVgepXsvd_W84mA7LRaVmiAXWWSg
 rbx/box/creation.py,sha256=Evz7K6JoarD-4JJQsZsgoxU9FgCF9Z7-LfuroG4Cqls,2444
 rbx/box/deferred.py,sha256=II3X9e87JCOZtmspnHh-n4PFqh-FsH_oc0XJHZ9ZYVQ,691
 rbx/box/download.py,sha256=MFP-R26JiYGAP89I0TK-0fYc69Fsd20tsBqgtRCy5AE,2234
-rbx/box/environment.py,sha256=47NtyuVC6zSQKAtQaXPEXvqcD-KJiuWRpWF8pYvcG4c,11158
+rbx/box/environment.py,sha256=S-OLvR2_Nac8m923b9AtDhOY3goRJXlPA_I3s7BeDqQ,11162
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/formatting.py,sha256=3phFRHzqVXj4Ok1yDhCq6Clbw6KlqwJNpMhs--oTWFI,405
 rbx/box/generators.py,sha256=5-3K0JSLR9GbV0LmOkvNsWiQaMvhFBrI56ZaV1WgodQ,13472
@@ -27,13 +27,14 @@ rbx/box/generators_test.py,sha256=J7aBfuJhU84MWDWzgReRoOuQw_hVa09B8gTKAvL2XVo,19
 rbx/box/lazy_importing_main.py,sha256=6Z8As7qVFFT619xHH9Xt8VCH57NjC4aDxfAgkWiUwT8,116
 rbx/box/lazy_importing_test.py,sha256=B0-b3y_DkxEmtVfu4NfmVsgVdFl6kRCsEL6GLMHJISo,628
 rbx/box/main.py,sha256=Imwc0ZkheOpa5r8S0Xpb8RLQzJgxb9vyuSR4_wab11g,43
+rbx/box/naming.py,sha256=n3Nvw2MuWtAjywDxYDV5gg22Upf8Ap1lYavo0o46SRA,612
 rbx/box/package.py,sha256=YuX_FS6yKx6FaFz0NF0cx3v6jzhqwvsLr3Oprx_TTJA,13645
-rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
-rbx/box/packaging/boca/packager.py,sha256=X21vxdl9gY53s5fJ0YMFHHQrf1Ch6-d59nAsxr1YFR8,12236
+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/moj/packager.py,sha256=XMv7tqdrL6R7dX6ZZcNGCmqVrKhBYuMf5NW9VuE7U80,8792
-rbx/box/packaging/packager.py,sha256=_NqRk1u2Q8SUhad-aRJk0Vox74MjW5msGPdpWZ_LzAk,3386
+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
 rbx/box/packaging/polygon/test.py,sha256=bgEju5PwudgyfwxXJagm8fM6CJVlWM6l_-2q1V-oKaQ,3069
 rbx/box/packaging/polygon/xml_schema.py,sha256=-r24bCeRMGLrGGoT9FIgmqr87xHL-JzrFaR6bztbYtw,2703
@@ -43,13 +44,13 @@ 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_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
-rbx/box/statements/build_statements.py,sha256=uHlC3y3PtKaGUd2ZS_zYxi6-AKco6v_yd-lvm6BfrNA,12091
+rbx/box/statements/build_statements.py,sha256=6przkQWy70ixDbqWMZmBgncaoWg67RY1gPdQ4TPjaTE,12150
 rbx/box/statements/builders.py,sha256=6lYV-cnC-NXMnJf1wasbq_AMbjdIuPpMirm7QsjZI6s,11825
 rbx/box/statements/joiners.py,sha256=jItNXkAbTjFQpPMgfDMW86n3vMTbaE8sgo9I8Yf4Txg,2886
 rbx/box/statements/latex.py,sha256=LkcHwXjMFxbw--Gj9T1VkFKQFsXhY9dN7xZHpZycNW8,1346
@@ -69,7 +70,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/unit.py,sha256=veyBuz_7AbDFbdWi02jq_zLwXEkmgt0djXgVJU-OYCU,3755
+rbx/box/unit.py,sha256=ziyfgU4gmmNqKucMYYiJksOHkp22pxYpgk7dpX2mSQM,5793
 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
@@ -94,7 +95,7 @@ rbx/grading/judge/storage.py,sha256=3vv0HvtenbUZBH33CB5ZzX66ppL22G6munBaAA9BgwQ,
 rbx/grading/judge/test.py,sha256=ll0Iw7zyOpGdKPD_PGH7dvUkb4stQLu-ikbQnqJvuAc,944
 rbx/grading/judge/testiso.py,sha256=v14DtkWiZFJ9AKMzrb0_vZKPWDt8jz8iIw1Z2O-Advk,1397
 rbx/grading/processing_context.py,sha256=2fxa610WzXGvICDVWkPCG721w-1tXDVT7w_KtSnD0OM,1213
-rbx/grading/steps.py,sha256=nfZpHeoWK8d9Sm-5Zi5pYYpSdYIVvpTf88A6_C3QGyU,25744
+rbx/grading/steps.py,sha256=RpA6HjQ4NaZLMryyFFGBW53QojLoD9VH5yjuZMycWds,25752
 rbx/grading/steps_with_caching.py,sha256=nez2YwgauGXKRjhk6tQxTDGQ-HEk7KfZOeAPhsxi5iw,3150
 rbx/grading/steps_with_caching_run_test.py,sha256=mh4DRInrOGhnQFWD1SlcjDm_HvcSDFTDMSpAlG-Q5SI,15570
 rbx/grading_utils.py,sha256=lL2KtSkOsMElqrRoApQTbFcqVOeHVWUDTMCa3IsLpC4,4484
@@ -187,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.47.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.47.dist-info/METADATA,sha256=PDafPB7Sz8UPXRwvMQpVZ5GZuDxjyT5Nd-P7wX1lOXY,3261
-rbx_cp-0.5.47.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.47.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.47.dist-info/RECORD,,
+rbx_cp-0.5.49.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.49.dist-info/METADATA,sha256=mNCg5KTbxOIcJGovPqYotTF3kFQXqxcJ-8TRjAK47Pg,3261
+rbx_cp-0.5.49.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.49.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.49.dist-info/RECORD,,