rbx.cp 0.11.2__py3-none-any.whl → 0.13.2__py3-none-any.whl

rbx/box/packaging/polygon/xml_schema.py

@@ -10,7 +10,7 @@ class Name(BaseXmlModel):
 
 
 class Statement(BaseXmlModel):
-    charset: Optional[Literal['UTF-8']] = attr(default=None)
+    charset: Optional[str] = attr(default=None)
 
     language: str = attr()
 
@@ -43,9 +43,12 @@ class Testset(BaseXmlModel):
     size: int = element('test-count', default=None)
 
     inputPattern: str = element('input-path-pattern')
-    answerPattern: str = element('answer-path-pattern')
+    outputPattern: Optional[str] = element('output-path-pattern', default=None)
+    answerPattern: Optional[str] = element('answer-path-pattern', default=None)
 
-    tests: List[Test] = wrapped('tests', element(tag='test'), default_factory=list)
+    tests: List[Test] = wrapped(
+        'tests', element(tag='test', default=None), default_factory=list
+    )
 
 
 class Judging(BaseXmlModel):
@@ -56,7 +59,7 @@ class Judging(BaseXmlModel):
 
 
 class Checker(BaseXmlModel):
-    name: str = attr()
+    name: Optional[str] = attr(default=None)
     type: Literal['testlib'] = attr()
     source: File = element()
     binary: Optional[File] = element(default=None)
@@ -70,6 +73,8 @@ class Interactor(BaseXmlModel):
 
 
 class Problem(BaseXmlModel, tag='problem'):
+    short_name: str = attr('short-name')
+
     names: List[Name] = wrapped('names', element(tag='name'), default_factory=list)
 
     statements: List[Statement] = wrapped(
@@ -86,9 +91,13 @@ class Problem(BaseXmlModel, tag='problem'):
         default=[],
     )
 
-    checker: Checker = wrapped('assets', element(tag='checker'))
+    checker: Optional[Checker] = wrapped(
+        'assets', element(tag='checker', default=None), default=None
+    )
 
-    interactor: Optional[Interactor] = wrapped('assets', element(tag='interactor'))
+    interactor: Optional[Interactor] = wrapped(
+        'assets', element(tag='interactor', default=None), default=None
+    )
 
 
 class ContestProblem(BaseXmlModel):

rbx/box/schema.py

@@ -9,7 +9,7 @@ from pydantic import AfterValidator, BaseModel, ConfigDict, Field, model_validat
 from pydantic_core import PydanticCustomError
 
 from rbx.autoenum import AutoEnum, alias
-from rbx.box.fields import FNameField, NameField
+from rbx.box.fields import NameField
 from rbx.box.statements.expander import expand_statements
 from rbx.box.statements.schema import Statement
 from rbx.grading.steps import Outcome
@@ -257,7 +257,7 @@ class Testcase(BaseModel):
 class GeneratorCall(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
-    name: str = FNameField(description='The name of the generator to call.')
+    name: str = Field(description='The name of the generator to call.')
 
     args: Optional[str] = Field(
         default=None, description='The arguments to pass to the generator.'
@@ -355,7 +355,7 @@ problems that have points.
 class Generator(CodeItem):
     model_config = ConfigDict(extra='forbid')
 
-    name: str = NameField(description="""The name of the generator.""")
+    name: str = Field(description="""The name of the generator.""")
 
 
 class Solution(CodeItem):

rbx/box/solutions.py

@@ -158,12 +158,10 @@ def compile_solutions(
     tracked_solutions: Optional[Set[str]] = None,
     sanitized: bool = False,
 ) -> Dict[pathlib.Path, str]:
-    pkg = package.find_problem_package_or_die()
-
     compiled_solutions = {}
 
     if tracked_solutions is None:
-        tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
+        tracked_solutions = set(str(sol.path) for sol in package.get_solutions())
 
     for solution in expand_solutions(list(tracked_solutions)):
         if progress:
@@ -232,9 +230,8 @@ async def convert_list_of_solution_evaluations_to_dict(
     skeleton: SolutionReportSkeleton,
     items: Iterable[EvaluationItem],
 ) -> List[Dict[str, List[Evaluation]]]:
-    pkg = package.find_problem_package_or_die()
     res: List[Dict[str, List[Evaluation]]] = [
-        collections.defaultdict(list) for _ in pkg.solutions
+        collections.defaultdict(list) for _ in package.get_solutions()
     ]
 
     for item in items:
@@ -250,10 +247,9 @@ def _get_solutions_for_skeleton(
     tracked_solutions: Optional[Iterable[str]] = None,
     verification: VerificationLevel = VerificationLevel.NONE,
 ) -> List[Solution]:
-    pkg = package.find_problem_package_or_die()
     solutions = [
         sol
-        for sol in pkg.solutions
+        for sol in package.get_solutions()
         if verification.value >= VerificationLevel.ALL_SOLUTIONS.value or is_fast(sol)
     ]
     if tracked_solutions is not None:
@@ -739,8 +735,7 @@ def _get_solution_repr(sol: Solution) -> List[Tuple[str, str]]:
 
 
 def expand_solutions_with_source(sols: List[str]) -> List[Tuple[Solution, bool]]:
-    pkg = package.find_problem_package_or_die()
-    pkg_sols = {str(sol.path): sol for sol in pkg.solutions}
+    pkg_sols = {str(sol.path): sol for sol in package.get_solutions()}
 
     # Download remote sols.
     path_sols = remote.expand_files(sols)
@@ -777,20 +772,21 @@ async def pick_solutions(
     tracked_solutions: Optional[OrderedSet[str]],
     extra_solutions: Optional[List[str]] = None,
 ) -> List[str]:
-    pkg = package.find_problem_package_or_die()
     # Store in a separate list to maintain order with the package declaration.
     import questionary
 
+    solutions = package.get_solutions()
+
     choices = [
         questionary.Choice(
             title=_get_solution_repr(sol),
             value=str(sol.path),
             checked=tracked_solutions is None or str(sol.path) in tracked_solutions,
         )
-        for sol in pkg.solutions
+        for sol in solutions
     ]
 
-    seen_sols = set(str(sol.path) for sol in pkg.solutions)
+    seen_sols = set(str(sol.path) for sol in solutions)
 
     if extra_solutions is not None:
         # Add only new solutions.

rbx/box/statements/build_statements.py

@@ -339,7 +339,6 @@ async def build(
     vars: Annotated[
         Optional[List[str]],
         typer.Option(
-            '-v',
             '--vars',
             help='Variables to be used in the statements.',
         ),

rbx/box/statements/latex.py

@@ -5,6 +5,8 @@ from typing import Optional
 
 import chardet
 
+from rbx.utils import command_exists
+
 MAX_PDFLATEX_RUNS = 3
 
 
@@ -45,3 +47,12 @@ class Latex:
             return LatexResult(result=completed, pdf=None)
 
         return LatexResult(result=completed, pdf=output_path.read_bytes())
+
+
+def install_tex_packages(path: pathlib.Path, cwd: pathlib.Path):
+    if not command_exists('texliveonfly'):
+        return
+    subprocess.run(
+        ['texliveonfly', path],
+        cwd=cwd,
+    )

rbx/box/stresses.py

@@ -67,7 +67,7 @@ async def run_stress(
             raise typer.Exit(1)
         generator = generators.get_call_from_string(generator_call)
         stress = Stress(
-            name=f'{generator.name}',
+            name=f'{pathlib.Path(generator.name).stem}',
             generator=generator,
             finder=finder,
         )

rbx/box/tooling/converter.py

@@ -0,0 +1,76 @@
+import pathlib
+import tempfile
+from typing import Optional
+
+import typer
+
+from rbx import console
+from rbx.box import builder, cd, package
+from rbx.box.environment import VerificationLevel
+from rbx.box.packaging.boca.packager import BocaPackager
+from rbx.box.packaging.importer import BaseImporter
+from rbx.box.packaging.moj.packager import MojPackager
+from rbx.box.packaging.packager import BasePackager, BuiltStatement
+from rbx.box.packaging.polygon.importer import PolygonImporter
+from rbx.box.packaging.polygon.packager import PolygonPackager
+from rbx.box.statements.build_statements import build_statement
+
+PACKAGER_REGISTRY = {
+    'polygon': PolygonPackager,
+    'boca': BocaPackager,
+    'moj': MojPackager,
+}
+
+IMPORTER_REGISTRY = {
+    'polygon': PolygonImporter,
+}
+
+
+def get_packager(source: str, **kwargs) -> BasePackager:
+    if source not in PACKAGER_REGISTRY:
+        console.console.print(f'Unknown packager: {source}')
+        raise typer.Exit(1)
+    return PACKAGER_REGISTRY[source](**kwargs)
+
+
+def get_importer(source: str, **kwargs) -> BaseImporter:
+    if source not in IMPORTER_REGISTRY:
+        console.console.print(f'Unknown importer: {source}')
+        raise typer.Exit(1)
+    return IMPORTER_REGISTRY[source](**kwargs)
+
+
+async def convert(
+    pkg_dir: pathlib.Path,
+    into_dir: pathlib.Path,
+    source: str,
+    destination: str,
+    main_language: Optional[str] = None,
+) -> pathlib.Path:
+    importer = get_importer(source, main_language=main_language)
+    packager = get_packager(destination)
+    await importer.import_package(pkg_dir, into_dir)
+
+    with cd.new_package_cd(into_dir):
+        package.clear_package_cache()
+
+        pkg = package.find_problem_package_or_die()
+
+        if not await builder.build(VerificationLevel.NONE.value):
+            console.console.print('[error]Failed to build the problem.[/error]')
+            raise typer.Exit(1)
+
+        built_statements = []
+        for statement_type in packager.statement_types():
+            for language in packager.languages():
+                statement = packager.get_statement_for_language(language)
+                statement_path = build_statement(statement, pkg, statement_type)
+                built_statements.append(
+                    BuiltStatement(statement, statement_path, statement_type)
+                )
+
+        with tempfile.TemporaryDirectory() as td:
+            result_path = packager.package(
+                package.get_build_path(), pathlib.Path(td), built_statements
+            )
+            return result_path

rbx/box/tooling/main.py

@@ -1,8 +1,61 @@
+import atexit
+import pathlib
+import shutil
+import tempfile
+import zipfile
+from typing import Annotated, Optional
+
+import syncer
 import typer
 
-from rbx import annotations
+from rbx import annotations, console
+from rbx.box.tooling import converter
 from rbx.box.tooling.boca import main as boca_main
 
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
 
 app.add_typer(boca_main.app, name='boca')
+
+
+@app.command('convert')
+@syncer.sync
+async def convert(
+    pkg: Annotated[pathlib.Path, typer.Argument(help='The package to convert.')],
+    source: Annotated[
+        str, typer.Option('-s', '--source', help='The format to convert from.')
+    ],
+    dest: Annotated[
+        str, typer.Option('-d', '--dest', help='The format to convert to.')
+    ],
+    output: Annotated[str, typer.Option('-o', '--output', help='The output path.')],
+    language: Annotated[
+        Optional[str],
+        typer.Option('--language', '-l', help='The main language of the problem.'),
+    ] = None,
+):
+    if pkg.suffix == '.zip':
+        temp_dir = tempfile.TemporaryDirectory()
+        with zipfile.ZipFile(pkg, 'r') as zip_ref:
+            zip_ref.extractall(temp_dir.name)
+        pkg = pathlib.Path(temp_dir.name)
+
+        atexit.register(temp_dir.cleanup)
+
+    if not pkg.is_dir():
+        console.console.print(f'[error]Package {pkg} is not a directory.[/error]')
+        raise typer.Exit(1)
+
+    with tempfile.TemporaryDirectory() as td:
+        result_path = await converter.convert(
+            pkg, pathlib.Path(td), source, dest, main_language=language
+        )
+        output_path = pathlib.Path(output)
+        if output_path.suffix == '.zip':
+            output_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy(result_path, output_path)
+        else:
+            output_path.mkdir(parents=True, exist_ok=True)
+            shutil.unpack_archive(result_path, output_path)
+        console.console.print(
+            f'[success]Converted package to [item]{output_path}[/item].[/success]'
+        )

rbx/grading/caching.py

@@ -241,6 +241,7 @@ def _copy_hashed_files(artifact_list: List[GradingArtifacts], cacher: FileCacher
             ) is not None:
                 # Use a symlink to the file in the persistent cache, if available.
                 output.dest.unlink(missing_ok=True)
+                output.dest.parent.mkdir(parents=True, exist_ok=True)
                 output.dest.symlink_to(path_to_symlink)
             else:
                 # Otherwise, copy it.

rbx/grading/judge/sandbox.py

@@ -469,6 +469,7 @@ class SandboxBase(abc.ABC):
         if override:
             real_path.unlink(missing_ok=True)
         try:
+            real_path.parent.mkdir(parents=True, exist_ok=True)
             real_path.symlink_to(utils.abspath(from_path))
         except NotImplementedError:
             return None

rbx/grading/steps.py

@@ -355,6 +355,7 @@ def _process_output_artifacts(
         ):
             # File is in the persistent cache, store a symlink to it.
             dst.unlink(missing_ok=True)
+            dst.parent.mkdir(parents=True, exist_ok=True)
             dst.symlink_to(path_to_symlink)
         else:
             # File is not in the persistent cache, copy it.

rbx/resources/presets/default/contest/.gitignore

@@ -1,6 +1,21 @@
 .box/
 build/
+__pycache__/
 
+.DS_Store
+.vscode/
+
+a.out
+*.exe
+*.pyc
 *.o
+*~
+
+*.fdb_latexmk
+*.fls
+*.log
+*.synctex.gz
 *.aux
 *.log
+
+*.un~

rbx/resources/presets/default/contest/contest.rbx.yml

@@ -1,13 +1,13 @@
 ---
 # yaml-language-server: $schema=https://rsalesc.github.io/rbx/schemas/Contest.json
-# Add problems by running `rbx contest add <problem-name> <short-name>`
+# Add problems by running `rbx contest add`
 name: "new-contest"
 statements:
   - name: "statement-en"
     title: "New contest"
     language: "en"
     path: "statement/contest.rbx.tex"
-    type: "jinja-tex"
+    type: JinjaTeX
     assets:
       - "statement/icpc.sty"
       - "statement/*.png"

rbx/resources/presets/default/problem/.gitignore

@@ -1,6 +1,21 @@
 .box/
 build/
+__pycache__/
 
+.DS_Store
+.vscode/
+
+a.out
+*.exe
+*.pyc
 *.o
+*~
+
+*.fdb_latexmk
+*.fls
+*.log
+*.synctex.gz
 *.aux
 *.log
+
+*.un~

rbx/resources/presets/default/problem/problem.rbx.yml

@@ -5,9 +5,6 @@ timeLimit: 1000 # ms
 memoryLimit: 256 # MiB
 checker: {path: "wcmp.cpp"} # Download others from testlib with `rbx download checker`
 validator: {path: "validator.cpp"}
-generators:
-  - path: "gens/gen.cpp"
-    name: "gen"
 testcases:
   - name: "samples"
     testcaseGlob: "manual_tests/samples/*.in" # Pattern for the sample inputs.
@@ -39,7 +36,7 @@ statements:
 stresses:
   - name: "stress"
     generator:
-      name: "gen"
+      name: "gens/gen"
       args: "[1..<MAX_N>] @" # `@` generates a random string
     finder: "[sols/wa.cpp] ~ INCORRECT"
 unitTests:

rbx/resources/presets/default/problem/testplan/random.py

@@ -1,3 +1,3 @@
 # Generate 10 random testcases with n <= 1e9
 for i in range(10):
-    print(f'gen 1000000000 {i}')
+    print(f'gens/gen 1000000000 {i}')

rbx/resources/presets/default/problem/testplan/random.txt

@@ -1,4 +1,2 @@
-gen 123456
-gen 12345678
-# Obtained by running `rbx stress -g 'gen [1..<MAX_N>] @' -f '[sols/wa.cpp] ~ INCORRECT'`
-gen 149403982 b139a2bd
+gens/gen 123456
+gens/gen 12345678

rbx/resources/presets/default/problem/validator.cpp

@@ -1,3 +1,4 @@
+#include "rbx.h"
 #include "testlib.h"
 
 using namespace std;
@@ -6,7 +7,7 @@ int main(int argc, char *argv[]) {
   registerValidation(argc, argv);
   prepareOpts(argc, argv);
 
-  int MAX_N = opt<int>("MAX_N"); // Read from package vars.
+  int MAX_N = getVar<int>("MAX_N"); // Read from package vars.
 
   inf.readInt(1, MAX_N, "A");
   inf.readSpace();

rbx/resources/presets/default/shared/icpc.sty

@@ -220,7 +220,7 @@
 				\end{minipage}
 			\end{tabular}
 		\end{center}
-		\vspace{-0.5cm}
+		\vspace{-0.1cm}
 	}
 } % exampleInteractive
 

rbx/utils.py

@@ -6,6 +6,7 @@ import os
 import os.path
 import pathlib
 import resource
+import subprocess
 from typing import Any, Optional, Type, TypeVar
 
 import rich
@@ -145,6 +146,18 @@ def get_open_fds():
     return fds
 
 
+def command_exists(command):
+    try:
+        subprocess.run(
+            [command], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        return True
+    except FileNotFoundError:
+        return False
+    except subprocess.CalledProcessError:
+        return True
+
+
 @contextlib.contextmanager
 def new_cd(x: pathlib.Path):
     d = os.getcwd()

{rbx_cp-0.11.2.dist-info → rbx_cp-0.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.11.2
+Version: 0.13.2
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0
@@ -20,6 +20,7 @@ Requires-Dist: fastapi (>=0.115.8,<0.116.0)
 Requires-Dist: filelock (>=3.14.0,<4.0.0)
 Requires-Dist: gitignore-parser (>=0.1.12,<0.2.0)
 Requires-Dist: gitpython (>=3.1.43,<4.0.0)
+Requires-Dist: iso639-lang (>=2.6.1,<3.0.0)
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: lark (>=1.2.2,<2.0.0)
 Requires-Dist: latexbuild (>=0.2.2,<0.3.0)
@@ -33,7 +34,6 @@ Requires-Dist: pydantic (==2.8.2)
 Requires-Dist: pydantic-xml[lxml] (>=2.11.0,<3.0.0)
 Requires-Dist: pypandoc (>=1.15,<2.0)
 Requires-Dist: pyte (>=0.8.2,<0.9.0)
-Requires-Dist: python-iso639 (>=2024.4.27,<2025.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: questionary (>=2.1.0,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)