rbx.cp 0.5.72__tar.gz → 0.5.73__tar.gz

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/PKG-INFO

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

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/pyproject.toml

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

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/box/cli.py

@@ -60,7 +60,7 @@ app.add_typer(
 )
 app.add_typer(
     download.app,
-    name='download',
+    name='download, down',
     cls=annotations.AliasGroup,
     help='Download an asset from supported repositories (sub-command).',
     rich_help_panel='Management',
@@ -104,12 +104,10 @@ def main(
         help='Whether to compile and run testlib components with sanitizers enabled. '
         'If you want to run the solutions with sanitizers enabled, use the "-s" flag in the corresponding run command.',
     ),
-    debug_logs: bool = typer.Option(
-        False,
-        '--debug-logs',
-        '--debug',
-        '-d',
-        help='Whether to save extra debug logs along with the evaluation results.',
+    capture: bool = typer.Option(
+        True,
+        '--capture',
+        help='Whether to save extra logs and outputs from interactive solutions.',
     ),
 ):
     if cd.is_problem_package() and not package.is_cache_valid():
@@ -125,7 +123,7 @@ def main(
             '[warning]Sanitizers are running just for testlib components.\n'
             'If you want to run the solutions with sanitizers enabled, use the [item]-s[/item] flag in the corresponding run command.[/warning]'
         )
-    state.STATE.debug_logs = debug_logs
+    state.STATE.debug_logs = capture
 
 
 @app.command('ui', hidden=True)
@@ -136,6 +134,15 @@ def ui():
     ui_pkg.start()
 
 
+@app.command(
+    'on',
+    help='Run a command in the context of a problem (or a set of problems) of a contest.',
+    context_settings={'allow_extra_args': True, 'ignore_unknown_options': True},
+)
+def on(ctx: typer.Context, problems: str) -> None:
+    contest.on(ctx, problems)
+
+
 @app.command('diff', hidden=True)
 def diff(path1: pathlib.Path, path2: pathlib.Path):
     from rbx.box.ui import main as ui_pkg

rbx_cp-0.5.73/rbx/box/contest/contest_utils.py

@@ -0,0 +1,36 @@
+from typing import List
+
+from rbx.box import environment, package
+from rbx.box.contest import contest_package
+from rbx.box.contest.schema import ContestProblem
+
+
+def match_problem(problems: str, contest_problem: ContestProblem) -> bool:
+    short_name = contest_problem.short_name.lower()
+    problems = problems.lower()
+    if problems == '*':
+        return True
+    if '-' in problems:
+        start, end = problems.split('-')
+        return start <= short_name <= end
+    problem_set = set(p.strip().lower() for p in problems.split(','))
+    return short_name in problem_set
+
+
+def get_problems_of_interest(problems: str) -> List[ContestProblem]:
+    contest = contest_package.find_contest_package_or_die()
+    problems_of_interest = []
+
+    for p in contest.problems:
+        if match_problem(problems, p):
+            problems_of_interest.append(p)
+    return problems_of_interest
+
+
+def clear_all_caches():
+    pkgs = [package, environment, contest_package]
+
+    for pkg in pkgs:
+        for fn in pkg.__dict__.values():
+            if hasattr(fn, 'cache_clear'):
+                fn.cache_clear()

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/box/contest/main.py

@@ -232,3 +232,27 @@ def each(ctx: typer.Context) -> None:
         console.console.print(
             '[error]One of the commands above failed. Check the output![/error]'
         )
+
+
+@app.command(
+    'on',
+    help='Run a command in the problem (or in a set of problems) of a context.',
+    context_settings={'allow_extra_args': True, 'ignore_unknown_options': True},
+)
+@within_contest
+def on(ctx: typer.Context, problems: str) -> None:
+    command = ' '.join(['rbx'] + ctx.args)
+    problems_of_interest = contest_utils.get_problems_of_interest(problems)
+
+    if not problems_of_interest:
+        console.console.print(
+            f'[error]No problems found in contest matching [item]{problems}[/item].[/error]'
+        )
+        raise typer.Exit(1)
+
+    for p in problems_of_interest:
+        console.console.print(
+            f'[status]Running [item]{command}[/item] for [item]{p.short_name}[/item]...[/status]'
+        )
+        subprocess.call(command, cwd=p.get_path(), shell=True)
+        console.console.print()

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/box/download.py

@@ -5,7 +5,7 @@ from typing import Optional
 import typer
 
 from rbx import annotations, console
-from rbx.box import header, package
+from rbx.box import header, package, remote
 from rbx.box.schema import CodeItem
 from rbx.config import get_builtin_checker, get_jngen, get_testlib
 from rbx.grading import steps
@@ -72,3 +72,21 @@ def checker(name: str):
     console.console.print(
         f'[success]Downloaded [item]{name}[/item] into current package.[/success]'
     )
+
+
+@app.command('remote, r', help='Download a remote code.')
+@package.within_problem
+def remote_cmd(
+    name: str,
+    output: Optional[str] = typer.Option(
+        None,
+        '-o',
+        '--output',
+        help='Whether to not build outputs for tests and run checker.',
+    ),
+):
+    path = remote.expand_file(name)
+
+    if output is not None:
+        pathlib.Path(output).parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy(str(path), output)

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/box/ui/screens/run_explorer.py

@@ -46,7 +46,7 @@ class RunExplorerScreen(Screen):
             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.'
+                    'This is an interactive problem.\nYou can use the [bold blue]rbx --capture run[/bold blue] command to capture the interaction between the processes and see them here.'
                 )
             yield tips
 

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/resources/packagers/boca/interactive/c

@@ -132,16 +132,26 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$INTPID
-ECINT=\$?
-
+ECINT=0
 ECSF=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
-  # kill the solution
-  kill -9 \$SFPID
-else
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
   wait \$SFPID
   ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
 fi
 
 rm -rf fifo.in fifo.out
@@ -149,27 +159,38 @@ rm -rf fifo.in fifo.out
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/resources/packagers/boca/interactive/cc

@@ -132,16 +132,26 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$INTPID
-ECINT=\$?
-
+ECINT=0
 ECSF=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
-  # kill the solution
-  kill -9 \$SFPID
-else
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
   wait \$SFPID
   ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
 fi
 
 rm -rf fifo.in fifo.out
@@ -149,27 +159,38 @@ rm -rf fifo.in fifo.out
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/resources/packagers/boca/interactive/cpp

@@ -132,16 +132,26 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$INTPID
-ECINT=\$?
-
+ECINT=0
 ECSF=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
-  # kill the solution
-  kill -9 \$SFPID
-else
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
   wait \$SFPID
   ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
 fi
 
 rm -rf fifo.in fifo.out
@@ -149,26 +159,38 @@ rm -rf fifo.in fifo.out
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/resources/packagers/boca/interactive/java

@@ -145,16 +145,26 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$INTPID
-ECINT=\$?
-
+ECINT=0
 ECSF=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
-  # kill the solution
-  kill -9 \$SFPID
-else
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
   wait \$SFPID
   ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
 fi
 
 rm -rf fifo.in fifo.out
@@ -162,27 +172,38 @@ rm -rf fifo.in fifo.out
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
+fi
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

{rbx_cp-0.5.72 → rbx_cp-0.5.73}/rbx/resources/packagers/boca/interactive/kt

@@ -136,16 +136,26 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$INTPID
-ECINT=\$?
-
+ECINT=0
 ECSF=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
-  # kill the solution
-  kill -9 \$SFPID
-else
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
   wait \$SFPID
   ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
 fi
 
 rm -rf fifo.in fifo.out
@@ -153,27 +163,38 @@ rm -rf fifo.in fifo.out
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
+fi
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh