rbx.cp 0.11.2__tar.gz → 0.12.0__tar.gz

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.11.2
+Version: 0.12.0
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/pyproject.toml

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

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/builder.py

@@ -96,10 +96,10 @@ async def verify(verification: environment.VerificationParam) -> bool:
 
     tracked_solutions = None
     if verification < VerificationLevel.ALL_SOLUTIONS.value:
-        pkg = package.find_problem_package_or_die()
-
         tracked_solutions = {
-            str(solution.path) for solution in pkg.solutions if is_fast(solution)
+            str(solution.path)
+            for solution in package.get_solutions()
+            if is_fast(solution)
         }
 
     with utils.StatusProgress('Running solutions...') as s:

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/contest/build_contest_statements.py

@@ -1,6 +1,5 @@
 import dataclasses
 import pathlib
-import subprocess
 import tempfile
 import typing
 from typing import Any, Dict, List, Optional, Tuple
@@ -13,7 +12,7 @@ from rbx.box.contest.contest_package import get_problems
 from rbx.box.contest.schema import Contest, ContestProblem, ContestStatement
 from rbx.box.formatting import href
 from rbx.box.schema import Package, Testcase
-from rbx.box.statements import build_statements
+from rbx.box.statements import build_statements, latex
 from rbx.box.statements.build_statements import (
     get_builders,
     get_environment_languages_for_statement,
@@ -253,10 +252,10 @@ def build_contest_only(
                 console.console.log(
                     f'Installing LaTeX packages for [item]{statement.name} {statement.language}[/item]...'
                 )
-                subprocess.run(
-                    ['texliveonfly', output],
-                    cwd=td,
-                )
+                tmp_file = pathlib.Path(td) / '__tmp_install__.tex'
+                tmp_file.write_bytes(output)
+                latex.install_tex_packages(tmp_file, pathlib.Path(td))
+
         last_content = output
         last_output = bdr.output_type()
 

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/contest/statements.py

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

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/generators.py

@@ -1,3 +1,4 @@
+import functools
 import pathlib
 import shutil
 from typing import Dict, List, Optional, Set
@@ -40,12 +41,44 @@ def _compile_generator(generator: CodeItem) -> str:
     return compile_item(generator, sanitized=SanitizationLevel.PREFER)
 
 
+@functools.cache
+def _warn_once_about_crlf():
+    console.console.print(
+        '[warning]It seems a few files have CRLF (\\r\\n) line endings.[/warning]'
+    )
+    console.console.print(
+        '[warning]This usually happens when the file is created on Windows. Please convert the file to LF (\\n) line endings.[/warning]'
+    )
+    console.console.print(
+        '[warning]If you are in VSCode, you can make sure LF (\\n) line endings are used by changing the [item]"files.eol"[/item] setting.[/warning]'
+    )
+
+
+@functools.cache
+def _warn_about_crlf(path: pathlib.Path):
+    _warn_once_about_crlf()
+    console.console.print(
+        f'[warning]Testcase file [item]{path}[/item] has CRLF (\\r\\n) line endings, converting to LF (\\n).[/warning]'
+    )
+
+
+def _check_crlf(path: pathlib.Path):
+    with open(path, 'rb') as f:
+        for line in f:
+            if line.endswith(b'\r\n') or line.endswith(b'\n\r'):
+                _warn_about_crlf(path)
+                break
+
+    path.write_text(path.read_text().replace('\r', ''))
+
+
 def _copy_testcase_over(
     testcase: Testcase,
     dest: Testcase,
 ):
     testcase = fill_output_for_defined_testcase(testcase)
     dest.inputPath.parent.mkdir(parents=True, exist_ok=True)
+    _check_crlf(testcase.inputPath)
     shutil.copy(
         str(testcase.inputPath),
         str(dest.inputPath),
@@ -55,6 +88,7 @@ def _copy_testcase_over(
         and testcase.outputPath.is_file()
         and dest.outputPath is not None
     ):
+        _check_crlf(testcase.outputPath)
         dest.outputPath.parent.mkdir(parents=True, exist_ok=True)
         shutil.copy(
             str(testcase.outputPath),
@@ -71,6 +105,8 @@ def _copy_testcase_output_over(
     if not src_path.is_file():
         return False
 
+    _check_crlf(src_path)
+
     shutil.copy(str(src_path), str(dest_output_path.with_suffix(suffix)))
     return True
 
@@ -84,6 +120,7 @@ def _copy_testcase_outputs_over(
     has_copied = False
 
     if testcase.outputPath is not None and testcase.outputPath.is_file():
+        _check_crlf(testcase.outputPath)
         shutil.copy(str(testcase.outputPath), str(dest.outputPath))
         has_copied = True
 
@@ -120,35 +157,42 @@ def get_call_from_string(call_str: str) -> GeneratorCall:
 async def _get_necessary_generators_for_groups(
     groups: Optional[Set[str]] = None,
 ) -> Set[str]:
-    pkg = package.find_problem_package_or_die()
-    existing_generators = set(generator.name for generator in pkg.generators)
     necessary_generators = set()
 
     class NecessaryGeneratorsVisitor(TestcaseGroupVisitor):
         async def visit(self, entry: GenerationTestcaseEntry):
             if entry.metadata.generator_call is not None:
+                if (
+                    package.get_generator_or_nil(entry.metadata.generator_call.name)
+                    is None
+                ):
+                    console.console.print(
+                        f'[error]Generator [item]{entry.metadata.generator_call.name}[/item] is not present in the package.[/error]'
+                    )
+                    if entry.metadata.generator_script is not None:
+                        console.console.print(
+                            f'[error]This generator is referenced from [item]{entry.metadata.generator_script}[/item].[/error]'
+                        )
+                    raise typer.Exit(1)
                 necessary_generators.add(entry.metadata.generator_call.name)
 
     await run_testcase_visitor(NecessaryGeneratorsVisitor(groups))
 
-    return existing_generators.intersection(necessary_generators)
+    return necessary_generators
 
 
 def compile_generators(
+    tracked_generators: Set[str],
     progress: Optional[StatusProgress] = None,
-    tracked_generators: Optional[Set[str]] = None,
 ) -> Dict[str, str]:
     def update_status(text: str):
         if progress is not None:
             progress.update(text)
 
-    pkg = package.find_problem_package_or_die()
-
     generator_to_compiled_digest = {}
 
-    for generator in pkg.generators:
-        if tracked_generators is not None and generator.name not in tracked_generators:
-            continue
+    for generator_name in tracked_generators:
+        generator = package.get_generator(generator_name)
         update_status(f'Compiling generator [item]{generator.name}[/item]')
         try:
             generator_to_compiled_digest[generator.name] = _compile_generator(generator)
@@ -267,9 +311,7 @@ async def generate_testcases(
 
     compiled_generators = compile_generators(
         progress=progress,
-        tracked_generators=await _get_necessary_generators_for_groups(groups)
-        if groups is not None
-        else None,
+        tracked_generators=await _get_necessary_generators_for_groups(groups),
     )
 
     testcase_utils.clear_built_testcases()

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/package.py

@@ -229,13 +229,45 @@ def get_build_testgroup_path(
 
 
 @functools.cache
-def get_generator(name: str, root: pathlib.Path = pathlib.Path()) -> Generator:
+def get_generator_or_nil(
+    name: str, root: pathlib.Path = pathlib.Path()
+) -> Optional[Generator]:
     package = find_problem_package_or_die(root)
     for generator in package.generators:
         if generator.name == name:
             return generator
-    console.console.print(f'[error]Generator [item]{name}[/item] not found[/error]')
-    raise typer.Exit(1)
+
+    path = pathlib.Path(root / name)
+    if path.is_file():
+        return Generator(name=name, path=path)
+
+    path_pattern = path.with_suffix('.*')
+    matching_files = list(
+        file.relative_to(root) for file in root.glob(str(path_pattern))
+    )
+
+    if len(matching_files) > 1:
+        console.console.print(
+            f'[error]Multiple candidate generators found for [item]{name}[/item]: {matching_files}[/error]'
+        )
+        console.console.print(
+            '[info]Please specify the generator path explicitly, including the extension, or rename the conflicting files.[/info]'
+        )
+        raise typer.Exit(1)
+
+    if matching_files:
+        return Generator(name=name, path=matching_files[0])
+
+    return None
+
+
+@functools.cache
+def get_generator(name: str, root: pathlib.Path = pathlib.Path()) -> Generator:
+    generator = get_generator_or_nil(name, root)
+    if generator is None:
+        console.console.print(f'[error]Generator [item]{name}[/item] not found[/error]')
+        raise typer.Exit(1)
+    return generator
 
 
 @functools.cache
@@ -292,7 +324,27 @@ def get_interactor(root: pathlib.Path = pathlib.Path()) -> CodeItem:
 @functools.cache
 def get_solutions(root: pathlib.Path = pathlib.Path()) -> List[Solution]:
     package = find_problem_package_or_die(root)
-    return package.solutions
+    seen_paths = set()
+    res = []
+
+    def add_solution(entry: Solution):
+        if entry.path in seen_paths:
+            return
+        seen_paths.add(entry.path)
+        res.append(entry)
+
+    for entry in package.solutions:
+        if '*' in str(entry.path):
+            for file in root.glob(str(entry.path)):
+                relative_file = file.relative_to(root)
+                add_solution(
+                    Solution.model_copy(
+                        entry, update={'path': relative_file}, deep=True
+                    )
+                )
+            continue
+        add_solution(entry)
+    return res
 
 
 @functools.cache

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/rbx/box/packaging/polygon/upload.py

@@ -214,8 +214,7 @@ def _upload_testcases(problem: api.Problem):
 
 def _upload_solutions(problem: api.Problem):
     console.console.print('Uploading main solution...')
-    pkg = package.find_problem_package_or_die()
-    main_solution = pkg.solutions[0]
+    main_solution = package.get_main_solution()
     if main_solution is None or main_solution.outcome != ExpectedOutcome.ACCEPTED:
         return
     problem.save_solution(
@@ -225,7 +224,7 @@ def _upload_solutions(problem: api.Problem):
         tag=api.SolutionTag.MA,
     )
 
-    for i, solution in enumerate(pkg.solutions):
+    for i, solution in enumerate(package.get_solutions()):
         console.console.print(
             f'Uploading solution [item]{solution.path.name}[/item] (tag: [item]{_get_solution_tag(solution, is_first=i == 0)}[/item])...'
         )

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.12.0/rbx/resources/presets/default/contest/.gitignore

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

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.12.0/rbx/resources/presets/default/problem/.gitignore

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

{rbx_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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_cp-0.11.2 → rbx_cp-0.12.0}/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/rbx/resources/presets/default/contest/.gitignore

@@ -1,6 +0,0 @@
-.box/
-build/
-
-*.o
-*.aux
-*.log

rbx_cp-0.11.2/rbx/resources/presets/default/problem/.gitignore

@@ -1,6 +0,0 @@
-.box/
-build/
-
-*.o
-*.aux
-*.log