rbx.cp 0.5.25__tar.gz → 0.5.26__tar.gz

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

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

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

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

{rbx_cp-0.5.25 → 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.25 → rbx_cp-0.5.26}/rbx/box/main.py

@@ -197,6 +197,12 @@ def run(
     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.'
@@ -206,12 +212,6 @@ def run(
             for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
         }
 
-    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)
-
     with utils.StatusProgress('Running solutions...') as s:
         solution_result = run_solutions(
             progress=s,
@@ -385,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.'
@@ -394,12 +401,6 @@ def irun(
             for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
         }
 
-    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)
-
     with utils.StatusProgress('Running solutions...') as s:
         asyncio.run(
             run_and_print_interactive_solutions(
@@ -539,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,

{rbx_cp-0.5.25 → 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.25 → rbx_cp-0.5.26}/rbx/box/solutions.py

@@ -13,6 +13,7 @@ import rich.live
 import rich.markup
 import rich.table
 import rich.text
+import typer
 from pydantic import BaseModel
 
 from rbx import console
@@ -547,14 +548,29 @@ 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)
 
-    return questionary.checkbox(
-        'Select solutions', choices=list(tracked_solutions)
-    ).ask()
+    # 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:

{rbx_cp-0.5.25 → 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.25 → 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))