rbx.cp 0.5.32__py3-none-any.whl → 0.5.34__py3-none-any.whl

rbx/box/code.py

@@ -186,15 +186,14 @@ def _check_stack_limit():
         if hard != resource.RLIM_INFINITY:
             target_text = min(hard, TARGET)
         console.console.print(
-            """
+            f"""
 ```
-export RBX_BIN_PATH=`which rbx`
-function rbx() {
-        ulimit -s %s && $RBX_BIN_PATH $@
-}
+function rbx() {{
+    local rbx_bin=`bash -c "type -P rbx"`
+    ulimit -s {target_text // 1024} && $rbx_bin $@
+}}
 ```
-            """
-            % target_text
+        """
         )
         console.console.print()
         console.console.print(

rbx/box/contest/build_contest_statements.py

@@ -22,6 +22,7 @@ from rbx.box.statements.builders import (
     StatementBuilderContest,
     StatementBuilderContext,
     StatementBuilderProblem,
+    StatementSample,
     prepare_assets,
 )
 from rbx.box.statements.joiners import (
@@ -51,7 +52,7 @@ class ExtractedProblem:
         return StatementBuilderProblem(
             package=self.package,
             statement=self.statement,
-            samples=self.samples,
+            samples=StatementSample.from_testcases(self.samples),
             io_path=self.built_statement,
             short_name=self.problem.short_name,
         )
@@ -124,7 +125,7 @@ def get_builder_problems(
         StatementBuilderProblem(
             package=ex.package,
             statement=ex.statement,
-            samples=ex.samples,
+            samples=StatementSample.from_testcases(ex.samples),
         )
         for ex in extracted_problems
     ]

rbx/box/main.py

@@ -760,8 +760,3 @@ def clear():
     console.console.print('Cleaning cache and build directories...')
     shutil.rmtree('.box', ignore_errors=True)
     shutil.rmtree('build', ignore_errors=True)
-
-
-@app.callback()
-def callback():
-    pass

rbx/box/package.py

@@ -364,6 +364,13 @@ def get_compilation_files(code: CodeItem) -> List[Tuple[pathlib.Path, pathlib.Pa
     return res
 
 
+@functools.cache
+def get_empty_sentinel_path(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
+    path = get_problem_cache_dir(root) / '.empty'
+    path.write_text('')
+    return path
+
+
 def clear_package_cache():
     pkgs = [sys.modules[__name__]]
 

rbx/box/solutions.py

@@ -911,38 +911,81 @@ class TimingSummary:
         if self.fastest_slow is None or time < self.fastest_slow:
             self.fastest_slow = time
 
+    def print(self, console: rich.console.Console, tl: Optional[int] = None):
+        if self.slowest_good is not None:
+            console.print(
+                f'Slowest [success]OK[/success] solution: {self.slowest_good} ms'
+            )
+        if self.fastest_slow is not None:
+            fastest_slow = self.fastest_slow
+            if tl is not None and self.fastest_slow > tl:
+                fastest_slow = f'>{tl}'
+            console.print(f'Fastest [error]slow[/error] solution: {fastest_slow} ms')
+
 
 async def _print_timing(
     console: rich.console.Console,
     skeleton: SolutionReportSkeleton,
     evaluations: StructuredEvaluation,
+    verification: VerificationLevel,
 ):
+    pkg = package.find_problem_package_or_die()
     summary = TimingSummary()
-    sumamry_per_language = collections.defaultdict(TimingSummary)
+    summary_per_language = collections.defaultdict(TimingSummary)
+    tls_per_language = {}
+    all_tls = set()
     for solution in skeleton.solutions:
-        all_evals = []
+        all_evals: List[Evaluation] = []
         for evals in evaluations[str(solution.path)].values():
             all_evals.extend([await eval() for eval in evals if eval is not None])
+        if not all_evals:
+            continue
+
+        # Get solution TL.
         solution_time = _get_evals_time_in_ms(all_evals)
+        solution_tls = [
+            eval.log.metadata.timeLimit
+            for eval in all_evals
+            if eval.log.metadata is not None and eval.log.metadata.timeLimit is not None
+        ]
+        solution_tl = 0
+        if solution_tls:
+            solution_tl = min(solution_tls)
+        else:
+            solution_tl = pkg.timelimit_for_language(solution.language)
+            if verification.value >= VerificationLevel.FULL.value:
+                solution_tl = solution_tl * 2
+        all_tls.add(solution_tl)
+        for eval in all_evals:
+            if eval.log.get_run_language() is not None:
+                tls_per_language[eval.log.get_run_language()] = solution_tl
+
+        # Get solution timings.
         if solution.outcome.match(Outcome.ACCEPTED):
             summary.add_good(solution_time)
-            sumamry_per_language[solution.language].add_good(solution_time)
+            summary_per_language[solution.language].add_good(solution_time)
         if solution.outcome.is_slow():
             summary.add_slow(solution_time)
-            sumamry_per_language[solution.language].add_slow(solution_time)
+            summary_per_language[solution.language].add_slow(solution_time)
 
     if summary.slowest_good is None and summary.fastest_slow is None:
         return
 
+    all_languages = set(summary_per_language)
+    all_tl = min(all_tls) if all_tls else None
     console.print('[status]Timing summary:[/status]')
-    if summary.slowest_good is not None:
-        console.print(
-            f'Slowest [success]OK[/success] solution: {summary.slowest_good} ms'
-        )
-    if summary.fastest_slow is not None:
-        console.print(
-            f'Fastest [error]slow[/error] solution: {summary.fastest_slow} ms'
+
+    if len(all_languages) <= 1 or len(all_tls) <= 1:
+        summary.print(console, tl=all_tl)
+        return
+
+    # Otherwise, print per language.
+    for lang in sorted(all_languages):
+        console.print(f'[status]{lang}[/status]')
+        summary_per_language[lang].print(
+            console, tl=tls_per_language.get(lang) or all_tl
         )
+        console.print()
 
 
 def _length_markup(markup: str) -> int:
@@ -1109,7 +1152,9 @@ async def _print_detailed_run_report(
     console.print()
 
     if timing:
-        await _print_timing(console, result.skeleton, structured_evaluations)
+        await _print_timing(
+            console, result.skeleton, structured_evaluations, verification=verification
+        )
     return ok
 
 
@@ -1193,7 +1238,9 @@ async def print_run_report(
         ok = ok and cur_ok
         console.print()
 
-    await _print_timing(console, result.skeleton, structured_evaluations)
+    await _print_timing(
+        console, result.skeleton, structured_evaluations, verification=verification
+    )
 
     return ok
 

rbx/box/statements/build_statements.py

@@ -15,6 +15,7 @@ from rbx.box.statements.builders import (
     StatementBuilderContext,
     StatementBuilderProblem,
     StatementCodeLanguage,
+    StatementSample,
     prepare_assets,
 )
 from rbx.box.statements.schema import (
@@ -263,7 +264,9 @@ def build_statement_bytes(
                 item=StatementBuilderProblem(
                     package=pkg,
                     statement=statement,
-                    samples=get_samples() if use_samples else [],
+                    samples=StatementSample.from_testcases(
+                        get_samples() if use_samples else []
+                    ),
                     short_name=short_name,
                 ),
                 verbose=False,

rbx/box/statements/builders.py

@@ -7,8 +7,9 @@ from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional, Tuple
 
 import typer
+from pydantic import BaseModel
 
-from rbx import console
+from rbx import console, utils
 from rbx.box.schema import Package, Primitive, Testcase
 from rbx.box.statements.latex import (
     MAX_PDFLATEX_RUNS,
@@ -64,7 +65,25 @@ class StatementBuilderItem(ABC):
         pass
 
 
-class StatementSample(Testcase):
+class StatementSample(BaseModel):
+    inputPath: pathlib.Path
+    outputPath: pathlib.Path
+    hasOutput: bool = True
+
+    @staticmethod
+    def from_testcase(testcase: Testcase) -> 'StatementSample':
+        return StatementSample(
+            inputPath=testcase.inputPath,
+            outputPath=testcase.outputPath or utils.get_empty_sentinel_path(),
+            hasOutput=testcase.outputPath is not None,
+        )
+
+    @staticmethod
+    def from_testcases(testcases: List[Testcase]) -> List['StatementSample']:
+        return [StatementSample.from_testcase(testcase) for testcase in testcases]
+
+
+class ExplainedStatementSample(StatementSample):
     explanation: Optional[str] = None
 
 
@@ -72,7 +91,7 @@ class StatementSample(Testcase):
 class StatementBuilderProblem(StatementBuilderItem):
     package: Package
     statement: Statement
-    samples: List[Testcase] = dataclasses.field(default_factory=list)
+    samples: List[StatementSample] = dataclasses.field(default_factory=list)
     short_name: Optional[str] = None
 
     # Will only be filled by contests.
@@ -301,8 +320,8 @@ class rbxTeXBuilder(StatementBuilder):
         problem_kwargs['problem']['blocks'] = blocks
         if statement_blocks.explanations is not None:
             problem_kwargs['problem']['samples'] = [
-                StatementSample(
-                    **typing.cast(Testcase, sample).model_dump(),
+                ExplainedStatementSample(
+                    **typing.cast(StatementSample, sample).model_dump(),
                     explanation=statement_blocks.explanations.get(i),
                 )
                 for i, sample in enumerate(problem_kwargs['problem']['samples'])

rbx/box/validators.py

@@ -273,6 +273,11 @@ def print_validation_report(infos: List[TestcaseValidationInfo]):
         if _is_hit_bound_good(v) and k != 'samples'
     }
 
+    all_groups = set(info.group for info in infos)
+    if len(all_groups) == 1 and 'samples' in all_groups:
+        # If there's only the samples group, do not check for hit bounds.
+        hit_bounds_per_group = {}
+
     if not hit_bounds_per_group:
         console.console.print('[info]No validation issues found.[/info]')
         return

rbx/utils.py

@@ -1,5 +1,6 @@
 import contextlib
 import fcntl
+import functools
 import json
 import os
 import pathlib
@@ -98,6 +99,13 @@ def save_ruyaml(path: pathlib.Path, yml: ruyaml.YAML, data: ruyaml.Any):
         yml.dump(data, f)
 
 
+@functools.cache
+def get_empty_sentinel_path() -> pathlib.Path:
+    path = get_app_path() / '.empty'
+    path.write_text('')
+    return path
+
+
 @contextlib.contextmanager
 def no_progress(status: Optional[rich.status.Status]):
     if status:

{rbx_cp-0.5.32.dist-info → rbx_cp-0.5.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.32
+Version: 0.5.34
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: fastapi (>=0.115.8,<0.116.0)
 Requires-Dist: filelock (>=3.14.0,<4.0.0)

{rbx_cp-0.5.32.dist-info → rbx_cp-0.5.34.dist-info}/RECORD

@@ -5,11 +5,11 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=eynVPyRdpYtSNmr8MP7-8jspNH74lj-DclwtiIcJrvM,3280
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
 rbx/box/checkers.py,sha256=VpgDzevOK7hrffG2zJGxquNiu-a9Fl3wquLn7xadcK0,6285
-rbx/box/code.py,sha256=AeR6yn_Z1euT1cRNniOPYuAYJSCf8TfhTW80AWLG9tE,13419
+rbx/box/code.py,sha256=UFy7jOeTvxtIu9pdVUDv2-D6IW-beJGPC3uCanIKZh0,13412
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/contest/build_contest_statements.py,sha256=OvKTE2O1UchiBRPzbU94KdIn0whT00VUbyPzUDlJRJg,11290
+rbx/box/contest/build_contest_statements.py,sha256=FjkO-TaT9YqkWySyQEaa69_ZwwyrsNvEBT5hE4qSFgk,11375
 rbx/box/contest/contest_package.py,sha256=OaUbpBtkhkgOPzJ1ccI_Vq4FMSaJvZm3gMOKfVY8oy4,3032
 rbx/box/contest/contest_utils.py,sha256=TDE7I6YQJlu4dQd68wzOp019bNgqiT0RlM-LMQMjL9w,301
 rbx/box/contest/main.py,sha256=fFYeZn8KTLt9j-OFFkcBeQWw8RsTLUauFV6drM2hT48,7404
@@ -23,8 +23,8 @@ rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/formatting.py,sha256=3phFRHzqVXj4Ok1yDhCq6Clbw6KlqwJNpMhs--oTWFI,405
 rbx/box/generators.py,sha256=XJsWXNjtQXUDX2huAUsl-q7OWFyIPc42CyS557jLYxk,20594
 rbx/box/generators_test.py,sha256=BqWf-A0u0ifZJZlvrMuOHOHQPfMox2Jy6540GmnTnkc,1753
-rbx/box/main.py,sha256=qSHoXBsG7nW9cXmnOm9afnGavIOZqvknu691YFACTxQ,23765
-rbx/box/package.py,sha256=SSckCXo7Zh412_qjYhSNwConjhR0Sk8911qGJU34Hac,11851
+rbx/box/main.py,sha256=9G21yVefrVLwM9NERozTe-w2xeEZROD2tDL82Gpc-AE,23722
+rbx/box/package.py,sha256=Z_voytvhDknhRKiLf1UsomvdRxlDxdXANNbUzL1HcD8,12042
 rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
 rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
 rbx/box/packaging/contest_main.py,sha256=Hbxh7geNqrePs5tWhPgdg5W2qhaW5yoreK_VP0Sm19k,2727
@@ -41,12 +41,12 @@ rbx/box/retries.py,sha256=z7cIh1QmLVUsTr3Attt_28dbwNg6KWTwpulcWCFwMPo,4667
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
 rbx/box/schema.py,sha256=iu6S2A2d_7SAQNFd34galQHxFAI2CQrIgXnSBlKgBCk,14307
 rbx/box/setter_config.py,sha256=ZM7_G2tbaixaFr0NvRaXkowwfxSWF2Gb4XHBsr2Prpc,4279
-rbx/box/solutions.py,sha256=A-VVxjTrQ2OuBk_2WynoK0kS5BtsEjkRWzBcx92N6Mk,42266
+rbx/box/solutions.py,sha256=oSlKeublgwSeaz_qt79d9OQqKuK6MINxa4kkiavutZo,43974
 rbx/box/solutions_test.py,sha256=Cx7Goon_0sz_PaUcD8qa8gmjgzOVub6VHss3CB0GaA0,1524
 rbx/box/state.py,sha256=yTpjfASpnSXkRB3JiDNvCg5b9JNnNxuYT4uMcbdr59s,109
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/statements/build_statements.py,sha256=upsMT-cAnSvbmKgtijdFc0OxPcyeBxRG92hY6dN-ZOk,11920
-rbx/box/statements/builders.py,sha256=W3VkmtjfzrT5MkIVXgfR9fM-OWK007ihm5hfzvp9cfc,10474
+rbx/box/statements/build_statements.py,sha256=GyCI_aiQpWSqz_ihDq5XCYXVOiWFRLXqhOesSRlmU1E,12019
+rbx/box/statements/builders.py,sha256=pKevMe3GwiXN_k0L2l155sY1rSLneSs0DLJ5T7WhxKQ,11152
 rbx/box/statements/joiners.py,sha256=ZbxomnMjEFT8yf5WSWUB4tBa3DL3AhjGEuh8uqHyDdg,2837
 rbx/box/statements/latex.py,sha256=LkcHwXjMFxbw--Gj9T1VkFKQFsXhY9dN7xZHpZycNW8,1346
 rbx/box/statements/latex_jinja.py,sha256=7WBfn1h8DpqCAmSE6Av64HfURMnJ2AO4QX1CD72sz5E,7096
@@ -61,7 +61,7 @@ rbx/box/ui/captured_log.py,sha256=ptICDPViVnz-_2NfrcB0SSBXNW5L74zI-vAZNN7kSok,11
 rbx/box/ui/css/app.tcss,sha256=apd5PkPEvl5jK3kE2qrxPyVED1VnvSsj08QQwzUPwEA,786
 rbx/box/ui/main.py,sha256=b0rHcBF42W4AOCv7WhtiGf_rUnY0yxpqO5oj3wfR4R4,984
 rbx/box/ui/run.py,sha256=wMEXrEFdQvMHz2hRKAFIithTnTtaL0kNQZu0jKmb8jI,7060
-rbx/box/validators.py,sha256=SNOzOk2lJdxnU3e6TFPaqaBwz-qisYLR44vbiH1F4Hc,8806
+rbx/box/validators.py,sha256=f6595hPsNSCxp8Q9IiGwWTrSNOBiJlQw63NVo0v1cRQ,9023
 rbx/box/validators_test.py,sha256=hriR6rD32Ouu64eKYYTPLZVvqMxXj7Q2h1l_JAefL7U,344
 rbx/checker.py,sha256=pj1jO3my48ru-qugbER5onccANCjoR0-PaFe3H3VGEY,4118
 rbx/clone.py,sha256=wpHyED0_7ST7LD3vj7HjXhzqEzlwh6dRQvKQVDYhGeU,6744
@@ -164,9 +164,9 @@ rbx/testdata/box1/wa.sol.cpp,sha256=qsHmvtLJOFI_sdvUT6ITqk7FJYqhrRTCmEIRdy4gSGE,
 rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ4HrWg,10
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
-rbx/utils.py,sha256=q1ZmfVCD6rdKVVZFBqwVetldSgGAbIh_KLHseBTUSiQ,4511
-rbx_cp-0.5.32.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.32.dist-info/METADATA,sha256=5pM2-oIeGiW-fSBJ7fO6XoYzokFQPixO6Lun8ifiwMA,3212
-rbx_cp-0.5.32.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.32.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.32.dist-info/RECORD,,
+rbx/utils.py,sha256=AITbkWpWtSp-x3Xept_aObfj_jPL7XL0JJoz5-F9Fp8,4671
+rbx_cp-0.5.34.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.34.dist-info/METADATA,sha256=iLu8QtrjNShKSOL-kXyqAys7nYVTJDSKH6NY9EyZpJE,3263
+rbx_cp-0.5.34.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+rbx_cp-0.5.34.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.34.dist-info/RECORD,,

{rbx_cp-0.5.32.dist-info → rbx_cp-0.5.34.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any