rbx.cp 0.5.65__tar.gz → 0.5.66__tar.gz

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

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

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

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

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

@@ -32,7 +32,6 @@ 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,
@@ -137,6 +136,13 @@ def ui():
     ui_pkg.start()
 
 
+@app.command('diff', hidden=True)
+def diff(path1: pathlib.Path, path2: pathlib.Path):
+    from rbx.box.ui import main as ui_pkg
+
+    ui_pkg.start_differ(path1, path2)
+
+
 @app.command('serve', hidden=True)
 def serve():
     from textual_serve.server import Server
@@ -243,7 +249,7 @@ async def run(
         tracked_solutions = set(
             await pick_solutions(
                 tracked_solutions,
-                extra_solutions=await expand_solutions(solutions or []),
+                extra_solutions=solutions,
             )
         )
         if not tracked_solutions:
@@ -479,7 +485,7 @@ async def irun(
         tracked_solutions = set(
             await pick_solutions(
                 tracked_solutions,
-                extra_solutions=await expand_solutions(solutions or []),
+                extra_solutions=solutions,
             )
         )
         if not tracked_solutions:

{rbx_cp-0.5.65 → rbx_cp-0.5.66}/rbx/box/package.py

@@ -150,6 +150,19 @@ def get_problem_cache_dir(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
     return cache_dir
 
 
+@functools.cache
+def get_problem_remote_dir(
+    platform: Optional[str] = None, root: pathlib.Path = pathlib.Path()
+) -> pathlib.Path:
+    remote_dir = get_problem_cache_dir(root) / '.remote'
+    remote_dir.mkdir(parents=True, exist_ok=True)
+
+    if platform is not None:
+        remote_dir = remote_dir / platform
+        remote_dir.mkdir(parents=True, exist_ok=True)
+    return remote_dir
+
+
 @functools.cache
 def get_problem_storage_dir(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
     storage_dir = get_problem_cache_dir(root) / '.storage'

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

@@ -4,6 +4,7 @@ import hashlib
 import os
 import pathlib
 import re
+import shutil
 import typing
 from typing import Any, NoReturn, Optional, Tuple
 
@@ -248,13 +249,50 @@ class BocaUploader:
                 '[error]Persistent error while uploading problem to BOCA website.[/error]'
             )
             console.console.print(
-                '[warning]This might be caused by PHP max upload size limit (which usually defaults to 2MBF).[/warning]'
+                '[warning]This might be caused by PHP max upload size limit (which usually defaults to 2MB).[/warning]'
             )
             console.console.print(
                 '[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)
 
+    def download_run(self, run_number: int, site_number: int, into_dir: pathlib.Path):
+        url = f'{self.base_url}/admin/runedit.php?runnumber={run_number}&runsitenumber={site_number}'
+        _, html = self.open(
+            url,
+            error_msg=f'Error while downloading BOCA run [item]{run_number}-{site_number}[/item]',
+        )
+
+        soup = BeautifulSoup(html, 'html.parser')
+        rows = soup.select('tr')
+
+        href: Optional[str] = None
+        filename: Optional[pathlib.Path] = None
+
+        for row in rows:
+            row_text = row.select('td')[0].text.strip().lower()
+            if row_text != "team's code:":
+                continue
+            link_col = row.select_one('td:nth-of-type(2) a:nth-of-type(1)')
+            if link_col is None:
+                continue
+            href = str(link_col.attrs['href'])
+            filename = pathlib.Path(link_col.text.strip())
+            break
+
+        if href is None or filename is None:
+            self.raw_error(
+                "Error while downloading run:\nNo link to team's code found."
+            )
+
+        link = self.br.find_link(url=href)
+        tmp_file, _ = self.br.retrieve(link.absolute_url)
+        if tmp_file is None:
+            self.raw_error('Error while downloading run:\nDownloaded file is None.')
+        final_path = into_dir / filename.with_stem(f'{run_number}-{site_number}')
+        shutil.move(tmp_file, final_path)
+        return final_path
+
 
 @functools.lru_cache
 def get_boca_uploader(

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

@@ -159,12 +159,10 @@ def compile_solutions(
 
     compiled_solutions = {}
 
-    for solution in pkg.solutions:
-        if (
-            tracked_solutions is not None
-            and str(solution.path) not in tracked_solutions
-        ):
-            continue
+    if tracked_solutions is None:
+        tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
+
+    for solution in expand_solutions(list(tracked_solutions)):
         if progress:
             progress.update(f'Compiling solution {href(solution.path)}...')
         try:
@@ -254,11 +252,7 @@ def _get_solutions_for_skeleton(
         if verification.value >= VerificationLevel.ALL_SOLUTIONS.value or is_fast(sol)
     ]
     if tracked_solutions is not None:
-        solutions = [
-            solution
-            for solution in solutions
-            if str(solution.path) in tracked_solutions
-        ]
+        solutions = expand_solutions(list(tracked_solutions))
     return solutions
 
 
@@ -726,28 +720,78 @@ def _get_solution_repr(sol: Solution) -> List[Tuple[str, str]]:
     ]
 
 
-async def expand_solutions(sols: List[str]) -> List[Solution]:
+# TODO: refactor this function
+def _expand_remote_sol(sol: str) -> Optional[str]:
+    from rbx.box.packaging.boca import upload as boca_upload
+
+    # Only BOCA supported for now.
+    assert sol.startswith('@')
+    sol = sol[1:]
+    if '-' in sol:
+        run_number, site_number = sol.split('-', 1)
+        run_number = int(run_number)
+        site_number = int(site_number)
+    else:
+        run_number = int(sol)
+        site_number = 1
+
+    expected_glob = (
+        package.get_problem_remote_dir('boca') / f'{run_number}-{site_number}.*'
+    )
+    expected_glob = expected_glob.relative_to(pathlib.Path.cwd())
+    for path in pathlib.Path.cwd().glob(str(expected_glob)):
+        if path.is_file():
+            relpath = path.resolve().relative_to(pathlib.Path.cwd())
+            console.console.print(f'Retrieving {href(relpath)} from cache...')
+            return str(relpath)
+
+    boca_uploader = boca_upload.get_boca_uploader()
+    boca_uploader.login()
+    sol_path = boca_uploader.download_run(
+        run_number, site_number, package.get_problem_remote_dir('boca')
+    )
+    console.console.print(f'Downloaded {href(sol_path)} from BOCA...')
+    return str(sol_path.resolve().relative_to(pathlib.Path.cwd()))
+
+
+def _expand_remote_sols(sols: List[str]) -> List[str]:
+    res = []
+    for sol in sols:
+        if not sol.startswith('@'):
+            res.append(sol)
+            continue
+        expanded = _expand_remote_sol(sol)
+        if expanded is None:
+            continue
+        res.append(expanded)
+    return res
+
+
+def expand_solutions(sols: List[str]) -> List[Solution]:
     pkg = package.find_problem_package_or_die()
-    seen_sols = set(str(sol.path) for sol in pkg.solutions)
+    seen_sols = {str(sol.path): sol for sol in pkg.solutions}
 
-    # Dedup sols.
-    sols = [sol for sol in sols if str(sol) not in seen_sols]
+    # Download remote sols.
+    sols = _expand_remote_sols(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
-    ]
+    res = []
+    for sol in sols:
+        if sol in seen_sols:
+            res.append(seen_sols[sol])
+        else:
+            res.append(
+                Solution(path=pathlib.Path(sol), outcome=ExpectedOutcome.ACCEPTED)
+            )
+    return res
 
 
 async def pick_solutions(
     tracked_solutions: Optional[Set[str]],
-    extra_solutions: Optional[Iterable[Solution]] = None,
+    extra_solutions: Optional[List[str]] = 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
@@ -763,13 +807,15 @@ async def pick_solutions(
 
     seen_sols = set(str(sol.path) for sol in pkg.solutions)
 
-    if extra_sols:
+    if extra_solutions is not None:
         # Add only new solutions.
         choices.extend(
             questionary.Choice(
-                title=_get_solution_repr(sol), value=str(sol.path), checked=True
+                title=_get_solution_repr(sol),
+                value=str(sol.path),
+                checked=True,
             )
-            for sol in extra_sols
+            for sol in expand_solutions(extra_solutions)
             if str(sol.path) not in seen_sols
         )
 

{rbx_cp-0.5.65 → rbx_cp-0.5.66}/rbx/box/ui/css/app.tcss

@@ -21,6 +21,20 @@ OptionList {
         border: solid $accent;
 }
 
+DiffBox {
+        border: solid $accent;
+        height: 1fr;
+        width: 1fr;
+        Markdown {
+                height: 1fr;
+                width: 1fr;
+
+                .code_inline {
+                        background: $background;
+                }
+        }
+}
+
 Button {
         width: 1fr;
         background: $accent;

{rbx_cp-0.5.65 → rbx_cp-0.5.66}/rbx/box/ui/main.py

@@ -1,3 +1,4 @@
+import pathlib
 from typing import Type
 
 from textual.app import App, ComposeResult
@@ -5,6 +6,7 @@ from textual.containers import Center
 from textual.screen import Screen
 from textual.widgets import Footer, Header, OptionList
 
+from rbx.box.ui.screens.differ import DifferScreen
 from rbx.box.ui.screens.run_explorer import RunExplorerScreen
 from rbx.box.ui.screens.test_explorer import TestExplorerScreen
 
@@ -35,6 +37,25 @@ class rbxApp(App):
         self.push_screen(screen_cls())
 
 
+class rbxDifferApp(App):
+    TITLE = 'rbx differ'
+    CSS_PATH = 'css/app.tcss'
+    BINDINGS = [('q', 'quit', 'Quit')]
+
+    def __init__(self, path1: pathlib.Path, path2: pathlib.Path):
+        super().__init__()
+        self.path1 = path1
+        self.path2 = path2
+
+    def on_mount(self):
+        self.push_screen(DifferScreen(self.path1, self.path2))
+
+
 def start():
     app = rbxApp()
     app.run()
+
+
+def start_differ(path1: pathlib.Path, path2: pathlib.Path):
+    app = rbxDifferApp(path1, path2)
+    app.run()

rbx_cp-0.5.66/rbx/box/ui/screens/differ.py

@@ -0,0 +1,29 @@
+import pathlib
+
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.screen import Screen
+from textual.widgets import Footer, Header
+
+from rbx.box.ui.widgets.diff_box import DiffBox
+
+
+class DifferScreen(Screen):
+    BINDINGS = [
+        ('q', 'quit', 'Quit'),
+    ]
+
+    def __init__(self, path1: pathlib.Path, path2: pathlib.Path):
+        super().__init__()
+        self.path1 = path1
+        self.path2 = path2
+
+    def compose(self) -> ComposeResult:
+        yield Header()
+        yield Footer()
+        with Vertical():
+            yield DiffBox()
+
+    def on_mount(self):
+        diff = self.query_one(DiffBox)
+        diff.paths = (self.path1, self.path2)

rbx_cp-0.5.66/rbx/box/ui/widgets/diff_box.py

@@ -0,0 +1,38 @@
+import difflib
+import pathlib
+from typing import Optional, Tuple
+
+from rich.markdown import Markdown
+from textual.app import ComposeResult
+from textual.reactive import reactive
+from textual.widget import Widget
+from textual.widgets import RichLog
+
+
+def compute_diff(file1: pathlib.Path, file2: pathlib.Path) -> str:
+    lines1 = file1.read_text().splitlines(keepends=True)
+    lines2 = file2.read_text().splitlines(keepends=True)
+    return ''.join(difflib.ndiff(lines1, lines2))
+
+
+class DiffBox(Widget, can_focus=False):
+    paths: reactive[Optional[Tuple[pathlib.Path, pathlib.Path]]] = reactive(None)
+
+    def __init__(self):
+        super().__init__()
+
+    def compose(self) -> ComposeResult:
+        md = RichLog()
+        md.border_title = 'Differ'
+        yield md
+
+    async def watch_paths(self, paths: Optional[Tuple[pathlib.Path, pathlib.Path]]):
+        log = self.query_one(RichLog)
+        log.clear()
+        if paths is None:
+            return
+        file1, file2 = paths
+        md = Markdown(
+            f'```diff\n{compute_diff(file1, file2)}\n```', code_theme='monokai'
+        )
+        log.write(md)

{rbx_cp-0.5.65 → rbx_cp-0.5.66}/rbx/box/unit.py

@@ -148,8 +148,6 @@ async def run_validator_unit_tests(progress: StatusProgress):
 
 async def run_checker_unit_tests(progress: StatusProgress):
     pkg = package.find_problem_package_or_die()
-    if not pkg.unitTests.checker:
-        return
 
     if not package.get_checker():
         console.console.print(