rbx.cp 0.5.51__tar.gz → 0.5.52__tar.gz

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.51
+Version: 0.5.52
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: async-lru (>=2.0.5,<3.0.0)
 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)
@@ -19,6 +20,7 @@ Requires-Dist: lark (>=1.2.2,<2.0.0)
 Requires-Dist: latexbuild (>=0.2.2,<0.3.0)
 Requires-Dist: mechanize (>=0.4.10,<0.5.0)
 Requires-Dist: more-itertools (>=10.5.0,<11.0.0)
+Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
 Requires-Dist: pydantic (==2.8.2)
 Requires-Dist: pydantic-xml[lxml] (>=2.11.0,<3.0.0)
 Requires-Dist: pyte (>=0.8.2,<0.9.0)

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.51"
+version = "0.5.52"
 description = ""
 packages = [
   {include = "rbx"}
@@ -34,6 +34,8 @@ lark = "^1.2.2"
 chardet = "^5.2.0"
 ruyaml = "^0.91.0"
 syncer = "^2.0.3"
+async-lru = "^2.0.5"
+nest-asyncio = "^1.6.0"
 
 [tool.poetry.scripts]
 rbc = "rbx.main:app"

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/cli.py

@@ -122,10 +122,12 @@ def main(
     state.STATE.debug_logs = debug_logs
 
 
-# @app.command('ui', hidden=True)
-# @package.within_problem
-# def ui():
-#     ui_pkg.start()
+@app.command('ui', hidden=True)
+@package.within_problem
+def ui():
+    from rbx.box.ui import main as ui_pkg
+
+    ui_pkg.start()
 
 
 @app.command(

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/code.py

@@ -193,7 +193,7 @@ def _check_stack_limit():
 ```
 function rbx() {{
     local rbx_bin=`bash -c "type -P rbx"`
-    ulimit -s {target_text // 1024} && $rbx_bin $@
+    ulimit -s {target_text // 1024} && $rbx_bin "$@"
 }}
 ```
         """

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/environment.py

@@ -4,7 +4,7 @@ from enum import Enum
 from typing import Annotated, List, Optional, Type, TypeVar
 
 import typer
-from pydantic import BaseModel, ConfigDict, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
 
 from rbx import config, console, utils
 from rbx.box.extensions import Extensions, LanguageExtensions
@@ -143,6 +143,13 @@ class EnvironmentLanguage(BaseModel):
         return self.get_extension(name, cls) or cls()
 
 
+class TimingConfig(BaseModel):
+    model_config = ConfigDict(extra='forbid')
+
+    # Formula to use to calculate the time limit for the environment.
+    formula: str = 'step_up(max(fastest * 3, slowest * 1.5), 100)'
+
+
 class Environment(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
@@ -167,6 +174,9 @@ class Environment(BaseModel):
     # Identifier of the preset that should be used when creating new problems.
     preset: str = 'default'
 
+    # Timing configuration for the environment.
+    timing: TimingConfig = Field(default_factory=TimingConfig)
+
     # Extensions to be added to the environment.
     extensions: Optional[Extensions] = None
 

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/main.py

@@ -1,2 +1,6 @@
 # flake8: noqa
+import nest_asyncio
+
+nest_asyncio.apply()
+
 from rbx.box.cli import app

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/solutions.py

@@ -5,7 +5,7 @@ import dataclasses
 import pathlib
 import shutil
 from collections.abc import Iterator
-from typing import Dict, Iterable, List, Optional, Set, Tuple
+from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
 
 import rich
 import rich.live
@@ -16,7 +16,7 @@ import typer
 from pydantic import BaseModel
 
 from rbx import console, utils
-from rbx.box import checkers, package
+from rbx.box import checkers, environment, package
 from rbx.box.code import (
     SanitizationLevel,
     compile_item,
@@ -1244,6 +1244,16 @@ async def print_run_report(
     return ok
 
 
+def _step_up(x: Any, step: int) -> int:
+    x = int(x)
+    return (x + step - 1) // step * step
+
+
+def _step_down(x: Any, step: int) -> int:
+    x = int(x)
+    return x // step * step
+
+
 async def estimate_time_limit(
     console: rich.console.Console,
     result: RunSolutionResult,
@@ -1262,12 +1272,12 @@ async def estimate_time_limit(
     for solution in result.skeleton.solutions:
         timings = []
         for evals in structured_evaluations[str(solution.path)].values():
-            for eval in evals:
-                if eval is None:
+            for ev in evals:
+                if ev is None:
                     continue
-                eval = await eval()
-                if eval.log.time is not None:
-                    timings.append(int(eval.log.time * 1000))
+                ev = await ev()
+                if ev.log.time is not None:
+                    timings.append(int(ev.log.time * 1000))
 
         if not timings:
             console.print(
@@ -1301,7 +1311,19 @@ async def estimate_time_limit(
             f'Slowest language: {slowest_language} ({slowest_language_time} ms)'
         )
 
-    estimated_tl = int(max(fastest_time * 3, slowest_time * 1.5))
-    console.print(f'[success]Estimated time limit:[/success] {estimated_tl} ms')
+    env = environment.get_environment()
+    estimated_tl = int(
+        eval(
+            env.timing.formula,
+            {
+                'fastest': fastest_time,
+                'slowest': slowest_time,
+                'step_up': _step_up,
+                'step_down': _step_down,
+            },
+        )
+    )
 
+    console.print(f'Using formula: {env.timing.formula}')
+    console.print(f'[success]Estimated time limit:[/success] {estimated_tl} ms')
     return estimated_tl

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/stresses.py

@@ -1,8 +1,8 @@
-import functools
 import time
 from shutil import rmtree
 from typing import List, Optional
 
+import async_lru
 import syncer
 import typer
 from pydantic import BaseModel
@@ -147,7 +147,7 @@ async def run_stress(
             else None,
         )
 
-        @functools.cache
+        @async_lru.alru_cache
         async def run_solution_fn(
             solution: str,
             retry_index: Optional[int] = None,
@@ -197,7 +197,7 @@ async def run_stress(
                 raise typer.Exit(1)
             expected_output_path = main_testcase_log.stdout_absolute_path
 
-        @functools.cache
+        @async_lru.alru_cache
         async def run_solution_and_checker_fn(
             call: finder_parser.FinderCall,
             input_path=input_path,
@@ -242,9 +242,12 @@ async def run_stress(
                 checker_result=eval.result,
             )
 
-        runner = finder_parser.FinderTreeRunner(
-            runner=syncer.sync(run_solution_and_checker_fn)
-        )
+        @syncer.sync
+        async def run_fn(*args, **kwargs):
+            # Wrap the runner in a syncer.sync to make it work with the finder parser.
+            return await run_solution_and_checker_fn(*args, **kwargs)
+
+        runner = finder_parser.FinderTreeRunner(runner=run_fn)
         finder_outcome: finder_parser.FinderOutcome = runner.transform(parsed_finder)
 
         internal_error_results = [

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/ui/captured_log.py

@@ -8,7 +8,7 @@ import re
 import signal
 import struct
 import termios
-from typing import Callable, List, Optional
+from typing import Callable, List, Optional, Tuple
 
 import pyte
 import textual
@@ -321,10 +321,14 @@ class LogDisplay(ScrollView, can_focus=True):
                 loop.remove_reader(pout)
             event.set()
 
-        async def cleanup():
+        async def cleanup(wait_tp: Optional[Tuple[int, int]] = None):
+            if self.exitcode is not None:
+                return
             try:
                 loop.remove_reader(pout)
-                _, exitstatus = os.waitpid(pid, os.WNOHANG)
+                if wait_tp is None:
+                    wait_tp = os.waitpid(pid, os.WNOHANG)
+                _, exitstatus = wait_tp
                 exitcode = os.waitstatus_to_exitcode(exitstatus)
                 self.exitcode = exitcode
             except ChildProcessError:
@@ -352,8 +356,8 @@ class LogDisplay(ScrollView, can_focus=True):
         async def wait():
             while True:
                 try:
-                    if os.waitpid(pid, os.WNOHANG) != (0, 0):
-                        await cleanup()
+                    if (wait_tp := os.waitpid(pid, os.WNOHANG)) != (0, 0):
+                        await cleanup(wait_tp)
                 except ChildProcessError:
                     break
                 await asyncio.sleep(0.5)

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/ui/css/app.tcss

@@ -3,7 +3,7 @@ Screen {
         color: $text;
 }
 
-rbxApp > Screen {
+Screen {
         align: center middle;
 }
 

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/box/ui/run.py

@@ -4,7 +4,7 @@ from typing import Optional, Set
 import textual
 from rich.text import Text
 from textual.app import ComposeResult
-from textual.containers import Center, Container, Grid
+from textual.containers import Center, Grid
 from textual.coordinate import Coordinate
 from textual.screen import Screen
 from textual.widgets import Button, DataTable, Footer, Header, SelectionList
@@ -57,12 +57,12 @@ class SolutionReportScreen(Screen):
                     cursor_type='row', cursor_foreground_priority='renderable'
                 )
         if self.log_display_state is not None:
-            yield LogDisplay()
+            yield LogDisplay(id='build-output')
 
     def on_mount(self):
-        self.query_one(
-            '#build-output', Container
-        ).border_title = 'Test generation and validation'
+        # self.query_one(
+        #     '#build-output', Container
+        # ).border_title = 'Test generation and validation'
         for solution, table in zip(
             self.skeleton.solutions,
             self.query(DataTable),
@@ -86,8 +86,7 @@ class SolutionReportScreen(Screen):
                 return i
         raise
 
-    def process(self, item: EvaluationItem):
-        textual.log(item)
+    async def process(self, item: EvaluationItem):
         pkg = package.find_problem_package_or_die()
         sol_idx_in_skeleton = self._find_solution_index_in_skeleton(
             pkg.solutions[item.solution_index]
@@ -102,12 +101,12 @@ class SolutionReportScreen(Screen):
 
         table.update_cell_at(
             Coordinate(row=row_idx, column=2),
-            get_testcase_markup_verdict(item.eval),
+            get_testcase_markup_verdict(await item.eval()),
             update_width=True,
         )
         table.update_cell_at(
             Coordinate(row=row_idx, column=3),
-            get_evals_formatted_time([item.eval]),
+            get_evals_formatted_time([await item.eval()]),
             update_width=True,
         )
 
@@ -158,11 +157,11 @@ class RunScreen(Screen):
     def on_screen_resume(self):
         self.query_one('#run-sols', SelectionList).focus()
 
-    def on_button_pressed(self, _: Button.Pressed):
-        self.action_run()
+    async def on_button_pressed(self, _: Button.Pressed):
+        await self.action_run()
 
     @textual.work(thread=True)
-    def _run_solutions(self, tracked_solutions: Set[str], check: bool):
+    async def _run_solutions(self, tracked_solutions: Set[str], check: bool):
         main_solution = package.get_main_solution()
         if check and main_solution is None:
             console.console.print(
@@ -176,9 +175,11 @@ class RunScreen(Screen):
         exitcode = self.app.call_from_thread(build)
 
         if exitcode != 0:
-            textual.log('early quit')
+            textual.log(f'early quit: {exitcode}')
             return
 
+        textual.log('build finished ok, running solutions')
+
         res = run_solutions(tracked_solutions=tracked_solutions, check=check)
 
         async def mount_report_widget() -> SolutionReportScreen:
@@ -191,15 +192,15 @@ class RunScreen(Screen):
             )
             return screen
 
-        new_screen = self.app.call_from_thread(mount_report_widget)
+        new_screen = await mount_report_widget()
 
-        def process(item: EvaluationItem):
-            new_screen.process(item)
+        async def process_item(item: EvaluationItem):
+            await new_screen.process(item)
 
         for item in res.items:
-            self.app.call_from_thread(process, item)
+            self.app.call_from_thread(process_item, item)
 
-    def action_run(self):
+    async def action_run(self):
         sols = self.query_one('#run-sols', SelectionList)
         config = self.query_one('#run-config', SelectionList)
 

{rbx_cp-0.5.51 → rbx_cp-0.5.52}/rbx/testing_utils.py

@@ -17,9 +17,9 @@ def get_testdata_path() -> pathlib.Path:
 
 
 def clear_all_functools_cache():
-    from rbx.box import environment, package
+    from rbx.box import environment, header, package
 
-    pkgs = [environment, package]
+    pkgs = [environment, package, header]
 
     for pkg in pkgs:
         for fn in pkg.__dict__.values():