rbx.cp 0.5.13__tar.gz → 0.5.15__tar.gz

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.13
+Version: 0.5.15
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
-Requires-Dist: fastapi (>=0.111.0,<0.112.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)
@@ -26,9 +26,9 @@ Requires-Dist: python-iso639 (>=2024.4.27,<2025.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: questionary (>=2.1.0,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: rich (>=13.7.1,<14.0.0)
+Requires-Dist: rich (>=13.9.4,<14.0.0)
 Requires-Dist: textual (>=0.79.1,<0.80.0)
-Requires-Dist: typer[all] (>=0.12.3,<0.13.0)
+Requires-Dist: typer (>=0.15.1,<0.16.0)
 Description-Content-Type: text/markdown
 
 <p align="center">

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.13"
+version = "0.5.15"
 description = ""
 packages = [
   {include = "rbx"}
@@ -10,14 +10,14 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-typer = {extras = ["all"], version = "^0.12.3"}
-fastapi = "^0.111.0"
+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"
-rich = "^13.7.1"
+rich = "^13.9.4"
 pyyaml = "^6.0.1"
 requests = "^2.32.3"
 latexbuild = "^0.2.2"

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/environment.py

@@ -197,7 +197,7 @@ def get_environment(env: Optional[str] = None) -> Environment:
     except ValidationError as e:
         console.console.print(e)
         console.console.print(
-            f'[error]Error parsing environment file [item]{env_path}[/item].[/error]'
+            f'[error]Error parsing environment file [item]{env_path}[/item][/error]'
         )
         raise typer.Exit(1) from e
 

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/generators.py

@@ -116,8 +116,8 @@ def generate_output_for_testcase(
 
     timelimit = pkg.timelimit_for_language(main_solution.language)
     sandbox = EnvironmentSandbox()
-    sandbox.timeLimit = timelimit * 2
-    sandbox.wallTimeLimit = timelimit * 2
+    sandbox.timeLimit = timelimit * 3
+    sandbox.wallTimeLimit = timelimit * 3
     sandbox.memoryLimit = pkg.memorylimit_for_language(main_solution.language)
     sandbox.fileSizeLimit = pkg.outputLimit
     extra_config = ExecutionConfig(sandbox=sandbox)
@@ -146,9 +146,6 @@ def generate_output_for_testcase(
         if run_log is not None:
             console.console.print(f'[error]Summary:[/error] {run_log.get_summary()}')
             checker_result = checkers.check_with_no_output(run_log)
-            console.console.print(
-                f'[warning]Time: [item]{run_log.time:.2f}s[/item][/warning]',
-            )
             console.console.print(
                 f'[warning]Verdict: [item]{checker_result.outcome.value}[/item][/warning]',
             )
@@ -339,7 +336,7 @@ def generate_standalone(
     )
     if not generation_log or generation_log.exitcode != 0:
         console.console.print(
-            f'[error]Failed generating test using generator call [info]{call.name} {expanded_args_str}[/info].[/error]',
+            f'[error]Failed generating test using generator call [info]{call.name} {expanded_args_str}[/info][/error]',
         )
         if generation_log is not None:
             console.console.print(
@@ -361,7 +358,7 @@ def generate_standalone(
         ok, message, *_ = validators.validate_test(output, validator, validator_digest)
         if not ok:
             console.console.print(
-                f'[error]Failed validating testcase generated by call [info]{call.name} {expanded_args_str}[/info].[/error]'
+                f'[error]Failed validating testcase generated by call [info]{call.name} {expanded_args_str}[/info][/error]'
             )
             console.console.print(f'[error]Message:[/error] {message}')
             console.console.print(f'Testcase written at [item]{output}[/item]')

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/main.py

@@ -44,7 +44,6 @@ from rbx.box.solutions import (
     run_solutions,
 )
 from rbx.box.statements import build_statements
-from rbx.box.ui import main as ui_pkg
 
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
 app.add_typer(
@@ -73,10 +72,10 @@ app.add_typer(
 )
 
 
-@app.command('ui', hidden=True)
-@package.within_problem
-def ui():
-    ui_pkg.start()
+# @app.command('ui', hidden=True)
+# @package.within_problem
+# def ui():
+#     ui_pkg.start()
 
 
 @app.command('edit, e', help='Open problem.rbx.yml in your default editor.')

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/packaging/polygon/packager.py

@@ -106,8 +106,8 @@ class PolygonPackager(BasePackager):
 
         return polygon_schema.Testset(
             name='tests',
-            timelimit=pkg.timeLimit,
-            memorylimit=pkg.memoryLimit * 1024 * 1024,
+            timelimit=pkg.timelimit_for_language(None),
+            memorylimit=pkg.memorylimit_for_language(None) * 1024 * 1024,
             size=len(testcases),
             inputPattern='tests/%03d',
             answerPattern='tests/%03d.a',

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/presets/__init__.py

@@ -4,6 +4,7 @@ import tempfile
 from typing import Annotated, Iterable, List, Optional, Sequence, Union
 
 import git
+import questionary
 import rich
 import rich.prompt
 import typer
@@ -16,7 +17,7 @@ from rbx.box.presets.fetch import PresetFetchInfo, get_preset_fetch_info
 from rbx.box.presets.lock_schema import LockedAsset, PresetLock
 from rbx.box.presets.schema import Preset, TrackedAsset
 from rbx.config import get_default_app_path
-from rbx.grading.judge.digester import digest_cooperatively
+from rbx.grading.judge.digester import digest_cooperatively, digest_file
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -34,7 +35,7 @@ def get_preset_yaml(root: pathlib.Path = pathlib.Path()) -> Preset:
     found = find_preset_yaml(root)
     if not found:
         console.console.print(
-            f'[error][item]preset.rbx.yml[/item] not found in [item]{root.absolute()}[/item].[/error]'
+            f'[error][item]preset.rbx.yml[/item] not found in [item]{root.absolute()}[/item][/error]'
         )
         raise typer.Exit(1)
     return utils.model_from_yaml(Preset, found.read_text())
@@ -300,10 +301,22 @@ def optionally_install_environment_from_preset(
     if preset.env is None:
         return
     env_path = get_environment_path(preset.name)
+    preset_env_path = root / preset.env
     if env_path.is_file():
-        return
+        if digest_file(preset_env_path) == digest_file(env_path):
+            return
+        overwrite = questionary.confirm(
+            'Preset environment file has changed. Overwrite?',
+            default=False,
+        ).ask()
+        if not overwrite:
+            return
+
+    console.console.print(
+        f'[success]Overwriting the existing environment based on [item]{preset.env}[/item].'
+    )
     env_path.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copyfile(str(root / preset.env), env_path)
+    shutil.copyfile(str(preset_env_path), env_path)
 
 
 def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
@@ -406,7 +419,7 @@ def _sync(update: bool = False):
             '[error]Package does not have a [item].preset.lock.yml[/item] file and thus cannot be synced.[/error]'
         )
         console.console.print(
-            '[error]Ensure this package was created through a preset, or manually associate one with [item]rbx presets lock [PRESET][/item].[/error]'
+            '[error]Ensure this package was created through a preset, or manually associate one with [item]rbx presets lock [PRESET][/item][/error]'
         )
         raise typer.Exit(1)
 

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/schema.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import pathlib
 from typing import Dict, List, Optional, Union
 
@@ -350,15 +351,14 @@ that is correct and used as reference -- and should have the `accepted` outcome.
 
     def timelimit_for_language(self, language: Optional[str]) -> int:
         res = self.timeLimit
-        if language is None:
-            return res
-        if language not in self.modifiers:
-            return res
-        modifier = self.modifiers[language]
-        if modifier.time is not None:
-            return modifier.time
-        if modifier.timeMultiplier is not None:
-            return int(res * float(modifier.timeMultiplier))
+        if language is not None and language in self.modifiers:
+            modifier = self.modifiers[language]
+            if modifier.time is not None:
+                res = modifier.time
+            if modifier.timeMultiplier is not None:
+                res = int(res * float(modifier.timeMultiplier))
+        if 'RBX_TIME_MULTIPLIER' in os.environ:
+            res = int(res * float(os.environ['RBX_TIME_MULTIPLIER']))
         return res
 
     def memorylimit_for_language(self, language: Optional[str]) -> int:

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/solutions.py

@@ -114,7 +114,7 @@ def compile_solutions(
             compiled_solutions[solution.path] = compile_item(solution)
         except:
             console.console.print(
-                f'[error]Failed compiling solution [item]{solution.path}[/item].[/error]'
+                f'[error]Failed compiling solution [item]{solution.path}[/item][/error]'
             )
             raise
 
@@ -491,14 +491,24 @@ def _get_evals_memory_in_mb(evals: List[Evaluation]) -> int:
     return max(int(eval.log.memory or 0) // (1024 * 1024) for eval in evals)
 
 
+def _get_evals_memory_in_bytes(evals: List[Evaluation]) -> int:
+    if not evals:
+        return 0
+    return max(int(eval.log.memory or 0) for eval in evals)
+
+
 def get_evals_formatted_time(evals: List[Evaluation]) -> str:
     max_time = _get_evals_time_in_ms(evals)
     return f'{max_time} ms'
 
 
 def get_evals_formatted_memory(evals: List[Evaluation]) -> str:
-    max_memory = _get_evals_memory_in_mb(evals)
-    return f'{max_memory} MiB'
+    max_memory = _get_evals_memory_in_bytes(evals)
+    if max_memory < 1024 * 1024:
+        if max_memory < 1024:
+            return f'{max_memory} B'
+        return f'{max_memory // 1024} KiB'
+    return f'{max_memory // (1024 * 1024)} MiB'
 
 
 def _print_solution_outcome(
@@ -778,7 +788,10 @@ def print_run_report(
         is_closing_group = last_group is not None and is_new_group
 
         if is_closing_group:
-            console.print(f'({get_evals_formatted_time(group_evals)})', end='')
+            console.print(
+                f'({get_evals_formatted_time(group_evals)}, {get_evals_formatted_memory(group_evals)})',
+                end='',
+            )
             console.print()
 
         if is_new_solution:

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/stresses.py

@@ -35,7 +35,7 @@ def _compile_finder(finder: CodeItem) -> str:
         digest = compile_item(finder)
     except Exception as e:
         console.console.print(
-            f'[error]Failed compiling checker [item]{finder.path}[/item].[/error]'
+            f'[error]Failed compiling checker [item]{finder.path}[/item][/error]'
         )
         raise typer.Exit(1) from e
     return digest
@@ -214,7 +214,7 @@ def run_stress(
 
         if internal_error_results:
             console.console.print(
-                f'[error]Checkers failed during stress test [item]{name}[/item] with args [info]{expanded_generator_call.name} {expanded_generator_call.args}[/info].[/error]'
+                f'[error]Checkers failed during stress test [item]{name}[/item] with args [info]{expanded_generator_call.name} {expanded_generator_call.args}[/info][/error]'
             )
             for internal_error_result in internal_error_results:
                 assert internal_error_result.checker is not None

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/stressing/finder_parser.py

@@ -300,7 +300,7 @@ def validate(tree: lark.ParseTree):
     for checker in all_checkers:
         if not pathlib.Path(checker).is_file():
             console.console.print(
-                f'[error]Finder expression references non-existing checker [item]{checker}[/item].[/error]'
+                f'[error]Finder expression references non-existing checker [item]{checker}[/item][/error]'
             )
             raise typer.Exit(1)
 
@@ -308,7 +308,7 @@ def validate(tree: lark.ParseTree):
     for solution in all_solutions:
         if not pathlib.Path(solution).is_file():
             console.console.print(
-                f'[error]Finder expression references non-existing solution [item]{solution}[/item].[/error]'
+                f'[error]Finder expression references non-existing solution [item]{solution}[/item][/error]'
             )
             raise typer.Exit(1)
 

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/box/validators.py

@@ -35,7 +35,7 @@ def _compile_validator(validator: CodeItem) -> str:
         digest = compile_item(validator)
     except:
         console.console.print(
-            f'[error]Failed compiling validator [item]{validator.path}[/item].[/error]'
+            f'[error]Failed compiling validator [item]{validator.path}[/item][/error]'
         )
         raise
     return digest

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/clone.py

@@ -158,7 +158,7 @@ def main(lang: Optional[str] = None):
                 )
             else:
                 console.print(
-                    f'[status][rbx]rbx[/rbx] parsed problem from [item]{problem.url}[/item].[/status]'
+                    f'[status][rbx]rbx[/rbx] parsed problem from [item]{problem.url}[/item][/status]'
                 )
         else:
             batch_to_left[problem.batch.id] -= 1

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/grading/judge/digester.py

@@ -1,4 +1,5 @@
 import hashlib
+import pathlib
 from typing import IO
 
 import gevent
@@ -33,3 +34,8 @@ def digest_cooperatively(f: IO[bytes], chunk_size: int = 2**20):
     d = Digester()
     digest_cooperatively_into_digester(f, d, chunk_size)
     return d.digest()
+
+
+def digest_file(path: pathlib.Path):
+    with open(path, 'rb') as f:
+        return digest_cooperatively(f)

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/grading/judge/sandboxes/timeit.py

@@ -5,7 +5,6 @@ import resource
 import signal
 import stat
 import sys
-from math import ceil
 from time import monotonic
 from typing import List, Optional
 
@@ -58,8 +57,9 @@ def parse_opts() -> Options:
 
 
 def get_memory_usage(ru: resource.struct_rusage) -> int:
-    used = ceil((ru.ru_maxrss + ru.ru_ixrss + ru.ru_idrss + ru.ru_isrss) / 1024)
-    return used
+    if sys.platform == 'darwin':
+        return ru.ru_maxrss // 1024 + ru.ru_ixrss
+    return ru.ru_maxrss + ru.ru_ixrss + ru.ru_idrss + ru.ru_isrss
 
 
 def get_cpu_time(ru: resource.struct_rusage) -> float:

{rbx_cp-0.5.13 → rbx_cp-0.5.15}/rbx/grading/steps.py

@@ -132,12 +132,6 @@ class TestcaseIO(BaseModel):
     output: Optional[pathlib.Path] = None
 
 
-class PreprocessLog(BaseModel):
-    cmd: List[str]
-    exitcode: int
-    log: str
-
-
 class RunLogMetadata(BaseModel):
     language: Optional[str] = None
 
@@ -162,6 +156,11 @@ class RunLog(BaseModel):
         return f'FAILED with exit code {self.exitcode} and sandbox status {self.exitstatus} (time: {time}s, memory: {memory//(1024*1024)}MB)'
 
 
+class PreprocessLog(RunLog):
+    cmd: List[str]
+    log: str
+
+
 class TestcaseLog(RunLog):
     stdout_absolute_path: Optional[pathlib.Path] = None
     stderr_absolute_path: Optional[pathlib.Path] = None
@@ -397,6 +396,9 @@ def compile(
         log = PreprocessLog(
             cmd=cmd,
             exitcode=sandbox.get_exit_code(),
+            exitstatus=sandbox.get_exit_status(),
+            time=sandbox.get_execution_time(),
+            memory=sandbox.get_memory_used(),
             log='\n'.join(std_outputs),
         )
         logs.append(log)
@@ -406,10 +408,10 @@ def compile(
 
     if logs and logs[-1].exitcode != 0:
         console.print(
-            'Preprocessing [error]failed[/error] with command',
+            '[error]FAILED[/error] Preprocessing failed with command',
             utils.highlight_json_obj(logs[-1].cmd),
         )
-        console.print(f'Exit code: [error]{logs[-1].exitcode}[/error]')
+        console.print(f'[error]Summary:[/error] {logs[-1].get_summary()}')
         console.print(Text.from_ansi(logs[-1].log), style='default')
         return False