rbx.cp 0.5.52__tar.gz → 0.5.53__tar.gz

{rbx_cp-0.5.52 → rbx_cp-0.5.53}/PKG-INFO

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

{rbx_cp-0.5.52 → rbx_cp-0.5.53}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.52"
+version = "0.5.53"
 description = ""
 packages = [
   {include = "rbx"}
@@ -55,6 +55,7 @@ griffe-fieldz = ">=0.1.2, <1.0.0"
 pytest-cov = "^5.0.0"
 textual-dev = "^1.6.1"
 pytest-asyncio = "^0.26.0"
+mkdocs-gen-files = "^0.5.0"
 
 [build-system]
 requires = ["poetry-core"]

rbx_cp-0.5.53/rbx/box/dump_schemas.py

@@ -0,0 +1,18 @@
+import pathlib
+
+import mkdocs_gen_files
+
+from rbx.box.contest.schema import Contest
+from rbx.box.environment import Environment
+from rbx.box.package import Package
+from rbx.box.presets.lock_schema import PresetLock
+from rbx.box.presets.schema import Preset
+from rbx.box.statements.schema import Statement
+from rbx.utils import dump_schema_str
+
+models = [Package, Environment, Contest, Preset, PresetLock, Statement]
+
+for model in models:
+    path = pathlib.Path('schemas') / f'{model.__name__}.json'
+    with mkdocs_gen_files.open(str(path), 'w') as f:
+        f.write(dump_schema_str(model))

{rbx_cp-0.5.52 → rbx_cp-0.5.53}/rbx/box/packaging/polygon/upload.py

@@ -250,6 +250,24 @@ def _get_statement_blocks(statement: Statement) -> StatementBlocks:
         )
 
 
+def _get_explanations(explanations: Dict[int, str]) -> str:
+    entries = []
+    for i in sorted(explanations):
+        explanation = explanations[i]
+        entries.append(f'\\textbf{{Explanation for example {i + 1}}}\n\n{explanation}')
+    return '\n\n'.join(entries)
+
+
+def _get_notes_with_explanations(blocks: StatementBlocks) -> Optional[str]:
+    notes = blocks.blocks.get('notes')
+    explanations = blocks.explanations
+    if notes is None and not explanations:
+        return None
+    if notes is None:
+        return _get_explanations(blocks.explanations)
+    return notes + '\n\n' + _get_explanations(blocks.explanations)
+
+
 def _upload_statement_resources(problem: api.Problem, statement: Statement):
     assets = get_relative_assets(statement.path, statement.assets)
     for asset, relative_asset in assets:
@@ -293,7 +311,7 @@ def _upload_statement(problem: api.Problem):
             input=blocks.blocks.get('input'),
             output=blocks.blocks.get('output'),
             interaction=blocks.blocks.get('interaction'),
-            notes=blocks.blocks.get('notes'),
+            notes=_get_notes_with_explanations(blocks),
         )
         problem.save_statement(
             lang=code_to_langs([language])[0], problem_statement=polygon_statement
@@ -311,8 +329,8 @@ async def upload_problem(name: str):
     name = _normalize_problem_name(name)
     problem = _find_or_create_problem(name)
     _update_problem_info(problem)
-    _update_checker(problem)
     _update_rbx_header(problem)
+    _update_checker(problem)
 
     if (
         pkg.type == TaskType.COMMUNICATION

{rbx_cp-0.5.52 → rbx_cp-0.5.53}/rbx/utils.py

@@ -57,21 +57,32 @@ def get_app_path() -> pathlib.Path:
     return pathlib.Path(app_dir)
 
 
-def ensure_schema(model: Type[BaseModel]) -> pathlib.Path:
-    path = get_app_path() / 'schemas' / f'{model.__name__}.json'
+def dump_schema_str(model: Type[BaseModel]) -> str:
+    return json.dumps(model.model_json_schema(), indent=4)
+
+
+def dump_schema(model: Type[BaseModel], path: pathlib.Path):
     path.parent.mkdir(parents=True, exist_ok=True)
-    schema = json.dumps(model.model_json_schema(), indent=4)
+    schema = dump_schema_str(model)
     path.write_text(schema)
+
+
+def ensure_schema(model: Type[BaseModel]) -> pathlib.Path:
+    path = get_app_path() / 'schemas' / f'{model.__name__}.json'
+    dump_schema(model, path)
     return path.resolve()
 
 
 def model_json(model: BaseModel) -> str:
-    ensure_schema(model.__class__)
     return model.model_dump_json(indent=4, exclude_unset=True, exclude_none=True)
 
 
+def uploaded_schema_path(model: Type[BaseModel]) -> str:
+    return f'https://rsalesc.github.io/rbx/schemas/{model.__name__}.json'
+
+
 def model_to_yaml(model: BaseModel) -> str:
-    path = ensure_schema(model.__class__)
+    path = uploaded_schema_path(model.__class__)
     return f'# yaml-language-server: $schema={path}\n\n' + yaml.dump(
         model.model_dump(mode='json', exclude_unset=True, exclude_none=True),
         sort_keys=False,
@@ -80,7 +91,6 @@ def model_to_yaml(model: BaseModel) -> str:
 
 
 def model_from_yaml(model: Type[T], s: str) -> T:
-    ensure_schema(model)
     return model(**yaml.safe_load(s))