rbx.cp 0.5.63__tar.gz → 0.5.65__tar.gz

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

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

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

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

{rbx_cp-0.5.63 → 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.63 → rbx_cp-0.5.65}/rbx/box/contest/build_contest_statements.py

@@ -10,6 +10,7 @@ from rbx import console, testing_utils
 from rbx.box import cd, package
 from rbx.box.contest.contest_package import get_problems
 from rbx.box.contest.schema import Contest, ContestProblem, ContestStatement
+from rbx.box.formatting import href
 from rbx.box.schema import Package, Testcase
 from rbx.box.statements import build_statements
 from rbx.box.statements.build_statements import (
@@ -344,6 +345,6 @@ def build_statement(
     console.console.print(
         f'Statement built successfully for language '
         f'[item]{statement.language}[/item] at '
-        f'[item]{statement_path.resolve()}[/item]'
+        f'{href(statement_path)}'
     )
     return statement_path

rbx_cp-0.5.65/rbx/box/formatting.py

@@ -0,0 +1,39 @@
+import os
+import pathlib
+from typing import Optional
+
+from rbx.box import setter_config
+
+
+def href(url: os.PathLike[str], text: Optional[str] = None, style: str = 'item') -> str:
+    custom_text = False
+    if text is None:
+        text = str(url)
+    else:
+        custom_text = True
+
+    if not custom_text:
+        if not setter_config.get_setter_config().hyperlinks:
+            return f'[{style}]{text}[/{style}]'
+        if os.environ.get('TERM') in ['vscode']:
+            return f'[{style}]{text}[/{style}]'
+
+    if isinstance(url, pathlib.Path):
+        url = url.resolve()
+
+    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:
+    if memory_in_bytes < 1024 * 1024:
+        if memory_in_bytes < 1024:
+            return f'{memory_in_bytes} B'
+        return f'{memory_in_bytes / 1024:.0f} KiB'
+    return f'{memory_in_bytes / (1024 * 1024):.{mib_decimal_places}f} MiB'
+
+
+def get_formatted_time(time_in_ms: int) -> str:
+    return f'{time_in_ms} ms'

{rbx_cp-0.5.63 → rbx_cp-0.5.65}/rbx/box/packaging/boca/upload.py

@@ -1,4 +1,5 @@
 import datetime
+import functools
 import hashlib
 import os
 import pathlib
@@ -41,6 +42,8 @@ class BocaUploader:
         self.username = _parse_env_var('BOCA_USERNAME', username)
         self.password = _parse_env_var('BOCA_PASSWORD', password)
 
+        self.loggedIn = False
+
         self.br = mechanize.Browser()
         self.br.set_handle_robots(False)
         self.br.addheaders = [  # type: ignore
@@ -140,6 +143,9 @@ class BocaUploader:
         return self.log_response_alert(response, error_msg)
 
     def login(self):
+        if self.loggedIn:
+            return
+
         _, html = self.open(
             f'{self.base_url}', error_msg='Error while opening BOCA login page'
         )
@@ -157,6 +163,8 @@ class BocaUploader:
         login_url = f'{self.base_url}?name={self.username}&password={pwd_hash}'
         self.open(login_url, error_msg='Error while logging in to BOCA')
 
+        self.loggedIn = True
+
     def upload(self, file: pathlib.Path) -> bool:
         self.open(
             f'{self.base_url}/admin/problem.php',
@@ -226,6 +234,7 @@ class BocaUploader:
                 console.console.print(
                     f'[warning]Potentially transient error while uploading problem to BOCA. Retrying ({tries}/{RETRIES})...[/warning]'
                 )
+                self.loggedIn = False
                 continue
 
             ok = True
@@ -245,3 +254,12 @@ class BocaUploader:
                 '[warning]Check [item]https://www.php.net/manual/en/ini.core.php#ini.sect.file-uploads[/item] for more information.[/warning]'
             )
             raise typer.Exit(1)
+
+
+@functools.lru_cache
+def get_boca_uploader(
+    base_url: Optional[str] = None,
+    username: Optional[str] = None,
+    password: Optional[str] = None,
+) -> BocaUploader:
+    return BocaUploader(base_url, username, password)

{rbx_cp-0.5.63 → rbx_cp-0.5.65}/rbx/box/packaging/main.py

@@ -7,6 +7,7 @@ import typer
 
 from rbx import annotations, console
 from rbx.box import environment, header, package
+from rbx.box.formatting import href
 from rbx.box.naming import get_problem_name_with_contest_info
 from rbx.box.package import get_build_path
 from rbx.box.packaging.packager import BasePackager, BuiltStatement
@@ -62,7 +63,7 @@ async def run_packager(
     console.console.print(
         f'[success]Problem packaged for [item]{packager.name()}[/item]![/success]'
     )
-    console.console.print(f'Package was saved at [item]{result_path.resolve()}[/item]')
+    console.console.print(f'Package was saved at {href(result_path)}')
     return result_path
 
 
@@ -105,9 +106,9 @@ async def boca(
     result_path = await run_packager(BocaPackager, verification=verification)
 
     if upload:
-        from rbx.box.packaging.boca.upload import BocaUploader
+        from rbx.box.packaging.boca.upload import get_boca_uploader
 
-        uploader = BocaUploader()
+        uploader = get_boca_uploader()
         uploader.login_and_upload(result_path)
 
 

{rbx_cp-0.5.63 → rbx_cp-0.5.65}/rbx/box/setter_config.py

@@ -71,6 +71,10 @@ class SetterConfig(BaseModel):
         default={},
         description='Substitutions to apply to commands before running them.',
     )
+    hyperlinks: bool = Field(
+        default=True,
+        description='Whether to use hyperlinks in the terminal output.',
+    )
 
     def substitute_command(self, command: str, sanitized: bool = False) -> str:
         exe = shlex.split(command)[0]

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

@@ -26,7 +26,7 @@ from rbx.box.deferred import Deferred
 from rbx.box.environment import (
     VerificationLevel,
 )
-from rbx.box.formatting import get_formatted_memory, get_formatted_time
+from rbx.box.formatting import get_formatted_memory, get_formatted_time, href
 from rbx.box.generators import (
     GenerationMetadata,
     expand_generator_call,
@@ -166,7 +166,7 @@ def compile_solutions(
         ):
             continue
         if progress:
-            progress.update(f'Compiling solution [item]{solution.path}[/item]...')
+            progress.update(f'Compiling solution {href(solution.path)}...')
         try:
             compiled_solutions[solution.path] = compile_item(
                 solution,
@@ -176,7 +176,7 @@ def compile_solutions(
             )
         except:
             console.console.print(
-                f'[error]Failed compiling solution [item]{solution.path}[/item][/error]'
+                f'[error]Failed compiling solution {href(solution.path)}.[/error]'
             )
             raise
 
@@ -204,7 +204,7 @@ def _run_solution(
 
         if progress:
             progress.update(
-                f'Running solution [item]{solution.path}[/item] on test [item]{group.name}[/item] / [item]{i}[/item]...'
+                f'Running solution {href(solution.path)} on test [item]{group.name}[/item] / [item]{i}[/item]...'
             )
 
         async def run_fn(i=i, testcase=testcase, output_path=output_path):
@@ -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()
@@ -1026,8 +1059,8 @@ def _print_solution_header(
     solution: SolutionSkeleton,
     console: rich.console.Console,
 ):
-    console.print(f'[item]{solution.path}[/item]', end=' ')
-    console.print(f'({solution.runs_dir})')
+    console.print(f'{href(solution.path)}', end=' ')
+    console.print(f'({href(solution.runs_dir, style="info")})')
 
 
 @dataclasses.dataclass
@@ -1052,14 +1085,14 @@ class TimingSummary:
     def print(self, console: rich.console.Console, tl: Optional[int] = None):
         if self.slowest_good is not None:
             console.print(
-                f'Slowest [success]OK[/success] solution: {self.slowest_good.time} ms, [item]{self.slowest_good.solution.path}[/item]'
+                f'Slowest [success]OK[/success] solution: {self.slowest_good.time} ms, {href(self.slowest_good.solution.path)}'
             )
         if self.fastest_slow is not None:
             fastest_slow = self.fastest_slow.time
             if tl is not None and self.fastest_slow.time > tl:
                 fastest_slow = f'>{tl}'
             console.print(
-                f'Fastest [error]slow[/error] solution: {fastest_slow} ms, [item]{self.fastest_slow.solution.path}[/item]'
+                f'Fastest [error]slow[/error] solution: {fastest_slow} ms, {href(self.fastest_slow.solution.path)}'
             )
 
 
@@ -1184,7 +1217,7 @@ async def _render_detailed_group_table(
     ) -> rich.table.Table:
         table = rich.table.Table()
         for solution in skeleton.solutions:
-            table.add_column(f'[item]{solution.path}[/item]', justify='full')
+            table.add_column(f'{href(solution.path)}', justify='full')
 
         padded_rows = []
 
@@ -1424,7 +1457,7 @@ async def estimate_time_limit(
 
         if not timings:
             console.print(
-                f'[warning]No timings for solution [item]{solution.path}[/item].[/warning]'
+                f'[warning]No timings for solution {href(solution.path)}.[/warning]'
             )
             continue
 

{rbx_cp-0.5.63 → rbx_cp-0.5.65}/rbx/box/statements/build_statements.py

@@ -8,6 +8,7 @@ import typer
 
 from rbx import annotations, console
 from rbx.box import environment, naming, package
+from rbx.box.formatting import href
 from rbx.box.schema import Package
 from rbx.box.statements.builders import (
     BUILDER_LIST,
@@ -302,7 +303,7 @@ def build_statement(
     console.console.print(
         f'Statement built successfully for language '
         f'[item]{statement.language}[/item] at '
-        f'[item]{statement_path.resolve()}[/item]'
+        f'{href(statement_path)}'
     )
     return statement_path
 

{rbx_cp-0.5.63 → 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),

rbx_cp-0.5.63/rbx/box/formatting.py

@@ -1,10 +0,0 @@
-def get_formatted_memory(memory_in_bytes: int, mib_decimal_places: int = 0) -> str:
-    if memory_in_bytes < 1024 * 1024:
-        if memory_in_bytes < 1024:
-            return f'{memory_in_bytes} B'
-        return f'{memory_in_bytes / 1024:.0f} KiB'
-    return f'{memory_in_bytes / (1024 * 1024):.{mib_decimal_places}f} MiB'
-
-
-def get_formatted_time(time_in_ms: int) -> str:
-    return f'{time_in_ms} ms'