rbx.cp 0.5.14__py3-none-any.whl → 0.5.15__py3-none-any.whl

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]',
             )

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/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/box/solutions.py

@@ -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(

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.14.dist-info → rbx_cp-0.5.15.dist-info}/METADATA

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

{rbx_cp-0.5.14.dist-info → rbx_cp-0.5.15.dist-info}/RECORD

@@ -19,7 +19,7 @@ rbx/box/creation.py,sha256=mVHVVj8ozX9D5qpkLewE5WSjF6HtTm74Pkwubk-bATg,2259
 rbx/box/download.py,sha256=MFP-R26JiYGAP89I0TK-0fYc69Fsd20tsBqgtRCy5AE,2234
 rbx/box/environment.py,sha256=GjwnJwtkTdkHmUh1b23zagjLsTiJQAOpP36A93mA-zc,11159
 rbx/box/extensions.py,sha256=p0iLaU28KswOBDX2HGVO_dR2gk-JSAWb6sXC6GZ1d0w,738
-rbx/box/generators.py,sha256=lKX_50Yf4bretHxgGzEZxKV7LFjpweaADC-22WEpLY4,16302
+rbx/box/generators.py,sha256=XgufvzPvE7-EVUC9xNlgzlmAEgwFTdtPuaCpo0eY818,16175
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
 rbx/box/main.py,sha256=id1YpYKb7GHWoEMdiRAwfT08kY-ol52ulGcaCaPhtqw,16411
 rbx/box/package.py,sha256=Hds0WIvhAWXnYOmIXGULcLLVeFM1YkllOPSKHB5QSkk,10532
@@ -28,15 +28,15 @@ rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJH
 rbx/box/packaging/contest_main.py,sha256=ypiBS8dd0yCqoFJIqiK1Fo02dQmUB_G-Z7G926jomrk,2746
 rbx/box/packaging/main.py,sha256=CyjfuvwmRsJGk4lKVp2LT_WCQ5jZ5L_7NfZQEC40nuY,2228
 rbx/box/packaging/packager.py,sha256=suCT_SLnWa915rV2j8VFqzH43HGKRTr9mGGlrvj45aw,3267
-rbx/box/packaging/polygon/packager.py,sha256=CcjHzDr4MwSyp270gsPY6RWoz8bUJeykDqXPvQ3XZ1U,10773
+rbx/box/packaging/polygon/packager.py,sha256=HNpxP2nclLChSnrQtkT7tLwDdXHl1dzXMIF5RZwr9M4,10811
 rbx/box/packaging/polygon/test.py,sha256=bgEju5PwudgyfwxXJagm8fM6CJVlWM6l_-2q1V-oKaQ,3069
 rbx/box/packaging/polygon/xml_schema.py,sha256=-r24bCeRMGLrGGoT9FIgmqr87xHL-JzrFaR6bztbYtw,2703
 rbx/box/presets/__init__.py,sha256=Wiegp1onXPaZs8RE1J3PKT5j3PFWKw2U2rkgOSbnYeM,17529
 rbx/box/presets/fetch.py,sha256=F-BCOlvEBEyDqtOhiDuGPn4EDtA4Bwm-fqHJ7zZGlW8,1975
 rbx/box/presets/lock_schema.py,sha256=6sRPnyePOC8yy-5WcD5JRZdDJHf8loqbvpQ1IPiOU9s,349
 rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,1962
-rbx/box/schema.py,sha256=RBQmFxr35LfaRwbxR6WezeQQ3twqh9VS3tn20rlRm_I,12580
-rbx/box/solutions.py,sha256=zfRawpEufWOI2uw7jNFb86bx8HwU5UaiwQMUj9KlDBE,27447
+rbx/box/schema.py,sha256=J6gUkVO1o2zT9UO1008N0CqMomdAyfmyXbB8LP-PFW0,12672
+rbx/box/solutions.py,sha256=uO8mg0AbcG1doVQVoDJp1UMUJithFnkSxroUygRduos,27771
 rbx/box/solutions_test.py,sha256=DetQj7ZVnV3tBXBpCrFeK_Yv3XUtdEf29y_6qnyeyfY,1496
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/statements/build_statements.py,sha256=24ZUM5H33NhmqnDL0ofA1anUKWxuZG1paA1tCV4AKns,11911
@@ -74,7 +74,7 @@ rbx/grading/judge/sandbox.py,sha256=0h3YCmGabf9OfORJgx6v2Bed4kE-i8FyuZkPux-sDVk,
 rbx/grading/judge/sandboxes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/grading/judge/sandboxes/isolate.py,sha256=9xgBuNfAvGtO2zME1FXRah2rcPvzDShsPG0TTuX_UDU,25649
 rbx/grading/judge/sandboxes/stupid_sandbox.py,sha256=Gpu1I-VroS_NUSRUotZ72IFRaH8yxjp9860WiTkOvFw,10090
-rbx/grading/judge/sandboxes/timeit.py,sha256=rOQnxf90hhTrWOQ1Mt57HNhZAAn1jDULtMjHFGycil8,6528
+rbx/grading/judge/sandboxes/timeit.py,sha256=Ct3pxY2Uawaz4O3xIufD49DSTZnbTOhYIch1QcHLVdY,6558
 rbx/grading/judge/storage.py,sha256=FirqjwDqb0m0h2OTFyWrZL7CQ4XjZNxhqB4JpnDIhZY,9485
 rbx/grading/judge/test.py,sha256=ll0Iw7zyOpGdKPD_PGH7dvUkb4stQLu-ikbQnqJvuAc,944
 rbx/grading/judge/testiso.py,sha256=v14DtkWiZFJ9AKMzrb0_vZKPWDt8jz8iIw1Z2O-Advk,1397
@@ -157,8 +157,8 @@ rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
 rbx/utils.py,sha256=wy8zQRb97n3lptilK7UxM4A44KjXb1W5Z1tD61a-K4A,4173
-rbx_cp-0.5.14.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.14.dist-info/METADATA,sha256=1dncSdLwt6q_zdoeysRdfAlZVk4wfHXA4cDojM5d3kA,3249
-rbx_cp-0.5.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.14.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.14.dist-info/RECORD,,
+rbx_cp-0.5.15.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.15.dist-info/METADATA,sha256=dsSJt_OUkKEhPuffKzj-6Zuzr2aYcVowkIhcI6vyE1I,3249
+rbx_cp-0.5.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.15.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.15.dist-info/RECORD,,