rbx.cp 0.16.1__py3-none-any.whl → 0.16.4__py3-none-any.whl

rbx/__version__.py

@@ -1 +1 @@
-__version__ = '0.16.1'
+__version__ = '0.16.4'

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/box/git_utils.py

@@ -48,9 +48,33 @@ def ls_remote_tags(uri: str) -> List[str]:
     ]
 
 
-def latest_remote_tag(uri: str) -> str:
+def ls_version_remote_tags(uri: str) -> List[str]:
     tags = ls_remote_tags(uri)
     valid_tags = [tag for tag in tags if semver.Version.is_valid(tag)]
-    if not valid_tags:
+    return valid_tags
+
+
+def latest_remote_tag(
+    uri: str, before: Optional[str] = None, after: Optional[str] = None
+) -> str:
+    tags = ls_version_remote_tags(uri)
+    if not tags:
         raise ValueError(f'No valid tags found for {uri}')
-    return sorted(valid_tags, key=semver.VersionInfo.parse)[-1]
+    if before is not None:
+        tags = [
+            tag
+            for tag in tags
+            if semver.VersionInfo.parse(tag) <= semver.VersionInfo.parse(before)
+        ]
+    if after is not None:
+        tags = [
+            tag
+            for tag in tags
+            if semver.VersionInfo.parse(tag) >= semver.VersionInfo.parse(after)
+        ]
+    return sorted(tags, key=semver.VersionInfo.parse)[-1]
+
+
+def has_remote_tag(uri: str, tag: str) -> bool:
+    tags = ls_remote_tags(uri)
+    return tag in tags

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,19 +29,21 @@ 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
@@ -322,13 +324,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/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/box/packaging/polygon/xml_schema.py

@@ -27,12 +27,14 @@ class File(BaseXmlModel):
 
 
 class Test(BaseXmlModel):
-    method: Literal['manual', 'generated'] = attr()
+    method: Literal['manual', 'generated'] = attr(default='manual')
 
     sample: Optional[bool] = attr(default=None)
 
     description: Optional[str] = attr(default=None)
 
+    verdict: Optional[str] = attr(default=None)
+
 
 class Testset(BaseXmlModel):
     name: Optional[str] = attr(default=None)
@@ -60,7 +62,7 @@ class Judging(BaseXmlModel):
 
 class Checker(BaseXmlModel):
     name: Optional[str] = attr(default=None)
-    type: Literal['testlib'] = attr()
+    type: Literal['testlib'] = attr(default='testlib')
     source: File = element()
     binary: Optional[File] = element(default=None)
     cpy: Optional[File] = element(tag='copy', default=None)

rbx/box/presets/__init__.py

@@ -11,7 +11,7 @@ import semver
 import typer
 
 from rbx import console, utils
-from rbx.box import cd
+from rbx.box import cd, git_utils
 from rbx.box.git_utils import latest_remote_tag
 from rbx.box.presets.fetch import (
     PresetFetchInfo,
@@ -605,7 +605,18 @@ def _install_preset_from_remote(
         console.console.print(
             f'Cloning preset from [item]{fetch_info.fetch_uri}[/item]...'
         )
-        git.Repo.clone_from(fetch_info.fetch_uri, d)
+        repo = git.Repo.clone_from(fetch_info.fetch_uri, d)
+        if fetch_info.tool_tag is not None:
+            console.console.print(
+                f'Checking out tool tag [item]{fetch_info.tool_tag}[/item]...'
+            )
+            try:
+                repo.git.checkout(fetch_info.tool_tag)
+            except Exception as e:
+                console.console.print(
+                    f'[error]Could not checkout tool tag [item]{fetch_info.tool_tag}[/item] for preset [item]{fetch_info.name}[/item].[/error]'
+                )
+                raise typer.Exit(1) from e
         pd = pathlib.Path(d)
         if fetch_info.inner_dir:
             console.console.print(
@@ -719,14 +730,32 @@ def _install_preset_from_fetch_info(
             update=update,
         )
         return
-    if _install_preset_from_resources(
-        fetch_info,
-        dest,
-        ensure_contest=ensure_contest,
-        ensure_problem=ensure_problem,
-        update=update,
-    ):
+    if fetch_info.is_tool():
+        # Fallback to the remote tool tag if it exists.
+        assert fetch_info.tool_tag is not None
+        remote_fetch_info = get_preset_fetch_info(
+            get_remote_uri_from_tool_preset(fetch_info.name)
+        )
+        assert remote_fetch_info is not None
+        remote_fetch_info.tool_tag = fetch_info.tool_tag
+
+        _install_preset_from_remote(
+            remote_fetch_info,
+            dest,
+            ensure_contest=ensure_contest,
+            ensure_problem=ensure_problem,
+            update=update,
+        )
         return
+
+    # if _install_preset_from_resources(
+    #     fetch_info,
+    #     dest,
+    #     ensure_contest=ensure_contest,
+    #     ensure_problem=ensure_problem,
+    #     update=update,
+    # ):
+    #     return
     console.console.print(
         f'[error]Preset [item]{fetch_info.name}[/item] not found.[/error]'
     )
@@ -895,8 +924,6 @@ def _sync(try_update: bool = False, force: bool = False, symlinks: bool = False)
 def copy_tree_normalizing_gitdir(
     src_path: pathlib.Path, dst_path: pathlib.Path, update: bool = False
 ):
-    from rbx.box import git_utils
-
     shutil.copytree(str(src_path), str(dst_path), dirs_exist_ok=update, symlinks=True)
 
     if not (src_path / '.git').is_file():
@@ -918,8 +945,6 @@ def copy_local_preset(
 ):
     copy_tree_normalizing_gitdir(preset_path, dest_path / '.local.rbx')
 
-    from rbx.box import git_utils
-
     preset_repo = git_utils.get_repo_or_nil(preset_path)
     current_repo = git_utils.get_repo_or_nil(
         pathlib.Path.cwd(), search_parent_directories=True

rbx/box/presets/fetch.py

@@ -4,6 +4,11 @@ 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'
+
 
 class PresetFetchInfo(BaseModel):
     # The actual name of this preset.
@@ -18,12 +23,18 @@ class PresetFetchInfo(BaseModel):
     # Inner directory from where to pull the preset.
     inner_dir: str = ''
 
+    # Tool tag.
+    tool_tag: Optional[str] = None
+
     def is_remote(self) -> bool:
         return self.fetch_uri is not None
 
     def is_local_dir(self) -> bool:
         return bool(self.inner_dir) and not self.is_remote()
 
+    def is_tool(self) -> bool:
+        return self.tool_tag is not None
+
 
 def get_inner_dir_from_tool_preset(tool_preset: str) -> str:
     return f'rbx/resources/presets/{tool_preset}'
@@ -78,7 +89,10 @@ def get_preset_fetch_info(uri: Optional[str]) -> Optional[PresetFetchInfo]:
         match = compiled.match(s)
         if match is None:
             return None
-        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/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.1"
+min_version: "0.16.4"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

{rbx_cp-0.16.1.dist-info → rbx_cp-0.16.4.dist-info}/METADATA

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

{rbx_cp-0.16.1.dist-info → rbx_cp-0.16.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 rbx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/__version__.py,sha256=_5Udfe3jX_Ju2NuNb0dUgUDu7GADMpIFGMOs0TQl5TI,23
+rbx/__version__.py,sha256=9ZYMANsHpUpRueGC3gdnVjGvLseEK8ywMOkZEQU44Gg,23
 rbx/annotations.py,sha256=_TkLhgZWiUyon3bonHwUo03ls1jY8LwgcR4bVgtgnc0,3519
 rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=umrTdVAwvsOosBDVvDZ6kq1yWg3Z2Lxp2o1zK-V7BBk,3594
 rbx/box/cd.py,sha256=_XAzb3kV1NUaaRs8hc9SGDo10O1yh2_gr1EiAKzfUjI,2711
 rbx/box/checkers.py,sha256=mRovZyTZdySFEaYFVc3Lc-xgEsu6F9FjVPOxDwub7aY,13226
-rbx/box/cli.py,sha256=ybtCWnH0uYhUe95s6ZhBGoPmanMMleaTaWB78tA3kag,29773
+rbx/box/cli.py,sha256=grWUlz5jpcwF2y4eqYBGurOpu4KlB8mRvvs7C92cWAs,29721
 rbx/box/code.py,sha256=TWF-o8fTh5nAtndKuO9Ti7KL-Ye6mkOoUnRzS4POrfw,25524
 rbx/box/compile.py,sha256=Kzn5mEQu4vb91W9vjyt0DS6cfPJzFLTUoowFj7uHLUo,2539
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/fields.py,sha256=Gsox7Q1M7I8I2FtKvwiAfYUC6USpwghk8fel2Q9Eyhg,2291
 rbx/box/formatting.py,sha256=i3vXHpo_L_VpVPxOe4wHlai1WhlDJlfxUexS9DC0Szg,1249
 rbx/box/generators.py,sha256=trI4i3BFAzIK4wA0hdCjU1rf8QLwSXKWzSFtCZX17SA,17739
-rbx/box/git_utils.py,sha256=WTK8lfmkrBtJpSBuFSwjlSXpkdHnKcVYJgGWTr5V1lY,1513
+rbx/box/git_utils.py,sha256=wuM_k5RgCz5lvoiBciSHo5XT1BdNLhXB0hBlGsc08Vs,2140
 rbx/box/global_package.py,sha256=YfFGw2vxFspF2v3phBEeBCrLe1sfbANrctGqii3I2X4,2106
 rbx/box/header.py,sha256=OZJD2J0fdIiYyiEAwQ3x3M8TwM1v1J9nhIjnPVz4Zy8,3029
 rbx/box/lang.py,sha256=CSD-yxFUC3LWdGpv4IVFOLdgONc_JbsI45BEN3bjaFw,888
@@ -40,10 +40,10 @@ rbx/box/packaging/boca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 rbx/box/packaging/boca/boca_language_utils.py,sha256=bd5-KxN-0h6yg74Jx3NUsgwf_euBU95zC2GLw0MAFS4,1071
 rbx/box/packaging/boca/boca_outcome_utils.py,sha256=MhO7aKTJ1weCgSJBA9MF_ejK3HFBFwC5dIsiR4wA1Mw,310
 rbx/box/packaging/boca/extension.py,sha256=EQALNEOv4zVDXSKs_dk11n92y7cBZVn8TogIK683lE0,890
-rbx/box/packaging/boca/packager.py,sha256=31fwscJR0JZTr-55i070fOpb6lAXtEGu50xWFTC2U4o,13746
+rbx/box/packaging/boca/packager.py,sha256=W-qCyIe8ZFxtZ-yYPKVVV7ayszIfpL_ZYrmow11fgvA,13903
 rbx/box/packaging/contest_main.py,sha256=G3CO4RILxGbUhyLsTdeDqPXEJ3sK2pSH9X8piqU61FQ,4486
 rbx/box/packaging/importer.py,sha256=qcKpDQyf6EvYXorofLs5abteBEWV9AezA8tcihCw5wk,909
-rbx/box/packaging/main.py,sha256=hP4UEKjLowRHBzttGKWx0UMAw8_8lVAAhQ9I9Y3khXA,2724
+rbx/box/packaging/main.py,sha256=GRTP7_Ao-8I5F0GrLTAXSOwYbh1DYP_cLPm5jUMKN0U,2782
 rbx/box/packaging/moj/packager.py,sha256=FjghOe5CPlaF1GqK0NZgWVV_eYWpdTmz88bh04yeAyI,8708
 rbx/box/packaging/packager.py,sha256=2a2yldbVZzEQLoQnfGc8fHDHasFRdLUwAGlQuxudLBs,7324
 rbx/box/packaging/pkg/packager.py,sha256=4pt4cZa_MU9gsWNVvh5Um1KEIh_axBHlXmPf6rpFoHg,4904
@@ -52,9 +52,9 @@ rbx/box/packaging/polygon/packager.py,sha256=1ddKbUJ-RgzgolDZTkmDJFF5N3JGTXRYVA8
 rbx/box/packaging/polygon/polygon_api.py,sha256=mPKEqiwANJ1nr-JhOgzGMaDhnbljsAgzzPHW6kkf7R4,41016
 rbx/box/packaging/polygon/test.py,sha256=bgEju5PwudgyfwxXJagm8fM6CJVlWM6l_-2q1V-oKaQ,3069
 rbx/box/packaging/polygon/upload.py,sha256=w7F0ejfEwhXrAyKADkA2FGuOfTCq96nMNi1YJNRyrtU,13801
-rbx/box/packaging/polygon/xml_schema.py,sha256=TSl4BWwMWv7V07BKJ56mcLXNr_3zlRgNmqN2q-wnk4M,3128
-rbx/box/presets/__init__.py,sha256=6CJpyIpx7wdUqPvRB5hQY5mIPDo6m1NTOSAYrfF3t5Q,36382
-rbx/box/presets/fetch.py,sha256=d37Pze32iQK2uWDr5I55cFeKwobZ6aczRNwpBoUJqoM,2755
+rbx/box/packaging/polygon/xml_schema.py,sha256=UbGtW5-SKN3wK952-eoTvcIDVoO0et10IA9bTb7jV8Y,3210
+rbx/box/presets/__init__.py,sha256=YusqU2ewwq3R1MqIXRM2N-i3uFX6s8m8PDbFJDr4zyg,37451
+rbx/box/presets/fetch.py,sha256=aom7f5atJ5Vy5Ox7k0aF8FDVMIeTjF0IRCkP_nrt6Ms,3118
 rbx/box/presets/lock_schema.py,sha256=8PKL7UMX4dkdVpCPLwYtaNIIrZpAfHGvTfnF8bRFedM,1708
 rbx/box/presets/schema.py,sha256=5Nw72QrSsA39cUCCLlVfSYMImK_-TfJEGu5TSIDv3W8,2918
 rbx/box/remote.py,sha256=hCdiZSmh6Y1vnSEwLZ_gtAMYV-WLVlU3iVnvcObRpRc,5274
@@ -201,7 +201,7 @@ rbx/resources/presets/default/contest/statement/info.rbx.tex,sha256=Wz8Tbmi2lPWM
 rbx/resources/presets/default/contest/statement/instructions.tex,sha256=JG_eR13ukZgEahrrmrbg40H8cUzpoUE8QLocihN-fZ8,2414
 rbx/resources/presets/default/contest/statement/logo.png,sha256=RLNYmZoc-BR6AZKkmr4UEg3h01YeFzvy604jMAQC7aA,414485
 rbx/resources/presets/default/env.rbx.yml,sha256=quSPG5Xs9KroYLATNLPNtORLGRWtrLLt2Fx81T1enAM,1692
-rbx/resources/presets/default/preset.rbx.yml,sha256=w6SUps46mrKPAoXCqxFPd8HyNqpHQDOyWIdswpsC6KA,520
+rbx/resources/presets/default/preset.rbx.yml,sha256=Fq2dBpQzcNEVZcES3ThbQadyyGb3WEMkxK6Mggttg7Q,520
 rbx/resources/presets/default/problem/.gitignore,sha256=1rt95y9Q7ZHIQn28JyZQUdD5zkpRosjAl9ZqoQmX2cE,149
 rbx/resources/presets/default/problem/gens/gen.cpp,sha256=rn6sGRjZ1sFE1Rq02r6488iquY9xTrutcvLv4d1sohA,178
 rbx/resources/presets/default/problem/manual_tests/samples/000.in,sha256=w66OEtCJGqjUNj8cJrqgImgGVm8W_OlIUtF255ds-ow,4
@@ -223,8 +223,8 @@ rbx/resources/templates/rbx.h,sha256=0AZds9R0PmuPgnlTENb33Y81LW0LlnmOJFaoN8oG3Yo
 rbx/resources/templates/template.cpp,sha256=xXWpWo7fa7HfmPNqkmHcmv3i46Wm0ZL-gPmkRfGvLn4,317
 rbx/testing_utils.py,sha256=vNNdaytowJfuopszVHeFzVtHWlPfipPW4zpqCOvdZKU,2908
 rbx/utils.py,sha256=AUIknhhED-ZIp6w-VcfPkaG1cYjQkovlX5WCvbVLNHg,9930
-rbx_cp-0.16.1.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.16.1.dist-info/METADATA,sha256=CvJPfF8h2IvR_MshkNWC-5TT9m55i3NFYc-P7M5PNHE,4799
-rbx_cp-0.16.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-rbx_cp-0.16.1.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
-rbx_cp-0.16.1.dist-info/RECORD,,
+rbx_cp-0.16.4.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.16.4.dist-info/METADATA,sha256=I7CFir9kxAZ--hAobuDQLIiFqd7l-xAkxLuzf_MTrNw,4799
+rbx_cp-0.16.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+rbx_cp-0.16.4.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
+rbx_cp-0.16.4.dist-info/RECORD,,