rbx.cp 0.5.24__tar.gz → 0.5.26__tar.gz

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.24
+Version: 0.5.26
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/pyproject.toml

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

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/code.py

@@ -75,7 +75,7 @@ def is_executable_sanitized(executable: DigestOrSource) -> bool:
 
 def add_sanitizer_flags_to_command(command: str) -> str:
     if is_cxx_command(command):
-        return command + ' -fsanitize=address,undefined -fno-omit-frame-pointer'
+        return command + ' -fsanitize=address,undefined -fno-omit-frame-pointer -g'
     return command
 
 

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/contest/main.py

@@ -147,12 +147,15 @@ def add(path: str, short_name: str, preset: Optional[str] = None):
 
     ru, contest = contest_package.get_ruyaml()
 
-    contest['problems'].append(
-        {
-            'short_name': short_name,
-            'path': path,
-        }
-    )
+    item = {
+        'short_name': short_name,
+        'path': path,
+    }
+    if 'problems' not in contest:
+        contest['problems'] = [item]
+    else:
+        contest['problems'].append(item)
+
     dest = find_contest_yaml()
     assert dest is not None
     utils.save_ruyaml(dest, ru, contest)

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/main.py

@@ -42,6 +42,7 @@ from rbx.box.solutions import (
     estimate_time_limit,
     get_exact_matching_solutions,
     get_matching_solutions,
+    pick_solutions,
     print_run_report,
     run_and_print_interactive_solutions,
     run_solutions,
@@ -143,6 +144,13 @@ def run(
         '-s',
         help='Whether to compile the solutions with sanitizers enabled.',
     ),
+    choice: bool = typer.Option(
+        False,
+        '--choice',
+        '--choose',
+        '-c',
+        help='Whether to pick solutions interactively.',
+    ),
 ):
     main_solution = package.get_main_solution()
     if check and main_solution is None:
@@ -174,31 +182,37 @@ def run(
         if override_tl is None:
             raise typer.Exit(1)
 
-    with utils.StatusProgress('Running solutions...') as s:
-        if sanitized:
-            console.console.print(
-                '[warning]Sanitizers are running, so the time limit for the problem will be dropped, '
-                'and the environment default time limit will be used instead.[/warning]'
-            )
+    if sanitized:
+        console.console.print(
+            '[warning]Sanitizers are running, so the time limit for the problem will be dropped, '
+            'and the environment default time limit will be used instead.[/warning]'
+        )
+
+    tracked_solutions = None
+    if outcome is not None:
+        tracked_solutions = {
+            str(solution.path)
+            for solution in get_matching_solutions(ExpectedOutcome(outcome))
+        }
+    if solution:
+        tracked_solutions = {solution}
 
-        tracked_solutions = None
-        if outcome is not None:
-            tracked_solutions = {
-                str(solution.path)
-                for solution in get_matching_solutions(ExpectedOutcome(outcome))
-            }
-        if solution:
-            tracked_solutions = {solution}
+    if choice:
+        tracked_solutions = set(pick_solutions(tracked_solutions))
+        if not tracked_solutions:
+            console.console.print('[error]No solutions selected. Exiting.[/error]')
+            raise typer.Exit(1)
 
-        if sanitized and tracked_solutions is None:
-            console.console.print(
-                '[warning]Sanitizers are running, and no solutions were specified to run. Will only run [item]ACCEPTED[/item] solutions.'
-            )
-            tracked_solutions = {
-                str(solution.path)
-                for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
-            }
+    if sanitized and tracked_solutions is None:
+        console.console.print(
+            '[warning]Sanitizers are running, and no solutions were specified to run. Will only run [item]ACCEPTED[/item] solutions.'
+        )
+        tracked_solutions = {
+            str(solution.path)
+            for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
+        }
 
+    with utils.StatusProgress('Running solutions...') as s:
         solution_result = run_solutions(
             progress=s,
             tracked_solutions=tracked_solutions,
@@ -338,6 +352,13 @@ def irun(
         '-s',
         help='Whether to compile the solutions with sanitizers enabled.',
     ),
+    choice: bool = typer.Option(
+        False,
+        '--choice',
+        '--choose',
+        '-c',
+        help='Whether to pick solutions interactively.',
+    ),
 ):
     if not print:
         console.console.print(
@@ -364,6 +385,13 @@ def irun(
         }
     if solution:
         tracked_solutions = {solution}
+
+    if choice:
+        tracked_solutions = set(pick_solutions(tracked_solutions))
+        if not tracked_solutions:
+            console.console.print('[error]No solutions selected. Exiting.[/error]')
+            raise typer.Exit(1)
+
     if sanitized and tracked_solutions is None:
         console.console.print(
             '[warning]Sanitizers are running, and no solutions were specified to run. Will only run [item]ACCEPTED[/item] solutions.'
@@ -373,18 +401,20 @@ def irun(
             for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
         }
 
-    asyncio.run(
-        run_and_print_interactive_solutions(
-            tracked_solutions=tracked_solutions,
-            check=check,
-            verification=VerificationLevel(verification),
-            generator=generators.get_call_from_string(generator)
-            if generator is not None
-            else None,
-            print=print,
-            sanitized=sanitized,
+    with utils.StatusProgress('Running solutions...') as s:
+        asyncio.run(
+            run_and_print_interactive_solutions(
+                progress=s,
+                tracked_solutions=tracked_solutions,
+                check=check,
+                verification=VerificationLevel(verification),
+                generator=generators.get_call_from_string(generator)
+                if generator is not None
+                else None,
+                print=print,
+                sanitized=sanitized,
+            )
         )
-    )
 
 
 @app.command('create, c', help='Create a new problem package.')
@@ -510,6 +540,8 @@ def stress(
                 name=testgroup, generatorScript=CodeItem(path=new_script_path)
             )
             ru, problem_yml = package.get_ruyaml()
+            if 'testcases' not in problem_yml:
+                problem_yml['testcases'] = []
             problem_yml['testcases'].append(
                 {
                     'name': testgroup,
@@ -551,7 +583,10 @@ def stress(
 @app.command('compile', help='Compile an asset given its path.')
 @package.within_problem
 def compile_command(
-    path: Annotated[str, typer.Argument(help='Path to the asset to compile.')],
+    path: Annotated[
+        Optional[str],
+        typer.Argument(help='Path to the asset to compile.'),
+    ] = None,
     sanitized: bool = typer.Option(
         False,
         '--sanitized',
@@ -565,6 +600,12 @@ def compile_command(
         help='Whether to compile the asset with warnings enabled.',
     ),
 ):
+    if path is None:
+        path = questionary.path("What's the path to your asset?").ask()
+        if path is None:
+            console.console.print('[error]No path specified.[/error]')
+            raise typer.Exit(1)
+
     compile.any(path, sanitized, warnings)
 
 

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/presets/__init__.py

@@ -68,13 +68,14 @@ def _find_nested_preset(root: pathlib.Path) -> Optional[pathlib.Path]:
 
 
 def _find_local_preset(root: pathlib.Path) -> Optional[pathlib.Path]:
+    original_root = root
     root = root.resolve()
     problem_yaml_path = root / '.local.rbx' / 'preset.rbx.yml'
     while root != pathlib.PosixPath('/') and not problem_yaml_path.is_file():
         root = root.parent
         problem_yaml_path = root / '.local.rbx' / 'preset.rbx.yml'
     if not problem_yaml_path.is_file():
-        return _find_nested_preset(root)
+        return _find_nested_preset(original_root)
     return problem_yaml_path.parent
 
 
@@ -326,6 +327,13 @@ def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
         console.console.print('[error]Naming a preset "local" is prohibited.[/error]')
 
     console.console.print(f'Installing preset [item]{preset.name}[/item]...')
+    installation_path = get_preset_installation_path(preset.name)
+
+    if root.resolve().is_relative_to(installation_path.resolve()):
+        console.console.print(
+            '[error]Current folder is nested into the preset installation path, cannot install it.[/error]'
+        )
+        raise typer.Exit(1)
 
     if preset.env is not None:
         console.console.print(
@@ -346,7 +354,6 @@ def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
             shutil.copyfile(str(root / preset.env), get_environment_path(preset.name))
 
     console.console.print(f'[item]{preset.name}[/item]: Copying preset folder...')
-    installation_path = get_preset_installation_path(preset.name)
     installation_path.parent.mkdir(parents=True, exist_ok=True)
     if installation_path.exists():
         res = force or rich.prompt.Confirm.ask(
@@ -412,7 +419,7 @@ def generate_lock(
     )
 
 
-def _sync(update: bool = False):
+def _sync(try_update: bool = False):
     preset_lock = get_preset_lock()
     if preset_lock is None:
         console.console.print(
@@ -423,18 +430,17 @@ def _sync(update: bool = False):
         )
         raise typer.Exit(1)
 
-    should_update = update and preset_lock.uri is not None
+    should_update = try_update and preset_lock.uri is not None
     installed_preset = get_installed_preset_or_null(preset_lock.preset_name)
     if installed_preset is None:
-        if not update or preset_lock.uri is None:
+        if not try_update or preset_lock.uri is None:
             console.console.print(
                 f'[error]Preset [item]{preset_lock.preset_name}[/item] is not installed. Install it before trying to update.'
             )
             raise typer.Exit(1)
-        should_update = True
-
-    if should_update:
-        install(uri=preset_lock.uri)
+        install(preset_lock.uri)
+    elif should_update:
+        update(preset_lock.name)
 
     _copy_updated_assets(
         preset_lock.preset_name,
@@ -477,6 +483,13 @@ def update(
         presets = [name]
 
     for preset_name in presets:
+        if preset_name == LOCAL:
+            if not questionary.confirm(
+                'Updating local preset will remove all custom changes you made to the preset.',
+                default=False,
+            ).ask():
+                continue
+
         preset = get_installed_preset_or_null(preset_name)
         if preset is None:
             console.console.print(
@@ -490,6 +503,20 @@ def update(
             continue
         install_from_remote(preset.fetch_info, force=True)
 
+        if preset_name == LOCAL:
+            # Get global path to the preset.
+            preset_path = get_preset_installation_path(preset.name)
+            dest_path = '.local.rbx'
+            shutil.rmtree(dest_path, ignore_errors=True)
+            shutil.copytree(preset_path, dest_path)
+            console.console.print(
+                '[success]Local preset updated successfully.[/success]'
+            )
+        else:
+            console.console.print(
+                f'[success]Preset [item]{preset_name}[/item] updated successfully.[/success]'
+            )
+
 
 @app.command(
     'sync',
@@ -507,7 +534,7 @@ def sync(
     ] = False,
 ):
     _check_is_valid_package()
-    _sync(update=update)
+    _sync(try_update=update)
 
 
 @app.command(

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/solutions.py

@@ -7,11 +7,13 @@ import shutil
 from collections.abc import Iterator
 from typing import Dict, Iterable, List, Optional, Set, Tuple
 
+import questionary
 import rich
 import rich.live
 import rich.markup
 import rich.table
 import rich.text
+import typer
 from pydantic import BaseModel
 
 from rbx import console
@@ -410,6 +412,7 @@ def run_solutions(
 
 
 def _run_interactive_solutions(
+    progress: Optional[StatusProgress] = None,
     tracked_solutions: Optional[Set[str]] = None,
     verification: VerificationLevel = VerificationLevel.NONE,
     generator: Optional[GeneratorCall] = None,
@@ -423,7 +426,7 @@ def _run_interactive_solutions(
 
     checker_digest = checkers.compile_checker() if check else None
     compiled_solutions = compile_solutions(
-        tracked_solutions=tracked_solutions, sanitized=sanitized
+        progress=progress, tracked_solutions=tracked_solutions, sanitized=sanitized
     )
 
     main_solution_digest = None
@@ -498,6 +501,7 @@ def _run_interactive_solutions(
 
 
 async def run_and_print_interactive_solutions(
+    progress: Optional[StatusProgress] = None,
     tracked_solutions: Optional[Set[str]] = None,
     verification: VerificationLevel = VerificationLevel.NONE,
     generator: Optional[GeneratorCall] = None,
@@ -507,6 +511,7 @@ async def run_and_print_interactive_solutions(
 ):
     pkg = package.find_problem_package_or_die()
     items = _run_interactive_solutions(
+        progress=progress,
         tracked_solutions=tracked_solutions,
         verification=verification,
         check=check,
@@ -515,6 +520,9 @@ async def run_and_print_interactive_solutions(
         print=print,
     )
 
+    if progress:
+        progress.stop()
+
     for item in items:
         sol = pkg.solutions[item.solution_index]
         _print_solution_header(sol, console.console, is_irun=True)
@@ -540,6 +548,31 @@ async def run_and_print_interactive_solutions(
             console.console.print()
 
 
+def _get_solution_repr(sol: Solution) -> List[Tuple[str, str]]:
+    return [
+        ('', f'{str(sol.path)} '),
+        (f'fg:{sol.outcome.style().replace('lnumber', 'cyan')}', sol.outcome.name),
+    ]
+
+
+def pick_solutions(tracked_solutions: Optional[Set[str]]) -> List[str]:
+    pkg = package.find_problem_package_or_die()
+    if tracked_solutions is None:
+        tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
+
+    # Store in a separate list to maintain order with the package declaration.
+    choices = [
+        questionary.Choice(title=_get_solution_repr(sol), value=str(sol.path))
+        for sol in pkg.solutions
+        if str(sol.path) in tracked_solutions
+    ]
+
+    picked = questionary.checkbox('Select solutions', choices=choices).ask()
+    if picked is None:
+        raise typer.Abort()
+    return picked
+
+
 def get_outcome_style_verdict(outcome: Outcome) -> str:
     if outcome == Outcome.ACCEPTED:
         return 'green'
@@ -554,21 +587,25 @@ def get_outcome_style_verdict(outcome: Outcome) -> str:
     return 'magenta'
 
 
-def get_testcase_markup_verdict(eval: Evaluation) -> str:
+def get_outcome_markup_verdict(outcome: Outcome) -> str:
     res = '✓'
-    if eval.result.outcome != Outcome.ACCEPTED:
+    if outcome != Outcome.ACCEPTED:
         res = '✗'
-    if eval.result.outcome == Outcome.TIME_LIMIT_EXCEEDED:
+    if outcome == Outcome.TIME_LIMIT_EXCEEDED:
         res = '⧖'
-    if eval.result.outcome == Outcome.RUNTIME_ERROR:
+    if outcome == Outcome.RUNTIME_ERROR:
         res = '✗'
-    style = get_outcome_style_verdict(eval.result.outcome)
+    style = get_outcome_style_verdict(outcome)
     res = f'[{style}]{res}[/{style}]'
+    return res
+
+
+def get_testcase_markup_verdict(eval: Evaluation) -> str:
     # if eval.log.stdout_absolute_path:
     #     output_path = eval.log.stdout_absolute_path.resolve()
     #     output_link = f'file://{output_path}'
     #     res = f'[link={output_link}]{res}[/link]'
-    return res
+    return get_outcome_markup_verdict(eval.result.outcome)
 
 
 def _get_evals_time_in_ms(evals: List[Evaluation]) -> int:
@@ -632,6 +669,10 @@ def get_evals_formatted_memory(evals: List[Evaluation]) -> str:
     return get_formatted_memory(max_memory)
 
 
+def get_worst_outcome(evals: List[Evaluation]) -> Outcome:
+    return Outcome.worst_outcome(eval.result.outcome for eval in evals)
+
+
 def _print_solution_outcome(
     solution: Solution,
     evals: List[Evaluation],
@@ -880,7 +921,11 @@ async def _render_detailed_group_table(
                     solution, non_null_evals, verification
                 )
                 formatted_memory = get_evals_formatted_memory(non_null_evals)
-                summary_row.append(('', '', formatted_time, '/', formatted_memory, ''))
+                worst_outcome = get_worst_outcome(non_null_evals)
+                verdict = get_outcome_markup_verdict(worst_outcome)
+                summary_row.append(
+                    ('', verdict, formatted_time, '/', formatted_memory, '')
+                )
             padded_rows.append(summary_row)
 
         for row in _render_padded_rows(padded_rows):
@@ -1020,12 +1065,13 @@ async def print_run_report(
             )
             console.print()
 
-        ok = ok and _print_solution_outcome(
+        cur_ok = _print_solution_outcome(
             solution,
             solution_evals,
             console,
             verification=verification,
         )
+        ok = ok and cur_ok
         console.print()
 
     await _print_timing(console, result.skeleton, structured_evaluations)

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/box/validators.py

@@ -262,10 +262,22 @@ def print_validation_report(infos: List[TestcaseValidationInfo]):
     if not _has_group_specific_validator():
         hit_bounds_per_group = {None: _merge_hit_bounds(hit_bounds_per_group.values())}
 
+    def _is_hit_bound_good(hit_bounds: HitBounds) -> bool:
+        return any(not v[0] or not v[1] for v in hit_bounds.values())
+
+    # Cleanup entries in hit bounds per group that are totally empty.
+    # Also skip samples.
+    hit_bounds_per_group = {
+        k: v
+        for k, v in hit_bounds_per_group.items()
+        if _is_hit_bound_good(v) and k != 'samples'
+    }
+
+    if not hit_bounds_per_group:
+        console.console.print('[info]No validation issues found.[/info]')
+        return
+
     for group, hit_bounds in hit_bounds_per_group.items():
-        if group == 'samples':
-            # Skip samples.
-            continue
         if group is None:
             console.console.print('Hit bounds:')
         else:

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/console.py

@@ -1,5 +1,7 @@
 import sys
 
+import rich
+import rich.markup
 from rich.console import Console
 from rich.theme import Theme
 
@@ -25,3 +27,13 @@ def multiline_prompt(text: str) -> str:
     lines = sys.stdin.readlines()
     console.print()
     return ''.join(lines)
+
+
+def render_from(r: rich.console.RenderableType) -> str:
+    with console.capture() as capture:
+        console.print(r)
+    return capture.get()
+
+
+def render_from_markup(markup: str) -> str:
+    return render_from(rich.markup.render(markup))

{rbx_cp-0.5.24 → rbx_cp-0.5.26}/rbx/grading/steps.py

@@ -6,7 +6,7 @@ import shutil
 import subprocess
 import sys
 from enum import Enum
-from typing import IO, Any, Dict, List, Optional, Tuple, Union
+from typing import IO, Any, Dict, Iterable, List, Optional, Tuple, Union
 
 import typer
 from pydantic import BaseModel
@@ -24,13 +24,20 @@ MAX_STDOUT_LEN = 1024 * 1024 * 128  # 128 MB
 class Outcome(Enum):
     ACCEPTED = 'accepted'
     WRONG_ANSWER = 'wrong-answer'
-    JUDGE_FAILED = 'judge-failed'
-    RUNTIME_ERROR = 'runtime-error'
-    TIME_LIMIT_EXCEEDED = 'time-limit-exceeded'
     MEMORY_LIMIT_EXCEEDED = 'memory-limit-exceeded'
+    TIME_LIMIT_EXCEEDED = 'time-limit-exceeded'
+    RUNTIME_ERROR = 'runtime-error'
     OUTPUT_LIMIT_EXCEEDED = 'output-limit-exceeded'
+    JUDGE_FAILED = 'judge-failed'
     INTERNAL_ERROR = 'internal-error'
 
+    @classmethod
+    def worst_outcome(cls, outcomes: Iterable['Outcome']) -> 'Outcome':
+        def _outcome_to_int(o: 'Outcome') -> int:
+            return cls._member_names_.index(o.name)
+
+        return max(outcomes, key=_outcome_to_int)
+
 
 class DigestHolder(BaseModel):
     value: Optional[str] = None