rbx.cp 0.5.66__py3-none-any.whl → 0.5.67__py3-none-any.whl

rbx/box/ui/css/app.tcss

@@ -1,10 +1,11 @@
 Screen {
         background: $background;
         color: $text;
+        align: center middle;
 }
 
-Screen {
-        align: center middle;
+ModalScreen {
+        background: $background 65%;
 }
 
 ListView {
@@ -25,13 +26,9 @@ DiffBox {
         border: solid $accent;
         height: 1fr;
         width: 1fr;
-        Markdown {
+        RichLog {
                 height: 1fr;
                 width: 1fr;
-
-                .code_inline {
-                        background: $background;
-                }
         }
 }
 
@@ -110,4 +107,27 @@ TestExplorerScreen, RunTestExplorerScreen {
                 border: solid $accent;
                 padding: 0 1;
         }
+}
+
+#rich-dialog {
+        max-width: 80;
+        height: auto;
+        max-height: 5;
+
+        RichLog {
+                border: solid $accent;
+                padding: 0 1;
+        }
+}
+
+#selector-dialog {
+        max-width: 80;
+        height: auto;
+}
+
+#run-tips {
+        border: solid $accent;
+        padding: 0 1;
+        height: auto;
+        text-align: center;
 }

rbx/box/ui/main.py

@@ -6,6 +6,7 @@ from textual.containers import Center
 from textual.screen import Screen
 from textual.widgets import Footer, Header, OptionList
 
+from rbx.box import remote
 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
@@ -57,5 +58,7 @@ def start():
 
 
 def start_differ(path1: pathlib.Path, path2: pathlib.Path):
+    path1, path2 = remote.expand_files([path1, path2])
+
     app = rbxDifferApp(path1, path2)
     app.run()

rbx/box/ui/screens/rich_log_modal.py

@@ -0,0 +1,29 @@
+from typing import Optional
+
+from textual.app import ComposeResult
+from textual.containers import Container
+from textual.screen import ModalScreen
+
+from rbx.box.ui.widgets.rich_log_box import RichLogBox
+
+
+class RichLogModal(ModalScreen[None]):
+    BINDINGS = [
+        ('q', 'app.pop_screen', 'Close'),
+        ('g', 'app.pop_screen', 'Close'),
+    ]
+
+    def __init__(self, log: str, title: Optional[str] = None):
+        super().__init__()
+        self._log = log
+        self._title = title
+
+    def compose(self) -> ComposeResult:
+        with Container(id='rich-dialog'):
+            box = RichLogBox(markup=True)
+            if self._title:
+                box.border_title = self._title
+            yield box
+
+    async def on_mount(self):
+        self.query_one(RichLogBox).write(self._log)

rbx/box/ui/screens/run_explorer.py

@@ -1,15 +1,19 @@
 from typing import Optional
 
 from textual.app import ComposeResult
+from textual.containers import Vertical
 from textual.reactive import reactive
 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
 from rbx.box.ui.screens.error import ErrorScreen
 from rbx.box.ui.screens.run_test_explorer import RunTestExplorerScreen
 from rbx.box.ui.screens.selector import SelectorScreen
 from rbx.box.ui.utils.run_ui import get_skeleton, get_solution_markup, has_run
+from rbx.box.ui.widgets.rich_log_box import RichLogBox
 
 
 class RunExplorerScreen(Screen):
@@ -29,9 +33,22 @@ class RunExplorerScreen(Screen):
                 Label(get_solution_markup(self.skeleton, sol), markup=True)
                 for i, sol in enumerate(self.skeleton.solutions)
             ]
-        run_list = ListView(*[ListItem(item) for item in items], id='run-list')
-        run_list.border_title = 'Runs'
-        yield run_list
+        with Vertical():
+            run_list = ListView(*[ListItem(item) for item in items], id='run-list')
+            run_list.border_title = 'Runs'
+            yield run_list
+
+            tips = RichLogBox(id='run-tips')
+            tips.markup = True
+            tips.display = False
+            tips.border_title = 'Tips'
+            pkg = package.find_problem_package_or_die()
+            if pkg.type == TaskType.COMMUNICATION:
+                tips.display = True
+                tips.write(
+                    'This is an interactive problem.\nYou can use the [bold blue]rbx -d run[/bold blue] command to capture the interaction between the processes and see them here.'
+                )
+            yield tips
 
     def on_mount(self):
         if not has_run():

rbx/box/ui/screens/run_test_explorer.py

@@ -13,7 +13,9 @@ from rbx.box.testcase_extractors import (
     GenerationTestcaseEntry,
     extract_generation_testcases,
 )
+from rbx.box.ui.screens.rich_log_modal import RichLogModal
 from rbx.box.ui.utils.run_ui import (
+    get_metadata_markup,
     get_run_testcase_markup,
     get_run_testcase_metadata_markup,
 )
@@ -30,6 +32,7 @@ class RunTestExplorerScreen(Screen):
         ('3', 'show_log', 'Show log'),
         ('m', 'toggle_metadata', 'Toggle metadata'),
         ('s', 'toggle_side_by_side', 'Toggle sxs'),
+        ('g', 'toggle_test_metadata', 'Toggle test metadata'),
     ]
 
     side_by_side: reactive[bool] = reactive(False)
@@ -62,6 +65,11 @@ class RunTestExplorerScreen(Screen):
                 yield TwoSidedTestBoxWidget(id='test-output')
 
     async def on_mount(self):
+        self.title = str(self.solution.path)
+
+        if self.diff_solution is not None:
+            self.title = f'{self.title} vs. {self.diff_solution.path}'
+
         self.query_one('#test-list').border_title = 'Tests'
         self.query_one('#test-input').border_title = 'Input'
 
@@ -164,3 +172,15 @@ class RunTestExplorerScreen(Screen):
             return
         widget = self.query_one('#test-output', TwoSidedTestBoxWidget)
         widget.diff_with_data = diff_with_data
+
+    def action_toggle_test_metadata(self):
+        list_view = self.query_one('#test-list', ListView)
+        if list_view.index is None:
+            return
+        entry = self._entries[list_view.index]
+        self.app.push_screen(
+            RichLogModal(
+                get_metadata_markup(entry),
+                title='Testcase metadata',
+            )
+        )

rbx/box/ui/screens/selector.py

@@ -1,6 +1,7 @@
 from typing import List, Optional
 
 from textual.app import ComposeResult
+from textual.containers import Container
 from textual.screen import ModalScreen
 from textual.widgets import ListItem, ListView
 
@@ -14,10 +15,11 @@ class SelectorScreen(ModalScreen[int]):
         self.title = title
 
     def compose(self) -> ComposeResult:
-        list_view = ListView(*self.options)
-        if self.title:
-            list_view.border_title = self.title
-        yield list_view
+        with Container(id='selector-dialog'):
+            list_view = ListView(*self.options)
+            if self.title:
+                list_view.border_title = self.title
+            yield list_view
 
     def on_list_view_selected(self, event: ListView.Selected):
         self.dismiss(event.list_view.index)

rbx/box/ui/screens/test_explorer.py

@@ -11,6 +11,7 @@ from rbx.box.testcase_extractors import (
     GenerationTestcaseEntry,
     extract_generation_testcases_from_groups,
 )
+from rbx.box.ui.utils.run_ui import get_metadata_markup
 from rbx.box.ui.widgets.file_log import FileLog
 from rbx.box.ui.widgets.rich_log_box import RichLogBox
 from rbx.box.ui.widgets.test_output_box import TestBoxWidget, TestcaseRenderingData
@@ -78,19 +79,7 @@ class TestExplorerScreen(Screen):
         )
 
         metadata.clear()
-        metadata.write(
-            f'[bold]{entry.group_entry.group}[/bold] / [bold]{entry.group_entry.index}[/bold]'
-        )
-        if entry.metadata.copied_from is not None:
-            metadata.write(
-                f'[bold]Copied from:[/bold] {entry.metadata.copied_from.inputPath}'
-            )
-        if entry.metadata.generator_call is not None:
-            metadata.write(f'[bold]Gen. call:[/bold] {entry.metadata.generator_call}')
-        if entry.metadata.generator_script is not None:
-            metadata.write(
-                f'[bold]Gen. script:[/bold] {entry.metadata.generator_script}'
-            )
+        metadata.write(get_metadata_markup(entry))
 
     async def _update_tests(self):
         self.watch(

rbx/box/ui/utils/run_ui.py

@@ -4,6 +4,7 @@ from typing import List, Optional
 from rbx import utils
 from rbx.box import package, solutions
 from rbx.box.solutions import SolutionReportSkeleton, SolutionSkeleton
+from rbx.box.testcase_extractors import GenerationTestcaseEntry
 from rbx.box.testcase_utils import TestcaseEntry
 from rbx.grading.steps import Evaluation
 
@@ -93,3 +94,15 @@ def get_run_testcase_metadata_markup(
     if checker_msg is not None:
         lines.append(f'[b]Checker:[/b] {checker_msg}')
     return '\n'.join(lines)
+
+
+def get_metadata_markup(entry: GenerationTestcaseEntry) -> str:
+    lines = []
+    lines.append(f'[b]{entry.group_entry.group}[/b] / [b]{entry.group_entry.index}[/b]')
+    if entry.metadata.copied_from is not None:
+        lines.append(f'[b]Copied from:[/b] {entry.metadata.copied_from.inputPath}')
+    if entry.metadata.generator_call is not None:
+        lines.append(f'[b]Gen. call:[/b] {entry.metadata.generator_call}')
+    if entry.metadata.generator_script is not None:
+        lines.append(f'[b]Gen. script:[/b] {entry.metadata.generator_script}')
+    return '\n'.join(lines)

rbx/box/unit.py

@@ -14,6 +14,7 @@ from rbx.box.schema import (
     ValidatorOutcome,
     ValidatorTest,
 )
+from rbx.grading.steps import Outcome
 from rbx.utils import StatusProgress
 
 
@@ -181,6 +182,39 @@ async def run_checker_unit_tests(progress: StatusProgress):
             skip_run_log=True,
         )
 
+        if test.answer is not None:
+            ans_result = await checkers.check(
+                compiled_digest,
+                run_log=None,
+                testcase=Testcase(
+                    inputPath=test.input or empty_file,
+                    outputPath=test.answer,
+                ),
+                program_output=test.answer,
+                skip_run_log=True,
+            )
+
+            if ans_result.outcome != Outcome.ACCEPTED:
+                console.console.print(
+                    f'[error]FAIL[/error] Unit test [item]#{i + 1}[/item] ({test.running_tests_formatted_string()})'
+                )
+                console.console.print(
+                    '[error]Error validating the [item].ans[/item] file.'
+                )
+                console.console.print(
+                    '[error]While checking your [item].ans[/item] against itself, the checker returned the following error:[/error]'
+                )
+                console.console.print(
+                    f'  [status]Verdict[/status] {ans_result.outcome.name}'
+                )
+                console.console.print(
+                    f'  [status]Message[/status] {ans_result.message}'
+                )
+                console.console.print(
+                    '[error]Please fix your [item].ans[/item] file and try again, or double-check that your checker is correct.[/error]'
+                )
+                continue
+
         markup = (
             '[success]OK[/success]'
             if test.outcome.match(result.outcome)

rbx/grading/steps.py

@@ -34,6 +34,7 @@ class Outcome(Enum):
     WRONG_ANSWER = 'wrong-answer'
     MEMORY_LIMIT_EXCEEDED = 'memory-limit-exceeded'
     TIME_LIMIT_EXCEEDED = 'time-limit-exceeded'
+    IDLENESS_LIMIT_EXCEEDED = 'idleness-limit-exceeded'
     RUNTIME_ERROR = 'runtime-error'
     OUTPUT_LIMIT_EXCEEDED = 'output-limit-exceeded'
     JUDGE_FAILED = 'judge-failed'
@@ -46,6 +47,12 @@ class Outcome(Enum):
 
         return max(outcomes, key=_outcome_to_int)
 
+    def is_slow(self) -> bool:
+        return self in [
+            Outcome.TIME_LIMIT_EXCEEDED,
+            Outcome.IDLENESS_LIMIT_EXCEEDED,
+        ]
+
 
 class DigestHolder(BaseModel):
     value: Optional[str] = None

rbx/resources/checkers/noop.cpp

@@ -0,0 +1,13 @@
+#include "testlib.h"
+
+using namespace std;
+
+int main(int argc, char *argv[]) {
+  setName("no-op checker");
+  registerTestlibCmd(argc, argv);
+
+  while (!ouf.seekEof()) {
+    ouf.skipChar();
+  }
+  quitf(_ok, "ok");
+}

rbx/resources/packagers/boca/compile/java

@@ -107,8 +107,13 @@ cdir=$(pwd)
 echo "Current directory is $cdir" >&2
 
 # Make sure the class name is Main.
-mv "src/$name" "src/Main.java"
-sed -i -E "s/public[[:space:]]+class[[:space:]]+[A-Za-z0-9_\\$]+([^A-Za-z0-9_\\$])/public class Main\1/" src/Main.java
+regex="public[[:space:]]+class[[:space:]]+[A-Za-z0-9_\\$]+([^A-Za-z0-9_\\$])"
+klass=$(basename "$name" .java)
+if [ -n "$(sed -n -E "/$regex/p" src/$name)" ]; then
+  klass="Main"
+  mv "src/$name" "src/Main.java"
+  sed -i -E "s/$regex/public class Main\1/" src/Main.java
+fi
 
 cat <<EOF >compileit.sh
 #!/bin/bash
@@ -126,8 +131,8 @@ if [ ! -x \$jar ]; then
 fi
 export CLASSPATH=.:\$CLASSPATH
 cd src
-if [ -r "Main.java" ]; then
-  \$javac Main.java
+if [ -r "\$klass.java" ]; then
+  \$javac \$klass.java
   echo \$? > ../compileit.retcode
 fi
 find . -name "*.java" | while read lin; do
@@ -135,7 +140,7 @@ find . -name "*.java" | while read lin; do
   echo \$? > ../compileit.retcode
 done
 rm -f ../$jarfile
-\$jar cvfe ../$jarfile Main *
+\$jar cvfe ../$jarfile \$klass *
 exit 0
 EOF
 chmod 755 compileit.sh

rbx/resources/packagers/boca/compile/py2

@@ -42,47 +42,47 @@
 umask 0022
 
 if [ "$1" == "" ]; then
-    echo "parameter problem"
-    exit 43
+  echo "parameter problem"
+  exit 43
 fi
 if [ ! -r "$1" ]; then
-    echo "$1 not found or it's not readable"
-    exit 44
+  echo "$1 not found or it's not readable"
+  exit 44
 fi
 name="$1"
 if [ ! -r "$1" ]; then
-    echo "$1 not found or it's not readable"
-    exit 44
+  echo "$1 not found or it's not readable"
+  exit 44
 fi
 mkdir -p src
 if [ "${name##*.}" == "zip" -a "${name##*.}" == "ZIP" ]; then
-	unzip "$name" -d src
-	name="*.c"
+  unzip "$name" -d src
+  name="*.c"
 else
-	cp "$name" src
+  cp "$name" src
 fi
 id -u bocajail >/dev/null 2>/dev/null
 if [ $? == 0 ]; then
-	bocau=`id -u bocajail`
-	bocag=`id -g bocajail`
-	chown bocajail.nogroup .
+  bocau=$(id -u bocajail)
+  bocag=$(id -g bocajail)
+  chown bocajail.nogroup .
 else
-	bocau=`id -u nobody`
-	bocag=`id -g nobody`
-	chown nobody.nogroup .
+  bocau=$(id -u nobody)
+  bocag=$(id -g nobody)
+  chown nobody.nogroup .
 fi
 if [ "$bocau" == "" -o "$bocag" == "" ]; then
-	echo "error finding user to run script"
-	exit 43
+  echo "error finding user to run script"
+  exit 43
 fi
 
 # this script makes use of safeexec to execute the code with less privilegies
 # make sure that directories below are correct.
-sf=`which safeexec`
+sf=$(which safeexec)
 [ -x "$sf" ] || sf=/usr/bin/safeexec
 if [ ! -x $sf ]; then
-    echo "$sf not found or it's not executable"
-    exit 46
+  echo "$sf not found or it's not executable"
+  exit 46
 fi
 maxm=512000
 if [ "$4" != "" ]; then
@@ -93,9 +93,9 @@ fi
 
 # setting up the timelimit according to the problem
 if [ "$3" == "" ]; then
-time=5
+  time=5
 else
-time=$3
+  time=$3
 fi
 let "ttime = $time + 30"
 
@@ -106,7 +106,7 @@ else
 fi
 
 rm -f "$exe" compileit.retcode runit.retcode 2>/dev/null
-cat <<EOF > compileit.sh
+cat <<EOF >compileit.sh
 #!/bin/bash
 cc=\`which python2\`
 [ -x "\$cc" ] || cc=/usr/bin/python2
@@ -115,6 +115,14 @@ if [ ! -x "\$cc" ]; then
     exit 47
 fi
 cd src
+"\$cc" -m py_compile "$name"
+pyc_ret=\$?
+if [ "\$pyc_ret" != "0" ]; then
+    echo "python syntax check failed: \$pyc_ret"
+    echo \$pyc_ret > ../compileit.retcode
+    exit 0
+fi
+
 echo "#!/usr/bin/python2" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"
 echo \$? > ../compileit.retcode
@@ -122,13 +130,13 @@ exit 0
 EOF
 chmod 755 compileit.sh
 
-cdir=`pwd`
+cdir=$(pwd)
 echo "Current directory is $cdir" >&2
 echo $cdir | grep -q "/bocajail"
 if [ $? == 0 ]; then
-    cdir=`echo $cdir | sed "s/.*\/bocajail//"`
-    echo "Internal directory is $cdir"
-    cat <<EOF > runit.sh
+  cdir=$(echo $cdir | sed "s/.*\/bocajail//")
+  echo "Internal directory is $cdir"
+  cat <<EOF >runit.sh
 #!/bin/bash
 cd "$cdir"
 [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc
@@ -142,32 +150,32 @@ if [ ! -d /bocajail ]; then
   /bin/umount /sys 2>/dev/null
 fi
 EOF
-    chmod 755 runit.sh
-    chroot /bocajail "$cdir/runit.sh"
-    if [ -r runit.retcode ]; then
-    	ret=`cat runit.retcode`
-    else
-		ret=99
-    fi
+  chmod 755 runit.sh
+  chroot /bocajail "$cdir/runit.sh"
+  if [ -r runit.retcode ]; then
+    ret=$(cat runit.retcode)
+  else
+    ret=99
+  fi
 else
-	echo "COMPILATION IS NOT BEING CHROOTED -- THIS IS NOT AN IDEAL SETTING"
-	$sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh
-	ret=$?
+  echo "COMPILATION IS NOT BEING CHROOTED -- THIS IS NOT AN IDEAL SETTING"
+  $sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh
+  ret=$?
 fi
 if [ -f "stdout0" ]; then
-	cat "stdout0"
+  cat "stdout0"
 fi
 if [ -f "stderr0" ]; then
-	cat "stderr0"
+  cat "stderr0"
 fi
 rm -rf src/
 if [ "$ret" != "0" ]; then
-	echo "Compilation Error: $ret"
-	exit $ret
+  echo "Compilation Error: $ret"
+  exit $ret
 fi
-ret=`cat compileit.retcode`
+ret=$(cat compileit.retcode)
 if [ "$ret" != "0" ]; then
-	echo "Compilation Error: $ret"
-	ret=1
+  echo "Compilation Error: $ret"
+  ret=1
 fi
 exit $ret