rbx.cp 0.5.50__py3-none-any.whl → 0.5.52__py3-none-any.whl

rbx/box/cli.py

@@ -27,6 +27,7 @@ from rbx.box import (
 from rbx.box.contest import main as contest
 from rbx.box.contest.contest_package import find_contest_yaml
 from rbx.box.environment import VerificationLevel, get_environment_path
+from rbx.box.header import generate_header
 from rbx.box.packaging import main as packaging
 from rbx.box.schema import CodeItem, ExpectedOutcome, TestcaseGroup
 from rbx.box.solutions import (
@@ -121,10 +122,12 @@ def main(
     state.STATE.debug_logs = debug_logs
 
 
-# @app.command('ui', hidden=True)
-# @package.within_problem
-# def ui():
-#     ui_pkg.start()
+@app.command('ui', hidden=True)
+@package.within_problem
+def ui():
+    from rbx.box.ui import main as ui_pkg
+
+    ui_pkg.start()
 
 
 @app.command(
@@ -755,6 +758,16 @@ def unit_tests():
         unit.run_unit_tests(s)
 
 
+@app.command(
+    'header',
+    rich_help_panel='Configuration',
+    help='Generate the rbx.h header file.',
+)
+@package.within_problem
+def header():
+    generate_header()
+
+
 @app.command(
     'environment, env',
     rich_help_panel='Configuration',

rbx/box/code.py

@@ -193,7 +193,7 @@ def _check_stack_limit():
 ```
 function rbx() {{
     local rbx_bin=`bash -c "type -P rbx"`
-    ulimit -s {target_text // 1024} && $rbx_bin $@
+    ulimit -s {target_text // 1024} && $rbx_bin "$@"
 }}
 ```
         """
@@ -415,6 +415,7 @@ def compile_item(
 
     download.maybe_add_testlib(code, artifacts)
     download.maybe_add_jngen(code, artifacts)
+    download.maybe_add_rbx_header(code, artifacts)
     artifacts.inputs.append(
         GradingFileInput(src=generator_path, dest=PosixPath(file_mapping.compilable))
     )

rbx/box/download.py

@@ -5,7 +5,7 @@ from typing import Optional
 import typer
 
 from rbx import annotations, console
-from rbx.box import package
+from rbx.box import header, package
 from rbx.box.schema import CodeItem
 from rbx.config import get_builtin_checker, get_jngen, get_testlib
 from rbx.grading import steps
@@ -20,6 +20,16 @@ def get_local_artifact(name: str) -> Optional[steps.GradingFileInput]:
     return None
 
 
+def maybe_add_rbx_header(code: CodeItem, artifacts: steps.GradingArtifacts):
+    header.get_header()
+    artifact = get_local_artifact('rbx.h')
+    assert artifact is not None
+    compilation_files = package.get_compilation_files(code)
+    if any(dest == artifact.dest for _, dest in compilation_files):
+        return
+    artifacts.inputs.append(artifact)
+
+
 def maybe_add_testlib(code: CodeItem, artifacts: steps.GradingArtifacts):
     # Try to get from compilation files, then from package folder, then from tool.
     artifact = get_local_artifact('testlib.h') or steps.testlib_grading_input()

rbx/box/environment.py

@@ -4,7 +4,7 @@ from enum import Enum
 from typing import Annotated, List, Optional, Type, TypeVar
 
 import typer
-from pydantic import BaseModel, ConfigDict, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
 
 from rbx import config, console, utils
 from rbx.box.extensions import Extensions, LanguageExtensions
@@ -143,6 +143,13 @@ class EnvironmentLanguage(BaseModel):
         return self.get_extension(name, cls) or cls()
 
 
+class TimingConfig(BaseModel):
+    model_config = ConfigDict(extra='forbid')
+
+    # Formula to use to calculate the time limit for the environment.
+    formula: str = 'step_up(max(fastest * 3, slowest * 1.5), 100)'
+
+
 class Environment(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
@@ -167,6 +174,9 @@ class Environment(BaseModel):
     # Identifier of the preset that should be used when creating new problems.
     preset: str = 'default'
 
+    # Timing configuration for the environment.
+    timing: TimingConfig = Field(default_factory=TimingConfig)
+
     # Extensions to be added to the environment.
     extensions: Optional[Extensions] = None
 

rbx/box/header.py

@@ -0,0 +1,73 @@
+import functools
+import importlib
+import importlib.resources
+import pathlib
+from typing import Callable, Dict, Type
+
+from rbx.box import package
+from rbx.box.schema import Primitive
+
+
+@functools.cache
+def get_header() -> pathlib.Path:
+    generate_header()
+
+    return pathlib.Path('rbx.h')
+
+
+def generate_header():
+    with importlib.resources.as_file(
+        importlib.resources.files('rbx') / 'resources' / 'templates' / 'rbx.h'
+    ) as file:
+        with file.open('r') as f:
+            header = f.read()
+
+    with pathlib.Path('rbx.h').open('w') as f:
+        f.write(_preprocess_header(header))
+
+
+def _preprocess_header(header: str) -> str:
+    return (
+        header.replace('//<rbx::string_var>', _get_string_var_block())
+        .replace('//<rbx::int_var>', _get_int_var_block())
+        .replace('//<rbx::float_var>', _get_float_var_block())
+        .replace('//<rbx::bool_var>', _get_bool_var_block())
+    )
+
+
+def _get_string_var_block() -> str:
+    return _get_var_block(_get_vars_of_type(str, lambda x: f'{x:!r}'))
+
+
+def _get_int_var_block() -> str:
+    return _get_var_block(_get_vars_of_type(int, lambda x: str(x)))
+
+
+def _get_float_var_block() -> str:
+    return _get_var_block(_get_vars_of_type(float, lambda x: f'{x}'))
+
+
+def _get_bool_var_block() -> str:
+    return _get_var_block(_get_vars_of_type(bool, lambda x: 'true' if x else 'false'))
+
+
+def _get_vars_of_type(
+    type: Type, transform: Callable[[Primitive], str]
+) -> Dict[str, str]:
+    pkg = package.find_problem_package_or_die()
+    vars = pkg.expanded_vars
+    return {
+        name: transform(value)
+        for name, value in vars.items()
+        if isinstance(value, type)
+    }
+
+
+def _get_var_block(mappings: Dict[str, str]) -> str:
+    entries = []
+    # Iterate over sorted keys to ensure a deterministic order.
+    for name in sorted(mappings):
+        value = mappings[name]
+        entry = f'  if (name == "{name}") {{\n    return {value};\n  }}\n'
+        entries.append(entry)
+    return ''.join(entries)

rbx/box/main.py

@@ -1,2 +1,6 @@
 # flake8: noqa
+import nest_asyncio
+
+nest_asyncio.apply()
+
 from rbx.box.cli import app

rbx/box/naming.py

@@ -20,3 +20,12 @@ def get_problem_shortname() -> Optional[str]:
             return problem.short_name
 
     return None
+
+
+def get_problem_name_with_contest_info() -> str:
+    problem = package.find_problem_package_or_die()
+    contest = contest_package.find_contest_package()
+    short_name = get_problem_shortname()
+    if contest is None or short_name is None:
+        return problem.name
+    return f'{contest.name}-{short_name}-{problem.name}'

rbx/box/packaging/boca/packager.py

@@ -6,7 +6,7 @@ from typing import List
 import typer
 
 from rbx import console
-from rbx.box import naming, package
+from rbx.box import header, naming, package
 from rbx.box.environment import get_extension_or_default
 from rbx.box.packaging.boca.extension import BocaExtension, BocaLanguage
 from rbx.box.packaging.packager import BasePackager, BuiltStatement
@@ -150,9 +150,11 @@ class BocaPackager(BasePackager):
         checker_text = checker_path.read_text()
         testlib = get_testlib().read_text()
         checker = package.get_checker().path.read_text()
+        rbx_header = header.get_header().read_text()
         return (
             checker_text.replace('{{rbxFlags}}', extension.flags_with_defaults()['cc'])
             .replace('{{testlib_content}}', testlib)
+            .replace('{{rbx_header_content}}', rbx_header)
             .replace('{{checker_content}}', checker)
         )
 

rbx/box/packaging/contest_main.py

@@ -2,6 +2,7 @@ import pathlib
 import tempfile
 from typing import Type
 
+import syncer
 import typer
 
 from rbx import annotations, console
@@ -18,7 +19,7 @@ from rbx.box.packaging.packager import (
 app = typer.Typer(no_args_is_help=True, cls=annotations.AliasGroup)
 
 
-def run_contest_packager(
+async def run_contest_packager(
     contest_packager_cls: Type[BaseContestPackager],
     packager_cls: Type[BasePackager],
     verification: environment.VerificationParam,
@@ -33,7 +34,7 @@ def run_contest_packager(
         )
         with cd.new_package_cd(problem.get_path()):
             package.clear_package_cache()
-            package_path = run_packager(packager_cls, verification=verification)
+            package_path = await run_packager(packager_cls, verification=verification)
             built_packages.append(
                 BuiltProblemPackage(
                     path=problem.get_path() / package_path,
@@ -73,7 +74,8 @@ def run_contest_packager(
 
 @app.command('polygon', help='Build a contest package for Polygon.')
 @contest_package.within_contest
-def polygon(
+@syncer.sync
+async def polygon(
     verification: environment.VerificationParam,
 ):
     from rbx.box.packaging.polygon.packager import (
@@ -81,6 +83,6 @@ def polygon(
         PolygonPackager,
     )
 
-    run_contest_packager(
+    await run_contest_packager(
         PolygonContestPackager, PolygonPackager, verification=verification
     )

rbx/box/packaging/main.py

@@ -6,7 +6,8 @@ import syncer
 import typer
 
 from rbx import annotations, console
-from rbx.box import environment, package
+from rbx.box import environment, header, package
+from rbx.box.naming import get_problem_name_with_contest_info
 from rbx.box.package import get_build_path
 from rbx.box.packaging.packager import BasePackager, BuiltStatement
 from rbx.box.statements.build_statements import build_statement
@@ -21,6 +22,8 @@ async def run_packager(
 ) -> pathlib.Path:
     from rbx.box import builder
 
+    header.generate_header()
+
     if not await builder.verify(verification=verification):
         console.console.print(
             '[error]Build or verification failed, check the report.[/error]'
@@ -68,11 +71,22 @@ async def run_packager(
 @syncer.sync
 async def polygon(
     verification: environment.VerificationParam,
+    upload: bool = typer.Option(
+        False,
+        '--upload',
+        '-u',
+        help='If set, will upload the package to Polygon.',
+    ),
 ):
     from rbx.box.packaging.polygon.packager import PolygonPackager
 
     await run_packager(PolygonPackager, verification=verification)
 
+    if upload:
+        from rbx.box.packaging.polygon.upload import upload_problem
+
+        await upload_problem(name=get_problem_name_with_contest_info())
+
 
 @app.command('boca', help='Build a package for BOCA.')
 @package.within_problem

rbx/box/packaging/moj/packager.py

@@ -5,7 +5,7 @@ from typing import List
 import typer
 
 from rbx import console
-from rbx.box import package
+from rbx.box import header, package
 from rbx.box.environment import get_extension_or_default
 from rbx.box.packaging.boca.extension import BocaExtension, BocaLanguage
 from rbx.box.packaging.boca.packager import BocaPackager
@@ -153,6 +153,11 @@ class MojPackager(BocaPackager):
         testlib_path.parent.mkdir(parents=True, exist_ok=True)
         testlib_path.write_text(get_testlib().read_text())
 
+        # Prepare rbx.h
+        rbx_header_path = into_path / 'scripts' / 'rbx.h'
+        rbx_header_path.parent.mkdir(parents=True, exist_ok=True)
+        rbx_header_path.write_text(header.get_header().read_text())
+
         # Prepare checker
         checker_path = into_path / 'scripts' / 'checker.cpp'
         checker_path.parent.mkdir(parents=True, exist_ok=True)

rbx/box/packaging/polygon/packager.py

@@ -1,13 +1,13 @@
 import functools
 import pathlib
 import shutil
-from typing import List
+from typing import List, Optional
 
 import iso639
 import typer
 
 from rbx import console
-from rbx.box import package
+from rbx.box import header, package
 from rbx.box.packaging.packager import (
     BaseContestPackager,
     BasePackager,
@@ -16,6 +16,7 @@ from rbx.box.packaging.packager import (
     BuiltStatement,
 )
 from rbx.box.packaging.polygon import xml_schema as polygon_schema
+from rbx.box.schema import TaskType
 from rbx.config import get_testlib
 
 DAT_TEMPLATE = """
@@ -36,7 +37,7 @@ def code_to_langs(langs: List[str]) -> List[str]:
 
 
 @functools.cache
-def _is_valid_lang_code(lang: str) -> bool:
+def is_valid_lang_code(lang: str) -> bool:
     try:
         code_to_langs([lang])
     except iso639.LanguageNotFoundError:
@@ -49,6 +50,10 @@ def _is_valid_lang_code(lang: str) -> bool:
 
 
 class PolygonPackager(BasePackager):
+    @classmethod
+    def task_types(cls) -> List[TaskType]:
+        return [TaskType.BATCH, TaskType.COMMUNICATION]
+
     def _validate(self):
         langs = self.languages()
         pkg = package.find_problem_package_or_die()
@@ -83,6 +88,14 @@ class PolygonPackager(BasePackager):
             cpy=polygon_schema.File(path='check.cpp'),
         )
 
+    def _get_interactor(self) -> Optional[polygon_schema.Interactor]:
+        pkg = package.find_problem_package_or_die()
+        if pkg.interactor is None:
+            return None
+        return polygon_schema.Interactor(
+            source=polygon_schema.File(path='files/interactor.cpp', type='cpp.g++17'),
+        )
+
     def _get_manual_test(self) -> polygon_schema.Test:
         # TODO: return samples
         return polygon_schema.Test(method='manual')
@@ -118,7 +131,10 @@ class PolygonPackager(BasePackager):
         return polygon_schema.Judging(testsets=[self._get_single_testset()])
 
     def _get_files(self) -> List[polygon_schema.File]:
-        return [polygon_schema.File(path='files/testlib.h', type='h.g++')]
+        return [
+            polygon_schema.File(path='files/testlib.h', type='h.g++'),
+            polygon_schema.File(path='files/rbx.h', type='h.g++'),
+        ]
 
     def _statement_application_type(self, statement: BuiltStatement) -> str:
         return 'application/pdf'
@@ -148,7 +164,8 @@ class PolygonPackager(BasePackager):
             for built_statement in built_statements
         ]
 
-    def name(self) -> str:
+    @classmethod
+    def name(cls) -> str:
         return 'polygon'
 
     def package(
@@ -157,11 +174,14 @@ class PolygonPackager(BasePackager):
         into_path: pathlib.Path,
         built_statements: List[BuiltStatement],
     ):
+        pkg = package.find_problem_package_or_die()
+
         problem = polygon_schema.Problem(
             names=self._get_names(),
             checker=self._get_checker(),
             judging=self._get_judging(),
             files=self._get_files(),
+            interactor=self._get_interactor(),
             # TODO: revisit polygon problem statements
             # statements=self._process_statements(built_statements, into_path),
         )
@@ -179,8 +199,11 @@ class PolygonPackager(BasePackager):
         files_path = into_path / 'files'
         files_path.mkdir(parents=True, exist_ok=True)
         shutil.copyfile(get_testlib(), files_path / 'testlib.h')
+        shutil.copyfile(header.get_header(), files_path / 'rbx.h')
         shutil.copyfile(package.get_checker().path, files_path / 'check.cpp')
         shutil.copyfile(package.get_checker().path, into_path / 'check.cpp')
+        if pkg.interactor is not None:
+            shutil.copyfile(pkg.interactor.path, files_path / 'interactor.cpp')
 
         # Copy all testcases
         (into_path / 'tests').mkdir(parents=True, exist_ok=True)
@@ -219,7 +242,7 @@ class PolygonContestPackager(BaseContestPackager):
                 value=self.get_statement_for_language(lang).title,
             )
             for lang in self.languages()
-            if _is_valid_lang_code(lang)
+            if is_valid_lang_code(lang)
         ]
         if names:
             names[0].main = True
@@ -284,7 +307,7 @@ class PolygonContestPackager(BaseContestPackager):
     ) -> pathlib.Path:
         filtered_statements = []
         for built_statement in built_statements:
-            if not _is_valid_lang_code(built_statement.statement.language):
+            if not is_valid_lang_code(built_statement.statement.language):
                 continue
             filtered_statements.append(built_statement)