rbx.cp 0.13.6__py3-none-any.whl → 0.13.7__py3-none-any.whl

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/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/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/box/testcase_utils.py

@@ -40,6 +40,8 @@ class TestcaseEntry(BaseModel):
 
 
 class TestcasePattern(BaseModel):
+    __test__ = False
+
     group_prefix: List[str]
     index: Optional[int] = None
 

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/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/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.dist-info → rbx_cp-0.13.7.dist-info}/METADATA

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

{rbx_cp-0.13.6.dist-info → rbx_cp-0.13.7.dist-info}/RECORD

@@ -6,7 +6,7 @@ rbx/box/builder.py,sha256=umrTdVAwvsOosBDVvDZ6kq1yWg3Z2Lxp2o1zK-V7BBk,3594
 rbx/box/cd.py,sha256=_XAzb3kV1NUaaRs8hc9SGDo10O1yh2_gr1EiAKzfUjI,2711
 rbx/box/checkers.py,sha256=mRovZyTZdySFEaYFVc3Lc-xgEsu6F9FjVPOxDwub7aY,13226
 rbx/box/cli.py,sha256=eBXiy3zG6IzrIHPYplFWhGn7cB7nmA7F1GiAGoYFWp0,29904
-rbx/box/code.py,sha256=SXjce-rBr_B4bVNgCYBuN6KZJTtb9GfYqIxPmrO2XWo,25467
+rbx/box/code.py,sha256=2e1tDdrVqHUIT6qaW-MiU2YeuYSdRBhTCTJX78E82do,25465
 rbx/box/compile.py,sha256=Kzn5mEQu4vb91W9vjyt0DS6cfPJzFLTUoowFj7uHLUo,2539
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/contest/build_contest_statements.py,sha256=N7TQ8Ki7ZM94sATHploDsSKbY41Xey_FlXclEdCBpJI,13010
@@ -66,7 +66,7 @@ rbx/box/statements/builders.py,sha256=t3q1BX1SaELQVZB0tynuhAs_0UI3yzpUcvsQEEaUE-
 rbx/box/statements/expander.py,sha256=sdbMtNcJQCbXGIkFIl9h24pGr77vhFLnM31V5AfuduI,1715
 rbx/box/statements/joiners.py,sha256=jItNXkAbTjFQpPMgfDMW86n3vMTbaE8sgo9I8Yf4Txg,2886
 rbx/box/statements/latex.py,sha256=ipTGjL4kjAsnqgiH6Pk1PwKFegBumQP4-y0pFAbNN8I,1584
-rbx/box/statements/latex_jinja.py,sha256=iMx47ynKMjLNcfymzHV24jtWrRVnit0Va9H8yTfgmiA,10379
+rbx/box/statements/latex_jinja.py,sha256=1VWabl8dD0ix3XNABANA1Qt00D4ww0HR2L5lmywmdWU,10383
 rbx/box/statements/schema.py,sha256=n1OXbcmte-cGQn7PlSGOzBEYi0gRYUNDSubgYFKxo7I,5429
 rbx/box/stats.py,sha256=rUAnmp7kTgUvIQ56NLpQaIQkazB37MVcUos5en3xUQw,3258
 rbx/box/stresses.py,sha256=SV0Hx7SPZZEIhwasWDVpTWuMhWWTjfJs2IEW-H0xJZw,12092
@@ -74,14 +74,14 @@ rbx/box/stressing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 rbx/box/stressing/finder_parser.py,sha256=PnONJD2yun5X5EmHqkaz-rh3DHhn_BkTPHZrIXRKZbw,11898
 rbx/box/stressing/generator_parser.py,sha256=oHZryjR3YohgaSO9WEirQ7b2e-98WgZStF0N99W4Thw,7380
 rbx/box/tasks.py,sha256=CJ7TqzhVMPP4VUSrMpp3ofSDJn0rbuwIUWgFOiup_vE,11426
-rbx/box/testcase_extractors.py,sha256=J43eG7vpxc5nP_2yhrXJODkd4EYlV4WiYVbM6hzipY4,11944
-rbx/box/testcase_utils.py,sha256=HoDr_RxWpfviLd2oTj_m2wg1e4XaY9LD-QBqx_QjDI0,6899
+rbx/box/testcase_extractors.py,sha256=vyT3Qw9FkQ-SABcgjyL9UBdKT1SktJ3-_4A-HRj6FQA,11942
+rbx/box/testcase_utils.py,sha256=Ywz9c9zH96IZAj8rDDuhS7xmdLXeLM6JsKZf2x9X5Go,6921
 rbx/box/testcases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/testcases/main.py,sha256=_I7h_obRcpNLRQ6dDJDIE5NAvTyn5nBOhdsBhRA_PvU,5442
 rbx/box/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/testing/testing_package.py,sha256=kzvSbL_4fkjD2l3hfYapyOezLHhhySi9sp4u92MoycY,10121
+rbx/box/testing/testing_package.py,sha256=szNc8GcxI0ywCjzV8fOuZh5F0fMtQ6_tLOfivF7hu10,15401
 rbx/box/testing/testing_preset.py,sha256=7TxfL4fT9JetRMRkQ3Iko99N5gzfKz8_lPM0rkkQx_k,1135
-rbx/box/testing/testing_shared.py,sha256=rX7w5VrCzf4l9zYhq3eFW1iHaWDLU-Xkn5oCjnAavhA,2558
+rbx/box/testing/testing_shared.py,sha256=3j1n61ROVDxU2vZbLLIQuGEeYDs_CxsnnK9d7lT6hPI,2649
 rbx/box/tooling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/tooling/boca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/tooling/boca/main.py,sha256=knl1rpaHIwA63KkzMJMZQrejzMpbTPBhYqGx1IpuNm4,289
@@ -127,7 +127,7 @@ rbx/grading/judge/digester.py,sha256=gtOIe_iL4PEWA7OKelW1gjSI-nBvbOpDPJGV8VQyjSg
 rbx/grading/judge/program.py,sha256=ttT7X_uLls4ARIbid0MnSteo8Eti1fRw73FL_Ej6S_o,9683
 rbx/grading/judge/sandbox.py,sha256=mcqJscMPhMfjKhxKFkwIP-I4bnQHHMWeBcXiWHGVS-k,21324
 rbx/grading/judge/sandboxes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/grading/judge/sandboxes/stupid_sandbox.py,sha256=-fSYt0WNf04rrakhxdrunYlmwO2uM2Pf1HmUX8qfxrI,11458
+rbx/grading/judge/sandboxes/stupid_sandbox.py,sha256=QJkazyqvTq9nQjupLVkH0HbdP13RH52T2jLBExAEQwE,11554
 rbx/grading/judge/sandboxes/tee.py,sha256=fLulB8fV7k5cO-ikRgURpsETrvr6LoUSjGxFM3GZs5U,672
 rbx/grading/judge/storage.py,sha256=A88O81-vzv8vMBGrO9gtFk8iB5fTD7ObpO8mvNH4OmA,14576
 rbx/grading/limits.py,sha256=ev312UTOo8S4-3AAVibQdXZclWCxS96CdbZxqW4y1kE,770
@@ -219,8 +219,8 @@ rbx/submitors/codeforces.py,sha256=s8c7sXfm5k76SKMC8g0Y93-RRf8wY2uWbBtA8ODD5eM,4
 rbx/submitors/submitor.py,sha256=8q-Hbdahxt30ciT_R9j_xF6lEPUh9IcfAUnzjQjbvHU,457
 rbx/testing_utils.py,sha256=965vlkQpUW8cEqjB6S2g_C_avL5fn503mJPbqjY_zt4,2317
 rbx/utils.py,sha256=xDqmry5rpqRGPFrx3ipNGBt2WxWDAD5LwU7jvgibXkk,8630
-rbx_cp-0.13.6.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.13.6.dist-info/METADATA,sha256=YRfhn0e29x1tf9DRjJbTE2kL19oQN3gx7Cz1evofaUg,4659
-rbx_cp-0.13.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-rbx_cp-0.13.6.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.13.6.dist-info/RECORD,,
+rbx_cp-0.13.7.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.13.7.dist-info/METADATA,sha256=TcJSmgIQFD7R_zuGbOLun5EixzDKQevwsn-7lJ6ln98,4659
+rbx_cp-0.13.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+rbx_cp-0.13.7.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.13.7.dist-info/RECORD,,