rbx.cp 0.5.37__tar.gz → 0.5.39__tar.gz

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/PKG-INFO

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

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/pyproject.toml

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

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/annotations.py

@@ -1,4 +1,3 @@
-import importlib
 import importlib.resources
 import pathlib
 import re

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/code.py

@@ -47,7 +47,7 @@ class SanitizationLevel(Enum):
 
     def should_sanitize(self) -> bool:
         cfg = setter_config.get_setter_config()
-        if cfg.sanitizers.enabled:
+        if cfg.sanitizers.enabled or state.STATE.sanitized:
             return self.value >= SanitizationLevel.PREFER.value
         return self.value >= SanitizationLevel.FORCE.value
 

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/contest/statements.py

@@ -3,7 +3,7 @@ from typing import Annotated, List, Optional
 import typer
 
 from rbx import annotations, console
-from rbx.box import builder, cd, environment, package
+from rbx.box import cd, environment, package
 from rbx.box.contest.build_contest_statements import build_statement
 from rbx.box.contest.contest_package import (
     find_contest_package_or_die,
@@ -44,6 +44,8 @@ def build(
     contest = find_contest_package_or_die()
     # At most run the validators, only in samples.
     if samples:
+        from rbx.box import builder
+
         for problem in contest.problems:
             console.console.print(
                 f'Processing problem [item]{problem.short_name}[/item]...'

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/generators.py

@@ -16,7 +16,6 @@ from rbx.box.schema import (
     GeneratorCall,
     Testcase,
 )
-from rbx.box.stressing import generator_parser
 from rbx.box.testcase_extractors import (
     GenerationMetadata,
     GenerationTestcaseEntry,
@@ -119,6 +118,8 @@ def compile_generators(
 
 
 def expand_generator_call(call: GeneratorCall) -> GeneratorCall:
+    from rbx.box.stressing import generator_parser
+
     vars = package.find_problem_package_or_die().expanded_vars
     generator_for_args = generator_parser.Generator(vars)
     parsed_args = generator_parser.parse(call.args or '')

rbx_cp-0.5.39/rbx/box/lazy_importing_main.py

@@ -0,0 +1,7 @@
+import sys
+
+from rbx.box import main  # noqa
+
+if __name__ == '__main__':
+    for m in sys.modules:
+        print(m)

rbx_cp-0.5.39/rbx/box/lazy_importing_test.py

@@ -0,0 +1,25 @@
+import subprocess
+import sys
+from pathlib import Path
+
+LAZY_MODULES = {
+    'gitpython',
+    'questionary',
+    'fastapi',
+    'requests',
+    'pydantic_xml',
+    'rbx.box.packaging.polygon.packager',
+    'rbx.box.stresses',
+}
+
+
+def test_rich_not_imported_unnecessary():
+    file_path = Path(__file__).parent / 'lazy_importing_main.py'
+    result = subprocess.run(
+        [sys.executable, '-m', 'coverage', 'run', str(file_path)],
+        capture_output=True,
+        encoding='utf-8',
+    )
+    modules = result.stdout.splitlines()
+    modules = [module for module in modules if module in LAZY_MODULES]
+    assert not modules

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/main.py

@@ -18,11 +18,9 @@ from typing import Annotated, List, Optional
 import rich
 import rich.prompt
 import typer
-import questionary
 
 from rbx import annotations, config, console, utils
 from rbx.box import (
-    builder,
     cd,
     setter_config,
     state,
@@ -33,7 +31,6 @@ from rbx.box import (
     package,
     compile,
     presets,
-    stresses,
     validators,
 )
 from rbx.box.contest import main as contest
@@ -58,43 +55,70 @@ app.add_typer(
     setter_config.app,
     name='config, cfg',
     cls=annotations.AliasGroup,
-    help='Manage setter configuration.',
+    help='Manage setter configuration (sub-command).',
+    rich_help_panel='Configuration',
 )
 app.add_typer(
     build_statements.app,
     name='statements, st',
     cls=annotations.AliasGroup,
-    help='Manage statements.',
+    help='Manage statements (sub-command).',
+    rich_help_panel='Deploying',
 )
 app.add_typer(
     download.app,
     name='download',
     cls=annotations.AliasGroup,
-    help='Download an asset from supported repositories.',
+    help='Download an asset from supported repositories (sub-command).',
+    rich_help_panel='Management',
 )
 app.add_typer(
-    presets.app, name='presets', cls=annotations.AliasGroup, help='Manage presets.'
+    presets.app,
+    name='presets',
+    cls=annotations.AliasGroup,
+    help='Manage presets (sub-command).',
+    rich_help_panel='Configuration',
 )
 app.add_typer(
     packaging.app,
     name='package, pkg',
     cls=annotations.AliasGroup,
-    help='Build problem packages.',
+    help='Build problem packages (sub-command).',
+    rich_help_panel='Deploying',
 )
 app.add_typer(
-    contest.app, name='contest', cls=annotations.AliasGroup, help='Contest management.'
+    contest.app,
+    name='contest',
+    cls=annotations.AliasGroup,
+    help='Manage contests (sub-command).',
+    rich_help_panel='Management',
 )
 app.add_typer(
     testcases.app,
     name='testcases, tc, t',
     cls=annotations.AliasGroup,
-    help='Testcase management.',
+    help='Manage testcases (sub-command).',
+    rich_help_panel='Management',
 )
 
 
 @app.callback()
-def main():
+def main(
+    sanitized: bool = typer.Option(
+        False,
+        '--sanitized',
+        '-s',
+        help='Whether to compile and run testlib components with sanitizers enabled. '
+        'If you want to run the solutions with sanitizers enabled, use the "-s" flag in the corresponding run command.',
+    ),
+):
     state.STATE.run_through_cli = True
+    state.STATE.sanitized = sanitized
+    if sanitized:
+        console.console.print(
+            '[warning]Sanitizers are running just for testlib components.\n'
+            'If you want to run the solutions with sanitizers enabled, use the [item]-s[/item] flag in the corresponding run command.[/warning]'
+        )
 
 
 # @app.command('ui', hidden=True)
@@ -103,7 +127,11 @@ def main():
 #     ui_pkg.start()
 
 
-@app.command('edit, e', help='Open problem.rbx.yml in your default editor.')
+@app.command(
+    'edit, e',
+    rich_help_panel='Configuration',
+    help='Open problem.rbx.yml in your default editor.',
+)
 @package.within_problem
 def edit():
     console.console.print('Opening problem definition in editor...')
@@ -113,13 +141,21 @@ def edit():
     config.open_editor(package.find_problem_yaml() or pathlib.Path())
 
 
-@app.command('build, b', help='Build all tests for the problem.')
+@app.command(
+    'build, b', rich_help_panel='Deploying', help='Build all tests for the problem.'
+)
 @package.within_problem
 def build(verification: environment.VerificationParam):
+    from rbx.box import builder
+
     builder.build(verification=verification)
 
 
-@app.command('run, r', help='Build and run solution(s).')
+@app.command(
+    'run, r',
+    rich_help_panel='Testing',
+    help='Build and run solution(s).',
+)
 @package.within_problem
 def run(
     verification: environment.VerificationParam,
@@ -189,6 +225,8 @@ def run(
             console.console.print('[error]No solutions selected. Exiting.[/error]')
             raise typer.Exit(1)
 
+    from rbx.box import builder
+
     if not builder.build(verification=verification, output=check):
         return
 
@@ -298,6 +336,7 @@ def _time_impl(check: bool, detailed: bool) -> Optional[int]:
 
 @app.command(
     'time, t',
+    rich_help_panel='Testing',
     help='Estimate a time limit for the problem based on a time limit formula and timings of accepted solutions.',
 )
 @package.within_problem
@@ -322,6 +361,8 @@ def time(
         )
         check = False
 
+    from rbx.box import builder
+
     verification = VerificationLevel.ALL_SOLUTIONS.value
     if not builder.build(verification=verification, output=check):
         return None
@@ -330,7 +371,9 @@ def time(
 
 
 @app.command(
-    'irun, ir', help='Build and run solution(s) by passing testcases in the CLI.'
+    'irun, ir',
+    rich_help_panel='Testing',
+    help='Build and run solution(s) by passing testcases in the CLI.',
 )
 @package.within_problem
 def irun(
@@ -442,7 +485,11 @@ def irun(
         )
 
 
-@app.command('create, c', help='Create a new problem package.')
+@app.command(
+    'create, c',
+    rich_help_panel='Management',
+    help='Create a new problem package.',
+)
 def create(
     name: str,
     preset: Annotated[
@@ -464,7 +511,11 @@ def create(
     creation.create(name)
 
 
-@app.command('stress', help='Run a stress test.')
+@app.command(
+    'stress',
+    rich_help_panel='Testing',
+    help='Run a stress test.',
+)
 @package.within_problem
 def stress(
     name: Annotated[
@@ -522,6 +573,8 @@ def stress(
         )
         raise typer.Exit(1)
 
+    from rbx.box import stresses
+
     with utils.StatusProgress('Running stress...') as s:
         report = stresses.run_stress(
             name,
@@ -555,6 +608,8 @@ def stress(
             and group.generatorScript.path.suffix == '.txt'
         }
 
+        import questionary
+
         testgroup = questionary.select(
             'Choose the testgroup to add the tests to.\nOnly test groups that have a .txt generatorScript are shown below: ',
             choices=list(groups_by_name) + ['(create new script)', '(skip)'],
@@ -614,7 +669,11 @@ def stress(
         break
 
 
-@app.command('compile', help='Compile an asset given its path.')
+@app.command(
+    'compile',
+    rich_help_panel='Testing',
+    help='Compile an asset given its path.',
+)
 @package.within_problem
 def compile_command(
     path: Annotated[
@@ -635,6 +694,8 @@ def compile_command(
     ),
 ):
     if path is None:
+        import questionary
+
         path = questionary.path("What's the path to your asset?").ask()
         if path is None:
             console.console.print('[error]No path specified.[/error]')
@@ -643,7 +704,11 @@ def compile_command(
     compile.any(path, sanitized, warnings)
 
 
-@app.command('validate', help='Run the validator in a one-off fashion, interactively.')
+@app.command(
+    'validate',
+    rich_help_panel='Testing',
+    help='Run the validator in a one-off fashion, interactively.',
+)
 @package.within_problem
 def validate(
     path: Annotated[
@@ -676,7 +741,11 @@ def validate(
     validators.print_validation_report([info])
 
 
-@app.command('environment, env', help='Set or show the current box environment.')
+@app.command(
+    'environment, env',
+    rich_help_panel='Configuration',
+    help='Set or show the current box environment.',
+)
 def environment_command(
     env: Annotated[Optional[str], typer.Argument()] = None,
     install_from: Annotated[
@@ -721,6 +790,7 @@ def environment_command(
 
 @app.command(
     'activate',
+    rich_help_panel='Configuration',
     help='Activate the environment of the current preset used by the package.',
 )
 @cd.within_closest_package
@@ -755,7 +825,11 @@ def activate():
     console.console.print(f'[success]Preset [item]{preset.name}[/item] is activated.')
 
 
-@app.command('languages', help='List the languages available in this environment')
+@app.command(
+    'languages',
+    rich_help_panel='Configuration',
+    help='List the languages available in this environment',
+)
 def languages():
     env = environment.get_environment()
 
@@ -771,7 +845,11 @@ def languages():
         console.console.print()
 
 
-@app.command('clear, clean', help='Clears cache and build directories.')
+@app.command(
+    'clear, clean',
+    rich_help_panel='Management',
+    help='Clears cache and build directories.',
+)
 @cd.within_closest_package
 def clear():
     console.console.print('Cleaning cache and build directories...')

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/packaging/contest_main.py

@@ -14,7 +14,6 @@ from rbx.box.packaging.packager import (
     BuiltContestStatement,
     BuiltProblemPackage,
 )
-from rbx.box.packaging.polygon.packager import PolygonContestPackager, PolygonPackager
 
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
 
@@ -77,6 +76,11 @@ def run_contest_packager(
 def polygon(
     verification: environment.VerificationParam,
 ):
+    from rbx.box.packaging.polygon.packager import (
+        PolygonContestPackager,
+        PolygonPackager,
+    )
+
     run_contest_packager(
         PolygonContestPackager, PolygonPackager, verification=verification
     )

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/packaging/main.py

@@ -5,11 +5,9 @@ from typing import Type
 import typer
 
 from rbx import annotations, console
-from rbx.box import builder, environment, package
+from rbx.box import environment, package
 from rbx.box.package import get_build_path
-from rbx.box.packaging.boca.packager import BocaPackager
 from rbx.box.packaging.packager import BasePackager, BuiltStatement
-from rbx.box.packaging.polygon.packager import PolygonPackager
 from rbx.box.statements.build_statements import build_statement
 
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
@@ -19,6 +17,8 @@ def run_packager(
     packager_cls: Type[BasePackager],
     verification: environment.VerificationParam,
 ) -> pathlib.Path:
+    from rbx.box import builder
+
     if not builder.verify(verification=verification):
         console.console.print(
             '[error]Build or verification failed, check the report.[/error]'
@@ -58,6 +58,8 @@ def run_packager(
 def polygon(
     verification: environment.VerificationParam,
 ):
+    from rbx.box.packaging.polygon.packager import PolygonPackager
+
     run_packager(PolygonPackager, verification=verification)
 
 
@@ -65,4 +67,6 @@ def polygon(
 def boca(
     verification: environment.VerificationParam,
 ):
+    from rbx.box.packaging.boca.packager import BocaPackager
+
     run_packager(BocaPackager, verification=verification)

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/presets/__init__.py

@@ -3,8 +3,6 @@ import shutil
 import tempfile
 from typing import Annotated, Iterable, List, Optional, Sequence, Union
 
-import git
-import questionary
 import rich
 import rich.prompt
 import typer
@@ -306,6 +304,8 @@ def optionally_install_environment_from_preset(
     if env_path.is_file():
         if digest_file(preset_env_path) == digest_file(env_path):
             return
+        import questionary
+
         overwrite = questionary.confirm(
             'Preset environment file has changed. Overwrite?',
             default=False,
@@ -371,6 +371,8 @@ def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
 
 
 def install_from_remote(fetch_info: PresetFetchInfo, force: bool = False) -> str:
+    import git
+
     assert fetch_info.fetch_uri is not None
     with tempfile.TemporaryDirectory() as d:
         console.console.print(
@@ -484,6 +486,8 @@ def update(
 
     for preset_name in presets:
         if preset_name == LOCAL:
+            import questionary
+
             if not questionary.confirm(
                 'Updating local preset will remove all custom changes you made to the preset.',
                 default=False,

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/setter_config.py

@@ -1,5 +1,4 @@
 import functools
-import importlib
 import importlib.resources
 import pathlib
 import shlex

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/solutions.py

@@ -7,7 +7,6 @@ import shutil
 from collections.abc import Iterator
 from typing import Dict, Iterable, List, Optional, Set, Tuple
 
-import questionary
 import rich
 import rich.live
 import rich.markup
@@ -636,13 +635,22 @@ async def run_and_print_interactive_solutions(
 
     for item in items:
         sol = pkg.solutions[item.solution_index]
-        with utils.no_progress(progress):
-            _print_solution_header(sol, console.console, is_irun=True)
+
+        if progress:
+            progress.update(f'Running [item]{sol.path}[/item]...')
 
         eval = await item.eval()
 
+        with utils.no_progress(progress):
+            console.console.print(get_testcase_markup_verdict(eval), end=' ')
+            _print_solution_header(sol, console.console, is_irun=True)
+            _print_solution_outcome(
+                sol, [eval], console.console, verification, subset=True
+            )
+
         stdout_path = eval.log.stdout_absolute_path
         if print:
+            console.console.rule('Output', style='status')
             if (
                 eval.testcase.output is not None
                 and stdout_path is not None
@@ -674,6 +682,8 @@ def pick_solutions(tracked_solutions: Optional[Set[str]]) -> List[str]:
         tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
 
     # Store in a separate list to maintain order with the package declaration.
+    import questionary
+
     choices = [
         questionary.Choice(title=_get_solution_repr(sol), value=str(sol.path))
         for sol in pkg.solutions
@@ -779,14 +789,17 @@ def _print_solution_outcome(
     evals: List[Evaluation],
     console: rich.console.Console,
     verification: VerificationLevel = VerificationLevel.NONE,
+    subset: bool = False,
 ) -> bool:
     pkg = package.find_problem_package_or_die()
 
     has_plain_tle = False
+    all_verdicts = set()
     bad_verdicts = set()
     no_tle_bad_verdicts = set()
     has_sanitizer_warnings = False
     for eval in evals:
+        all_verdicts.add(eval.result.outcome)
         if eval.result.outcome != Outcome.ACCEPTED:
             bad_verdicts.add(eval.result.outcome)
         if (
@@ -807,18 +820,27 @@ def _print_solution_outcome(
     matched_bad_verdicts = bad_verdicts - unmatched_bad_verdicts
     expected_outcome_is_bad = not solution.outcome.match(Outcome.ACCEPTED)
 
-    if unmatched_bad_verdicts or (expected_outcome_is_bad and not matched_bad_verdicts):
+    has_failed = unmatched_bad_verdicts or (
+        expected_outcome_is_bad and not matched_bad_verdicts and not subset
+    )
+    if has_failed:
         console.print('[error]FAILED[/error]', end=' ')
     else:
         console.print('[success]OK[/success]', end=' ')
 
-    console.print(f'Expected: {solution.outcome}', end='')
-
-    if unmatched_bad_verdicts:
-        unmatched_bad_verdicts_names = set(v.name for v in unmatched_bad_verdicts)
-        console.print(f', got: {" ".join(unmatched_bad_verdicts_names)}', end='')
-    elif expected_outcome_is_bad and not matched_bad_verdicts:
-        console.print(f', got: {Outcome.ACCEPTED.name}', end='')
+    if has_failed or not subset:
+        console.print(f'Expected: {solution.outcome}', end='')
+    elif subset:
+        all_verdicts_names = ' '.join(v.name for v in all_verdicts)
+        console.print(f'Got: {all_verdicts_names}', end='')
+
+    if has_failed or not subset:
+        # Only print verdicts if not subset.
+        if unmatched_bad_verdicts:
+            unmatched_bad_verdicts_names = set(v.name for v in unmatched_bad_verdicts)
+            console.print(f', got: {" ".join(unmatched_bad_verdicts_names)}', end='')
+        elif expected_outcome_is_bad and not matched_bad_verdicts and not subset:
+            console.print(f', got: {Outcome.ACCEPTED.name}', end='')
 
     console.print()
     evals_time = _get_evals_time_in_ms(evals)

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/state.py

@@ -4,6 +4,7 @@ import dataclasses
 @dataclasses.dataclass
 class State:
     run_through_cli: bool = False
+    sanitized: bool = False
 
 
 STATE = State()

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/statements/build_statements.py

@@ -6,7 +6,7 @@ from typing import Annotated, Dict, List, Optional, Tuple
 import typer
 
 from rbx import annotations, console
-from rbx.box import builder, environment, package
+from rbx.box import environment, package
 from rbx.box.schema import Package
 from rbx.box.statements.builders import (
     BUILDER_LIST,
@@ -333,6 +333,8 @@ def build(
 ):
     # At most run the validators, only in samples.
     if samples:
+        from rbx.box import builder
+
         if not builder.build(
             verification=verification,
             groups=set(['samples']),

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/statements/builders.py

@@ -11,12 +11,6 @@ from pydantic import BaseModel
 
 from rbx import console, utils
 from rbx.box.schema import Package, Primitive, Testcase
-from rbx.box.statements.latex import (
-    MAX_PDFLATEX_RUNS,
-    Latex,
-    decode_latex_output,
-    should_rerun,
-)
 from rbx.box.statements.latex_jinja import (
     JinjaDictWrapper,
     render_latex_template,
@@ -355,6 +349,13 @@ class TeX2PDFBuilder(StatementBuilder):
         item: StatementBuilderItem,
         verbose: bool = False,
     ) -> bytes:
+        from rbx.box.statements.latex import (
+            MAX_PDFLATEX_RUNS,
+            Latex,
+            decode_latex_output,
+            should_rerun,
+        )
+
         latex = Latex(input.decode())
         latex_result = latex.build_pdf(context.root)
         pdf = latex_result.pdf

{rbx_cp-0.5.37 → rbx_cp-0.5.39}/rbx/box/statements/joiners.py

@@ -10,12 +10,6 @@ from rbx.box.statements.builders import (
     StatementBuilderContest,
     StatementCodeLanguage,
 )
-from rbx.box.statements.latex import (
-    MAX_PDFLATEX_RUNS,
-    Latex,
-    decode_latex_output,
-    should_rerun,
-)
 from rbx.box.statements.schema import Joiner, JoinerType, JoinTexToPDF, StatementType
 
 
@@ -84,6 +78,13 @@ class TeX2PDFJoiner(StatementJoiner):
         contest: StatementBuilderContest,
         verbose: bool = False,
     ) -> bytes:
+        from rbx.box.statements.latex import (
+            MAX_PDFLATEX_RUNS,
+            Latex,
+            decode_latex_output,
+            should_rerun,
+        )
+
         latex = Latex(input.decode())
         latex_result = latex.build_pdf(context.root)
         pdf = latex_result.pdf