rbx.cp 0.5.36__tar.gz → 0.5.38__tar.gz

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/PKG-INFO

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

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/pyproject.toml

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

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/rbx/annotations.py

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

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/rbx/box/builder.py

@@ -4,7 +4,6 @@ from rbx import console, utils
 from rbx.box import environment, package
 from rbx.box.environment import VerificationLevel
 from rbx.box.generators import (
-    extract_generation_testcases_from_groups,
     generate_outputs_for_testcases,
     generate_testcases,
 )
@@ -13,6 +12,7 @@ from rbx.box.solutions import (
     print_run_report,
     run_solutions,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases_from_groups
 from rbx.box.validators import (
     has_validation_errors,
     print_validation_report,
@@ -50,7 +50,10 @@ def build(
                 'Validated [item]{processed}[/item] testcases...',
                 keep=True,
             ) as s:
-                infos = validate_testcases(s, groups=groups)
+                infos = validate_testcases(
+                    s,
+                    groups=groups,
+                )
                 print_validation_report(infos)
 
             if has_validation_errors(infos):

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/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.36 → rbx_cp-0.5.38}/rbx/box/generators.py

@@ -1,12 +1,8 @@
-import abc
 import pathlib
-import shlex
 import shutil
-from pathlib import PosixPath
-from typing import Dict, Iterable, List, Optional, Set, Tuple
+from typing import Dict, List, Optional, Set
 
 import typer
-from pydantic import BaseModel
 
 from rbx import console
 from rbx.box import checkers, package, testcase_utils, validators
@@ -19,10 +15,19 @@ from rbx.box.schema import (
     CodeItem,
     GeneratorCall,
     Testcase,
-    TestcaseSubgroup,
 )
-from rbx.box.stressing import generator_parser
-from rbx.box.testcase_utils import TestcaseEntry, TestcasePattern, find_built_testcases
+from rbx.box.testcase_extractors import (
+    GenerationMetadata,
+    GenerationTestcaseEntry,
+    TestcaseGroupVisitor,
+    extract_generation_testcases,
+    run_testcase_visitor,
+)
+from rbx.box.testcase_utils import (
+    TestcaseEntry,
+    fill_output_for_defined_testcase,
+    find_built_testcases,
+)
 from rbx.grading.steps import (
     DigestHolder,
     DigestOrDest,
@@ -35,33 +40,11 @@ def _compile_generator(generator: CodeItem) -> str:
     return compile_item(generator, sanitized=SanitizationLevel.PREFER)
 
 
-def _get_group_input(
-    group_path: pathlib.Path, subgroup_prefix: str, i: int
-) -> pathlib.Path:
-    return group_path / f'{subgroup_prefix}{i:03d}.in'
-
-
-def _get_group_output(
-    group_path: pathlib.Path, subgroup_prefix: str, i: int
-) -> pathlib.Path:
-    return group_path / f'{subgroup_prefix}{i:03d}.out'
-
-
-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('.ans')
-    if output_path.is_file():
-        res.outputPath = output_path
-    return res
-
-
 def _copy_testcase_over(
     testcase: Testcase,
     dest: Testcase,
 ):
-    testcase = _fill_output_for_defined_testcase(testcase)
+    testcase = fill_output_for_defined_testcase(testcase)
     dest.inputPath.parent.mkdir(parents=True, exist_ok=True)
     shutil.copy(
         str(testcase.inputPath),
@@ -90,230 +73,6 @@ def get_call_from_string(call_str: str) -> GeneratorCall:
     return GeneratorCall(name=name, args=args)
 
 
-def _run_generator_script(testcase: TestcaseSubgroup) -> str:
-    assert testcase.generatorScript is not None
-
-    cacher = package.get_file_cacher()
-
-    if not testcase.generatorScript.path.is_file():
-        console.console.print(
-            f'[error]Generator script not found: [item]{testcase.generatorScript.path}[/item][/error]'
-        )
-        raise typer.Exit(1)
-
-    script_digest = DigestHolder()
-    if testcase.generatorScript.path.suffix == '.txt':
-        script_digest.value = cacher.put_file_from_path(testcase.generatorScript.path)
-    else:
-        try:
-            compiled_digest = compile_item(testcase.generatorScript)
-        except:
-            console.console.print(
-                f'[error]Failed compiling generator script for group [item]{testcase.name}[/item].[/error]'
-            )
-            raise
-
-        run_stderr = DigestHolder()
-        run_log = run_item(
-            testcase.generatorScript,
-            DigestOrSource.create(compiled_digest),
-            stdout=DigestOrDest.create(script_digest),
-            stderr=DigestOrDest.create(run_stderr),
-        )
-
-        if run_log is None or run_log.exitcode != 0:
-            console.console.print(
-                f'Could not run generator script for group {testcase.name}'
-            )
-            if run_log is not None:
-                console.console.print(
-                    f'[error]Summary:[/error] {run_log.get_summary()}'
-                )
-            if run_stderr.value is not None:
-                console.console.print('[error]Stderr:[/error]')
-                console.console.print(
-                    package.get_digest_as_string(run_stderr.value) or ''
-                )
-            raise typer.Exit(1)
-
-    assert script_digest.value
-    script = cacher.get_file_content(script_digest.value).decode()
-    return script
-
-
-def _extract_script_lines(script: str) -> Iterable[Tuple[str, str, int]]:
-    lines = script.splitlines()
-    for i, line in enumerate(lines):
-        line = line.strip()
-        if not line:
-            continue
-        if line.startswith('#'):
-            continue
-        yield shlex.split(line)[0], shlex.join(shlex.split(line)[1:]), i + 1
-
-
-class GeneratorScriptEntry(BaseModel):
-    path: pathlib.Path
-    line: int
-
-
-class GenerationMetadata(BaseModel):
-    copied_to: Testcase
-
-    copied_from: Optional[Testcase] = None
-    generator_call: Optional[GeneratorCall] = None
-    generator_script: Optional[GeneratorScriptEntry] = None
-
-
-class GenerationTestcaseEntry(BaseModel):
-    group_entry: TestcaseEntry
-    subgroup_entry: TestcaseEntry
-
-    metadata: GenerationMetadata
-
-
-class TestcaseVisitor(abc.ABC):
-    @abc.abstractmethod
-    def visit(self, entry: GenerationTestcaseEntry):
-        pass
-
-    def should_visit_group(self, group_name: str) -> bool:
-        return True
-
-    def should_visit_subgroup(self, subgroup_path: str) -> bool:
-        return True
-
-    def should_visit_generator_scripts(
-        self, group_name: str, subgroup_path: str
-    ) -> bool:
-        return True
-
-
-class TestcaseGroupVisitor(TestcaseVisitor):
-    def __init__(self, groups: Optional[Set[str]] = None):
-        self.groups = groups
-
-    def should_visit_group(self, group_name: str) -> bool:
-        return self.groups is None or group_name in self.groups
-
-
-def run_testcase_visitor(visitor: TestcaseVisitor):
-    pkg = package.find_problem_package_or_die()
-
-    def _explore_subgroup(
-        subgroup: TestcaseSubgroup, subgroup_index: Optional[int], prefix: List[str]
-    ):
-        assert prefix and len(prefix) >= 1 and len(prefix) <= 2
-        group_path = prefix[0]
-        subgroup_path = '/'.join(prefix)
-        if not visitor.should_visit_subgroup(subgroup_path):
-            return
-
-        def _entry(i: int) -> TestcaseEntry:
-            return TestcaseEntry(group=group_path, index=i)
-
-        def _sub_entry(i: int) -> TestcaseEntry:
-            return TestcaseEntry(group=subgroup_path, index=i)
-
-        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'{prefix[1]}-'
-            return Testcase(
-                inputPath=_get_group_input(group_fs_path, group_prefix, i),
-                outputPath=_get_group_output(group_fs_path, group_prefix, i),
-            )
-
-        # Go through testcases.
-        i = 0
-        # Individual testcases.
-        for tc in subgroup.testcases or []:
-            visitor.visit(
-                GenerationTestcaseEntry(
-                    group_entry=_entry(i),
-                    subgroup_entry=_sub_entry(i),
-                    metadata=GenerationMetadata(
-                        copied_from=_fill_output_for_defined_testcase(tc),
-                        copied_to=_copied_to(i),
-                    ),
-                )
-            )
-            i += 1
-
-        # Glob testcases.
-        if subgroup.testcaseGlob:
-            matched_inputs = sorted(PosixPath().glob(subgroup.testcaseGlob))
-
-            for input_path in matched_inputs:
-                if not input_path.is_file() or input_path.suffix != '.in':
-                    continue
-
-                tc = Testcase(inputPath=input_path)
-                visitor.visit(
-                    GenerationTestcaseEntry(
-                        group_entry=_entry(i),
-                        subgroup_entry=_sub_entry(i),
-                        metadata=GenerationMetadata(
-                            copied_from=_fill_output_for_defined_testcase(tc),
-                            copied_to=_copied_to(i),
-                        ),
-                    )
-                )
-                i += 1
-
-        # Single generators.
-        for generator_call in subgroup.generators:
-            visitor.visit(
-                GenerationTestcaseEntry(
-                    group_entry=_entry(i),
-                    subgroup_entry=_sub_entry(i),
-                    metadata=GenerationMetadata(
-                        generator_call=generator_call,
-                        copied_to=_copied_to(i),
-                    ),
-                )
-            )
-            i += 1
-
-        if not visitor.should_visit_generator_scripts(group_path, subgroup_path):
-            return
-
-        # Run generator script.
-        if subgroup.generatorScript is not None:
-            script = _run_generator_script(subgroup)
-
-            # Run each line from generator script.
-            for generator_name, args, line_number in _extract_script_lines(script):
-                call = GeneratorCall(name=generator_name, args=args)
-                visitor.visit(
-                    GenerationTestcaseEntry(
-                        group_entry=_entry(i),
-                        subgroup_entry=_sub_entry(i),
-                        metadata=GenerationMetadata(
-                            generator_call=call,
-                            generator_script=GeneratorScriptEntry(
-                                path=subgroup.generatorScript.path,
-                                line=line_number,
-                            ),
-                            copied_to=_copied_to(i),
-                        ),
-                    )
-                )
-                i += 1
-
-    for group in pkg.testcases:
-        if not visitor.should_visit_group(group.name):
-            continue
-
-        _explore_subgroup(group, 0 if group.subgroups else None, [group.name])
-
-        for i, subgroup in enumerate(group.subgroups):
-            _explore_subgroup(subgroup, i + 1, [group.name, subgroup.name])
-
-
 def _get_necessary_generators_for_groups(
     groups: Optional[Set[str]] = None,
 ) -> Set[str]:
@@ -359,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 '')
@@ -439,14 +200,14 @@ def generate_standalone(
             _, validator_digest = validator_tp
         if progress:
             progress.update('Validating test...')
-        ok, message, *_ = validators.validate_test(
+        validation_info = validators.validate_one_off(
             spec.copied_to.inputPath,
             validator,
             validator_digest,
         )
-        if not ok:
+        if not validation_info.ok:
             _print_error_header('failed validating testcase.')
-            console.console.print(f'[error]Message:[/error] {message}')
+            console.console.print(f'[error]Message:[/error] {validation_info.message}')
             console.console.print(
                 f'Testcase written at [item]{spec.copied_to.inputPath}[/item]'
             )
@@ -552,67 +313,6 @@ def generate_output_for_testcase(
         raise typer.Exit(1)
 
 
-def extract_generation_testcases(
-    entries: List[TestcaseEntry],
-) -> List[GenerationTestcaseEntry]:
-    # TODO: support subgroups.
-    groups = set(entry.group for entry in entries)
-    entry_keys = set(entry.key() for entry in entries)
-
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseVisitor):
-        def should_visit_group(self, group_name: str) -> bool:
-            return group_name in groups
-
-        def visit(self, entry: GenerationTestcaseEntry):
-            # TODO: support subgroups.
-            if entry.group_entry.key() not in entry_keys:
-                return
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor())
-    return res
-
-
-def extract_generation_testcases_from_groups(
-    groups: Optional[Set[str]] = None,
-) -> List[GenerationTestcaseEntry]:
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseGroupVisitor):
-        def visit(self, entry: GenerationTestcaseEntry):
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor(groups))
-    return res
-
-
-def extract_generation_testcases_from_patterns(
-    patterns: List[TestcasePattern],
-) -> List[GenerationTestcaseEntry]:
-    res: List[GenerationTestcaseEntry] = []
-
-    class ExtractGenerationTestcasesVisitor(TestcaseVisitor):
-        def should_visit_group(self, group_name: str) -> bool:
-            return any(pattern.intersecting_group(group_name) for pattern in patterns)
-
-        def should_visit_subgroup(self, subgroup_path: str) -> bool:
-            return any(
-                pattern.intersecting_group(subgroup_path) for pattern in patterns
-            )
-
-        def visit(self, entry: GenerationTestcaseEntry):
-            if not any(
-                pattern.match(entry.group_entry) for pattern in patterns
-            ) and not any(pattern.match(entry.subgroup_entry) for pattern in patterns):
-                return
-            res.append(entry)
-
-    run_testcase_visitor(ExtractGenerationTestcasesVisitor())
-    return res
-
-
 def generate_outputs_for_testcases(
     entries: List[TestcaseEntry],
     progress: Optional[StatusProgress] = None,

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/rbx/box/generators_test.py

@@ -4,10 +4,10 @@ import pytest
 
 from rbx.box import package
 from rbx.box.generators import (
-    extract_generation_testcases_from_groups,
     generate_outputs_for_testcases,
     generate_testcases,
 )
+from rbx.box.testcase_extractors import extract_generation_testcases_from_groups
 from rbx.testing_utils import print_directory_tree
 
 

rbx_cp-0.5.38/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.38/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.36 → rbx_cp-0.5.38}/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
@@ -116,6 +113,8 @@ def edit():
 @app.command('build, b', help='Build all tests for the problem.')
 @package.within_problem
 def build(verification: environment.VerificationParam):
+    from rbx.box import builder
+
     builder.build(verification=verification)
 
 
@@ -189,6 +188,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
 
@@ -322,6 +323,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
@@ -522,6 +525,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 +560,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)'],
@@ -635,6 +642,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]')

{rbx_cp-0.5.36 → rbx_cp-0.5.38}/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.36 → rbx_cp-0.5.38}/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.36 → rbx_cp-0.5.38}/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,