rbx.cp 0.9.1__tar.gz → 0.10.0__tar.gz

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.9.1
+Version: 0.10.0
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0
@@ -31,6 +31,7 @@ Requires-Dist: ordered-set (>=4.1.0,<5.0.0)
 Requires-Dist: psutil (>=7.0.0,<8.0.0)
 Requires-Dist: pydantic (==2.8.2)
 Requires-Dist: pydantic-xml[lxml] (>=2.11.0,<3.0.0)
+Requires-Dist: pypandoc (>=1.15,<2.0)
 Requires-Dist: pyte (>=0.8.2,<0.9.0)
 Requires-Dist: python-iso639 (>=2024.4.27,<2025.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.9.1"
+version = "0.10.0"
 description = ""
 packages = [
   {include = "rbx"}
@@ -48,6 +48,7 @@ ruamel-yaml = "^0.18.14"
 lz4 = "^4.4.4"
 ordered-set = "^4.1.0"
 gitignore-parser = "^0.1.12"
+pypandoc = "^1.15"
 
 [tool.poetry.scripts]
 rbc = "rbx.main:app"

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/box/checkers.py

@@ -30,7 +30,7 @@ def compile_checker(progress: Optional[StatusProgress] = None) -> str:
     try:
         digest = compile_item(checker, sanitized=SanitizationLevel.PREFER)
     except Exception as e:
-        console.console.print('[error]Failed compiling checker.[/error]')
+        console.console.print('[error]Failed compiling checker[/error]')
         raise typer.Exit(1) from e
     return digest
 

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/box/cli.py

@@ -110,7 +110,7 @@ app.add_typer(
 @app.callback()
 def main(
     cache: Annotated[
-        int,
+        grading_context.CacheLevel,
         typer.Option(
             '-c',
             '--cache',

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/box/statements/builders.py

@@ -4,8 +4,9 @@ import re
 import shutil
 import typing
 from abc import ABC, abstractmethod
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Literal, Optional, Tuple
 
+import pypandoc
 import typer
 from pydantic import BaseModel
 
@@ -15,6 +16,7 @@ from rbx.box.statements.latex_jinja import (
     JinjaDictWrapper,
     render_latex_template,
     render_latex_template_blocks,
+    render_markdown_template_blocks,
 )
 from rbx.box.statements.schema import (
     ConversionStep,
@@ -23,6 +25,7 @@ from rbx.box.statements.schema import (
     Statement,
     StatementType,
     TexToPDF,
+    rbxMarkdownToTeX,
     rbxToTeX,
 )
 from rbx.box.testcase_utils import (
@@ -207,13 +210,24 @@ def render_jinja(root: pathlib.Path, content: bytes, **kwargs) -> bytes:
 
 
 def render_jinja_blocks(
-    root: pathlib.Path, content: bytes, **kwargs
+    root: pathlib.Path,
+    content: bytes,
+    mode: Literal['latex', 'markdown'] = 'latex',
+    **kwargs,
 ) -> StatementBlocks:
-    temp_file = '__input__.tex'
+    if mode == 'latex':
+        temp_file = '__input__.tex'
+        renderer = render_latex_template_blocks
+    elif mode == 'markdown':
+        temp_file = '__input__.md'
+        renderer = render_markdown_template_blocks
+    else:
+        raise ValueError(f'Invalid mode: {mode}')
+
     temp_path = root / temp_file
     temp_path.write_bytes(content)
 
-    result: Dict[str, str] = render_latex_template_blocks(
+    result: Dict[str, str] = renderer(
         str(root),
         temp_file,
         kwargs,
@@ -356,6 +370,45 @@ class rbxTeXBuilder(StatementBuilder):
         )
 
 
+class rbxMarkdownToTeXBuilder(StatementBuilder):
+    def name(self) -> ConversionType:
+        return ConversionType.rbxMarkdownToTeX
+
+    def default_params(self) -> ConversionStep:
+        return rbxMarkdownToTeX(type=ConversionType.rbxMarkdownToTeX)
+
+    def input_type(self) -> StatementType:
+        return StatementType.rbxMarkdown
+
+    def output_type(self) -> StatementType:
+        return StatementType.rbxTeX
+
+    def handles_contest(self) -> bool:
+        # This builder cannot build contest statements.
+        return False
+
+    def build(
+        self,
+        input: bytes,
+        context: StatementBuilderContext,
+        item: StatementBuilderItem,
+        verbose: bool = False,
+    ) -> bytes:
+        problem = typing.cast(StatementBuilderProblem, item)
+
+        statement_blocks = render_jinja_blocks(
+            context.root, input, mode='markdown', **problem.build_inner_jinja_kwargs()
+        )
+        blocks = statement_blocks.blocks
+
+        result_str = ''
+        for name, content in blocks.items():
+            converted_content = pypandoc.convert_text(content, 'latex', 'markdown')
+            result_str += f'%- block {name}\n{converted_content}\n%- endblock\n\n'
+
+        return result_str.encode()
+
+
 class TeX2PDFBuilder(StatementBuilder):
     def name(self) -> ConversionType:
         return ConversionType.TexToPDF
@@ -413,6 +466,7 @@ BUILDER_LIST: List[StatementBuilder] = [
     TeX2PDFBuilder(),
     JinjaTeXBuilder(),
     rbxTeXBuilder(),
+    rbxMarkdownToTeXBuilder(),
 ]
 PROBLEM_BUILDER_LIST = [
     builder for builder in BUILDER_LIST if builder.handles_problem()

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/box/statements/latex_jinja.py

@@ -32,6 +32,12 @@ J2_ARGS = {
     'autoescape': False,
 }
 
+J2_MD_ARGS = {
+    'trim_blocks': True,
+    'autoescape': False,
+}
+
+
 ######################################################################
 # Latex escape regex constants
 ######################################################################
@@ -269,3 +275,35 @@ def render_latex_template_blocks(
             '[warning]This usually happens when accessing an undefined variable.[/warning]'
         )
         raise typer.Abort() from err
+
+
+def render_markdown_template_blocks(
+    path_templates, template_filename, template_vars=None
+) -> Dict[str, str]:
+    """Render a markdown template, filling in its template variables
+
+    :param path_templates: the path to the template directory
+    :param template_filename: the name, rooted at the path_template_directory,
+        of the desired template for rendering
+    :param template_vars: dictionary of key:val for jinja2 variables
+        defaults to None for case when no values need to be passed
+    """
+    var_dict = template_vars if template_vars else {}
+    j2_env = jinja2.Environment(
+        loader=jinja2.FileSystemLoader(path_templates),
+        **J2_MD_ARGS,  # type: ignore
+        undefined=StrictChainableUndefined,
+    )
+    add_builtin_filters(j2_env)
+    add_builtin_tests(j2_env)
+    template = j2_env.get_template(template_filename)
+    ctx = template.new_context(var_dict)  # type: ignore
+    try:
+        return {key: ''.join(value(ctx)) for key, value in template.blocks.items()}
+    except jinja2.UndefinedError as err:
+        console.console.print('[error]Error while rendering Jinja2 template:', end=' ')
+        console.console.print(err)
+        console.console.print(
+            '[warning]This usually happens when accessing an undefined variable.[/warning]'
+        )
+        raise typer.Abort() from err

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/box/statements/schema.py

@@ -27,6 +27,8 @@ class ConversionType(str, Enum):
     rbxToTex = 'rbx-tex'
     """Conversion from rbxTeX to LaTeX."""
 
+    rbxMarkdownToTeX = 'rbx-md-tex'
+    """Conversion from rbxMarkdown to LaTeX."""
     TexToPDF = 'tex2pdf'
     """Conversion from LaTeX to PDF using pdfLaTeX."""
 
@@ -38,6 +40,12 @@ class ConversionType(str, Enum):
 
 
 ### Conversion nodes.
+class rbxMarkdownToTeX(BaseModel):
+    """Configures the conversion between rbxMarkdown and LaTeX."""
+
+    type: Literal[ConversionType.rbxMarkdownToTeX]
+
+
 class rbxToTeX(BaseModel):
     """Configures the conversion between rbxTeX and LaTeX."""
 
@@ -75,15 +83,18 @@ class JoinTexToPDF(BaseModel):
     type: Literal[JoinerType.TexToPDF]
 
 
-ConversionStep = Union[TexToPDF, JinjaTeX, rbxToTeX]
+ConversionStep = Union[TexToPDF, JinjaTeX, rbxToTeX, rbxMarkdownToTeX]
 Joiner = JoinTexToPDF
 
 
 ### Statement types
 class StatementType(AutoEnum):
-    rbxTeX = alias('rbx-tex', 'rbx-tex', 'rbx')  # type: ignore
+    rbxTeX = alias('rbx-tex')  # type: ignore
     """Statement written in rbxTeX format."""
 
+    rbxMarkdown = alias('rbxMd', 'rbx-markdown', 'rbx-md')  # type: ignore
+    """Statement written in rbxMarkdown format."""
+
     TeX = alias('tex')
     """Statement written in pure LaTeX format."""
 
@@ -98,6 +109,8 @@ class StatementType(AutoEnum):
             return '.tex'
         if self == StatementType.rbxTeX:
             return '.rbx.tex'
+        if self == StatementType.rbxMarkdown:
+            return '.rbx.md'
         if self == StatementType.JinjaTeX:
             return '.jinja.tex'
         if self == StatementType.PDF:

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/grading/grading_context.py

@@ -1,7 +1,8 @@
 import contextvars
-from enum import Enum
 from typing import Callable, Optional, Union
 
+from rbx.autoenum import AutoEnum, alias
+
 Condition = Union[bool, Callable[[], bool]]
 
 
@@ -15,11 +16,11 @@ class ConditionedContext:
         return self.when()
 
 
-class CacheLevel(Enum):
-    NO_CACHE = 0
-    CACHE_TRANSIENTLY = 1
-    CACHE_COMPILATION = 2
-    CACHE_ALL = 3
+class CacheLevel(AutoEnum):
+    NO_CACHE = alias('none')
+    CACHE_TRANSIENTLY = alias('transient')
+    CACHE_COMPILATION = alias('compilation')
+    CACHE_ALL = alias('all')
 
 
 cache_level_var = contextvars.ContextVar('cache_level', default=CacheLevel.CACHE_ALL)
@@ -30,11 +31,11 @@ def is_compilation_only() -> bool:
 
 
 def is_transient() -> bool:
-    return cache_level_var.get().value <= CacheLevel.CACHE_TRANSIENTLY.value
+    return cache_level_var.get() == CacheLevel.CACHE_TRANSIENTLY or is_no_cache()
 
 
 def is_no_cache() -> bool:
-    return cache_level_var.get().value <= CacheLevel.NO_CACHE.value
+    return cache_level_var.get() == CacheLevel.NO_CACHE
 
 
 class cache_level(ConditionedContext):

{rbx_cp-0.9.1 → rbx_cp-0.10.0}/rbx/resources/presets/default/shared/icpc.sty

@@ -25,6 +25,41 @@
 \usepackage{pdftexcmds}
 \usepackage{amsmath}
 
+% Additional pandoc packages
+%\usepackage{lmodern}  % or 'libertine' / 'times' for different fonts
+\usepackage{amssymb}
+\usepackage{microtype}
+\usepackage{graphicx}
+\usepackage{longtable}
+\usepackage{booktabs}
+\usepackage{array}
+\usepackage{multirow}
+\usepackage{tabularx}
+\usepackage{fancyhdr}
+\usepackage{listings}
+\usepackage{parskip}
+
+% Links
+\hypersetup{
+  colorlinks=true,
+  linkcolor=blue,
+  urlcolor=blue,
+  citecolor=blue,
+  pdfborder={0 0 0}
+}
+
+% Pandoc shenanigans
+\newsavebox\pandoc@box
+\newcommand*\pandocbounded[1]{% scales image to fit in text height/width
+  \sbox\pandoc@box{#1}%
+  \Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}%
+  \Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}%
+  \ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both
+  \ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}%Add commentMore actions
+  \else\usebox{\pandoc@box}%
+  \fi%
+}
+
 \captionsetup[figure]{labelformat=empty}
 \setlist[itemize]{noitemsep, nolistsep}