rbx.cp 0.5.64__tar.gz → 0.5.65__tar.gz

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/PKG-INFO

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

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/pyproject.toml

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

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/rbx/box/cli.py

@@ -3,7 +3,7 @@ import shlex
 import shutil
 import sys
 import tempfile
-from typing import Annotated, Optional
+from typing import Annotated, List, Optional
 
 import rich
 import rich.prompt
@@ -32,6 +32,7 @@ from rbx.box.packaging import main as packaging
 from rbx.box.schema import CodeItem, ExpectedOutcome, TestcaseGroup
 from rbx.box.solutions import (
     estimate_time_limit,
+    expand_solutions,
     get_exact_matching_solutions,
     get_matching_solutions,
     pick_solutions,
@@ -178,10 +179,10 @@ async def build(verification: environment.VerificationParam):
 @syncer.sync
 async def run(
     verification: environment.VerificationParam,
-    solution: Annotated[
-        Optional[str],
+    solutions: Annotated[
+        Optional[List[str]],
         typer.Argument(
-            help='Path to solution to run. If not specified, will run all solutions.'
+            help='Path to solutions to run. If not specified, will run all solutions.'
         ),
     ] = None,
     outcome: Optional[str] = typer.Option(
@@ -235,11 +236,16 @@ async def run(
             str(solution.path)
             for solution in get_matching_solutions(ExpectedOutcome(outcome))
         }
-    if solution:
-        tracked_solutions = {solution}
+    if solutions:
+        tracked_solutions = set(solutions)
 
     if choice:
-        tracked_solutions = set(await pick_solutions(tracked_solutions))
+        tracked_solutions = set(
+            await pick_solutions(
+                tracked_solutions,
+                extra_solutions=await expand_solutions(solutions or []),
+            )
+        )
         if not tracked_solutions:
             console.console.print('[error]No solutions selected. Exiting.[/error]')
             raise typer.Exit(1)
@@ -395,10 +401,10 @@ async def time(
 @syncer.sync
 async def irun(
     verification: environment.VerificationParam,
-    solution: Annotated[
-        Optional[str],
+    solutions: Annotated[
+        Optional[List[str]],
         typer.Argument(
-            help='Path to solution to run. If not specified, will run all solutions.'
+            help='Path to solutions to run. If not specified, will run all solutions.'
         ),
     ] = None,
     outcome: Optional[str] = typer.Option(
@@ -466,11 +472,16 @@ async def irun(
             str(solution.path)
             for solution in get_matching_solutions(ExpectedOutcome(outcome))
         }
-    if solution:
-        tracked_solutions = {solution}
+    if solutions:
+        tracked_solutions = set(solutions)
 
     if choice:
-        tracked_solutions = set(await pick_solutions(tracked_solutions))
+        tracked_solutions = set(
+            await pick_solutions(
+                tracked_solutions,
+                extra_solutions=await expand_solutions(solutions or []),
+            )
+        )
         if not tracked_solutions:
             console.console.print('[error]No solutions selected. Exiting.[/error]')
             raise typer.Exit(1)

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/rbx/box/formatting.py

@@ -20,7 +20,11 @@ def href(url: os.PathLike[str], text: Optional[str] = None, style: str = 'item')
 
     if isinstance(url, pathlib.Path):
         url = url.resolve()
-    return f'[{style}][link={url}]{text}[/link][/{style}]'
+
+    url_str = str(url)
+    if pathlib.Path(url_str).exists():
+        url_str = f'file://{url_str}'
+    return f'[{style}][link={url_str}]{text}[/link][/{style}]'
 
 
 def get_formatted_memory(memory_in_bytes: int, mib_decimal_places: int = 0) -> str:

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/rbx/box/solutions.py

@@ -726,20 +726,53 @@ def _get_solution_repr(sol: Solution) -> List[Tuple[str, str]]:
     ]
 
 
-async def pick_solutions(tracked_solutions: Optional[Set[str]]) -> List[str]:
+async def expand_solutions(sols: List[str]) -> List[Solution]:
     pkg = package.find_problem_package_or_die()
-    if tracked_solutions is None:
-        tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
+    seen_sols = set(str(sol.path) for sol in pkg.solutions)
 
+    # Dedup sols.
+    sols = [sol for sol in sols if str(sol) not in seen_sols]
+
+    # Ensure sols exist.
+    sols = [sol for sol in sols if pathlib.Path(sol).is_file()]
+
+    return [
+        Solution(path=pathlib.Path(sol), outcome=ExpectedOutcome.ACCEPTED)
+        for sol in sols
+    ]
+
+
+async def pick_solutions(
+    tracked_solutions: Optional[Set[str]],
+    extra_solutions: Optional[Iterable[Solution]] = None,
+) -> List[str]:
+    extra_sols = set(extra_solutions) if extra_solutions is not None else set()
+
+    pkg = package.find_problem_package_or_die()
     # Store in a separate list to maintain order with the package declaration.
     import questionary
 
     choices = [
-        questionary.Choice(title=_get_solution_repr(sol), value=str(sol.path))
+        questionary.Choice(
+            title=_get_solution_repr(sol),
+            value=str(sol.path),
+            checked=tracked_solutions is None or str(sol.path) in tracked_solutions,
+        )
         for sol in pkg.solutions
-        if str(sol.path) in tracked_solutions
     ]
 
+    seen_sols = set(str(sol.path) for sol in pkg.solutions)
+
+    if extra_sols:
+        # Add only new solutions.
+        choices.extend(
+            questionary.Choice(
+                title=_get_solution_repr(sol), value=str(sol.path), checked=True
+            )
+            for sol in extra_sols
+            if str(sol.path) not in seen_sols
+        )
+
     picked = await questionary.checkbox('Select solutions', choices=choices).ask_async()
     if picked is None:
         raise typer.Abort()

{rbx_cp-0.5.64 → rbx_cp-0.5.65}/rbx/box/testcase_utils.py

@@ -172,6 +172,7 @@ def parse_interaction(file: pathlib.Path) -> TestcaseInteraction:
             )
             raise typer.Exit(1) from None
 
+        # Crop file.
         rest = f.read()
         start = 0
 
@@ -202,13 +203,17 @@ def parse_interaction(file: pathlib.Path) -> TestcaseInteraction:
             nxt_start, _ = nxt
             return (pipe, (prefix_end, nxt_start))
 
-        while True:
+        # TODO: optimize
+        blocks = 0
+        MAX_BLOCKS = 1024
+        while blocks < MAX_BLOCKS:
             block = _find_next_block()
             if block is None:
                 break
             pipe, (st, nd) = block
             entries.append(TestcaseInteractionEntry(data=rest[st:nd], pipe=pipe))
             start = nd
+            blocks += 1
 
     return TestcaseInteraction(
         prefixes=(interactor_prefix, solution_prefix),