rbx.cp 0.5.42__tar.gz → 0.5.45__tar.gz

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.42
+Version: 0.5.45
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: fastapi (>=0.115.8,<0.116.0)
 Requires-Dist: filelock (>=3.14.0,<4.0.0)
-Requires-Dist: gevent (>=24.2.1,<25.0.0)
 Requires-Dist: gitpython (>=3.1.43,<4.0.0)
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: lark (>=1.2.2,<2.0.0)

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/pyproject.toml

@@ -1,19 +1,21 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.42"
+version = "0.5.45"
 description = ""
 packages = [
   {include = "rbx"}
 ]
 authors = ["Roberto Sales"]
 readme = "README.md"
+exclude = [
+  "rbx/testdata/",
+]
 
 [tool.poetry.dependencies]
 python = "^3.9"
 typer = "^0.15.1"
 fastapi = "^0.115.8"
 filelock = "^3.14.0"
-gevent = "^24.2.1"
 mechanize = "^0.4.10"
 jinja2 = "^3.1.4"
 pydantic = "2.8.2"

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/box/cli.py

@@ -103,6 +103,13 @@ 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.',
+    ),
 ):
     state.STATE.run_through_cli = True
     state.STATE.sanitized = sanitized
@@ -111,6 +118,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
 
 
 # @app.command('ui', hidden=True)

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/box/code.py

@@ -216,6 +216,52 @@ class PreparedRun:
     metadata: RunLogMetadata
 
 
+@dataclasses.dataclass
+class CaptureSpec:
+    prefix: str
+    output: Optional[DigestOrDest] = None
+    merged_capture: Optional[pathlib.Path] = None
+
+
+def _prepare_for_communication(
+    run: PreparedRun,
+    stdin: pathlib.Path,
+    stdout: pathlib.Path,
+    reverse_io: bool = False,
+    capture: Optional[CaptureSpec] = None,
+):
+    run.sandbox_params.set_stdio(
+        stdin=stdin,
+        stdout=stdout,
+    )
+    run.sandbox_params.reverse_io = reverse_io
+    if capture is not None:
+        run.sandbox_params.timeit_prefix = capture.prefix
+
+        if capture.output is not None:
+            output_path = PosixPath('capture')
+            run.sandbox_params.timeit_dups['do'].append(output_path)
+
+            run.artifacts.outputs.append(
+                GradingFileOutput(
+                    src=output_path,
+                    **capture.output.expand(),
+                    touch=True,
+                )
+            )
+
+        if capture.merged_capture is not None:
+            merged_output_path = package.get_merged_capture_path().resolve()
+            run.sandbox_params.timeit_dups['Do'].append(merged_output_path)
+
+            run.artifacts.outputs.append(
+                GradingFileOutput(
+                    src=merged_output_path,
+                    dest=capture.merged_capture,
+                )
+            )
+
+
 def _prepare_run(
     code: CodeItem,
     executable: DigestOrSource,
@@ -484,6 +530,7 @@ class CommunicationItem:
     outputs: Optional[List[GradingFileOutput]] = None
     extra_args: Optional[str] = None
     extra_config: Optional[ExecutionConfig] = None
+    capture: Optional[DigestOrDest] = None
 
     def prepare(self) -> PreparedRun:
         return _prepare_run(
@@ -500,6 +547,7 @@ class CommunicationItem:
 async def run_communication(
     interactor: CommunicationItem,
     solution: CommunicationItem,
+    merged_capture: Optional[pathlib.Path] = None,
     retry_index: Optional[int] = None,
 ):
     fifo_in, fifo_out = package.get_fifos()
@@ -510,10 +558,35 @@ async def run_communication(
     interactor_prepared.metadata.retryIndex = retry_index
     solution_prepared.metadata.retryIndex = retry_index
 
-    interactor_prepared.sandbox_params.set_stdio(stdin=fifo_out, stdout=fifo_in)
-    solution_prepared.sandbox_params.set_stdio(stdin=fifo_in, stdout=fifo_out)
+    interactor_prefix = 'INTERACTOR:'
+    solution_prefix = 'SOLUTION:'
+
+    if merged_capture is not None:
+        package.get_merged_capture_path().write_text(
+            f'{interactor_prefix}\n{solution_prefix}\n'
+        )
 
-    solution_prepared.sandbox_params.reverse_io = True
+    _prepare_for_communication(
+        interactor_prepared,
+        fifo_out,
+        fifo_in,
+        capture=CaptureSpec(
+            prefix=interactor_prefix,
+            output=interactor.capture,
+            merged_capture=merged_capture,
+        ),
+    )
+    _prepare_for_communication(
+        solution_prepared,
+        fifo_in,
+        fifo_out,
+        reverse_io=True,
+        capture=CaptureSpec(
+            prefix=solution_prefix,
+            output=solution.capture,
+            merged_capture=merged_capture,
+        ),
+    )
 
     interactor_run_params = steps.CoordinatedRunParams(
         command=interactor_prepared.command,

rbx_cp-0.5.45/rbx/box/main.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+from rbx.box.cli import app

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/box/package.py

@@ -393,16 +393,23 @@ def get_compilation_files(code: CodeItem) -> List[Tuple[pathlib.Path, pathlib.Pa
     return res
 
 
+@functools.cache
+def get_shared_dir(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
+    shared_dir = get_problem_cache_dir(root) / '.shared'
+    shared_dir.mkdir(parents=True, exist_ok=True)
+    return shared_dir
+
+
 @functools.cache
 def get_empty_sentinel_path(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
-    path = get_problem_cache_dir(root) / '.empty'
+    path = get_shared_dir(root) / '.empty'
     path.write_text('')
     return path
 
 
 @functools.cache
 def get_fifos(root: pathlib.Path = pathlib.Path()) -> Tuple[pathlib.Path, pathlib.Path]:
-    path = get_problem_cache_dir(root) / '.fifos'
+    path = get_shared_dir(root) / '.fifos'
     shutil.rmtree(path, ignore_errors=True)
     path.mkdir(parents=True, exist_ok=True)
     fifo_in = path / 'fifo.in'
@@ -412,6 +419,13 @@ def get_fifos(root: pathlib.Path = pathlib.Path()) -> Tuple[pathlib.Path, pathli
     return fifo_in, fifo_out
 
 
+@functools.cache
+def get_merged_capture_path(root: pathlib.Path = pathlib.Path()) -> pathlib.Path:
+    path = get_shared_dir(root) / '.merged_capture'
+    path.write_text('')
+    return path
+
+
 def clear_package_cache():
     pkgs = [sys.modules[__name__]]
 

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/box/state.py

@@ -5,6 +5,7 @@ import dataclasses
 class State:
     run_through_cli: bool = False
     sanitized: bool = False
+    debug_logs: bool = False
 
 
 STATE = State()

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/box/tasks.py

@@ -1,7 +1,7 @@
 import pathlib
 from typing import Optional
 
-from rbx.box import checkers, package
+from rbx.box import checkers, package, state
 from rbx.box.code import CommunicationItem, run_communication, run_item
 from rbx.box.environment import EnvironmentSandbox, ExecutionConfig, VerificationLevel
 from rbx.box.retries import Retrier
@@ -49,6 +49,7 @@ async def run_solution_on_testcase(
     timelimit_override: Optional[int] = None,
     use_retries: bool = True,
     use_timelimit: bool = True,
+    capture_pipes: bool = False,
 ) -> Evaluation:
     if interactor_digest is not None:
         return await _run_communication_solution_on_testcase(
@@ -63,6 +64,7 @@ async def run_solution_on_testcase(
             timelimit_override=timelimit_override,
             use_retries=use_retries,
             use_timelimit=use_timelimit,
+            capture_pipes=capture_pipes,
         )
 
     async def run_fn(retry_index: int) -> Evaluation:
@@ -155,7 +157,10 @@ async def _run_communication_solution_on_testcase(
     timelimit_override: Optional[int] = None,
     use_retries: bool = True,
     use_timelimit: bool = True,
+    capture_pipes: bool = False,
 ) -> Evaluation:
+    capture_pipes = capture_pipes or state.STATE.debug_logs
+
     async def run_fn(retry_index: int) -> Evaluation:
         actual_sandbox = package.get_singleton_sandbox()
         interactor_sandbox = package.get_singleton_interactor_sandbox()
@@ -185,6 +190,9 @@ async def _run_communication_solution_on_testcase(
         log_path = output_path.with_suffix('.log')
         output_path.parent.mkdir(parents=True, exist_ok=True)
 
+        interactor_capture_path = (
+            output_path.with_suffix('.pin') if capture_pipes else None
+        )
         interactor_item = CommunicationItem(
             code=package.get_interactor(),
             executable=DigestOrSource.create(interactor_digest),
@@ -204,17 +212,28 @@ async def _run_communication_solution_on_testcase(
                     touch=True,
                 )
             ],
+            capture=DigestOrDest.create(interactor_capture_path)
+            if interactor_capture_path
+            else None,
+        )
+        solution_capture_path = (
+            output_path.with_suffix('.pout') if capture_pipes else None
         )
         solution_item = CommunicationItem(
             code=solution,
             executable=DigestOrSource.create(compiled_digest),
             extra_config=extra_config,
+            capture=DigestOrDest.create(solution_capture_path)
+            if solution_capture_path
+            else None,
         )
 
+        merged_capture_path = output_path.with_suffix('.pio') if capture_pipes else None
         interactor_run_log, run_log = await run_communication(
             interactor=interactor_item,
             solution=solution_item,
             retry_index=retry_index,
+            merged_capture=merged_capture_path,
         )
 
         checker_result = await checkers.check_communication(

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/cacher.py

@@ -9,8 +9,6 @@ import tempfile
 import typing
 from typing import IO, List, Optional
 
-import gevent
-
 from rbx.grading.judge import digester, storage
 
 logger = logging.getLogger(__name__)
@@ -318,8 +316,6 @@ class FileCacher:
                 d.update(buf)
                 while len(buf) > 0:
                     written = dst.write(buf)
-                    # Cooperative yield.
-                    gevent.sleep(0)
                     if written is None:
                         break
                     buf = buf[written:]

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/digester.py

@@ -2,8 +2,6 @@ import hashlib
 import pathlib
 from typing import IO
 
-import gevent
-
 
 class Digester:
     """Simple wrapper of hashlib using our preferred hasher."""
@@ -26,7 +24,6 @@ def digest_cooperatively_into_digester(
     buf = f.read(chunk_size)
     while len(buf) > 0:
         digester.update(buf)
-        gevent.sleep(0)
         buf = f.read(chunk_size)
 
 

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/sandbox.py

@@ -1,4 +1,5 @@
 import abc
+import collections
 import dataclasses
 import io
 import logging
@@ -114,6 +115,12 @@ class SandboxParams(pydantic.BaseModel):
     extra_timeout: Optional[int] = None  # ms
     reverse_io: bool = False
 
+    # For timeit
+    timeit_dups: Dict[str, List[pathlib.Path]] = dataclasses.field(
+        default_factory=lambda: collections.defaultdict(list)
+    )
+    timeit_prefix: Optional[str] = None
+
     def get_cacheable_params(self) -> Dict[str, Any]:
         return self.model_dump(mode='json', exclude_unset=True, exclude_none=True)
 

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/sandboxes/stupid_sandbox.py

@@ -105,8 +105,17 @@ class StupidSandbox(SandboxBase):
             file_args.append(f'-e{self.params.stderr_file}')
         if self.params.reverse_io:
             file_args.reverse()
+        args.extend(file_args)
 
-        return args + file_args
+        if self.params.timeit_dups:
+            for i, files in self.params.timeit_dups.items():
+                assert i.lower() in ['di', 'do', 'de']
+                for file in files:
+                    args.append(f'-{i}{file}')
+        if self.params.timeit_prefix:
+            args.append(f'-P{self.params.timeit_prefix}')
+
+        return args
 
     def get_root_path(self) -> pathlib.Path:
         """Return the toplevel path of the sandbox.

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/sandboxes/timeit.py

@@ -6,7 +6,7 @@ import signal
 import stat
 import sys
 from time import monotonic
-from typing import List, Optional
+from typing import Any, Dict, List, Optional, Set, Union
 
 
 @dataclasses.dataclass
@@ -22,12 +22,96 @@ class Options:
     memory_limit: Optional[int] = None  # kb, but passed in args as mb
     fs_limit: Optional[int] = None  # kb
     files_to_open: List[int] = dataclasses.field(default_factory=list)
+    file_duplicates: Dict[int, List[str]] = dataclasses.field(default_factory=dict)
+    prefixed: Set[str] = dataclasses.field(default_factory=set)
+    prefix: str = ''
 
 
 def exit_with(code: int):
     sys.exit(code)
 
 
+def get_tee_command(files: List[str]) -> str:
+    path = (
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), 'tee.py')
+        + ' '
+        + ' '.join(files)
+    )
+    return sys.executable + ' ' + path
+
+
+valid_modes = ['a', 'w']
+
+
+@dataclasses.dataclass
+class Tee:
+    file: Any
+    prefix: Union[str, bytes] = ''
+
+
+def create_tee(files, mode, buffer_size=4096, prefix=''):
+    """Get a file object that will mirror writes across multiple files objs
+
+    Options:
+        files     A list of files and/or file objects. All strings will be
+                  treated as file paths and opened for writing. Everything
+                  else is assumed to be a file-like object that implements
+                  both the write() and flush() methods.
+
+        mode      Which mode to use when opening new files. Valid values
+                  are 'a' (append) and 'w' (overwrite).
+
+        buffer_size
+                Control the size of the buffer between writes to the
+                resulting file object and the list of files.
+    """
+    if mode not in valid_modes:
+        raise IOError(
+            'Only valid modes to create_tee() are: %s' % ', '.join(valid_modes)
+        )
+
+    tee_list = []
+    for file in files:
+        if isinstance(file, Tee):
+            tee_list.append(file)
+        else:
+            tee_list.append(Tee(file))
+    for tee in tee_list:
+        if isinstance(tee.file, str):
+            tee.file = open(tee.file, f'{mode}b')
+        if isinstance(tee.prefix, str):
+            tee.prefix = tee.prefix.encode()
+
+    pipe_read, pipe_write = os.pipe()
+    pid = os.fork()
+    if pid == 0:
+        # Child -- Read bytes from the pipe and write them to the specified
+        #          files.
+        try:
+            # Close parent's end of the pipe
+            os.close(pipe_write)
+
+            bytes = os.read(pipe_read, buffer_size)
+            while bytes:
+                for tee in tee_list:
+                    if tee.prefix:
+                        tee.file.write(tee.prefix)
+                    tee.file.write(bytes)
+                    tee.file.flush()
+                    # TODO maybe add in fsync() here if the fileno() method
+                    # exists on file
+
+                bytes = os.read(pipe_read, buffer_size)
+        except Exception:
+            pass
+        finally:
+            os._exit(255)
+    else:
+        # Parent -- Return a file object wrapper around the pipe to the
+        #           child.
+        return os.fdopen(pipe_write, 'w', closefd=False)
+
+
 def parse_opts() -> Options:
     options = Options(output_file=sys.argv[1], argv=[])
     options.files_to_open = []
@@ -50,10 +134,21 @@ def parse_opts() -> Options:
         elif opt.startswith('-e'):
             options.stderr_file = opt[2:]
             options.files_to_open.append(2)
+        elif opt.startswith('-d') or opt.startswith('-D'):
+            is_prefixed = opt.startswith('-D')
+            possibilities = [None, 'o', 'e']
+            index = possibilities.index(opt[2])
+            if index not in options.file_duplicates:
+                options.file_duplicates[index] = []
+            options.file_duplicates[index].append(opt[3:])
+            if is_prefixed:
+                options.prefixed.add(opt[3:])
         elif opt.startswith('-c'):
             options.chdir = opt[2:]
         elif opt.startswith('-f'):
             options.fs_limit = int(opt[2:])
+        elif opt.startswith('-P'):
+            options.prefix = opt[2:]
         else:
             raise Exception(f'Invalid option {opt}')
         num_opts += 1
@@ -108,10 +203,18 @@ def redirect_fds(options: Options):
         if i == 0:
             # stdin
             open_args = [os.O_RDONLY]
-        fd = os.open(
-            file,
-            *open_args,
-        )
+        if i in options.file_duplicates:
+            dups = [
+                Tee(f, prefix=options.prefix if f in options.prefixed else '')
+                for f in options.file_duplicates[i]
+            ]
+            tee = create_tee(dups + [file], 'a', prefix=options.prefix)
+            fd = tee.fileno()
+        else:
+            fd = os.open(
+                file,
+                *open_args,
+            )
         os.dup2(fd, i)
         os.close(fd)
 
@@ -221,3 +324,4 @@ def main():
 
 if __name__ == '__main__':
     main()
+# type: ignore

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/grading/judge/storage.py

@@ -6,8 +6,6 @@ import tempfile
 from abc import ABC, abstractmethod
 from typing import IO, AnyStr, List, Optional
 
-import gevent
-
 logger = logging.getLogger(__name__)
 
 TOMBSTONE = 'x'
@@ -40,11 +38,9 @@ def copyfileobj(
         if maxlen > 0 and maxlen < len(buffer):
             buffer = buffer[:maxlen]
         while len(buffer) > 0:
-            gevent.sleep(0)
             written = destination_fobj.write(buffer)
             buffer = buffer[written:]
             maxlen -= written
-        gevent.sleep(0)
 
 
 @dataclasses.dataclass

{rbx_cp-0.5.42 → rbx_cp-0.5.45}/rbx/main.py

@@ -1,8 +1,4 @@
 # flake8: noqa
-from gevent import monkey
-
-monkey.patch_all()
-
 import typer
 from typing_extensions import Annotated
 

rbx_cp-0.5.42/rbx/box/main.py

@@ -1,6 +0,0 @@
-# flake8: noqa
-from gevent import monkey
-
-monkey.patch_all()
-
-from rbx.box.cli import app

rbx_cp-0.5.42/rbx/testdata/box1/gen1.cpp

@@ -1,7 +0,0 @@
-#include <bits/stdc++.h>
-
-using namespace std;
-
-int32_t main() {
-  cout << "123" << endl;
-}

rbx_cp-0.5.42/rbx/testdata/box1/gen2.cpp

@@ -1,9 +0,0 @@
-#include "testlib.h"
-
-using namespace std;
-
-int main(int argc, char *argv[]) {
-    registerGen(argc, argv, 1);
-
-    println(opt<int>(1));
-}

rbx_cp-0.5.42/rbx/testdata/box1/genScript.py

@@ -1,2 +0,0 @@
-print('gen2 25')
-print('gen2 1000000000')

rbx_cp-0.5.42/rbx/testdata/box1/hard-tle.sol.cpp

@@ -1,26 +0,0 @@
-#include <bits/stdc++.h>
-#include <ctime>
-
-using namespace std;
-
-void busy_loop() {
-  double wait = 5.0;
-  int start = clock();
-  int end = clock();
-  while (((double) (end - start)) / CLOCKS_PER_SEC < wait)
-  {
-    end = clock();
-  }
-}
-
-int32_t main() {
-    ios::sync_with_stdio(false);
-    cin.tie(0);
-
-    int n; cin >> n;
-
-    busy_loop();
-
-    cout << "hard" << endl;
-    return 0;
-}

rbx_cp-0.5.42/rbx/testdata/box1/ole.cpp

@@ -1,17 +0,0 @@
-
-#include <bits/stdc++.h>
-
-using namespace std;
-
-int32_t main() {
-  ios::sync_with_stdio(false);
-  cin.tie(0);
-
-  int n;
-  cin >> n;
-
-  for (int i = 1; i <= 100000; i++) { // more than output limit of 100kb
-    cout << 123456 << "\n";
-  }
-  return 0;
-}

rbx_cp-0.5.42/rbx/testdata/box1/problem.rbx.yml

@@ -1,39 +0,0 @@
----
-name: "test-problem"
-timeLimit: 1000
-memoryLimit: 256
-outputLimit: 100 # 100 kb
-generators:
-  - name: "gen1"
-    path: "gen1.cpp"
-  - name: "gen2"
-    path: "gen2.cpp"
-validator:
-  path: "validator.cpp"
-testcases:
-  - name: "gen1"
-    testcaseGlob: "tests/*.in"
-    subgroups:
-      - name: "gen"
-        generators:
-          - name: "gen1"
-          - name: "gen2"
-            args: "424242"
-      - name: "genScript"
-        generatorScript:
-          path: "genScript.py"
-solutions:
-  - path: "sol.cpp"
-    outcome: "ac"
-  - path: "wa.sol.cpp"
-    outcome: "fail"
-  - path: "re.sol.cpp"
-    outcome: "rte"
-  - path: "tle.sol.cpp"
-    outcome: "tle"
-  - path: "tle-and-incorrect.sol.cpp"
-    outcome: "tle"
-  - path: "hard-tle.sol.cpp"
-    outcome: "tle"
-  - path: "ole.cpp"
-    outcome: "ole"