rbx.cp 0.5.58__py3-none-any.whl → 0.5.60__py3-none-any.whl

rbx/box/checkers.py

@@ -60,8 +60,6 @@ def _any_failed(logs: List[Optional[RunLog]]) -> bool:
 
 
 def _check_pre_output(run_log: Optional[RunLog]) -> CheckerResult:
-    pkg = package.find_problem_package_or_die()
-
     is_sanitized = (
         run_log is not None
         and run_log.metadata is not None
@@ -71,7 +69,11 @@ def _check_pre_output(run_log: Optional[RunLog]) -> CheckerResult:
     if run_log is None:
         return CheckerResult(outcome=Outcome.INTERNAL_ERROR)
 
-    timelimit = pkg.timelimit_for_language(run_log.get_run_language())
+    timelimit = (
+        run_log.metadata.limits.get_expanded_tl()
+        if run_log.metadata is not None
+        else None
+    )
     is_tl_unbounded = (
         run_log is not None
         and run_log.metadata is not None
@@ -81,7 +83,7 @@ def _check_pre_output(run_log: Optional[RunLog]) -> CheckerResult:
     if (
         run_log.time is not None
         and timelimit is not None
-        and run_log.time * 1000 > timelimit * 2
+        and run_log.time * 1000 > timelimit
         and not is_sanitized
         and not is_tl_unbounded
     ):
@@ -104,12 +106,16 @@ def _convert_tle(result: CheckerResult, run_log: Optional[RunLog]) -> CheckerRes
     if result.outcome == Outcome.TIME_LIMIT_EXCEEDED:
         # This already is a TLE outcome.
         return result
-    pkg = package.find_problem_package_or_die()
     is_sanitized = (
         run_log is not None
         and run_log.metadata is not None
         and run_log.metadata.is_sanitized
     )
+    timelimit = (
+        run_log.metadata.limits.time
+        if run_log is not None and run_log.metadata is not None
+        else None
+    )
     is_tl_unbounded = (
         run_log is not None
         and run_log.metadata is not None
@@ -118,8 +124,8 @@ def _convert_tle(result: CheckerResult, run_log: Optional[RunLog]) -> CheckerRes
     if (
         run_log is not None
         and run_log.time is not None
-        and run_log.time * 1000
-        >= pkg.timelimit_for_language(run_log.get_run_language())
+        and timelimit is not None
+        and run_log.time * 1000 >= timelimit
         and not is_sanitized
         and not is_tl_unbounded
     ):

rbx/box/code.py

@@ -357,6 +357,7 @@ def _prepare_run(
             is_sanitized=sanitized,
             timeLimit=sandbox_params.timeout,
             memoryLimit=sandbox_params.address_space,
+            limits=execution_options.problemLimits,
             retryIndex=retry_index,
         ),
     )

rbx/box/environment.py

@@ -11,6 +11,7 @@ from rbx.box.extensions import Extensions, LanguageExtensions
 from rbx.grading.judge.sandbox import SandboxBase, SandboxParams
 from rbx.grading.judge.sandboxes.isolate import IsolateSandbox
 from rbx.grading.judge.sandboxes.stupid_sandbox import StupidSandbox
+from rbx.grading.limits import Limits
 
 T = TypeVar('T', bound=BaseModel)
 
@@ -104,6 +105,9 @@ class ExecutionConfig(BaseModel):
     # Sandbox configuration to use when executing for this language.
     sandbox: Optional[EnvironmentSandbox] = None
 
+    # Original limits of the problem.
+    problemLimits: Limits = Field(default_factory=Limits)
+
 
 class EnvironmentLanguage(BaseModel):
     model_config = ConfigDict(extra='forbid')
@@ -280,6 +284,7 @@ def merge_execution_configs(
 ) -> ExecutionConfig:
     merged_cfg = ExecutionConfig()
     merged_cfg.sandbox = EnvironmentSandbox()
+    merged_cfg.problemLimits = Limits()
     for cfg in execution_configs:
         if cfg is None:
             continue
@@ -288,6 +293,10 @@ def merge_execution_configs(
             merged_cfg.sandbox = _merge_shallow_models(
                 EnvironmentSandbox, merged_cfg.sandbox, cfg.sandbox
             )
+        if cfg.problemLimits is not None:
+            merged_cfg.problemLimits = _merge_shallow_models(
+                Limits, merged_cfg.problemLimits, cfg.problemLimits
+            )
     return merged_cfg
 
 

rbx/box/schema.py

@@ -325,22 +325,6 @@ class Stress(BaseModel):
     )
 
 
-class Limits(BaseModel):
-    time: Optional[int] = Field(
-        default=None, description='Value to override time limit with, in milliseconds.'
-    )
-    memory: Optional[int] = Field(
-        default=None, description='Value to override memory limit with, in MB.'
-    )
-    output: Optional[int] = Field(
-        default=None, description='Value to override output limit with, in KB.'
-    )
-
-    isDoubleTL: bool = Field(
-        default=False, description='Whether to use double TL for this language.'
-    )
-
-
 class LimitModifiers(BaseModel):
     timeMultiplier: Optional[float] = Field(
         default=None, description='Multiplier for time limit.'

rbx/box/solutions.py

@@ -36,7 +36,6 @@ from rbx.box.generators import (
 from rbx.box.schema import (
     ExpectedOutcome,
     GeneratorCall,
-    Limits,
     Solution,
     TaskType,
     Testcase,
@@ -53,6 +52,7 @@ from rbx.box.testcase_utils import (
     parse_interaction,
     print_interaction,
 )
+from rbx.grading.limits import Limits
 from rbx.grading.steps import (
     Evaluation,
     Outcome,
@@ -736,10 +736,12 @@ def get_capped_evals_formatted_time(
     max_time = _get_evals_time_in_ms(evals)
     has_tle = any(eval.result.outcome == Outcome.TIME_LIMIT_EXCEEDED for eval in evals)
     timelimits = [
-        eval.log.metadata.timeLimit
+        eval.log.metadata.limits.get_expanded_tl()
         for eval in evals
-        if eval.log.metadata is not None and eval.log.metadata.timeLimit is not None
+        if eval.log.metadata is not None
     ]
+    timelimits = [tl for tl in timelimits if tl is not None]
+
     tl = None
     if timelimits:
         tl = min(timelimits)
@@ -954,10 +956,12 @@ async def _print_timing(
         # Get solution TL.
         solution_time = _get_evals_time_in_ms(all_evals)
         solution_tls = [
-            eval.log.metadata.timeLimit
+            eval.log.metadata.limits.get_expanded_tl()
             for eval in all_evals
-            if eval.log.metadata is not None and eval.log.metadata.timeLimit is not None
+            if eval.log.metadata is not None
         ]
+        solution_tls = [tl for tl in solution_tls if tl is not None]
+
         solution_tl = 0
         if solution_tls:
             solution_tl = min(solution_tls)

rbx/box/tasks.py

@@ -5,8 +5,9 @@ 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
-from rbx.box.schema import Limits, Solution, Testcase
+from rbx.box.schema import Solution, Testcase
 from rbx.grading.judge.sandbox import SandboxBase
+from rbx.grading.limits import Limits
 from rbx.grading.steps import (
     DigestOrDest,
     DigestOrSource,
@@ -146,7 +147,7 @@ def _get_execution_config(
         sandbox.wallTimeLimit = sandbox.timeLimit * 2
     sandbox.memoryLimit = limits.memory
     sandbox.fileSizeLimit = limits.output
-    return ExecutionConfig(sandbox=sandbox)
+    return ExecutionConfig(sandbox=sandbox, problemLimits=limits)
 
 
 async def _run_communication_solution_on_testcase(

rbx/grading/limits.py

@@ -0,0 +1,26 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class Limits(BaseModel):
+    time: Optional[int] = Field(
+        default=None, description='Value to override time limit with, in milliseconds.'
+    )
+    memory: Optional[int] = Field(
+        default=None, description='Value to override memory limit with, in MB.'
+    )
+    output: Optional[int] = Field(
+        default=None, description='Value to override output limit with, in KB.'
+    )
+
+    isDoubleTL: bool = Field(
+        default=False, description='Whether to use double TL for this language.'
+    )
+
+    def get_expanded_tl(self) -> Optional[int]:
+        if self.time is None:
+            return None
+        if self.isDoubleTL:
+            return self.time * 2
+        return self.time

rbx/grading/steps.py

@@ -15,7 +15,7 @@ from enum import Enum
 from typing import IO, Any, Dict, Iterable, List, Optional, Tuple, Union
 
 import typer
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from rich.text import Text
 
 from rbx import utils
@@ -24,6 +24,7 @@ from rbx.console import console
 from rbx.grading import processing_context
 from rbx.grading.judge.sandbox import SandboxBase, SandboxParams
 from rbx.grading.judge.storage import Storage, copyfileobj
+from rbx.grading.limits import Limits
 
 MAX_STDOUT_LEN = 1024 * 1024 * 128  # 128 MB
 
@@ -188,6 +189,7 @@ class TestcaseIO(BaseModel):
 class RunLogMetadata(BaseModel):
     language: Optional[str] = None
     is_sanitized: bool = False
+    limits: Limits = Field(default_factory=Limits)
     timeLimit: Optional[int] = None
     memoryLimit: Optional[int] = None
     retryIndex: Optional[int] = None

{rbx_cp-0.5.58.dist-info → rbx_cp-0.5.60.dist-info}/METADATA

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

{rbx_cp-0.5.58.dist-info → rbx_cp-0.5.60.dist-info}/RECORD

@@ -4,9 +4,9 @@ rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=MDm2qqmhedAbhn3rWP6cDwbBsGhV6sz_2sg1zLkPDw0,3613
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
-rbx/box/checkers.py,sha256=Gz4hW4RkyFz2MhBKE1IjwuIIbDYPHpjsGCbaM_l1rCc,12668
+rbx/box/checkers.py,sha256=aGciafGNQ39UqndTEJRT3J8ngv_UigYxOT30yMzCwEI,12752
 rbx/box/cli.py,sha256=QnErJWp6OmBX5iC3tsjeOTHqX58tTpBFQRun9Y9a5UA,26892
-rbx/box/code.py,sha256=hmA2EoGOr13AYzicHNsnU2SkFW-44l7kOdu8QRwTJlI,18848
+rbx/box/code.py,sha256=PJJyw00iT9G7I9yyCWLOUY9R280qyE4YyMTxBZ38IcI,18900
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ rbx/box/creation.py,sha256=Evz7K6JoarD-4JJQsZsgoxU9FgCF9Z7-LfuroG4Cqls,2444
 rbx/box/deferred.py,sha256=II3X9e87JCOZtmspnHh-n4PFqh-FsH_oc0XJHZ9ZYVQ,691
 rbx/box/download.py,sha256=DxAiAk4lDYWEz1C9UTvZzHTq6hgm4fxGezApm2IkCTM,2601
 rbx/box/dump_schemas.py,sha256=3j5t47_vJmXj0BCczxDX6ByOcsfolGEDNCBXlPpk86w,593
-rbx/box/environment.py,sha256=fZnNQCdpG3xzKne0FY7gkuaopy6fdYvVFAXeHmC1ZOo,11498
+rbx/box/environment.py,sha256=Kp69MekUwwoVpupnafUcN5KAbP-ZTCwe0OQXt1h0FN8,11859
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/formatting.py,sha256=3phFRHzqVXj4Ok1yDhCq6Clbw6KlqwJNpMhs--oTWFI,405
 rbx/box/generators.py,sha256=RE0-D91BB-3rNDQXvCFWzU9iMhKIc_ALp960oGfM-rY,13780
@@ -49,9 +49,9 @@ rbx/box/presets/lock_schema.py,sha256=6sRPnyePOC8yy-5WcD5JRZdDJHf8loqbvpQ1IPiOU9
 rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,1962
 rbx/box/retries.py,sha256=tRk2K1bXw2xnwkAj2CsktRHTEhw7YKcPxMQTT6mCy-E,4707
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
-rbx/box/schema.py,sha256=tOQ1tLHqc_5V-UgrzM44aS8ULAkq-IkeErxjLCFVA8I,16778
+rbx/box/schema.py,sha256=y736-wZdGw56T6eDC_m7NAm2XRUdauBXJRQkQO79fpc,16264
 rbx/box/setter_config.py,sha256=s53talhwM6FTGDCcBhY7IlZ6_6mJ3PMp6V4kTtaSs50,4262
-rbx/box/solutions.py,sha256=dvED36h6wilQZjbBiKiB98Xx61IeYPUgstSGF1RqH58,45070
+rbx/box/solutions.py,sha256=P5DTKsVMBYL_-gv-F1jt6aap1Y1hy2CcVUGT23qPpmk,45170
 rbx/box/solutions_test.py,sha256=TCowbxBG3SvDlFO5-qtBj_M_HrAHe0IJaI1XwoQ1d00,1718
 rbx/box/state.py,sha256=MMf3DvfQji0jKEliCHct2Tpp_0epL1tvP8HbHNArQIc,166
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,7 +65,7 @@ rbx/box/stresses.py,sha256=k-m8Q2IVd5dap2fSDCbVqLj2LKqXzz6rIR8j9F8sLhY,12310
 rbx/box/stressing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/stressing/finder_parser.py,sha256=jXpYNa4FyugzmHi3r96Uv4rU1krRQJc5Ihr9jf1cvNo,11918
 rbx/box/stressing/generator_parser.py,sha256=oHZryjR3YohgaSO9WEirQ7b2e-98WgZStF0N99W4Thw,7380
-rbx/box/tasks.py,sha256=OFezrh8tAZ-FQ70vsa7f-d34jwVwLAF1HMHhd94Mao0,10143
+rbx/box/tasks.py,sha256=v05vJsOg6bVfV3sY7JNAfXVyJVGteUXrgDhCXzMO_2c,10195
 rbx/box/testcase_extractors.py,sha256=J43eG7vpxc5nP_2yhrXJODkd4EYlV4WiYVbM6hzipY4,11944
 rbx/box/testcase_utils.py,sha256=31rvCpLi681R6Xm1WpG8HPDOkTtF0bRWa8IsmdWGLCk,7556
 rbx/box/testcases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,8 +106,9 @@ rbx/grading/judge/sandboxes/timeit.py,sha256=0qs3RD2LmFMg0wolGPSl5sg8HRMHsnZEgUE
 rbx/grading/judge/storage.py,sha256=3vv0HvtenbUZBH33CB5ZzX66ppL22G6munBaAA9BgwQ,9418
 rbx/grading/judge/test.py,sha256=ll0Iw7zyOpGdKPD_PGH7dvUkb4stQLu-ikbQnqJvuAc,944
 rbx/grading/judge/testiso.py,sha256=v14DtkWiZFJ9AKMzrb0_vZKPWDt8jz8iIw1Z2O-Advk,1397
+rbx/grading/limits.py,sha256=ev312UTOo8S4-3AAVibQdXZclWCxS96CdbZxqW4y1kE,770
 rbx/grading/processing_context.py,sha256=EOxsRTKB_JEgcKNodDWPIYaBramANU-6QnDkqdF8tEk,2556
-rbx/grading/steps.py,sha256=VscFO-fnKtSspdB1Cnu18l8feaREbsh0MNkexJ6obOc,27163
+rbx/grading/steps.py,sha256=qt-ozgLpWpu5dFZGr5HlbfdStqbfFDXj6gpoSlXdxp0,27259
 rbx/grading/steps_with_caching.py,sha256=nez2YwgauGXKRjhk6tQxTDGQ-HEk7KfZOeAPhsxi5iw,3150
 rbx/grading/steps_with_caching_run_test.py,sha256=mh4DRInrOGhnQFWD1SlcjDm_HvcSDFTDMSpAlG-Q5SI,15570
 rbx/grading_utils.py,sha256=lL2KtSkOsMElqrRoApQTbFcqVOeHVWUDTMCa3IsLpC4,4484
@@ -201,8 +202,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=x_PqD8Zd2PkN91NxVHUnSTs044-1WK5KKtttKQBXpFs,2083
 rbx/utils.py,sha256=SfR844_i0ebRDMkmS_w1YdZiWPc6h2RGADygewlWRbA,4845
-rbx_cp-0.5.58.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.58.dist-info/METADATA,sha256=i76ogXU9G6jTz56svxwBvVnGDE48SD8775WK_hytAVQ,3604
-rbx_cp-0.5.58.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.58.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.58.dist-info/RECORD,,
+rbx_cp-0.5.60.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.60.dist-info/METADATA,sha256=g9YRO-uCwylD64Cq_6H6LLfzA_DDb232QKjkEFtR1b0,3604
+rbx_cp-0.5.60.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.60.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.60.dist-info/RECORD,,