rbx.cp 0.16.2__tar.gz → 0.17.0__tar.gz

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.16.2
+Version: 0.17.0
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/pyproject.toml

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

rbx_cp-0.17.0/rbx/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.17.0'

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/cli.py

@@ -109,9 +109,7 @@ app.add_typer(
 
 def version_callback(value: bool) -> None:
     if value:
-        import importlib.metadata
-
-        version = importlib.metadata.version('rbx.cp')
+        version = utils.get_version()
 
         console.console.print(f'rbx version {version}')
         raise typer.Exit()

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/naming.py

@@ -1,8 +1,13 @@
 from typing import Optional, Tuple
 
+import typer
+
 from rbx.box import package
 from rbx.box.contest import contest_package
 from rbx.box.contest.schema import ContestProblem
+from rbx.box.schema import Package
+from rbx.box.statements.schema import Statement
+from rbx.console import console
 
 
 def get_problem_entry_in_contest() -> Optional[Tuple[int, ContestProblem]]:
@@ -44,3 +49,30 @@ def get_problem_name_with_contest_info() -> str:
     if contest is None or short_name is None:
         return problem.name
     return f'{contest.name}-{short_name}-{problem.name}'
+
+
+def get_title(
+    lang: Optional[str] = None,
+    statement: Optional[Statement] = None,
+    pkg: Optional[Package] = None,
+    fallback_to_title: bool = False,
+) -> str:
+    if pkg is None:
+        pkg = package.find_problem_package_or_die()
+    title: Optional[str] = None
+    if lang is not None:
+        title = pkg.titles.get(lang)
+    if statement is not None:
+        title = statement.title or title
+    if title is None:
+        if fallback_to_title and pkg.titles:
+            if len(pkg.titles) != 1:
+                console.print(
+                    '[error]Package has multiple titles and no statement. Could not infer which title to use.[/error]'
+                )
+                console.print(f'Available titles: {pkg.titles}')
+                raise typer.Exit(1)
+            title = list(pkg.titles.values())[0]
+        else:
+            title = pkg.name
+    return title

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/boca/packager.py

@@ -1,7 +1,7 @@
 import pathlib
 import shutil
 from math import fabs
-from typing import List
+from typing import List, Optional
 
 import typer
 
@@ -29,27 +29,26 @@ class BocaPackager(BasePackager):
     def task_types(cls) -> List[TaskType]:
         return [TaskType.BATCH, TaskType.COMMUNICATION]
 
-    def _get_main_statement(self) -> Statement:
+    def _get_main_statement(self) -> Optional[Statement]:
         pkg = package.find_problem_package_or_die()
 
         if not pkg.expanded_statements:
-            console.console.print('[error]No statements found.[/error]')
-            raise typer.Exit(1)
+            return None
 
         return pkg.expanded_statements[0]
 
     def _get_main_built_statement(
         self, built_statements: List[BuiltStatement]
-    ) -> BuiltStatement:
+    ) -> Optional[BuiltStatement]:
         statement = self._get_main_statement()
+        if statement is None:
+            return None
+
         for built_statement in built_statements:
             if built_statement.statement == statement:
                 return built_statement
 
-        console.console.print(
-            '[error]Main statement not found among built statements.[/error]'
-        )
-        raise typer.Exit(1)
+        return None
 
     def _get_problem_name(self) -> str:
         # BOCA forces Java class names to be the name of the problem.
@@ -64,9 +63,11 @@ class BocaPackager(BasePackager):
 
     def _get_problem_info(self) -> str:
         statement = self._get_main_statement()
+        lang = statement.language if statement is not None else None
+        title = naming.get_title(lang, statement, fallback_to_title=True)
         return (
             f'basename={self._get_problem_basename()}\n'
-            f'fullname={statement.title}\n'
+            f'fullname={title}\n'
             f'descfile={self._get_problem_basename()}.pdf\n'
         )
 
@@ -322,13 +323,15 @@ class BocaPackager(BasePackager):
             (tests_path / language).write_text('exit 0\n')
 
         # Problem statement
-        description_path = into_path / 'description'
-        description_path.mkdir(parents=True, exist_ok=True)
-        (description_path / 'problem.info').write_text(self._get_problem_info())
-        shutil.copyfile(
-            self._get_main_built_statement(built_statements).path,
-            (description_path / self._get_problem_basename()).with_suffix('.pdf'),
-        )
+        main_built_statement = self._get_main_built_statement(built_statements)
+        if main_built_statement is not None:
+            description_path = into_path / 'description'
+            description_path.mkdir(parents=True, exist_ok=True)
+            (description_path / 'problem.info').write_text(self._get_problem_info())
+            shutil.copyfile(
+                self._get_main_built_statement(built_statements).path,
+                (description_path / self._get_problem_basename()).with_suffix('.pdf'),
+            )
 
         # Copy solutions
         solutions_path = into_path / 'solutions'

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/main.py

@@ -26,7 +26,8 @@ async def polygon(
         None,
         '--language',
         '-l',
-        help='If set, will use the given language as the main language.',
+        help='If set, will use the given language as the main language. '
+        'Leave unset if your problem has no statements.',
     ),
     upload_as_english: bool = typer.Option(
         False,

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/packager.py

@@ -3,7 +3,7 @@ import pathlib
 import shutil
 import tempfile
 from abc import ABC, abstractmethod
-from typing import List, Tuple, Type
+from typing import List, Optional, Tuple, Type
 
 import typer
 
@@ -94,12 +94,17 @@ class BasePackager(ABC):
             res.extend(tests_per_group[group.name])
         return res
 
-    def get_statement_for_language(self, lang: str) -> Statement:
+    def get_statement_for_language_or_null(self, lang: str) -> Optional[Statement]:
         pkg = package.find_problem_package_or_die()
         for statement in pkg.expanded_statements:
             if statement.language == lang:
                 return statement
-        raise
+        return None
+
+    def get_statement_for_language_or_die(self, lang: str) -> Statement:
+        statement = self.get_statement_for_language_or_null(lang)
+        if statement is None:
+            raise ValueError(f'No statement for language {lang} found.')
 
 
 class BaseContestPackager(ABC):
@@ -210,7 +215,7 @@ async def run_packager(
         for statement_type in statement_types:
             languages = packager.languages()
             for language in languages:
-                statement = packager.get_statement_for_language(language)
+                statement = packager.get_statement_for_language_or_die(language)
                 statement_path = build_statement(statement, pkg, statement_type)
                 built_statements.append(
                     BuiltStatement(statement, statement_path, statement_type)

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/polygon/importer.py

@@ -70,6 +70,14 @@ def _populate_tests(
     ]
 
 
+def _populate_titles(problem: Problem, pkg: Package):
+    titles = {}
+    for name in problem.names:
+        iso639_code = lang.lang_to_code(name.language)
+        titles[iso639_code] = name.value
+    pkg.titles = titles
+
+
 def _populate_statements(
     problem: Problem,
     pkg: Package,
@@ -83,9 +91,6 @@ def _populate_statements(
     found_main = False
 
     for statement in pdf_statements:
-        if statement.language not in name_per_language:
-            continue
-        name = name_per_language[statement.language]
         statement_path = into_path / _get_statement_path(statement)
         statement_path.parent.mkdir(parents=True, exist_ok=True)
         shutil.copy(pkg_path / statement.path, statement_path)
@@ -93,8 +98,7 @@ def _populate_statements(
         iso639_code = lang.lang_to_code(statement.language)
 
         pkg_statement = BoxStatement(
-            name=f'statement-{name.language}',
-            title=name.value,
+            name=f'statement-{statement.language}',
             language=iso639_code,
             path=_get_statement_path(statement),
             type=StatementType.PDF,
@@ -110,7 +114,8 @@ def _populate_statements(
             found_main = True
             continue
 
-        if name.main and not found_main:
+        name = name_per_language.get(statement.language)
+        if name is not None and name.main and not found_main:
             # If main statement, add it to the front of the list
             pkg_statements = [pkg_statement] + pkg_statements
             found_main = True
@@ -124,8 +129,17 @@ def _populate_statements(
         console.console.print(
             f'[error]Main statement of language [item]{main_language}[/item] not found.[/error]',
         )
+        console.console.print(
+            'If you want no statement in your imported package, '
+            'leave the [item]--main-language[/item] flag unset.'
+        )
         raise typer.Exit(1)
 
+    if not pkg_statements:
+        console.console.print(
+            '[warning]Imported problem has no statements. Continuing without a statement.[/warning]',
+        )
+
 
 def _is_cpp_source(source: File) -> bool:
     if source.type is None:
@@ -224,6 +238,7 @@ class PolygonImporter(BaseImporter):
         )
 
         _populate_tests(testset, pkg, pkg_path, into_path)
+        _populate_titles(problem, pkg)
         _populate_statements(problem, pkg, pkg_path, into_path, self.main_language)
         _copy_checker(problem, pkg, pkg_path, into_path)
         _copy_interactor(problem, pkg, pkg_path, into_path)

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/polygon/packager.py

@@ -5,7 +5,7 @@ from typing import List, Optional
 import typer
 
 from rbx import console, utils
-from rbx.box import header, limits_info, package
+from rbx.box import header, limits_info, naming, package
 from rbx.box.lang import code_to_lang, code_to_langs, is_valid_lang_code
 from rbx.box.packaging.packager import (
     BaseContestPackager,
@@ -62,7 +62,7 @@ class PolygonPackager(BasePackager):
 
         lang_codes = set()
         for statement in pkg.expanded_statements:
-            lang_codes.add(statement.title)
+            lang_codes.add(statement.language)
 
         for lang in langs:
             if lang not in lang_codes:
@@ -72,14 +72,15 @@ class PolygonPackager(BasePackager):
                 )
                 raise typer.Exit(1)
 
+    def _get_name(self, lang: str) -> polygon_schema.Name:
+        statement = self.get_statement_for_language_or_null(lang)
+        return polygon_schema.Name(
+            language=code_to_langs([lang])[0],
+            value=naming.get_title(lang, statement),
+        )
+
     def _get_names(self) -> List[polygon_schema.Name]:
-        names = [
-            polygon_schema.Name(
-                language=code_to_langs([lang])[0],
-                value=self.get_statement_for_language(lang).title,
-            )
-            for lang in self.languages()
-        ]
+        names = [self._get_name(lang) for lang in self.languages()]
 
         _select_main_language(names, self.main_language)
 

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/packaging/polygon/upload.py

@@ -8,7 +8,7 @@ import rich.progress
 import typer
 
 from rbx import console
-from rbx.box import header, limits_info, package
+from rbx.box import header, limits_info, naming, package
 from rbx.box.generators import get_all_built_testcases
 from rbx.box.lang import code_to_langs, is_valid_lang_code
 from rbx.box.packaging.polygon import polygon_api as api
@@ -353,7 +353,7 @@ def _upload_statement(
         blocks = _get_statement_blocks(statement)
         polygon_statement = api.Statement(
             encoding='utf-8',
-            name=statement.title,
+            name=naming.get_title(statement.language, statement, pkg),
             legend=blocks.blocks.get('legend') or '',
             input=blocks.blocks.get('input') or '',
             output=blocks.blocks.get('output') or '',

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/presets/fetch.py

@@ -4,6 +4,9 @@ from typing import Optional
 
 from pydantic import BaseModel
 
+from rbx import utils
+from rbx.box import git_utils
+
 _RBX_REMOTE_URI = 'https://github.com/rsalesc/rbx'
 
 
@@ -86,8 +89,10 @@ def get_preset_fetch_info(uri: Optional[str]) -> Optional[PresetFetchInfo]:
         match = compiled.match(s)
         if match is None:
             return None
-        # Treat as a plain local preset name (no implicit tool tag resolution).
-        return PresetFetchInfo(name=s)
+        tool_tag = git_utils.latest_remote_tag(
+            _RBX_REMOTE_URI, before=utils.get_version()
+        )
+        return PresetFetchInfo(name=s, tool_tag=tool_tag)
 
     extractors = [
         get_github_fetch_info,

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/schema.py

@@ -508,6 +508,12 @@ class Package(BaseModel):
     # Name of the problem.
     name: str = NameField(description='The name of the problem.')
 
+    titles: Dict[str, str] = Field(
+        default={},
+        description='Titles for the problem in each language. '
+        'Languages should be specified as lowercase ISO 639-1 codes.',
+    )
+
     type: TaskType = Field(
         default=TaskType.BATCH, description='The type of the problem.'
     )

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/statements/builders.py

@@ -11,6 +11,7 @@ import typer
 from pydantic import BaseModel
 
 from rbx import console, utils
+from rbx.box import naming
 from rbx.box.fields import Primitive
 from rbx.box.schema import LimitsProfile, Package, Testcase
 from rbx.box.statements.latex_jinja import (
@@ -130,7 +131,9 @@ class StatementBuilderProblem(StatementBuilderItem):
             'statement': self.statement,
             'samples': self.samples,
             'vars': JinjaDictWrapper.from_dict(self.vars or {}, wrapper_key='vars'),
-            'title': self.statement.title or self.package.name,
+            'title': naming.get_title(
+                self.statement.language, self.statement, self.package
+            ),
             'limits': self.limits,
         }
         if self.short_name is not None:

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/statements/schema.py

@@ -132,8 +132,11 @@ class Statement(BaseModel):
         default='en', description='Language code of this statement (ISO 639-1).'
     )
 
-    title: str = Field(
-        default='', description='Name of the problem, as it appears in the statement.'
+    title: Optional[str] = Field(
+        default=None,
+        description='Title of the problem, as it appears in the statement. '
+        'Can be left unset if the problem has no title or if title comes '
+        'from the `titles` field of the package.',
     )
 
     path: pathlib.Path = Field(

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/box/tooling/converter.py

@@ -63,7 +63,7 @@ async def convert(
         built_statements = []
         for statement_type in packager.statement_types():
             for language in packager.languages():
-                statement = packager.get_statement_for_language(language)
+                statement = packager.get_statement_for_language_or_die(language)
                 statement_path = build_statement(statement, pkg, statement_type)
                 built_statements.append(
                     BuiltStatement(statement, statement_path, statement_type)

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/resources/presets/default/preset.rbx.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://rsalesc.github.io/rbx/schemas/Preset.json
 name: "default"
-min_version: "0.16.2"
+min_version: "0.17.0"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

{rbx_cp-0.16.2 → rbx_cp-0.17.0}/rbx/resources/presets/default/problem/problem.rbx.yml

@@ -3,6 +3,8 @@
 name: "new-problem"
 timeLimit: 1000 # ms
 memoryLimit: 256 # MiB
+titles:
+  en: "New problem"
 checker: {path: "wcmp.cpp"} # Download others from testlib with `rbx download checker`
 validator: {path: "validator.cpp"}
 testcases:
@@ -31,7 +33,6 @@ solutions:
     outcome: "INCORRECT"
 statements:
   - name: "statement-en"
-    title: "New Problem"
     path: "statement/statement.rbx.tex" # Open this file to edit your statement.
     type: "rbxTeX"
     language: "en"

rbx_cp-0.16.2/rbx/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.16.2'