rbx.cp 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

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/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/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
@@ -333,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]'
@@ -353,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()
@@ -397,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:
@@ -411,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(
@@ -814,6 +821,7 @@ def header():
     generate_header()
 
 
+# TODO: warn when using a preset (or show it)
 @app.command(
     'environment, env',
     rich_help_panel='Configuration',
@@ -831,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]'
         )
@@ -852,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)
@@ -861,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',
@@ -918,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/box/code.py

@@ -408,6 +408,7 @@ def _precompile_header(
     input_artifact: GradingFileInput,
     force_warnings: bool = False,
     verbose: bool = False,
+    include_other_headers: bool = False,
 ) -> GradingFileInput:
     """
     Precompile a header file (.h).
@@ -435,11 +436,12 @@ def _precompile_header(
     precompilation_artifacts = GradingArtifacts()
 
     # Keep only header files.
-    precompilation_artifacts.inputs = [
-        input
-        for input in artifacts.inputs
-        if input.src is not None and input.src.suffix == '.h'
-    ]
+    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,
@@ -572,14 +574,14 @@ def compile_item(
             if is_cxx_command(get_exe_from_command(command))
         ]
 
-    # Precompile C++ header files.
+    # 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.suffix == '.h'
+                and input.dest.name in ['stdc++.h', 'jngen.h', 'testlib.h']
             ):
                 precompilation_inputs.append(
                     _precompile_header(

rbx/box/contest/contest_package.py

@@ -9,7 +9,7 @@ from pydantic import ValidationError
 from rbx import console, utils
 from rbx.box import cd
 from rbx.box.contest.schema import Contest
-from rbx.box.package import find_problem_package_or_die, warn_preset_deactivated
+from rbx.box.package import find_problem_package_or_die
 from rbx.box.schema import Package
 
 YAML_NAME = 'contest.rbx.yml'
@@ -24,7 +24,6 @@ def find_contest_yaml(root: pathlib.Path = pathlib.Path()) -> Optional[pathlib.P
         contest_yaml_path = root / YAML_NAME
     if not contest_yaml_path.is_file():
         return None
-    warn_preset_deactivated(root)
     return contest_yaml_path
 
 
@@ -84,12 +83,10 @@ def get_problems(contest: Contest) -> List[Package]:
     return problems
 
 
-def get_ruyaml() -> Tuple[ruyaml.YAML, ruyaml.Any]:
-    contest_yaml_path = find_contest_yaml()
+def get_ruyaml(root: pathlib.Path = pathlib.Path()) -> Tuple[ruyaml.YAML, ruyaml.Any]:
+    contest_yaml_path = find_contest_yaml(root)
     if contest_yaml_path is None:
-        console.console.print(
-            f'Contest not found in {pathlib.Path().absolute()}', style='error'
-        )
+        console.console.print(f'[error]Contest not found in {root.absolute()}[/error]')
         raise typer.Exit(1)
     res = ruyaml.YAML()
     return res, res.load(contest_yaml_path.read_text())

rbx/box/contest/main.py

@@ -17,7 +17,6 @@ from rbx.box.contest.contest_package import (
 )
 from rbx.box.contest.schema import ContestProblem
 from rbx.box.packaging import contest_main as packaging
-from rbx.box.presets.fetch import get_preset_fetch_info
 from rbx.box.schema import Package
 from rbx.config import open_editor
 
@@ -40,53 +39,18 @@ app.add_typer(
 def create(
     path: str,
     preset: Annotated[
-        str,
+        Optional[str],
         typer.Option(
             '--preset',
             '-p',
-            help='Which preset to use to create this package. Can be a named of an already installed preset, or an URI, in which case the preset will be downloaded.',
+            help='Which preset to use to create this package. Can be a named of an already installed preset, or an URI, in which case the preset will be downloaded.\n'
+            'If not provided, the default preset will be used, or the active preset if any.',
         ),
-    ] = 'default',
-    local: bool = typer.Option(
-        False,
-        '--local',
-        '-l',
-        help='Whether to inline the installed preset within the contest folder.',
-    ),
+    ] = None,
 ):
     console.console.print(f'Creating new contest at [item]{path}[/item]...')
 
-    fetch_info = get_preset_fetch_info(preset)
-    if fetch_info is None:
-        console.console.print(
-            f'[error]Invalid preset name/URI [item]{preset}[/item][/error]'
-        )
-        raise typer.Exit(1)
-
-    if fetch_info.is_remote():
-        preset = presets.install_from_remote(fetch_info)
-    elif fetch_info.is_local_dir():
-        preset = presets.install_from_local_dir(fetch_info)
-
-    preset_cfg = presets.get_installed_preset(preset)
-    preset_path = (
-        presets.get_preset_installation_path(preset)
-        if preset_cfg.contest is not None
-        else presets.get_preset_installation_path('default')
-    )
-
-    contest_path = (
-        presets.get_preset_installation_path(preset) / preset_cfg.contest
-        if preset_cfg.contest is not None
-        else presets.get_preset_installation_path('default') / 'contest'
-    )
-
-    if not contest_path.is_dir():
-        console.console.print(
-            f'[error]Contest template [item]{contest_path}[/item] does not exist.[/error]'
-        )
-        raise typer.Exit(1)
-
+    fetch_info = presets.get_preset_fetch_info_with_fallback(preset)
     dest_path = pathlib.Path(path)
 
     if dest_path.exists():
@@ -100,23 +64,11 @@ def create(
             )
             raise typer.Exit(1)
 
-    dest_path.mkdir(parents=True, exist_ok=True)
-    shutil.copytree(str(contest_path), str(dest_path), dirs_exist_ok=True)
-    shutil.rmtree(str(dest_path / 'build'), ignore_errors=True)
-    shutil.rmtree(str(dest_path / '.box'), ignore_errors=True)
-    shutil.rmtree(str(dest_path / '.local.rbx'), ignore_errors=True)
-    # TODO: consider clearing build and .box recursively for nested problem directories
-    for lock in dest_path.rglob('.preset-lock.yml'):
-        lock.unlink(missing_ok=True)
-
-    if local:
-        presets.copy_local_preset(
-            preset_path, dest_path, remote_uri=fetch_info.uri or preset_cfg.uri
-        )
+    presets.install_contest(dest_path, fetch_info)
 
     with cd.new_package_cd(dest_path):
         contest_utils.clear_all_caches()
-        presets.generate_lock(preset if not local else presets.LOCAL)
+        presets.generate_lock()
 
 
 @app.command('edit, e', help='Open contest.rbx.yml in your default editor.')
@@ -143,9 +95,6 @@ def add(path: str, short_name: str, preset: Optional[str] = None):
         )
         raise typer.Exit(1)
 
-    preset_lock = presets.get_preset_lock()
-    if preset is None and preset_lock is not None:
-        preset = preset_lock.preset_name
     creation.create(name, preset=preset, path=pathlib.Path(path))
 
     contest = find_contest_package_or_die()

rbx/box/creation.py

@@ -1,12 +1,10 @@
 import pathlib
-import shutil
 from typing import Annotated, Optional
 
 import typer
 
 from rbx import console, utils
 from rbx.box import package, presets
-from rbx.box.presets.fetch import get_preset_fetch_info
 
 
 def create(
@@ -26,33 +24,9 @@ def create(
     ] = None,
     path: Optional[pathlib.Path] = None,
 ):
-    preset = preset or 'default'
     console.console.print(f'Creating new problem [item]{name}[/item]...')
 
-    fetch_info = get_preset_fetch_info(preset)
-    if fetch_info is None:
-        console.console.print(
-            f'[error]Invalid preset name/URI [item]{preset}[/item].[/error]'
-        )
-        raise typer.Exit(1)
-
-    if fetch_info.fetch_uri is not None:
-        preset = presets.install_from_remote(fetch_info)
-
-    preset_cfg = presets.get_installed_preset(preset)
-
-    problem_path = (
-        presets.get_preset_installation_path(preset) / preset_cfg.problem
-        if preset_cfg.problem is not None
-        else presets.get_preset_installation_path('default') / 'problem'
-    )
-
-    if not problem_path.is_dir():
-        console.console.print(
-            f'[error]Problem template [item]{problem_path}[/item] does not exist.[/error]'
-        )
-        raise typer.Exit(1)
-
+    fetch_info = presets.get_preset_fetch_info_with_fallback(preset)
     dest_path = path or pathlib.Path(name)
 
     if dest_path.exists():
@@ -61,18 +35,11 @@ def create(
         )
         raise typer.Exit(1)
 
-    dest_path.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copytree(str(problem_path), str(dest_path))
-
-    # Remove a few left overs.
-    shutil.rmtree(str(dest_path / 'build'), ignore_errors=True)
-    shutil.rmtree(str(dest_path / '.box'), ignore_errors=True)
-    for lock in dest_path.rglob('.preset-lock.yml'):
-        lock.unlink(missing_ok=True)
+    presets.install_problem(dest_path, fetch_info)
 
     # Change problem name.
     ru, problem = package.get_ruyaml(dest_path)
     problem['name'] = name
     utils.save_ruyaml(dest_path / 'problem.rbx.yml', ru, problem)
 
-    presets.generate_lock(preset, root=dest_path)
+    presets.generate_lock(dest_path)

rbx/box/environment.py

@@ -7,6 +7,7 @@ import typer
 from pydantic import BaseModel, ConfigDict, Field, ValidationError
 
 from rbx import config, console, utils
+from rbx.box import presets
 from rbx.box.extensions import Extensions, LanguageExtensions
 from rbx.grading.judge.sandbox import SandboxBase, SandboxParams
 from rbx.grading.judge.sandboxes.isolate import IsolateSandbox
@@ -185,22 +186,33 @@ class Environment(BaseModel):
     extensions: Optional[Extensions] = None
 
 
-def get_environment_path(env: str) -> pathlib.Path:
+def get_app_environment_path(env: str) -> pathlib.Path:
     return config.get_app_file(pathlib.PosixPath('envs') / f'{env}.rbx.yml')
 
 
-def get_local_environment_path() -> Optional[pathlib.Path]:
-    # TODO: implement logic to get env from local preset
-    return None
+def get_active_environment_path() -> pathlib.Path:
+    env_path = presets.get_preset_environment_path()
+    if env_path is None:
+        env_path = get_app_environment_path(config.get_config().boxEnvironment)
+    return env_path
+
+
+@functools.cache
+def get_active_environment_description() -> str:
+    env_path = presets.get_preset_environment_path()
+    if env_path is None:
+        return config.get_config().boxEnvironment
+    preset = presets.get_active_preset()
+    return f'preset - {preset.name}'
 
 
 @functools.cache
 def get_environment(env: Optional[str] = None) -> Environment:
     env_path = (
-        get_environment_path(env) if env is not None else get_local_environment_path()
+        get_app_environment_path(env)
+        if env is not None
+        else get_active_environment_path()
     )
-    if env_path is None:
-        env_path = get_environment_path(config.get_config().boxEnvironment)
     if not env_path.is_file():
         console.console.print(
             f'Environment file [item]{env_path}[/item] not found.', style='error'
@@ -232,8 +244,8 @@ def install_environment(name: str, file: pathlib.Path):
         )
         raise typer.Exit(1)
 
-    get_environment_path(name).parent.mkdir(parents=True, exist_ok=True)
-    get_environment_path(name).write_bytes(file.read_bytes())
+    get_app_environment_path(name).parent.mkdir(parents=True, exist_ok=True)
+    get_app_environment_path(name).write_bytes(file.read_bytes())
     console.console.print(
         f'[success]Environment [item]{name}[/item] was installed from [item]{file}[/item]'
     )

rbx/box/linting.py

@@ -0,0 +1,26 @@
+import pathlib
+
+import yamlfix
+import yamlfix.model
+
+from rbx import console
+from rbx.box.cd import is_contest_package, is_problem_package
+from rbx.box.stats import find_problem_packages_from_contest
+
+
+def fix_yaml(path: pathlib.Path, verbose: bool = True):
+    config = yamlfix.model.YamlfixConfig(quote_basic_values=True)
+    _, changed = yamlfix.fix_files([str(path)], dry_run=False, config=config)
+    if changed and verbose:
+        console.console.print(
+            f'Formatting [item]{path}[/item].',
+        )
+
+
+def fix_package(root: pathlib.Path = pathlib.Path()):
+    if is_problem_package(root):
+        fix_yaml(root / 'problem.rbx.yml')
+    if is_contest_package(root):
+        fix_yaml(root / 'contest.rbx.yml')
+        for problem in find_problem_packages_from_contest(root):
+            fix_yaml(problem / 'problem.rbx.yml')

rbx/box/package.py

@@ -10,10 +10,9 @@ import ruyaml
 import typer
 from pydantic import ValidationError
 
-from rbx import config, console, utils
-from rbx.box import cd, environment
+from rbx import console, utils
+from rbx.box import cd
 from rbx.box.environment import get_sandbox_type
-from rbx.box.presets import get_installed_preset_or_null, get_preset_lock
 from rbx.box.schema import (
     CodeItem,
     ExpectedOutcome,
@@ -38,33 +37,6 @@ TEMP_DIR = None
 CACHE_STEP_VERSION = 1
 
 
-def warn_preset_deactivated(root: pathlib.Path = pathlib.Path()):
-    preset_lock = get_preset_lock(root)
-    if preset_lock is None:
-        return
-
-    preset = get_installed_preset_or_null(preset_lock.preset_name)
-    if preset is None:
-        console.console.print(
-            f'[warning]WARNING: [item]{preset_lock.preset_name}[/item] is not installed. '
-            'Run [item]rbx presets sync && rbx activate[/item] to install and activate this preset.'
-        )
-        console.console.print()
-        return
-
-    if preset.env is not None and (
-        not environment.get_environment_path(preset.name).is_file()
-        or config.get_config().boxEnvironment != preset.name
-    ):
-        console.console.print(
-            '[warning]WARNING: This package uses a preset that configures a custom environment, '
-            f' but instead you are using the environment [item]{config.get_config().boxEnvironment}[/item]. '
-            'Run [item]rbx activate[/item] to use the environment configured by your preset.'
-        )
-        console.console.print()
-        return
-
-
 @functools.cache
 def find_problem_yaml(root: pathlib.Path = pathlib.Path()) -> Optional[pathlib.Path]:
     root = root.resolve()
@@ -74,7 +46,6 @@ def find_problem_yaml(root: pathlib.Path = pathlib.Path()) -> Optional[pathlib.P
         problem_yaml_path = root / YAML_NAME
     if not problem_yaml_path.is_file():
         return None
-    warn_preset_deactivated(root)
     return problem_yaml_path
 
 
@@ -130,9 +101,7 @@ def save_package(
 def get_ruyaml(root: pathlib.Path = pathlib.Path()) -> Tuple[ruyaml.YAML, ruyaml.Any]:
     problem_yaml_path = find_problem_yaml(root)
     if problem_yaml_path is None:
-        console.console.print(
-            f'Problem not found in {pathlib.Path().absolute()}', style='error'
-        )
+        console.console.print(f'[error]Problem not found in {root.absolute()}[/error]')
         raise typer.Exit(1)
     res = ruyaml.YAML()
     return res, res.load(problem_yaml_path.read_text())