rbx.cp 0.13.6__tar.gz → 0.13.8__tar.gz

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/PKG-INFO

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

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/pyproject.toml

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

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/code.py

@@ -174,7 +174,7 @@ def _ignore_warning_in_cxx_input(input: GradingFileInput):
     input.src = preprocessed_path
 
 
-def _maybe_rename_java_class(
+def maybe_rename_java_class(
     compilable_path: pathlib.Path, file_mapping: FileMapping
 ) -> pathlib.Path:
     mapped_path = PosixPath(file_mapping.compilable)
@@ -540,7 +540,7 @@ def compile_item(
     download.maybe_add_testlib(code, artifacts)
     download.maybe_add_jngen(code, artifacts)
     download.maybe_add_rbx_header(code, artifacts)
-    compilable_path = _maybe_rename_java_class(compilable_path, file_mapping)
+    compilable_path = maybe_rename_java_class(compilable_path, file_mapping)
     artifacts.inputs.append(
         GradingFileInput(src=compilable_path, dest=PosixPath(file_mapping.compilable))
     )

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/packaging/polygon/upload.py

@@ -247,9 +247,15 @@ def _get_statement_for_language(language: str) -> Optional[Statement]:
 def _get_statement_blocks(statement: Statement) -> StatementBlocks:
     # TODO: actually try to convert to rbxTeX
     assert statement.type == StatementType.rbxTeX
+    pkg = package.find_problem_package_or_die()
+    # TODO: pull this from a library, too hacky at the moment
     builder_problem = StatementBuilderProblem(
-        package=package.find_problem_package_or_die(),
+        package=pkg,
         statement=statement,
+        vars={
+            **pkg.expanded_vars,
+            **statement.expanded_vars,
+        },
     )
     with tempfile.TemporaryDirectory() as temp_dir:
         return render_jinja_blocks(

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/statements/latex_jinja.py

@@ -119,7 +119,7 @@ def scientific_notation(
     mult, exp, rest = _process_zeroes(value)
     if exp < zeroes:
         return str(value)
-    res = '10' if exp == 1 else f'10^{exp}'
+    res = '10' if exp == 1 else f'10^{{{exp}}}'
     if rest > 0 and len(str(rest)) + 1 >= len(str(value)):
         # Should not convert numbers like 532 to 5*10^2 + 32.
         return str(value)

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/testcase_extractors.py

@@ -30,7 +30,7 @@ def _get_group_output(
     return group_path / f'{subgroup_prefix}{i:03d}.out'
 
 
-async def _run_generator_script(testcase: TestcaseSubgroup) -> str:
+async def run_generator_script(testcase: TestcaseSubgroup) -> str:
     assert testcase.generatorScript is not None
 
     cacher = package.get_file_cacher()
@@ -240,7 +240,7 @@ async def run_testcase_visitor(visitor: TestcaseVisitor):
 
         # Run generator script.
         if subgroup.generatorScript is not None:
-            script = await _run_generator_script(subgroup)
+            script = await run_generator_script(subgroup)
 
             # Run each line from generator script.
             for generator_name, args, line_number in _extract_script_lines(script):

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/testcase_utils.py

@@ -40,6 +40,8 @@ class TestcaseEntry(BaseModel):
 
 
 class TestcasePattern(BaseModel):
+    __test__ = False
+
     group_prefix: List[str]
     index: Optional[int] = None
 
@@ -179,10 +181,10 @@ def parse_interaction(file: pathlib.Path) -> TestcaseInteraction:
 
         while line := f.readline().strip():
             if line.startswith(interactor_prefix):
-                stripped = line[len(interactor_prefix) :].strip()
+                stripped = line[len(interactor_prefix) :].rstrip()
                 entries.append(TestcaseInteractionEntry(data=stripped, pipe=0))
             elif line.startswith(solution_prefix):
-                stripped = line[len(solution_prefix) :].strip()
+                stripped = line[len(solution_prefix) :].rstrip()
                 entries.append(TestcaseInteractionEntry(data=stripped, pipe=1))
             else:
                 raise TestcaseInteractionParsingError(
@@ -202,11 +204,11 @@ def get_alternate_interaction_texts(
     solution_entries = []
     for entry in interaction.entries:
         if entry.pipe == 1:
-            solution_entries.append(entry.data)
-            interactor_entries.extend(['\n'] * entry.data.count('\n'))
+            solution_entries.append(entry.data + '\n')
+            interactor_entries.extend(['\n'] * (entry.data.count('\n') + 1))
         else:
-            interactor_entries.append(entry.data)
-            solution_entries.extend(['\n'] * entry.data.count('\n'))
+            interactor_entries.append(entry.data + '\n')
+            solution_entries.extend(['\n'] * (entry.data.count('\n') + 1))
     return ''.join(interactor_entries), ''.join(solution_entries)
 
 
@@ -217,4 +219,4 @@ def print_interaction(interaction: TestcaseInteraction):
             text.stylize('status')
         else:
             text.stylize('info')
-        console.console.print(text, end='')
+        console.console.print(text)

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/testing/testing_package.py

@@ -1,6 +1,6 @@
 import pathlib
 from dataclasses import dataclass
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
 from rbx import console, utils
 from rbx.box import package, presets
@@ -10,11 +10,14 @@ from rbx.box.schema import (
     CodeItem,
     ExpectedOutcome,
     Generator,
+    GeneratorCall,
     Interactor,
     Package,
     Solution,
     TaskType,
+    Testcase,
     TestcaseGroup,
+    TestcaseSubgroup,
     ValidatorOutcome,
     ValidatorTest,
 )
@@ -229,6 +232,154 @@ class TestingPackage(TestingShared):
         ]
         self.save()
 
+    def add_testgroup_with_subgroups(
+        self,
+        name: str,
+        subgroups: List[Dict[str, Any]],
+        validator: Optional[PathOrStr] = None,
+        extra_validators: Optional[List[PathOrStr]] = None,
+    ):
+        """Add a testgroup with subgroups.
+
+        Args:
+            name: Name of the testgroup
+            subgroups: List of subgroup definitions, each containing fields like:
+                - name: subgroup name
+                - generators: list of generator calls
+                - testcases: list of testcase objects
+                - testcaseGlob: glob pattern
+                - generatorScript: generator script path
+                - extraValidators: list of extra validators
+        """
+
+        subgroup_objects = []
+        for subgroup_data in subgroups:
+            subgroup_dict = {'name': subgroup_data['name']}
+
+            if 'generators' in subgroup_data:
+                subgroup_dict['generators'] = [
+                    GeneratorCall(name=gen['name'], args=gen.get('args'))
+                    for gen in subgroup_data['generators']
+                ]
+
+            if 'testcases' in subgroup_data:
+                subgroup_dict['testcases'] = [
+                    Testcase(
+                        inputPath=pathlib.Path(tc['inputPath']),
+                        outputPath=pathlib.Path(tc['outputPath'])
+                        if tc.get('outputPath')
+                        else None,
+                    )
+                    for tc in subgroup_data['testcases']
+                ]
+
+            if 'testcaseGlob' in subgroup_data:
+                subgroup_dict['testcaseGlob'] = subgroup_data['testcaseGlob']
+
+            if 'generatorScript' in subgroup_data:
+                subgroup_dict['generatorScript'] = CodeItem(
+                    path=pathlib.Path(subgroup_data['generatorScript'])
+                )
+
+            if 'extraValidators' in subgroup_data:
+                subgroup_dict['extraValidators'] = [
+                    CodeItem(path=pathlib.Path(v))
+                    for v in subgroup_data['extraValidators']
+                ]
+
+            subgroup_objects.append(TestcaseSubgroup(**subgroup_dict))
+
+        self.yml.testcases = self.yml.testcases + [
+            TestcaseGroup(
+                name=name,
+                subgroups=subgroup_objects,
+                validator=CodeItem(path=pathlib.Path(validator)) if validator else None,
+                extraValidators=[
+                    CodeItem(path=pathlib.Path(v)) for v in extra_validators
+                ]
+                if extra_validators
+                else [],
+            )
+        ]
+        self.save()
+
+    def add_testgroup_with_manual_testcases(
+        self,
+        name: str,
+        testcases: List[Dict[str, str]],
+        validator: Optional[PathOrStr] = None,
+        extra_validators: Optional[List[PathOrStr]] = None,
+    ):
+        """Add a testgroup with manually defined testcases.
+
+        Args:
+            name: Name of the testgroup
+            testcases: List of testcase definitions, each containing:
+                - inputPath: path to input file
+                - outputPath: optional path to output file
+        """
+
+        testcase_objects = []
+        for tc_data in testcases:
+            testcase_objects.append(
+                Testcase(
+                    inputPath=pathlib.Path(tc_data['inputPath']),
+                    outputPath=pathlib.Path(tc_data['outputPath'])
+                    if tc_data.get('outputPath')
+                    else None,
+                )
+            )
+
+        self.yml.testcases = self.yml.testcases + [
+            TestcaseGroup(
+                name=name,
+                testcases=testcase_objects,
+                validator=CodeItem(path=pathlib.Path(validator)) if validator else None,
+                extraValidators=[
+                    CodeItem(path=pathlib.Path(v)) for v in extra_validators
+                ]
+                if extra_validators
+                else [],
+            )
+        ]
+        self.save()
+
+    def add_testgroup_with_generators(
+        self,
+        name: str,
+        generators: List[Dict[str, str]],
+        validator: Optional[PathOrStr] = None,
+        extra_validators: Optional[List[PathOrStr]] = None,
+    ):
+        """Add a testgroup with generator calls.
+
+        Args:
+            name: Name of the testgroup
+            generators: List of generator definitions, each containing:
+                - name: generator name
+                - args: optional generator arguments
+        """
+
+        generator_objects = []
+        for gen_data in generators:
+            generator_objects.append(
+                GeneratorCall(name=gen_data['name'], args=gen_data.get('args'))
+            )
+
+        self.yml.testcases = self.yml.testcases + [
+            TestcaseGroup(
+                name=name,
+                generators=generator_objects,
+                validator=CodeItem(path=pathlib.Path(validator)) if validator else None,
+                extraValidators=[
+                    CodeItem(path=pathlib.Path(v)) for v in extra_validators
+                ]
+                if extra_validators
+                else [],
+            )
+        ]
+        self.save()
+
     def get_build_testgroup_path(self, name: str) -> pathlib.Path:
         return self.root / 'build' / 'tests' / name
 

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/box/testing/testing_shared.py

@@ -55,7 +55,10 @@ class TestingShared:
         return filename
 
     def relpath(self, path: PathOrStr) -> pathlib.Path:
-        return pathlib.Path(path).relative_to(self.root)
+        path = pathlib.Path(path)
+        if not path.is_relative_to(self.root):
+            return path
+        return path.relative_to(self.root)
 
     def add_from_testdata(self, path: PathOrStr, src: PathOrStr):
         testdata_path = get_testdata_path()

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/grading/judge/sandboxes/stupid_sandbox.py

@@ -316,7 +316,10 @@ class StupidSandbox(SandboxBase):
                     interactor_tee.pipes.output.close()
 
                 if idx == 0 and program_result.exitcode != 0:
-                    os.killpg(group_id, signal.SIGKILL)
+                    try:
+                        os.killpg(group_id, signal.SIGKILL)
+                    except Exception:
+                        pass
             elif pid == program.pid:
                 program_result = program.process_exit(status, ru)
                 results[0] = self._get_sandbox_log(program_result, params)

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/resources/presets/default/contest/contest.rbx.yml

@@ -17,6 +17,10 @@ statements:
       configure:
         - type: "rbx-tex" # Convert rbxTeX to TeX
           template: "statement/template.rbx.tex"
+      vars:
+        # Turn into false to hide time limits and memory limits in the problem statement.
+        # Useful for ICPC-style contests where you distribute a separate info sheet.
+        show_limits: true
   - name: "editorial-en"
     extends: "statement-en"
     override:

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/resources/presets/default/problem/problem.rbx.yml

@@ -31,6 +31,8 @@ statements:
     configure:
       - type: "rbx-tex" # Convert rbxTeX to TeX
         template: "statement/template.rbx.tex"
+    vars:
+      show_limits: true
 stresses:
   - name: "stress"
     generator:

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/contest_template.rbx.tex

@@ -1,10 +1,16 @@
-%- if vars.show_problem is truthy or vars.editorial is falsy
+%- if problem.vars.show_problem is truthy or problem.vars.editorial is falsy
 \includeProblem
 %- if problem.short_name is defined
 	[\VAR{problem.short_name}]
 %- endif
 {\VAR{problem.title | escape}}{
 
+%- if problem.vars.show_limits is truthy
+	\includeLimits{\VAR{problem.package.timeLimit} ms}{\VAR{problem.package.memoryLimit} MiB}
+%- else
+	\vspace{0.55cm}
+%- endif
+
 	\VAR{problem.blocks.legend}
 
 	%- if problem.blocks.input is defined
@@ -20,7 +26,7 @@
 	%- endif
 
 	%- if problem.samples
-		\vspace{0.3cm}
+		\vspace{0.1cm}
 		\subsection*{\strExamples}
 		%- for sample in problem.samples
 			%- if sample.interaction is not none

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/icpc.sty

@@ -16,6 +16,7 @@
 \let\mytitleformat\titleformat
 \let\titleformat\relax
 \usepackage{logicpuzzle}
+\let\titleformat\mytitleformat
 \usepackage{enumitem}
 \usepackage{amsfonts}
 \usepackage[brazil]{babel}
@@ -76,6 +77,11 @@
 
 \setlength{\voffset}{-1in}
 
+% Increase section text sizes
+\titleformat{\section}{\LARGE\bfseries}{\thesection}{1em}{}
+\titleformat{\subsection}{\Large\bfseries}{\thesubsection}{1em}{}
+\titleformat{\subsubsection}{\normalsize\bfseries}{\thesubsubsection}{1em}{}
+
 \newcommand{\insereArquivo}[1]{
 	\ifnum0\pdffilesize{#1}>0
 		\VerbatimInput[xleftmargin=0mm,numbers=none,obeytabs=true]{#1}\vspace{.5em}
@@ -139,6 +145,15 @@
 	#3
 }
 
+\newcommand{\includeLimits}[2]{
+	\vspace{0.2cm}
+	\begin{center}
+		\textit{\strTimeLimit: #1}\\
+		\textit{\strMemoryLimit: #2}
+	\end{center}
+	\vspace{0.25cm}
+}
+
 \newcommand{\inputdesc}[1]{
 	\subsection*{\strInput}
 	{#1} }
@@ -271,11 +286,9 @@
 \newcounter{pcounter}\setcounter{pcounter}{0}
 \newcounter{qcounter}\setcounter{qcounter}{0}
 
-\usepackage{titlesec}
-
-\titlespacing\section{0pt}{6pt plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
-\titlespacing\subsection{0pt}{6pt plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
-\titlespacing\subsubsection{0pt}{6t plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
+\titlespacing\section{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
+\titlespacing\subsection{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
+\titlespacing\subsubsection{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
 
 \newcommand{\InsertTitlePage}
 {

{rbx_cp-0.13.6 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/problem_template.rbx.tex

@@ -15,6 +15,12 @@
 %- endif
 {\VAR{problem.title | escape}}{
 
+%- if problem.vars.show_limits is truthy
+	\includeLimits{\VAR{problem.package.timeLimit} ms}{\VAR{problem.package.memoryLimit} MiB}
+%- else
+	\vspace{0.55cm}
+%- endif
+
 	\VAR{problem.blocks.legend}
 
 	%- if problem.blocks.input is defined
@@ -30,7 +36,7 @@
 	%- endif
 
 	%- if problem.samples
-		\vspace{0.3cm}
+		\vspace{0.1cm}
 		\subsection*{\strExamples}
 		%- for sample in problem.samples
 			%- if sample.interaction is not none