rbx.cp 0.5.29__tar.gz → 0.5.31__tar.gz

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/PKG-INFO

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

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.29"
+version = "0.5.31"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/code.py

@@ -1,5 +1,6 @@
 import pathlib
 import re
+import resource
 import shlex
 from enum import Enum
 from pathlib import PosixPath
@@ -10,7 +11,7 @@ import rich.text
 import typer
 
 from rbx import console
-from rbx.box import download, package, setter_config
+from rbx.box import download, package, setter_config, state
 from rbx.box.environment import (
     ExecutionConfig,
     get_compilation_config,
@@ -22,6 +23,7 @@ from rbx.box.environment import (
     get_sandbox_params_from_config,
     merge_execution_configs,
 )
+from rbx.box.formatting import get_formatted_memory
 from rbx.box.sanitizers import warning_stack
 from rbx.box.schema import CodeItem
 from rbx.grading import steps_with_caching
@@ -150,6 +152,57 @@ def _ignore_warning_in_cxx_input(input: GradingFileInput):
     input.src = preprocessed_path
 
 
+def _format_stack_limit(limit: int) -> str:
+    if limit == resource.RLIM_INFINITY:
+        return 'unlimited'
+    return get_formatted_memory(limit)
+
+
+def _check_stack_limit():
+    if not state.STATE.run_through_cli:
+        return
+    soft, hard = resource.RLIM_INFINITY, resource.RLIM_INFINITY
+
+    TARGET = 256 * 1024 * 1024  # 256 MiB
+    try:
+        soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
+    except Exception:
+        pass
+
+    if soft != hard or (soft != resource.RLIM_INFINITY and soft < TARGET):
+        soft_fmt = _format_stack_limit(soft)
+        hard_fmt = _format_stack_limit(hard)
+        console.console.print(
+            f'[error]Stack limit is too low (limit is set as [item]{soft_fmt}[/item], but configured user capacity is [item]{hard_fmt}[/item]).[/error]'
+        )
+        console.console.print(
+            '[error]It is not safe to develop problems in [item]rbx[/item] with this configuration.[/error]'
+        )
+        console.console.print(
+            'To solve this, add the following lines to the end of your [item]~/.bashrc[/item] or [item]~/.zshrc[/item] file (or equivalent shell configuration file):'
+        )
+
+        target_text = TARGET
+        if hard != resource.RLIM_INFINITY:
+            target_text = min(hard, TARGET)
+        console.console.print(
+            """
+```
+export RBX_BIN_PATH=`which rbx`
+function rbx() {
+        ulimit -s %s && $RBX_BIN_PATH $@
+}
+```
+            """
+            % target_text
+        )
+        console.console.print()
+        console.console.print(
+            'You can read more about this in [item]https://rsalesc.github.io/rbx/stack-limit/[/item].'
+        )
+        raise typer.Exit(1)
+
+
 # Compile code item and return its digest in the storage.
 def compile_item(
     code: CodeItem,
@@ -157,6 +210,8 @@ def compile_item(
     force_warnings: bool = False,
     verbose: bool = False,
 ) -> str:
+    _check_stack_limit()
+
     generator_path = PosixPath(code.path)
 
     if not generator_path.is_file():
@@ -268,6 +323,8 @@ def run_item(
     extra_config: Optional[ExecutionConfig] = None,
     retry_index: Optional[int] = None,
 ) -> Optional[RunLog]:
+    _check_stack_limit()
+
     language = find_language_name(code)
     execution_options = get_execution_config(language)
     if extra_config is not None:

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/contest/schema.py

@@ -19,7 +19,7 @@ class ProblemStatementOverride(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
     configure: List[ConversionStep] = Field(
-        [],
+        default=[],
         discriminator='type',
         description="""
 Configure how certain conversion steps should happen when applied to the statement file.
@@ -33,7 +33,7 @@ configure them in case they are applied.
 class ContestStatement(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
-    language: str = Field('en', description='Language code for this statement.')
+    language: str = Field(default='en', description='Language code for this statement.')
 
     title: str = Field(description='Title of the contest in this language.')
 
@@ -50,7 +50,7 @@ class ContestStatement(BaseModel):
     type: StatementType = Field(description='Type of the input statement file.')
 
     joiner: Optional[Joiner] = Field(
-        None,
+        default=None,
         description="""
 Joiner to be used to build the statement.
                            
@@ -98,7 +98,7 @@ Can be glob pattern as well, such as `imgs/*.png`.
     # Vars to be re-used in the statement.
     #   - It will be available as \VAR{vars} variable in the contest-level box statement.
     vars: Dict[str, Primitive] = Field(
-        {}, description='Variables to be re-used across the package.'
+        default={}, description='Variables to be re-used across the package.'
     )
 
     @property
@@ -147,7 +147,7 @@ class Contest(BaseModel):
     # Vars to be re-used in the statements.
     #   - It will be available as \VAR{vars} variable in the contest-level box statement.
     vars: Dict[str, Primitive] = Field(
-        {}, description='Variables to be re-used across the package.'
+        default={}, description='Variables to be re-used across the package.'
     )
 
     @property

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/creation.py

@@ -6,6 +6,7 @@ import typer
 
 from rbx import console
 from rbx.box import presets
+from rbx.box.contest.contest_package import find_contest_yaml
 from rbx.box.presets.fetch import get_preset_fetch_info
 
 
@@ -26,6 +27,15 @@ def create(
     ] = None,
     path: Optional[pathlib.Path] = None,
 ):
+    if find_contest_yaml() is not None:
+        console.console.print(
+            '[error]Cannot [item]rbx create[/item] a problem inside a contest.[/error]'
+        )
+        console.console.print(
+            '[error]Instead, use [item]rbx contest add[/item] to add a problem to a contest.[/error]'
+        )
+        raise typer.Exit(1)
+
     preset = preset or 'default'
     console.console.print(f'Creating new problem [item]{name}[/item]...')
 

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/extensions.py

@@ -8,11 +8,11 @@ from rbx.box.packaging.boca.extension import BocaExtension, BocaLanguageExtensio
 # Extension abstractions.
 class Extensions(BaseModel):
     boca: Optional[BocaExtension] = Field(
-        None, description='Environment-level extensions for BOCA packaging.'
+        default=None, description='Environment-level extensions for BOCA packaging.'
     )
 
 
 class LanguageExtensions(BaseModel):
     boca: Optional[BocaLanguageExtension] = Field(
-        None, description='Language-level extensions for BOCA packaging.'
+        default=None, description='Language-level extensions for BOCA packaging.'
     )

rbx_cp-0.5.31/rbx/box/formatting.py

@@ -0,0 +1,10 @@
+def get_formatted_memory(memory_in_bytes: int, mib_decimal_places: int = 0) -> str:
+    if memory_in_bytes < 1024 * 1024:
+        if memory_in_bytes < 1024:
+            return f'{memory_in_bytes} B'
+        return f'{memory_in_bytes / 1024:.0f} KiB'
+    return f'{memory_in_bytes / (1024 * 1024):.{mib_decimal_places}f} MiB'
+
+
+def get_formatted_time(time_in_ms: int) -> str:
+    return f'{time_in_ms} ms'

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/generators.py

@@ -47,11 +47,11 @@ def _get_group_output(
     return group_path / f'{subgroup_prefix}{i:03d}.out'
 
 
-def _fill_output_for_testcase(testcase: Testcase) -> Testcase:
+def _fill_output_for_defined_testcase(testcase: Testcase) -> Testcase:
     res = testcase.model_copy()
     if res.outputPath is not None:
         return res
-    output_path = res.inputPath.with_suffix('.out')
+    output_path = res.inputPath.with_suffix('.ans')
     if output_path.is_file():
         res.outputPath = output_path
     return res
@@ -61,7 +61,7 @@ def _copy_testcase_over(
     testcase: Testcase,
     dest: Testcase,
 ):
-    testcase = _fill_output_for_testcase(testcase)
+    testcase = _fill_output_for_defined_testcase(testcase)
     dest.inputPath.parent.mkdir(parents=True, exist_ok=True)
     shutil.copy(
         str(testcase.inputPath),
@@ -195,7 +195,7 @@ def run_testcase_visitor(visitor: TestcaseVisitor):
     pkg = package.find_problem_package_or_die()
 
     def _explore_subgroup(
-        subgroup: TestcaseSubgroup, subgroup_index: int, prefix: List[str]
+        subgroup: TestcaseSubgroup, subgroup_index: Optional[int], prefix: List[str]
     ):
         assert prefix and len(prefix) >= 1 and len(prefix) <= 2
         group_path = prefix[0]
@@ -212,8 +212,10 @@ def run_testcase_visitor(visitor: TestcaseVisitor):
         def _copied_to(i: int) -> Testcase:
             group_fs_path = package.get_build_testgroup_path(group_path)
             group_prefix = ''
+            if subgroup_index is not None:
+                group_prefix = f'{subgroup_index}-'
             if len(prefix) == 2:
-                group_prefix = f'{subgroup_index}-{prefix[1]}-'
+                group_prefix += f'{prefix[1]}-'
             return Testcase(
                 inputPath=_get_group_input(group_fs_path, group_prefix, i),
                 outputPath=_get_group_output(group_fs_path, group_prefix, i),
@@ -228,7 +230,7 @@ def run_testcase_visitor(visitor: TestcaseVisitor):
                     group_entry=_entry(i),
                     subgroup_entry=_sub_entry(i),
                     metadata=GenerationMetadata(
-                        copied_from=_fill_output_for_testcase(tc),
+                        copied_from=_fill_output_for_defined_testcase(tc),
                         copied_to=_copied_to(i),
                     ),
                 )
@@ -249,7 +251,7 @@ def run_testcase_visitor(visitor: TestcaseVisitor):
                         group_entry=_entry(i),
                         subgroup_entry=_sub_entry(i),
                         metadata=GenerationMetadata(
-                            copied_from=_fill_output_for_testcase(tc),
+                            copied_from=_fill_output_for_defined_testcase(tc),
                             copied_to=_copied_to(i),
                         ),
                     )
@@ -296,10 +298,10 @@ def run_testcase_visitor(visitor: TestcaseVisitor):
         if not visitor.should_visit_group(group.name):
             continue
 
-        _explore_subgroup(group, 0, [group.name])
+        _explore_subgroup(group, 0 if group.subgroups else None, [group.name])
 
         for i, subgroup in enumerate(group.subgroups):
-            _explore_subgroup(subgroup, i, [group.name, subgroup.name])
+            _explore_subgroup(subgroup, i + 1, [group.name, subgroup.name])
 
 
 def _get_necessary_generators_for_groups(
@@ -433,7 +435,7 @@ def generate_standalone(
             validator_digest,
         )
         if not ok:
-            _print_error_header('Failed validating testcase.')
+            _print_error_header('failed validating testcase.')
             console.console.print(f'[error]Message:[/error] {message}')
             console.console.print(
                 f'Testcase written at [item]{spec.copied_to.inputPath}[/item]'

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/generators_test.py

@@ -19,7 +19,7 @@ def test_generator_works(pkg_from_testdata: pathlib.Path):
     print_directory_tree(pkg_from_testdata)
 
     assert (
-        package.get_build_testgroup_path('gen1') / '0-main-000.in'
+        package.get_build_testgroup_path('gen1') / '0-000.in'
     ).read_text() == '777\n'
     assert (
         package.get_build_testgroup_path('gen1') / '1-gen-000.in'

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/main.py

@@ -25,6 +25,7 @@ from rbx.box import (
     builder,
     cd,
     setter_config,
+    state,
     creation,
     download,
     environment,
@@ -83,6 +84,11 @@ app.add_typer(
 )
 
 
+@app.callback()
+def main():
+    state.STATE.run_through_cli = True
+
+
 # @app.command('ui', hidden=True)
 # @package.within_problem
 # def ui():
@@ -255,6 +261,7 @@ def _time_impl(check: bool, detailed: bool) -> Optional[int]:
             tracked_solutions=tracked_solutions,
             check=check,
             verification=VerificationLevel(verification),
+            timelimit_override=600,  # 10 minute time limit for estimation
         )
 
     console.console.print()
@@ -352,6 +359,12 @@ def irun(
         '-t',
         help='Testcase to run, in the format "[group]/[index]". If not specified, will run interactively.',
     ),
+    output: bool = typer.Option(
+        False,
+        '--output',
+        '-o',
+        help='Whether to ask user for custom output.',
+    ),
     print: bool = typer.Option(
         False, '--print', '-p', help='Whether to print outputs to terminal.'
     ),
@@ -414,6 +427,7 @@ def irun(
                 if generator is not None
                 else None,
                 testcase_entry=TestcaseEntry.parse(testcase) if testcase else None,
+                custom_output=output,
                 print=print,
                 sanitized=sanitized,
             )

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/schema.py

@@ -156,11 +156,11 @@ class CodeItem(BaseModel):
     )
 
     language: Optional[str] = Field(
-        None, description="""The language of the code file."""
+        default=None, description="""The language of the code file."""
     )
 
     compilationFiles: Optional[List[str]] = Field(
-        [],
+        default=[],
         description="""
 Extra files that should be placed alongside the code file during its compilation,
 such as testlib.h, jngen.h, etc.
@@ -189,7 +189,7 @@ class GeneratorCall(BaseModel):
     name: str = FNameField(description='The name of the generator to call.')
 
     args: Optional[str] = Field(
-        None, description='The arguments to pass to the generator.'
+        default=None, description='The arguments to pass to the generator.'
     )
 
 
@@ -199,31 +199,31 @@ class TestcaseSubgroup(BaseModel):
     name: str = NameField(description='The name of the test group.')
 
     testcases: List[Testcase] = Field(
-        [],
+        default=[],
         description="""
 The path of testcases to add to this group,
 in the order they're defined.""",
     )
 
     testcaseGlob: Optional[str] = Field(
-        None,
+        default=None,
         description="""
 A Python glob that matches input file paths relative to the
 package directory. The globbed files should end with the extension
 ".in", and their corresponding outputs, if defined, should have the same file name,
-but ending with ".out".
+but ending with ".ans".
 """,
     )
 
     generators: List[GeneratorCall] = Field(
-        [],
+        default=[],
         description="""
 A list of generators to call to generate testcases for this group.
 """,
     )
 
     generatorScript: Optional[CodeItem] = Field(
-        None,
+        default=None,
         description="""
 A generator script to call to generate testcases for this group.
 """,
@@ -247,14 +247,14 @@ class TestcaseGroup(TestcaseSubgroup):
     model_config = ConfigDict(extra='forbid')
 
     subgroups: List[TestcaseSubgroup] = Field(
-        [],
+        default=[],
         description="""
 A list of test subgroups to define for this group.
         """,
     )
 
     validator: Optional[CodeItem] = Field(
-        None,
+        default=None,
         description="""
 A validator to use to validate the testcases of this group.
 If not specified, will use the package-level validator.
@@ -263,7 +263,7 @@ Useful in cases where the constraints vary across test groups.
     )
 
     weight: Optional[float] = Field(
-        1.0,
+        default=1.0,
         description="""
 The weight of this group in the final score. Useful for
 problems that have points.
@@ -301,29 +301,29 @@ class Stress(BaseModel):
 
 class Limits(BaseModel):
     time: Optional[int] = Field(
-        None, description='Value to override time limit with, in milliseconds.'
+        default=None, description='Value to override time limit with, in milliseconds.'
     )
     memory: Optional[int] = Field(
-        None, description='Value to override memory limit with, in MB.'
+        default=None, description='Value to override memory limit with, in MB.'
     )
     output: Optional[int] = Field(
-        None, description='Value to override output limit with, in KB.'
+        default=None, description='Value to override output limit with, in KB.'
     )
 
     isDoubleTL: bool = Field(
-        False, description='Whether to use double TL for this language.'
+        default=False, description='Whether to use double TL for this language.'
     )
 
 
 class LimitModifiers(BaseModel):
     timeMultiplier: Optional[float] = Field(
-        None, description='Multiplier for time limit.'
+        default=None, description='Multiplier for time limit.'
     )
     time: Optional[int] = Field(
-        None, description='Value to override time limit with, in milliseconds.'
+        default=None, description='Value to override time limit with, in milliseconds.'
     )
     memory: Optional[int] = Field(
-        None, description='Value to override memory limit with, in MB.'
+        default=None, description='Value to override memory limit with, in MB.'
     )
 
 
@@ -338,28 +338,30 @@ class Package(BaseModel):
     memoryLimit: int = Field(description='Memory limit of the problem, in MB.')
 
     outputLimit: int = Field(
-        4 * 1024, description='Output limit of the problem, in KB.'
+        default=4 * 1024, description='Output limit of the problem, in KB.'
     )
 
     modifiers: Dict[str, LimitModifiers] = Field(
-        {},
+        default={},
         description="""
     Limit modifiers that can be specified per language.
     """,
     )
 
     checker: Optional[CodeItem] = Field(
-        None, description='The checker for this problem.'
+        default=None, description='The checker for this problem.'
     )
 
     validator: Optional[CodeItem] = Field(
-        None, description='The validator for this problem.'
+        default=None, description='The validator for this problem.'
     )
 
-    generators: List[Generator] = Field([], description='Generators for this problem.')
+    generators: List[Generator] = Field(
+        default=[], description='Generators for this problem.'
+    )
 
     solutions: List[Solution] = Field(
-        [],
+        default=[],
         description="""
 All tested solutions for this problem.
 
@@ -368,17 +370,23 @@ that is correct and used as reference -- and should have the `accepted` outcome.
 """,
     )
 
-    testcases: List[TestcaseGroup] = Field([], description='Testcases for the problem.')
+    testcases: List[TestcaseGroup] = Field(
+        default=[], description='Testcases for the problem.'
+    )
 
-    stresses: List[Stress] = Field([], description='Stress tests for the problem.')
+    stresses: List[Stress] = Field(
+        default=[], description='Stress tests for the problem.'
+    )
 
-    statements: List[Statement] = Field([], description='Statements for the problem.')
+    statements: List[Statement] = Field(
+        default=[], description='Statements for the problem.'
+    )
 
     # Vars to be re-used across the package.
     #   - It will be passed as --key=value arguments to the validator.
     #   - It will be available as \VAR{key} variables in the rbx statement.
     vars: Dict[str, Primitive] = Field(
-        {}, description='Variables to be re-used across the package.'
+        default={}, description='Variables to be re-used across the package.'
     )
 
     @property

{rbx_cp-0.5.29 → rbx_cp-0.5.31}/rbx/box/setter_config.py

@@ -19,36 +19,36 @@ _CONFIG_FILE_NAME_MAC = 'default_setter_config.mac.yml'
 
 class SanitizersConfig(BaseModel):
     enabled: bool = Field(
-        False,
+        default=False,
         description='Whether to use sanitizers when running solutions.',
     )
 
     command_substitutions: Dict[str, str] = Field(
-        {},
+        default={},
         description='Substitutions to apply to commands before running them with sanitizers.',
     )
 
 
 class WarningsConfig(BaseModel):
     enabled: bool = Field(
-        False,
+        default=False,
         description='Whether to use warning flags when running solutions.',
     )
 
 
 class RepeatsConfig(BaseModel):
     reps: int = Field(
-        1,
+        default=1,
         description='Number of times to repeat the solution.',
     )
 
     retries: int = Field(
-        0,
+        default=0,
         description='Number of times to retry if the solution TLs.',
     )
 
     retries_for_stress: int = Field(
-        0,
+        default=0,
         description='Number of times to retry in stress mode if the solution TLs.',
     )
 
@@ -69,7 +69,7 @@ class SetterConfig(BaseModel):
     )
 
     command_substitutions: Dict[str, str] = Field(
-        {},
+        default={},
         description='Substitutions to apply to commands before running them.',
     )