rbx.cp 0.5.73__tar.gz → 0.6.1__tar.gz

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.73
+Version: 0.6.1
 Summary: 
 Author: Roberto Sales
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.9.1,<4.0.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -16,6 +15,7 @@ Requires-Dist: beautifulsoup4 (>=4.13.4,<5.0.0)
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: colour (>=0.1.5,<0.2.0)
 Requires-Dist: dateparser (>=1.2.1,<2.0.0)
+Requires-Dist: deepmerge (>=2.0,<3.0)
 Requires-Dist: fastapi (>=0.115.8,<0.116.0)
 Requires-Dist: filelock (>=3.14.0,<4.0.0)
 Requires-Dist: gitpython (>=3.1.43,<4.0.0)
@@ -39,10 +39,15 @@ Requires-Dist: syncer (>=2.0.3,<3.0.0)
 Requires-Dist: textual (>=3.1.1,<4.0.0)
 Requires-Dist: textual-serve (>=1.1.2,<2.0.0)
 Requires-Dist: typer (>=0.15.1,<0.16.0)
+Requires-Dist: yamlfix (>=1.17.0,<2.0.0)
 Description-Content-Type: text/markdown
 
 <p align="center">
-    <em>The go-to CLI tool for competitive programmers and setters.</em>
+	<img src="docs/rbx_white.png" alt="rbx" width="200">
+</p>
+
+<p align="center">
+    <em>The go-to CLI tool for programming competitions setters.</em>
 </p>
 <p align="center">
 	<!-- loscal repository, no metadata badges. -->
@@ -59,6 +64,7 @@ Description-Content-Type: text/markdown
   <summary>Table of Contents</summary><br>
 
 - [Overview](#overview)
+- [Features](#features)
 - [Documentation](#documentation)
 - [License](#license)
 </details>
@@ -72,9 +78,20 @@ Description-Content-Type: text/markdown
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/rbx.svg)](https://pypi.python.org/pypi/rbx/)
 [![PyPI version shields.io](https://img.shields.io/pypi/v/rbx.svg)](https://pypi.python.org/pypi/rbx/)
 
-rbx is a CLI tool and library that aims to help contestants and setters from the competitive programming community to have an easier time.
+**rbx** is a CLI tool that empowers setters from the competitive programming community.
+
+A flexible setting tool, as powerful as [Polygon](https://polygon.codeforces.com/), right on your terminal.
+
+--- 
+
+## Features
 
-Although trying to solve the issues of these two audiences seems to be too much for a single tool to handle, we exploit the fact that the journeys of contestants and setters have a lot in common.
+- 🧱 Structure: describe your problem or contest structure with the use of YAML configuration files.
+- 🤖 Generation: provides a simple way to describe your whole testset, including both manually added and generated testcases.
+- 🔨 Testing: provides commands for automatically running correct and incorrect solutions against the testcases of your problem, automatically judging whether the verdict was as expected or not.
+- ✅ Verify: checks if your testcases and solutions are strictly conformant with the use of validators and unit tests.
+- 📝 Statements: provides tooling for writing and building statements, also ensuring they're easily synchronized with your testset.
+- 📤 Package: provides a single command for packaging your problems for use in your preferred judge system.
 
 ---
 

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/README.md

@@ -1,5 +1,9 @@
 <p align="center">
-    <em>The go-to CLI tool for competitive programmers and setters.</em>
+	<img src="docs/rbx_white.png" alt="rbx" width="200">
+</p>
+
+<p align="center">
+    <em>The go-to CLI tool for programming competitions setters.</em>
 </p>
 <p align="center">
 	<!-- loscal repository, no metadata badges. -->
@@ -16,6 +20,7 @@
   <summary>Table of Contents</summary><br>
 
 - [Overview](#overview)
+- [Features](#features)
 - [Documentation](#documentation)
 - [License](#license)
 </details>
@@ -29,9 +34,20 @@
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/rbx.svg)](https://pypi.python.org/pypi/rbx/)
 [![PyPI version shields.io](https://img.shields.io/pypi/v/rbx.svg)](https://pypi.python.org/pypi/rbx/)
 
-rbx is a CLI tool and library that aims to help contestants and setters from the competitive programming community to have an easier time.
+**rbx** is a CLI tool that empowers setters from the competitive programming community.
+
+A flexible setting tool, as powerful as [Polygon](https://polygon.codeforces.com/), right on your terminal.
+
+--- 
+
+## Features
 
-Although trying to solve the issues of these two audiences seems to be too much for a single tool to handle, we exploit the fact that the journeys of contestants and setters have a lot in common.
+- 🧱 Structure: describe your problem or contest structure with the use of YAML configuration files.
+- 🤖 Generation: provides a simple way to describe your whole testset, including both manually added and generated testcases.
+- 🔨 Testing: provides commands for automatically running correct and incorrect solutions against the testcases of your problem, automatically judging whether the verdict was as expected or not.
+- ✅ Verify: checks if your testcases and solutions are strictly conformant with the use of validators and unit tests.
+- 📝 Statements: provides tooling for writing and building statements, also ensuring they're easily synchronized with your testset.
+- 📤 Package: provides a single command for packaging your problems for use in your preferred judge system.
 
 ---
 

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.73"
+version = "0.6.1"
 description = ""
 packages = [
   {include = "rbx"}
@@ -12,7 +12,7 @@ exclude = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.9.1"
 typer = "^0.15.1"
 fastapi = "^0.115.8"
 filelock = "^3.14.0"
@@ -42,6 +42,8 @@ aiofiles = "^24.1.0"
 colour = "^0.1.5"
 beautifulsoup4 = "^4.13.4"
 dateparser = "^1.2.1"
+deepmerge = "^2.0"
+yamlfix = "^1.17.0"
 
 [tool.poetry.scripts]
 rbc = "rbx.main:app"
@@ -62,7 +64,16 @@ pytest-cov = "^5.0.0"
 textual-dev = "^1.6.1"
 pytest-asyncio = "^0.26.0"
 mkdocs-gen-files = "^0.5.0"
+markdown-grid-tables = "^0.5.0"
 
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "$version"
+version_scheme = "pep440"
+version_provider = "poetry"
+update_changelog_on_bump = true
+major_version_zero = true
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/rbx/annotations.py

@@ -1,7 +1,7 @@
 import importlib.resources
 import pathlib
 import re
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 
 import typer
 import typer.core
@@ -112,6 +112,26 @@ Checker = Annotated[
 ]
 
 
+def parse_dictionary(value: Optional[str]) -> Dict[str, Any]:
+    if value is None:
+        return {}
+    res = {}
+    for item in value.split(','):
+        key, value = item.split('=', 1)
+        res[key] = value
+    return res
+
+
+def parse_dictionary_items(items: Optional[List[str]]) -> Dict[str, Any]:
+    if items is None:
+        return {}
+    res = {}
+    for item in items:
+        key, value = item.split('=', 1)
+        res[key] = value
+    return res
+
+
 class AliasGroup(typer.core.TyperGroup):
     _CMD_SPLIT_P = re.compile(r', ?')
 

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/rbx/box/cd.py

@@ -1,7 +1,7 @@
 import contextlib
 import functools
 import pathlib
-from typing import Optional
+from typing import List, Optional
 
 import typer
 
@@ -25,6 +25,16 @@ def find_package(root: pathlib.Path = pathlib.Path()) -> Optional[pathlib.Path]:
     return root
 
 
+def find_all_ancestor_packages(
+    root: pathlib.Path = pathlib.Path(),
+) -> List[pathlib.Path]:
+    packages = []
+    while (pkg := find_package(root)) is not None:
+        packages.append(pkg)
+        root = pkg.parent
+    return packages
+
+
 def is_problem_package(root: pathlib.Path = pathlib.Path()) -> bool:
     dir = find_package(root)
     if dir is None:

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/rbx/box/checkers.py

@@ -141,9 +141,16 @@ def _is_checker_exitcode(exitcode: int) -> bool:
     return exitcode in [0, 1, 2, 3]
 
 
+def _get_last_line(message: str) -> str:
+    if not message:
+        return ''
+    return message.strip().split('\n')[-1]
+
+
 def process_checker_run_log(
     checker_run_log: Optional[RunLog], message: str
 ) -> CheckerResult:
+    message = _get_last_line(message)
     if (
         checker_run_log is not None
         and checker_run_log.exitstatus == SandboxBase.EXIT_SANDBOX_ERROR
@@ -352,7 +359,8 @@ async def check_communication(
         return _extra_check_and_sanitize(result)
 
     # Just a defensive pattern to ensure result is not None, should never happen.
-    result = check_with_no_output(interactor_run_log)
+    if result is None:
+        result = check_with_no_output(interactor_run_log)
     if result.outcome != Outcome.ACCEPTED:
         if result.outcome == Outcome.RUNTIME_ERROR:
             result.outcome = Outcome.JUDGE_FAILED

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/rbx/box/cli.py

@@ -26,7 +26,7 @@ from rbx.box import (
 )
 from rbx.box.contest import main as contest
 from rbx.box.contest.contest_package import find_contest_yaml
-from rbx.box.environment import VerificationLevel, get_environment_path
+from rbx.box.environment import VerificationLevel, get_app_environment_path
 from rbx.box.header import generate_header
 from rbx.box.packaging import main as packaging
 from rbx.box.schema import CodeItem, ExpectedOutcome, TestcaseGroup
@@ -42,6 +42,7 @@ from rbx.box.solutions import (
 from rbx.box.statements import build_statements
 from rbx.box.testcase_utils import TestcaseEntry
 from rbx.box.testcases import main as testcases
+from rbx.box.tooling import main as tooling
 
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
 app.add_typer(
@@ -93,6 +94,13 @@ app.add_typer(
     help='Manage testcases (sub-command).',
     rich_help_panel='Management',
 )
+app.add_typer(
+    tooling.app,
+    name='tool, tooling',
+    cls=annotations.AliasGroup,
+    help='Manage tooling (sub-command).',
+    rich_help_panel='Misc',
+)
 
 
 @app.callback()
@@ -106,7 +114,8 @@ def main(
     ),
     capture: bool = typer.Option(
         True,
-        '--capture',
+        '--nocapture',
+        flag_value=False,
         help='Whether to save extra logs and outputs from interactive solutions.',
     ),
 ):
@@ -324,7 +333,7 @@ async def run(
     )
 
 
-async def _time_impl(check: bool, detailed: bool) -> Optional[int]:
+async def _time_impl(check: bool, detailed: bool, runs: int = 0) -> Optional[int]:
     if package.get_main_solution() is None:
         console.console.print(
             '[warning]No main solution found, so cannot estimate a time limit.[/warning]'
@@ -344,6 +353,7 @@ async def _time_impl(check: bool, detailed: bool) -> Optional[int]:
             check=check,
             verification=VerificationLevel(verification),
             timelimit_override=-1,  # Unlimited for time limit estimation
+            nruns=runs,
         )
 
     console.console.print()
@@ -388,6 +398,12 @@ async def time(
         '-d',
         help='Whether to print a detailed view of the tests using tables.',
     ),
+    runs: int = typer.Option(
+        0,
+        '--runs',
+        '-r',
+        help='Number of runs to perform for each solution. Zero means the config default.',
+    ),
 ):
     main_solution = package.get_main_solution()
     if check and main_solution is None:
@@ -402,7 +418,7 @@ async def time(
     if not await builder.build(verification=verification, output=check):
         return None
 
-    await _time_impl(check, detailed)
+    await _time_impl(check, detailed, runs)
 
 
 @app.command(
@@ -805,6 +821,7 @@ def header():
     generate_header()
 
 
+# TODO: warn when using a preset (or show it)
 @app.command(
     'environment, env',
     rich_help_panel='Configuration',
@@ -822,15 +839,14 @@ def environment_command(
     ] = None,
 ):
     if env is None:
-        cfg = config.get_config()
-        console.console.print(f'Current environment: [item]{cfg.boxEnvironment}[/item]')
         console.console.print(
-            f'Location: {environment.get_environment_path(cfg.boxEnvironment)}'
+            f'Current environment: [item]{environment.get_active_environment_description()}[/item]'
         )
+        console.console.print(f'Location: {environment.get_active_environment_path()}')
         return
     if install_from is not None:
         environment.install_environment(env, pathlib.Path(install_from))
-    if not get_environment_path(env).is_file():
+    if not get_app_environment_path(env).is_file():
         console.console.print(
             f'[error]Environment [item]{env}[/item] does not exist.[/error]'
         )
@@ -843,7 +859,7 @@ def environment_command(
         )
         return
     console.console.print(
-        f'Changing box environment from [item]{cfg.boxEnvironment}[/item] to [item]{env}[/item]...'
+        f'Changing global environment from [item]{cfg.boxEnvironment}[/item] to [item]{env}[/item]...'
     )
     cfg.boxEnvironment = env
     config.save_config(cfg)
@@ -852,43 +868,6 @@ def environment_command(
     clear()
 
 
-@app.command(
-    'activate',
-    rich_help_panel='Configuration',
-    help='Activate the environment of the current preset used by the package.',
-)
-@cd.within_closest_package
-def activate():
-    preset_lock = presets.get_preset_lock()
-    if preset_lock is None:
-        console.console.print(
-            '[warning]No configured preset to be activated for this package.[/warning]'
-        )
-        raise typer.Exit(1)
-
-    preset = presets.get_installed_preset_or_null(preset_lock.preset_name)
-    if preset is None:
-        if preset_lock.uri is None:
-            console.console.print(
-                '[error]Preset is not installed. Install it manually, or specify a URI in [item].preset-lock.yml[/item].[/error]'
-            )
-            raise typer.Exit(1)
-        presets.install(preset_lock.uri)
-
-    preset = presets.get_installed_preset(preset_lock.preset_name)
-
-    # Install the environment from the preset if it's not already installed.
-    presets.optionally_install_environment_from_preset(
-        preset, root=presets.get_preset_installation_path(preset_lock.name)
-    )
-
-    # Activate the environment.
-    if preset.env is not None:
-        environment_command(preset.name)
-
-    console.console.print(f'[success]Preset [item]{preset.name}[/item] is activated.')
-
-
 @app.command(
     'languages',
     rich_help_panel='Configuration',
@@ -909,6 +888,40 @@ def languages():
         console.console.print()
 
 
+@app.command(
+    'stats',
+    rich_help_panel='Management',
+    help='Show stats about current and related packages.',
+)
+@cd.within_closest_package
+def stats(
+    transitive: bool = typer.Option(
+        False,
+        '--transitive',
+        '-t',
+        help='Show stats about all reachable packages.',
+    ),
+):
+    from rbx.box import stats
+
+    if transitive:
+        stats.print_reachable_package_stats()
+    else:
+        stats.print_package_stats()
+
+
+@app.command(
+    'fix',
+    rich_help_panel='Management',
+    help='Format files of the current package.',
+)
+@cd.within_closest_package
+def fix():
+    from rbx.box import linting
+
+    linting.fix_package()
+
+
 @app.command(
     'clear, clean',
     rich_help_panel='Management',

{rbx_cp-0.5.73 → rbx_cp-0.6.1}/rbx/box/code.py

@@ -14,6 +14,7 @@ import typer
 from rbx import console
 from rbx.box import download, package, setter_config, state
 from rbx.box.environment import (
+    CompilationConfig,
     ExecutionConfig,
     FileMapping,
     get_compilation_config,
@@ -29,7 +30,7 @@ from rbx.box.formatting import get_formatted_memory
 from rbx.box.sanitizers import warning_stack
 from rbx.box.schema import CodeItem
 from rbx.grading import steps, steps_with_caching
-from rbx.grading.judge.sandbox import SandboxParams
+from rbx.grading.judge.sandbox import SandboxBase, SandboxParams
 from rbx.grading.steps import (
     DigestHolder,
     DigestOrDest,
@@ -39,7 +40,10 @@ from rbx.grading.steps import (
     GradingFileOutput,
     RunLog,
     RunLogMetadata,
+    get_exe_from_command,
+    is_cpp_command,
     is_cxx_command,
+    maybe_get_bits_stdcpp_for_commands,
 )
 
 
@@ -391,12 +395,111 @@ def _prepare_run(
     )
 
 
+def _should_precompile(commands: List[str]) -> bool:
+    return any(is_cpp_command(command) for command in commands)
+
+
+def _precompile_header(
+    compilation_options: CompilationConfig,
+    sanitized: SanitizationLevel,
+    sandbox: SandboxBase,
+    sandbox_params: SandboxParams,
+    artifacts: GradingArtifacts,
+    input_artifact: GradingFileInput,
+    force_warnings: bool = False,
+    verbose: bool = False,
+    include_other_headers: bool = False,
+) -> GradingFileInput:
+    """
+    Precompile a header file (.h).
+
+    Assumes input artifact is a header file (.h) and compilation commands are C++.
+    """
+    assert compilation_options.commands is not None
+
+    dependency_cache = package.get_dependency_cache()
+
+    # TODO: deduplicate code with compile_item.
+    commands = get_mapped_commands(
+        compilation_options.commands,
+        FileMapping(
+            compilable='precompilable.h',
+            executable='precompilable.h.gch',
+        ),
+    )
+    commands = add_warning_flags(commands, force_warnings)
+    commands = substitute_commands(commands, sanitized=sanitized.should_sanitize())
+
+    if sanitized.should_sanitize():
+        commands = add_sanitizer_flags(commands)
+
+    precompilation_artifacts = GradingArtifacts()
+
+    # Keep only header files.
+    if include_other_headers:
+        precompilation_artifacts.inputs = [
+            input
+            for input in artifacts.inputs
+            if input.src is not None and input.src.suffix == '.h'
+        ]
+    precompilation_artifacts.inputs.append(
+        GradingFileInput(
+            src=input_artifact.src,
+            dest=PosixPath('precompilable.h'),
+        )
+    )
+
+    # Pull only the precompiled header file.
+    precompiled_digest = DigestHolder()
+    precompilation_artifacts.outputs.append(
+        GradingFileOutput(
+            src=PosixPath('precompilable.h.gch'),
+            digest=precompiled_digest,
+            executable=True,
+        )
+    )
+
+    if not steps_with_caching.compile(
+        commands,
+        params=sandbox_params,
+        artifacts=precompilation_artifacts,
+        sandbox=sandbox,
+        dependency_cache=dependency_cache,
+    ):
+        console.console.print(
+            f'[error]Failed to precompile header file: [item]{input_artifact.src}[/item][/error]'
+        )
+        raise typer.Exit(1)
+
+    if verbose:
+        console.console.print(
+            f'[status]Precompiled header file: [item]{input_artifact.src}[/item]'
+        )
+
+        if (
+            precompilation_artifacts.logs is not None
+            and precompilation_artifacts.logs.preprocess is not None
+        ):
+            for log in precompilation_artifacts.logs.preprocess:
+                console.console.print(f'[status]Command:[/status] {log.get_command()}')
+                console.console.print(f'[status]Summary:[/status] {log.get_summary()}')
+
+    assert precompiled_digest.value is not None
+
+    return GradingFileInput(
+        digest=precompiled_digest,
+        dest=input_artifact.dest.with_suffix('.h.gch'),
+        executable=True,
+    )
+
+
 # Compile code item and return its digest in the storage.
 def compile_item(
     code: CodeItem,
     sanitized: SanitizationLevel = SanitizationLevel.PREFER,
     force_warnings: bool = False,
     verbose: bool = False,
+    precompile: bool = True,
 ) -> str:
     _check_stack_limit()
 
@@ -461,6 +564,41 @@ def compile_item(
     for input in artifacts.inputs:
         _ignore_warning_in_cxx_input(input)
 
+    # Add system bits/stdc++.h to the compilation.
+    bits_artifact = maybe_get_bits_stdcpp_for_commands(commands)
+    if bits_artifact is not None:
+        artifacts.inputs.append(bits_artifact)
+        commands = [
+            command + ' -I.'
+            for command in commands
+            if is_cxx_command(get_exe_from_command(command))
+        ]
+
+    # Precompile C++ interesting header files.
+    if precompile and _should_precompile(commands):
+        precompilation_inputs = []
+        for input in artifacts.inputs:
+            if (
+                input.src is not None
+                and input.src.suffix == '.h'
+                and input.dest.name in ['stdc++.h', 'jngen.h', 'testlib.h']
+            ):
+                precompilation_inputs.append(
+                    _precompile_header(
+                        compilation_options,
+                        sanitized,
+                        sandbox,
+                        sandbox_params,
+                        artifacts,
+                        input,
+                        force_warnings,
+                        verbose=False,
+                    )
+                )
+        if precompilation_inputs:
+            artifacts.inputs.extend(precompilation_inputs)
+
+    # Compile the code.
     if not steps_with_caching.compile(
         commands,
         params=sandbox_params,
@@ -473,6 +611,7 @@ def compile_item(
     assert compiled_digest.value is not None
 
     if verbose and artifacts.logs is not None and artifacts.logs.preprocess is not None:
+        console.console.print(f'[status]Compiled item: [item]{code.path}[/item]')
         for log in artifacts.logs.preprocess:
             console.console.print(f'[status]Command:[/status] {log.get_command()}')
             console.console.print(f'[status]Summary:[/status] {log.get_summary()}')
@@ -589,8 +728,8 @@ async def run_communication(
     interactor_prepared.metadata.retryIndex = retry_index
     solution_prepared.metadata.retryIndex = retry_index
 
-    interactor_prefix = 'INTERACTOR:'
-    solution_prefix = 'SOLUTION:'
+    interactor_prefix = '<'
+    solution_prefix = '>'
 
     if merged_capture is not None:
         package.get_merged_capture_path().write_text(