rbx.cp 0.13.3__tar.gz → 0.13.4__tar.gz

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.13.3
+Version: 0.13.4
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0
@@ -40,6 +40,7 @@ Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=13.9.4,<14.0.0)
 Requires-Dist: ruamel-yaml (>=0.18.14,<0.19.0)
 Requires-Dist: ruyaml (>=0.91.0,<0.92.0)
+Requires-Dist: sqlitedict (>=2.1.0,<3.0.0)
 Requires-Dist: syncer (>=2.0.3,<3.0.0)
 Requires-Dist: textual (>=3.1.1,<4.0.0)
 Requires-Dist: textual-serve (>=1.1.2,<2.0.0)

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.13.3"
+version = "0.13.4"
 description = ""
 packages = [
   {include = "rbx"}
@@ -49,6 +49,7 @@ ordered-set = "^4.1.0"
 gitignore-parser = "^0.1.12"
 pypandoc = "^1.15"
 iso639-lang = "^2.6.1"
+sqlitedict = "^2.1.0"
 
 [tool.poetry.scripts]
 rbc = "rbx.main:app"
@@ -70,6 +71,7 @@ textual-dev = "^1.6.1"
 pytest-asyncio = "^0.26.0"
 mkdocs-gen-files = "^0.5.0"
 markdown-grid-tables = "^0.5.0"
+pytest-xdist = "^3.8.0"
 
 
 [tool.commitizen]

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/annotations.py

@@ -7,7 +7,7 @@ import typer
 import typer.core
 from typing_extensions import Annotated
 
-from rbx import config, metadata
+from rbx import config
 from rbx.config import get_config
 
 
@@ -21,10 +21,10 @@ def _get_language_default():
 
 def _get_problem_options():
     options = set()
-    all_problems = metadata.find_problems()
-    for problem in all_problems:
-        options.add(problem.code)
-        options.update(problem.aliases)
+    # all_problems = metadata.find_problems()
+    # for problem in all_problems:
+    #     options.add(problem.code)
+    #     options.update(problem.aliases)
     return sorted(options)
 
 

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/checkers.py

@@ -5,8 +5,7 @@ from typing import List, Optional
 import typer
 
 from rbx import console
-from rbx.box import package
-from rbx.box.code import SanitizationLevel, compile_item, run_item
+from rbx.box import code, package
 from rbx.box.schema import Testcase
 from rbx.grading.judge.sandbox import SandboxBase
 from rbx.grading.steps import (
@@ -28,7 +27,7 @@ def compile_checker(progress: Optional[StatusProgress] = None) -> str:
         progress.update('Compiling checker...')
 
     try:
-        digest = compile_item(checker, sanitized=SanitizationLevel.PREFER)
+        digest = code.compile_item(checker, sanitized=code.SanitizationLevel.PREFER)
     except Exception as e:
         console.console.print('[error]Failed compiling checker[/error]')
         raise typer.Exit(1) from e
@@ -46,7 +45,7 @@ def compile_interactor(progress: Optional[StatusProgress] = None) -> str:
         progress.update('Compiling interactor...')
 
     try:
-        digest = compile_item(interactor, sanitized=SanitizationLevel.PREFER)
+        digest = code.compile_item(interactor, sanitized=code.SanitizationLevel.PREFER)
     except Exception as e:
         console.console.print('[error]Failed compiling interactor.[/error]')
         raise typer.Exit(1) from e
@@ -164,6 +163,14 @@ def process_checker_run_log(
 
     if checker_run_log is None:
         return CheckerResult(outcome=Outcome.INTERNAL_ERROR)
+    if checker_run_log.exitstatus not in [
+        SandboxBase.EXIT_OK,
+        SandboxBase.EXIT_NONZERO_RETURN,
+    ]:
+        return CheckerResult(
+            outcome=Outcome.JUDGE_FAILED,
+            message=f'checker failed with exit status {checker_run_log.exitstatus}: {message}',
+        )
     if not _is_checker_exitcode(checker_run_log.exitcode):
         return CheckerResult(
             outcome=Outcome.JUDGE_FAILED,
@@ -196,13 +203,17 @@ async def _check(
         if result.outcome != Outcome.ACCEPTED:
             return _convert_tle(result, run_log)
 
-    pkg = package.find_problem_package_or_die()
-    output_size = program_output.stat().st_size
-    if output_size > pkg.outputLimit * 1024:
-        return CheckerResult(
-            outcome=Outcome.OUTPUT_LIMIT_EXCEEDED,
-            message=f'Output size {pkg.outputLimit}kb, limit is {output_size // 1024}kb.',
-        )
+    if (
+        run_log is not None
+        and run_log.metadata is not None
+        and run_log.metadata.limits.output is not None
+    ):
+        output_size = program_output.stat().st_size
+        if output_size > run_log.metadata.limits.output * 1024:
+            return CheckerResult(
+                outcome=Outcome.OUTPUT_LIMIT_EXCEEDED,
+                message=f'Output size {run_log.metadata.limits.output}kb, limit is {output_size // 1024}kb.',
+            )
 
     error = DigestHolder()
     inputs = [
@@ -219,14 +230,14 @@ async def _check(
             dest=pathlib.PosixPath('output.txt'),
         ),
     ]
-    checker_run_log = await run_item(
+    checker_run_log = await code.run_item(
         package.get_checker(),
         DigestOrSource.create(checker_digest),
         stderr=DigestOrDest.create(error),
         inputs=inputs,
         extra_args='input.txt output.txt expected.txt',
     )
-    message = package.get_digest_as_string(error.value or '') or ''
+    message = package.get_digest_as_string(error.value) or ''
 
     processed_checker_result = process_checker_run_log(checker_run_log, message)
     if processed_checker_result.outcome == Outcome.INTERNAL_ERROR:

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/cli.py

@@ -128,7 +128,6 @@ def main(
     capture: bool = typer.Option(
         True,
         '--nocapture',
-        flag_value=False,
         help='Whether to save extra logs and outputs from interactive solutions.',
     ),
     profile: bool = typer.Option(
@@ -259,7 +258,6 @@ async def run(
     check: bool = typer.Option(
         True,
         '--nocheck',
-        flag_value=False,
         help='Whether to not build outputs for tests and run checker.',
     ),
     detailed: bool = typer.Option(
@@ -288,6 +286,7 @@ async def run(
         help='Whether to pick solutions interactively.',
     ),
 ):
+    console.console.log(check)
     main_solution = package.get_main_solution()
     if check and main_solution is None:
         console.console.print(
@@ -432,7 +431,6 @@ async def time(
     check: bool = typer.Option(
         True,
         '--nocheck',
-        flag_value=False,
         help='Whether to not build outputs for tests and run checker.',
     ),
     detailed: bool = typer.Option(
@@ -488,7 +486,6 @@ async def irun(
     check: bool = typer.Option(
         True,
         '--nocheck',
-        flag_value=False,
         help='Whether to not build outputs for tests and run checker.',
     ),
     generator: Optional[str] = typer.Option(

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/contest/build_contest_statements.py

@@ -10,6 +10,7 @@ from rbx import console, testing_utils, utils
 from rbx.box import cd, package
 from rbx.box.contest.contest_package import get_problems
 from rbx.box.contest.schema import Contest, ContestProblem, ContestStatement
+from rbx.box.fields import Primitive
 from rbx.box.formatting import href
 from rbx.box.schema import Package, Testcase
 from rbx.box.statements import build_statements, latex
@@ -72,14 +73,21 @@ def get_statement_builder_problems(
 
 
 def get_statement_builder_contest(
+    contest: Contest,
     statement: ContestStatement,
     extracted_problems: List[ExtractedProblem],
+    custom_vars: Optional[Dict[str, Primitive]] = None,
 ) -> StatementBuilderContest:
     return StatementBuilderContest(
         title=statement.title,
         location=statement.location,
         date=statement.date,
         problems=get_statement_builder_problems(extracted_problems),
+        vars={
+            **contest.expanded_vars,
+            **statement.expanded_vars,
+            **(custom_vars or {}),
+        },
     )
 
 
@@ -241,10 +249,13 @@ def build_contest_only(
                     languages=get_environment_languages_for_statement(),
                     params=params,
                     root=pathlib.Path(td),
+                ),
+                item=get_statement_builder_contest(
+                    contest,
+                    statement,
+                    extracted_problems,
                     custom_vars=custom_vars,
-                    vars={**contest.expanded_vars, **statement.expanded_vars},
                 ),
-                item=get_statement_builder_contest(statement, extracted_problems),
                 verbose=False,
             )
 
@@ -326,7 +337,9 @@ def build_statement_rooted(
     last_content = joiner.build(
         last_content,
         context=joiner_context,
-        contest=get_statement_builder_contest(statement, extracted_problems),
+        contest=get_statement_builder_contest(
+            contest, statement, extracted_problems, custom_vars=custom_vars
+        ),
     )
     last_output = joiner.output_type()
 

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/contest/schema.py

@@ -3,8 +3,7 @@ from typing import Annotated, Dict, List, Optional
 
 from pydantic import AfterValidator, BaseModel, ConfigDict, Field, model_validator
 
-from rbx.box.fields import FNameField, NameField
-from rbx.box.schema import Primitive, expand_var
+from rbx.box.fields import FNameField, NameField, Primitive, expand_var
 from rbx.box.statements.expander import expand_statements
 from rbx.box.statements.schema import (
     ConversionStep,

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/fields.py

@@ -1,4 +1,4 @@
-from typing import TypeVar
+from typing import Dict, TypeVar, Union
 
 from deepmerge import always_merger
 from pydantic import BaseModel, Field
@@ -33,3 +33,27 @@ def merge_pydantic_models(base: T, nxt: T) -> T:
     nxt_dict = nxt.model_dump(exclude_unset=True)
     merged_dict = always_merger.merge(base_dict, nxt_dict)
     return base.model_validate(merged_dict)
+
+
+Primitive = Union[str, int, float, bool]
+
+
+def expand_var(value: Primitive) -> Primitive:
+    if not isinstance(value, str):
+        return value
+    if value.startswith('\\'):
+        return value[1:]
+    if not value.startswith('py`') or not value.endswith('`'):
+        return value
+    res = eval(value[3:-1])
+    for supported_type in [str, int, float, bool]:
+        if isinstance(res, supported_type):
+            return res
+
+    raise TypeError(
+        f'Variable with backticks should evaluate to a primitive Python type: {value}'
+    )
+
+
+def expand_vars(vars: Dict[str, Primitive]) -> Dict[str, Primitive]:
+    return {key: expand_var(value) for key, value in vars.items()}

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/generators.py

@@ -63,13 +63,16 @@ def _warn_about_crlf(path: pathlib.Path):
 
 
 def _check_crlf(path: pathlib.Path):
+    should_fix = False
     with open(path, 'rb') as f:
         for line in f:
-            if line.endswith(b'\r\n') or line.endswith(b'\n\r'):
+            if line.endswith(b'\r\n'):
                 _warn_about_crlf(path)
+                should_fix = True
                 break
 
-    path.write_text(path.read_text().replace('\r', ''))
+    if should_fix:
+        path.write_text('\n'.join(path.read_text().splitlines()) + '\n')
 
 
 def _copy_testcase_over(

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/global_package.py

@@ -29,9 +29,13 @@ def is_cache_valid(cache_dir: pathlib.Path) -> bool:
     return True
 
 
+def get_global_cache_dir_path() -> pathlib.Path:
+    return get_app_path() / '.box'
+
+
 @functools.cache
 def get_global_cache_dir() -> pathlib.Path:
-    cache_dir = get_app_path() / '.box'
+    cache_dir = get_global_cache_dir_path()
     cache_dir.mkdir(parents=True, exist_ok=True)
     fingerprint_file = cache_dir / 'fingerprint'
     if not fingerprint_file.is_file():

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/header.py

@@ -1,11 +1,12 @@
 import functools
 import importlib
 import importlib.resources
+import json
 import pathlib
 from typing import Callable, Dict, Type
 
 from rbx.box import package
-from rbx.box.schema import Primitive
+from rbx.box.fields import Primitive
 
 
 @functools.cache
@@ -40,12 +41,21 @@ def _preprocess_header(header: str) -> str:
     )
 
 
+def _string_repr(s):
+    return json.dumps(s)
+
+
 def _get_string_var_block() -> str:
-    return _get_var_block(_get_vars_of_type(str, lambda x: f'{x:!r}'))
+    return _get_var_block(_get_vars_of_type(str, _string_repr))
 
 
 def _get_int_var_block() -> str:
-    return _get_var_block(_get_vars_of_type(int, lambda x: str(x)))
+    def _transform(x: Primitive) -> str:
+        if isinstance(x, bool):
+            return str(int(x))
+        return str(x)
+
+    return _get_var_block(_get_vars_of_type(int, _transform))
 
 
 def _get_float_var_block() -> str:
@@ -56,16 +66,14 @@ 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]:
+def _get_vars_of_type(t: 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 is_valid(value: Primitive) -> bool:
+        return isinstance(value, t)
+
+    return {name: transform(value) for name, value in vars.items() if is_valid(value)}
 
 
 def _get_var_block(mappings: Dict[str, str]) -> str:

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/package.py

@@ -181,8 +181,10 @@ def get_file_cacher(root: pathlib.Path = pathlib.Path()) -> FileCacher:
 
 @functools.cache
 def get_digest_as_string(
-    digest: str, root: pathlib.Path = pathlib.Path()
+    digest: Optional[str], root: pathlib.Path = pathlib.Path()
 ) -> Optional[str]:
+    if not digest:
+        return None
     cacher = get_file_cacher(root)
     try:
         content = cacher.get_file_content(digest)

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/presets/__init__.py

@@ -339,9 +339,9 @@ def _copy_preset_file(
 
     # The symlink points somewhere inside the preset folder, fix the symlink.
     dst_absolute_path = utils.abspath(dst)
-    fixed_target_relative_path = target_absolute_path.relative_to(
+    fixed_target_relative_path = utils.relpath(
+        target_absolute_path,
         dst_absolute_path.parent,
-        walk_up=True,
     )
     dst.symlink_to(fixed_target_relative_path)
 

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/schema.py

@@ -3,19 +3,17 @@ from __future__ import annotations
 import os
 import pathlib
 import re
-from typing import Annotated, Any, Dict, List, Optional, Union
+from typing import Annotated, Any, Dict, List, Optional
 
 from pydantic import AfterValidator, BaseModel, ConfigDict, Field, model_validator
 from pydantic_core import PydanticCustomError
 
 from rbx.autoenum import AutoEnum, alias
-from rbx.box.fields import NameField
+from rbx.box.fields import NameField, Primitive, expand_vars
 from rbx.box.statements.expander import expand_statements
 from rbx.box.statements.schema import Statement
 from rbx.grading.steps import Outcome
 
-Primitive = Union[str, int, float, bool]
-
 
 def _check_oneof(model_obj: BaseModel, fields: List[str]):
     has = []
@@ -30,27 +28,6 @@ def _check_oneof(model_obj: BaseModel, fields: List[str]):
     )
 
 
-def expand_var(value: Primitive) -> Primitive:
-    if not isinstance(value, str):
-        return value
-    if value.startswith('\\'):
-        return value[1:]
-    if not value.startswith('py`') or not value.endswith('`'):
-        return value
-    res = eval(value[3:-1])
-    for supported_type in [str, int, float, bool]:
-        if isinstance(res, supported_type):
-            return res
-
-    raise TypeError(
-        f'Variable with backticks should evaluate to a primitive Python type: {value}'
-    )
-
-
-def expand_vars(vars: Dict[str, Primitive]) -> Dict[str, Primitive]:
-    return {key: expand_var(value) for key, value in vars.items()}
-
-
 def _represents_int(s: str) -> bool:
     return re.match(r'[-+]?\d+$', s.strip()) is not None
 
@@ -245,6 +222,8 @@ Whether this interactor is a legacy interactor and needs a checker to be specifi
 
 
 class Testcase(BaseModel):
+    __test__ = False
+
     model_config = ConfigDict(extra='forbid')
 
     inputPath: pathlib.Path = Field(description="""The path of the input file.""")

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/statements/build_statements.py

@@ -262,7 +262,6 @@ def build_statement_bytes(
                     languages=get_environment_languages_for_statement(),
                     params=params,
                     root=pathlib.Path(td),
-                    custom_vars=custom_vars,
                 ),
                 item=StatementBuilderProblem(
                     package=pkg,
@@ -271,6 +270,11 @@ def build_statement_bytes(
                         get_samples() if use_samples else []
                     ),
                     short_name=short_name,
+                    vars={
+                        **pkg.expanded_vars,
+                        **statement.expanded_vars,
+                        **(custom_vars or {}),
+                    },
                 ),
                 verbose=False,
             )

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/statements/builders.py

@@ -11,7 +11,8 @@ import typer
 from pydantic import BaseModel
 
 from rbx import console, utils
-from rbx.box.schema import Package, Primitive, Testcase
+from rbx.box.fields import Primitive
+from rbx.box.schema import Package, Testcase
 from rbx.box.statements.latex_jinja import (
     JinjaDictWrapper,
     render_latex_template,
@@ -48,8 +49,6 @@ class StatementBuilderContext:
     languages: List[StatementCodeLanguage]
     params: ConversionStep
     root: pathlib.Path
-    custom_vars: Optional[Dict[str, Any]] = None
-    vars: Optional[Dict[str, Primitive]] = None
 
     def build_jinja_kwargs(self) -> Dict[str, Any]:
         res = {
@@ -57,9 +56,6 @@ class StatementBuilderContext:
             'languages': self.languages,
             'keyed_languages': {lang.id: lang for lang in self.languages},
         }
-        if self.vars is not None or self.custom_vars is not None:
-            res['vars'] = self.vars or {}
-            res['vars'].update(self.custom_vars or {})
         return res
 
 
@@ -125,12 +121,14 @@ class StatementBuilderProblem(StatementBuilderItem):
     # Will only be filled by contests.
     io_path: Optional[pathlib.Path] = None
 
+    vars: Optional[Dict[str, Primitive]] = None
+
     def build_inner_jinja_kwargs(self) -> Dict[str, Any]:
         kwargs = {
             'package': self.package,
             'statement': self.statement,
             'samples': self.samples,
-            'vars': JinjaDictWrapper(self.package.expanded_vars, key='vars'),
+            'vars': JinjaDictWrapper(self.vars or {}, key='vars'),
             'title': self.statement.title or self.package.name,
         }
         if self.short_name is not None:
@@ -152,6 +150,7 @@ class StatementBuilderContest(StatementBuilderItem):
     location: Optional[str] = None
     date: Optional[str] = None
     problems: List[StatementBuilderProblem] = dataclasses.field(default_factory=list)
+    vars: Optional[Dict[str, Primitive]] = None
 
     def build_inner_jinja_kwargs(self) -> Dict[str, Any]:
         res = {'title': self.title}
@@ -167,6 +166,7 @@ class StatementBuilderContest(StatementBuilderItem):
             'problems': [
                 problem.build_inner_jinja_kwargs() for problem in self.problems
             ],
+            'vars': JinjaDictWrapper(self.vars or {}, key='vars'),
         }
         return res
 

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/statements/schema.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import pathlib
 from enum import Enum
-from typing import Annotated, List, Literal, Optional, Union
+from typing import Annotated, Dict, List, Literal, Optional, Union
 
 from pydantic import AfterValidator, BaseModel, ConfigDict, Field
 
 from rbx.autoenum import AutoEnum, alias
-from rbx.box.fields import FNameField
+from rbx.box.fields import FNameField, Primitive, expand_var
 from rbx.box.lang import is_valid_lang_code
 
 
@@ -175,3 +175,12 @@ the statement. Files will be included in the same folder as the statement file,
 their relativeness. Can be glob pattern as well, such as `imgs/*.png`.
 """,
     )
+
+    vars: Dict[str, Primitive] = Field(
+        default={},
+        description='Variables to be used in the statement.',
+    )
+
+    @property
+    def expanded_vars(self) -> Dict[str, Primitive]:
+        return {key: expand_var(value) for key, value in self.vars.items()}

{rbx_cp-0.13.3 → rbx_cp-0.13.4}/rbx/box/testcase_utils.py

@@ -14,6 +14,8 @@ from rbx.box.schema import Testcase, TestcaseGroup
 
 
 class TestcaseEntry(BaseModel):
+    __test__ = False
+
     group: str
     index: int