rbx.cp 0.5.47__tar.gz → 0.5.48__tar.gz

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

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

{rbx_cp-0.5.47 → rbx_cp-0.5.48}/pyproject.toml

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

{rbx_cp-0.5.47 → rbx_cp-0.5.48}/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.48/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.48}/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.48}/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.48}/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.48}/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.48}/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.48}/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