rbx.cp 0.5.64__py3-none-any.whl → 0.5.65__py3-none-any.whl

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/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/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/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),

{rbx_cp-0.5.64.dist-info → rbx_cp-0.5.65.dist-info}/METADATA

@@ -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.dist-info → rbx_cp-0.5.65.dist-info}/RECORD

@@ -5,7 +5,7 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=MDm2qqmhedAbhn3rWP6cDwbBsGhV6sz_2sg1zLkPDw0,3613
 rbx/box/cd.py,sha256=KGaqXHnv2hCumZS2VdMezFfwFEQcSq0rt05_KZtuQAo,1570
 rbx/box/checkers.py,sha256=aGciafGNQ39UqndTEJRT3J8ngv_UigYxOT30yMzCwEI,12752
-rbx/box/cli.py,sha256=mockAftbBYRt587_Fjbkpk7GZtj0MxcRJGoHBQxfTXE,27139
+rbx/box/cli.py,sha256=gCgXxUA243WmG7hXuDeGb0D9tF11dwzPtxobzKQM2DA,27445
 rbx/box/code.py,sha256=2oC1JbZiwfeg53ZICPig-KJYchqFRIZz-inlM-cLc7Q,19911
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
@@ -22,7 +22,7 @@ rbx/box/download.py,sha256=DxAiAk4lDYWEz1C9UTvZzHTq6hgm4fxGezApm2IkCTM,2601
 rbx/box/dump_schemas.py,sha256=3j5t47_vJmXj0BCczxDX6ByOcsfolGEDNCBXlPpk86w,593
 rbx/box/environment.py,sha256=Kp69MekUwwoVpupnafUcN5KAbP-ZTCwe0OQXt1h0FN8,11859
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
-rbx/box/formatting.py,sha256=csscjgWrTa6zjs2ueVCFRzA3WxdUFbzkzOxHWyQVerw,1049
+rbx/box/formatting.py,sha256=pPijbtoF2zK-8_y_Q7TOxMJAojZcMmFew4aCCSVfNRQ,1154
 rbx/box/generators.py,sha256=RE0-D91BB-3rNDQXvCFWzU9iMhKIc_ALp960oGfM-rY,13780
 rbx/box/generators_test.py,sha256=J7aBfuJhU84MWDWzgReRoOuQw_hVa09B8gTKAvL2XVo,1987
 rbx/box/git_utils.py,sha256=VlUgzuHOCnrjjiJQnDB32qDHbHw_zkwgA7wm4bloibc,750
@@ -52,7 +52,7 @@ rbx/box/retries.py,sha256=cZcNYLVHFDbhbeqMzxITgo8SYY8qzyxm0tIYcmWl1Ek,4877
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
 rbx/box/schema.py,sha256=y736-wZdGw56T6eDC_m7NAm2XRUdauBXJRQkQO79fpc,16264
 rbx/box/setter_config.py,sha256=9iObg6BwxQhFAhIOk31Jc0BDDpRYVGf3SyLIOsWIltM,4393
-rbx/box/solutions.py,sha256=pQG_4HVpFds6C0gcxmvKr557s7IhYmLoYB_s_1GgtAI,49049
+rbx/box/solutions.py,sha256=LQio9FJL51XlEZ20QohWpgTbBiyTN7tZ72eY-K3p3DY,49981
 rbx/box/solutions_test.py,sha256=PX1TQoRzNd9mi1SGsG7WFrpqFgNrNX5Kwt0mkwFdoOA,1749
 rbx/box/state.py,sha256=MMf3DvfQji0jKEliCHct2Tpp_0epL1tvP8HbHNArQIc,166
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -68,7 +68,7 @@ rbx/box/stressing/finder_parser.py,sha256=jXpYNa4FyugzmHi3r96Uv4rU1krRQJc5Ihr9jf
 rbx/box/stressing/generator_parser.py,sha256=oHZryjR3YohgaSO9WEirQ7b2e-98WgZStF0N99W4Thw,7380
 rbx/box/tasks.py,sha256=sVPR6a3CSU28pN6bMjZcZATYZBV7JlZvhvxcPRH8-MI,10514
 rbx/box/testcase_extractors.py,sha256=J43eG7vpxc5nP_2yhrXJODkd4EYlV4WiYVbM6hzipY4,11944
-rbx/box/testcase_utils.py,sha256=lvQ58D-R8vYx5AFA9sJ9xMIZJvtjYjisTpAjMIoyG4Y,7686
+rbx/box/testcase_utils.py,sha256=0HydSzmy1Olqws6iPMkX6dnPnl45sPZf83SlrjQxs40,7816
 rbx/box/testcases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/testcases/main.py,sha256=_I7h_obRcpNLRQ6dDJDIE5NAvTyn5nBOhdsBhRA_PvU,5442
 rbx/box/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -212,8 +212,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=x_PqD8Zd2PkN91NxVHUnSTs044-1WK5KKtttKQBXpFs,2083
 rbx/utils.py,sha256=SfR844_i0ebRDMkmS_w1YdZiWPc6h2RGADygewlWRbA,4845
-rbx_cp-0.5.64.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.64.dist-info/METADATA,sha256=rBpsAACES-Q_TSMl1doYvu3m29ymEtfkYx62vfrI75E,3604
-rbx_cp-0.5.64.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.64.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.64.dist-info/RECORD,,
+rbx_cp-0.5.65.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.65.dist-info/METADATA,sha256=TBx0q_SnA7K1cbAXvTbdgdLbCgTq7phrGbGBJSiKefk,3604
+rbx_cp-0.5.65.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.65.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.65.dist-info/RECORD,,