rbx.cp 0.5.32__tar.gz → 0.5.34__tar.gz

{rbx_cp-0.5.32 → rbx_cp-0.5.34}/PKG-INFO

@@ -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 → rbx_cp-0.5.34}/pyproject.toml

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

{rbx_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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_cp-0.5.32 → rbx_cp-0.5.34}/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: