rbx.cp 0.5.62__tar.gz → 0.5.64__tar.gz

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

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

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

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

{rbx_cp-0.5.62 → rbx_cp-0.5.64}/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.64/rbx/box/formatting.py

@@ -0,0 +1,35 @@
+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()
+    return f'[{style}][link={url}]{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.62 → rbx_cp-0.5.64}/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.62 → rbx_cp-0.5.64}/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.62 → rbx_cp-0.5.64}/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.62 → rbx_cp-0.5.64}/rbx/box/solutions.py

@@ -16,7 +16,7 @@ import typer
 from pydantic import BaseModel
 
 from rbx import console, utils
-from rbx.box import checkers, environment, package
+from rbx.box import checkers, environment, package, state
 from rbx.box.code import (
     SanitizationLevel,
     compile_item,
@@ -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,
@@ -87,6 +87,7 @@ class SolutionReportSkeleton(BaseModel):
     groups: List[GroupSkeleton]
     limits: Dict[str, Limits]
     verification: VerificationLevel
+    capture_pipes: bool = False
 
     def find_group_skeleton(self, group_name: str) -> Optional[GroupSkeleton]:
         groups = [group for group in self.groups if group.name == group_name]
@@ -165,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,
@@ -175,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
 
@@ -203,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):
@@ -303,6 +304,7 @@ def _get_report_skeleton(
         limits=limits,
         entries=entries,
         verification=verification,
+        capture_pipes=state.STATE.debug_logs,
     )
 
     skeleton_file = runs_dir / 'skeleton.yml'
@@ -627,6 +629,7 @@ def _get_interactive_skeleton(
         limits=limits,
         entries=[],
         verification=verification,
+        capture_pipes=True,
     )
 
     skeleton_file = irun_dir / 'skeleton.yml'
@@ -1023,8 +1026,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
@@ -1049,14 +1052,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)}'
             )
 
 
@@ -1181,7 +1184,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 = []
 
@@ -1421,7 +1424,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.62 → rbx_cp-0.5.64}/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.62 → rbx_cp-0.5.64}/rbx/box/ui/screens/run_test_explorer.py

@@ -7,6 +7,7 @@ from textual.screen import Screen
 from textual.widgets import Footer, Header, Label, ListItem, ListView
 
 from rbx.box import package
+from rbx.box.schema import TaskType
 from rbx.box.solutions import SolutionReportSkeleton, SolutionSkeleton
 from rbx.box.testcase_extractors import (
     GenerationTestcaseEntry,
@@ -64,6 +65,9 @@ class RunTestExplorerScreen(Screen):
         self.query_one('#test-list').border_title = 'Tests'
         self.query_one('#test-input').border_title = 'Input'
 
+        # Ensure the output is show, even for interactive tests
+        self.action_show_output()
+
         await self._update_tests()
 
     def _get_rendering_data(
@@ -118,8 +122,15 @@ class RunTestExplorerScreen(Screen):
     def has_diffable_solution(self) -> bool:
         return self.diff_solution is not None or package.get_main_solution() is not None
 
+    def should_show_interaction(self) -> bool:
+        pkg = package.find_problem_package_or_die()
+        return pkg.type == TaskType.COMMUNICATION and self.skeleton.capture_pipes
+
     def action_show_output(self):
-        self.query_one('#test-output', TwoSidedTestBoxWidget).show_output()
+        if self.should_show_interaction():
+            self.query_one('#test-output', TwoSidedTestBoxWidget).show_interaction()
+        else:
+            self.query_one('#test-output', TwoSidedTestBoxWidget).show_output()
 
     def action_show_stderr(self):
         self.query_one('#test-output', TwoSidedTestBoxWidget).show_stderr()

{rbx_cp-0.5.62 → rbx_cp-0.5.64}/rbx/box/ui/screens/test_explorer.py

@@ -5,6 +5,8 @@ from textual.containers import Horizontal, Vertical
 from textual.screen import Screen
 from textual.widgets import Footer, Header, Label, ListItem, ListView, RichLog
 
+from rbx.box import package
+from rbx.box.schema import TaskType
 from rbx.box.testcase_extractors import (
     GenerationTestcaseEntry,
     extract_generation_testcases_from_groups,
@@ -42,6 +44,9 @@ class TestExplorerScreen(Screen):
         self.query_one('#test-list').border_title = 'Tests'
         self.query_one('#test-input').border_title = 'Input'
 
+        # Ensure either output or interaction is visible.
+        self.action_show_output()
+
         metadata = self.query_one('#test-metadata', RichLogBox)
         metadata.display = False
         metadata.border_title = 'Metadata'
@@ -67,6 +72,7 @@ class TestExplorerScreen(Screen):
         entry = self._entries[index]
         input.path = entry.metadata.copied_to.inputPath
 
+        assert entry.metadata.copied_to.outputPath is not None
         output.data = TestcaseRenderingData.from_one_path(
             entry.metadata.copied_to.outputPath
         )
@@ -105,8 +111,15 @@ class TestExplorerScreen(Screen):
             [ListItem(Label(name)) for name in test_names]
         )
 
+    def is_interactive(self) -> bool:
+        pkg = package.find_problem_package_or_die()
+        return pkg.type == TaskType.COMMUNICATION
+
     def action_show_output(self):
-        self.query_one('#test-output', TestBoxWidget).show_output()
+        if self.is_interactive():
+            self.query_one('#test-output', TestBoxWidget).show_interaction()
+        else:
+            self.query_one('#test-output', TestBoxWidget).show_output()
 
     def action_show_stderr(self):
         self.query_one('#test-output', TestBoxWidget).show_stderr()

rbx_cp-0.5.64/rbx/box/ui/widgets/interaction_box.py

@@ -0,0 +1,59 @@
+import asyncio
+import pathlib
+from typing import Optional
+
+import rich.text
+from textual import work
+from textual.reactive import reactive
+
+from rbx.box import testcase_utils
+from rbx.box.ui.widgets.rich_log_box import RichLogBox
+
+BATCH_SIZE = 1024
+
+
+class InteractionBox(RichLogBox):
+    DEFAULT_CSS = """
+    InteractionBox {
+        border: solid $accent;
+        height: 1fr;
+        width: 1fr;
+    }
+    """
+
+    path: reactive[Optional[pathlib.Path]] = reactive(None)
+
+    def on_mount(self):
+        super().on_mount()
+        self.auto_scroll = False
+        self.can_focus = False
+
+    @work(exclusive=True)
+    async def _load_file(self, path: pathlib.Path):
+        self.clear()
+        path_str = str(path.relative_to(pathlib.Path.cwd()))
+        self.border_subtitle = f'{path_str} (loading...)'
+
+        interaction = await asyncio.to_thread(testcase_utils.parse_interaction, path)
+
+        for entry in interaction.entries:
+            if entry.pipe == 0:
+                self.write(rich.text.Text(entry.data.rstrip(), style='green'))
+            else:
+                self.write(rich.text.Text(entry.data.rstrip()))
+
+        self.border_subtitle = path_str
+
+    async def watch_path(self, path: Optional[pathlib.Path]):
+        self.clear()
+
+        if path is None:
+            self.border_subtitle = '(no file selected)'
+            return
+
+        if not path.is_file():
+            path_str = str(path.relative_to(pathlib.Path.cwd()))
+            self.border_subtitle = f'{path_str} (does not exist)'
+            return
+
+        self._load_file(path)

{rbx_cp-0.5.62 → rbx_cp-0.5.64}/rbx/box/ui/widgets/test_output_box.py

@@ -9,6 +9,7 @@ from textual.widget import Widget
 from textual.widgets import ContentSwitcher
 
 from rbx.box.ui.widgets.file_log import FileLog
+from rbx.box.ui.widgets.interaction_box import InteractionBox
 from rbx.box.ui.widgets.rich_log_box import RichLogBox
 
 
@@ -17,6 +18,7 @@ class TestcaseRenderingData:
     input_path: Optional[pathlib.Path] = None
     output_path: Optional[pathlib.Path] = None
     stderr_path: Optional[pathlib.Path] = None
+    interaction_path: Optional[pathlib.Path] = None
     log_path: Optional[pathlib.Path] = None
     rich_content: Optional[str] = None
 
@@ -27,6 +29,7 @@ class TestcaseRenderingData:
             output_path=path.with_suffix('.out'),
             stderr_path=path.with_suffix('.err'),
             log_path=path.with_suffix('.log'),
+            interaction_path=path.with_suffix('.pio'),
         )
 
 
@@ -41,12 +44,14 @@ class TestBoxWidget(Widget, can_focus=False):
         output: FileLog
         stderr: FileLog
         log: FileLog
+        interaction: FileLog
 
     def logs(self) -> Logs:
         return self.Logs(
             output=self.query_one('#test-box-output', FileLog),
             stderr=self.query_one('#test-box-stderr', FileLog),
             log=self.query_one('#test-box-log', FileLog),
+            interaction=self.query_one('#test-box-interaction', InteractionBox),
         )
 
     def compose(self) -> ComposeResult:
@@ -55,6 +60,7 @@ class TestBoxWidget(Widget, can_focus=False):
                 yield FileLog(id='test-box-output')
                 yield FileLog(id='test-box-stderr')
                 yield FileLog(id='test-box-log')
+                yield InteractionBox(id='test-box-interaction')
             yield RichLogBox(id='test-box-metadata')
 
     def on_mount(self):
@@ -62,7 +68,7 @@ class TestBoxWidget(Widget, can_focus=False):
         logs.output.border_title = 'Output'
         logs.stderr.border_title = 'Stderr'
         logs.log.border_title = 'Log'
-
+        logs.interaction.border_title = 'Interaction'
         metadata = self.query_one('#test-box-metadata', RichLogBox)
         metadata.display = False
         metadata.border_title = 'Metadata'
@@ -78,7 +84,7 @@ class TestBoxWidget(Widget, can_focus=False):
         logs.output.path = data.output_path
         logs.stderr.path = data.stderr_path
         logs.log.path = data.log_path
-
+        logs.interaction.path = data.interaction_path
         metadata = self.query_one('#test-box-metadata', RichLogBox)
         metadata.clear()
         if data.rich_content is not None:
@@ -98,6 +104,9 @@ class TestBoxWidget(Widget, can_focus=False):
     def show_log(self):
         self.query_one(ContentSwitcher).current = 'test-box-log'
 
+    def show_interaction(self):
+        self.query_one(ContentSwitcher).current = 'test-box-interaction'
+
     def toggle_metadata(self):
         metadata = self.query_one('#test-box-metadata', RichLogBox)
         metadata.display = not metadata.display

{rbx_cp-0.5.62 → rbx_cp-0.5.64}/rbx/box/ui/widgets/two_sided_test_output_box.py

@@ -51,6 +51,10 @@ class TwoSidedTestBoxWidget(Widget, can_focus=False):
         self.query_one('#test-box-1', TestBoxWidget).show_log()
         self.query_one('#test-box-2', TestBoxWidget).show_log()
 
+    def show_interaction(self):
+        self.query_one('#test-box-1', TestBoxWidget).show_interaction()
+        self.query_one('#test-box-2', TestBoxWidget).show_interaction()
+
     def toggle_metadata(self):
         self.query_one('#test-box-1', TestBoxWidget).toggle_metadata()
         self.query_one('#test-box-2', TestBoxWidget).toggle_metadata()

rbx_cp-0.5.62/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'