rbx.cp 0.5.47__tar.gz → 0.5.49__tar.gz

{rbx_cp-0.5.47 → rbx_cp-0.5.49}/PKG-INFO

@@ -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 → rbx_cp-0.5.49}/pyproject.toml

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

{rbx_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.49/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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_cp-0.5.47 → rbx_cp-0.5.49}/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