rbx.cp 0.18.1__py3-none-any.whl → 0.18.3__py3-none-any.whl

rbx/__version__.py

@@ -1 +1 @@
-__version__ = '0.18.1'
+__version__ = '0.18.3'

rbx/box/environment.py

@@ -294,21 +294,35 @@ def get_environment(env: Optional[str] = None) -> Environment:
 
 
 @functools.cache
-def get_language(name: str) -> EnvironmentLanguage:
+def get_language_or_nil(name: str) -> Optional[EnvironmentLanguage]:
     for lang in get_environment().languages:
         if lang.name == name:
             return lang
-    console.console.print(f'Language [item]{name}[/item] not found.', style='error')
+    return None
+
+
+def get_language(name: str) -> EnvironmentLanguage:
+    lang = get_language_or_nil(name)
+    if lang is not None:
+        return lang
+    console.console.print(f'[error]Language [item]{name}[/item] not found.[/error]')
     raise typer.Exit()
 
 
 @functools.cache
-def get_language_by_extension(extension: str) -> EnvironmentLanguage:
+def get_language_by_extension_or_nil(extension: str) -> Optional[EnvironmentLanguage]:
     for lang in get_environment().languages:
         if lang.extension == extension:
             return lang
+    return None
+
+
+def get_language_by_extension(extension: str) -> EnvironmentLanguage:
+    lang = get_language_by_extension_or_nil(extension)
+    if lang is not None:
+        return lang
     console.console.print(
-        f'Language with extension [item]{extension}[/item] not found.', style='error'
+        f'[error]Language with extension [item]{extension}[/item] not found.[/error]'
     )
     raise typer.Exit()
 

rbx/box/package.py

@@ -10,7 +10,7 @@ from pydantic import ValidationError
 
 from rbx import console, utils
 from rbx.box import cd, global_package
-from rbx.box.environment import get_sandbox_type
+from rbx.box.environment import get_language_by_extension, get_sandbox_type
 from rbx.box.global_package import get_cache_fingerprint
 from rbx.box.sanitizers import issue_stack
 from rbx.box.schema import (
@@ -354,11 +354,15 @@ def get_solutions(root: pathlib.Path = pathlib.Path()) -> List[Solution]:
         if '*' in str(entry.path):
             for file in sorted(root.glob(str(entry.path))):
                 relative_file = file.relative_to(root)
-                add_solution(
-                    Solution.model_copy(
-                        entry, update={'path': relative_file}, deep=True
+                if (
+                    entry.language is not None
+                    or get_language_by_extension(relative_file.suffix[1:]) is not None
+                ):
+                    add_solution(
+                        Solution.model_copy(
+                            entry, update={'path': relative_file}, deep=True
+                        )
                     )
-                )
             continue
         add_solution(entry)
     return res

rbx/box/packaging/boca/boca_language_utils.py

@@ -5,12 +5,18 @@ from rbx.box.packaging.boca.extension import BocaLanguage, BocaLanguageExtension
 
 
 def get_rbx_language_from_boca_language(boca_language: BocaLanguage) -> str:
+    # First by BOCA language name.
     for language in get_environment().languages:
         language_extension = language.get_extension_or_default(
-            language.name, BocaLanguageExtension
+            'boca', BocaLanguageExtension
         )
         if language_extension.bocaLanguage == boca_language:
             return language.name
+    # Then by rbx language extension.
+    for language in get_environment().languages:
+        if language.extension == boca_language:
+            return language.name
+    # Then by rbx language name.
     return boca_language
 
 

rbx/box/testing/testing_preset.py

@@ -9,6 +9,7 @@ class TestingPreset(TestingShared):
     def __init__(self, root: PathOrStr):
         super().__init__(root)
         self._yml = None
+        self.initialize()
 
     def initialize(self):
         if not self.yml_path.exists():

rbx/box/tooling/boca/scraper.py

@@ -16,6 +16,13 @@ from throttlex import Throttler
 
 from rbx import console, utils
 from rbx.box import naming
+from rbx.box.environment import (
+    get_environment,
+    get_language_or_nil,
+)
+from rbx.box.packaging.boca.boca_language_utils import (
+    get_rbx_language_from_boca_language,
+)
 from rbx.box.tooling.boca.debug_utils import pretty_print_request_data
 from rbx.grading.steps import Outcome
 
@@ -104,6 +111,24 @@ class BocaDetailedRun(BocaRun):
     autojudge_answer: str
 
 
+def get_boca_languages() -> List[BocaLanguage]:
+    env = get_environment()
+    res = []
+    for bocaLanguage in env.extensions.boca.languages:
+        rbxLanguage = get_rbx_language_from_boca_language(bocaLanguage)
+        rbxLanguage = get_language_or_nil(rbxLanguage)
+        if rbxLanguage is None:
+            continue
+        res.append(
+            BocaLanguage(
+                index=len(res) + 1,
+                name=rbxLanguage.readableName,
+                extension=bocaLanguage,
+            )
+        )
+    return res
+
+
 class BocaScraper:
     def __init__(
         self,
@@ -778,6 +803,35 @@ class BocaScraper:
         self.open(req)
         self.log('Main site configured successfully')
 
+    def configure_languages(self, languages: List[BocaLanguage]):
+        self.open(
+            f'{self.base_url}/admin/language.php',
+            error_msg='Error while configuring languages in BOCA',
+        )
+        try:
+            self.br.select_form(name='form1')
+        except mechanize.FormNotFoundError:
+            self.error(
+                'Languages configuration form not found in BOCA website. This might happen when the login failed.'
+            )
+
+        reqs = []
+        for language in languages:
+            form = typing.cast(mechanize.HTMLForm, self.br.form)
+            form.set_all_readonly(False)
+            form['confirmation'] = 'confirm'
+
+            form['langnumber'] = f'{language.index}'
+            form['langname'] = language.name
+            form['langextension'] = language.extension
+
+            reqs.append(self.br.click(name='Submit3', type='submit'))
+
+        for req in reqs:
+            pretty_print_request_data(req)
+            self.open(req)
+        self.log('Languages configured successfully')
+
     def create_judge_account(self, password: str = 'boca'):
         _, html = self.open(
             f'{self.base_url}/admin/user.php',

rbx/resources/presets/default/env.rbx.yml

@@ -22,6 +22,9 @@ languages:
       command: "./{executable}"
     fileMapping:
       compilable: "compilable.cpp"
+    extensions:
+      boca:
+        bocaLanguage: "cc"
   - name: "c"
     readableName: "C"
     extension: "c"
@@ -55,7 +58,7 @@ languages:
     fileMapping:
       compilable: "Main.java"
       executable: "Main.jar"
-  - name: "kotlin"
+  - name: "kt"
     readableName: "Kotlin"
     extension: "kt"
     compilation:
@@ -70,8 +73,9 @@ languages:
       executable: "Main.jar"
 extensions:
   boca:
-    languages: ["c", "cpp", "java", "py3", "kt"]
+    languages: ["c", "cc", "cpp", "java", "py3", "kt"]
     flags:
       c: "-O2 -lm -static"
       cc: "-std=c++20 -O2 -lm -static"
+      cpp: "-std=c++20 -O2 -lm -static"
     preferContestLetter: true

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.18.1"
+min_version: "0.18.3"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

rbx/resources/presets/default/problem/problem.rbx.yml

@@ -17,19 +17,19 @@ testcases:
     generatorScript:
       path: "testplan/random.py" # Generator script written programatically.
 solutions:
-  - path: "sols/main.cpp"
+  - path: "sols/main*.*"
     outcome: "ACCEPTED"
-  - path: "sols/ac-*.cpp"
+  - path: "sols/ac-*.*"
     outcome: "ACCEPTED"
-  - path: "sols/wa-*.cpp"
+  - path: "sols/wa-*.*"
     outcome: "WRONG_ANSWER"
-  - path: "sols/tle-*.cpp"
+  - path: "sols/tle-*.*"
     outcome: "TIME_LIMIT_EXCEEDED"
-  - path: "sols/mle-*.cpp"
+  - path: "sols/mle-*.*"
     outcome: "MEMORY_LIMIT_EXCEEDED"
-  - path: "sols/re-*.cpp"
+  - path: "sols/re-*.*"
     outcome: "RUNTIME_ERROR"
-  - path: "sols/fail-*.cpp"
+  - path: "sols/fail-*.*"
     outcome: "INCORRECT"
 statements:
   - name: "statement-en"

{rbx_cp-0.18.1.dist-info → rbx_cp-0.18.3.dist-info}/METADATA

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

{rbx_cp-0.18.1.dist-info → rbx_cp-0.18.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rbx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/__version__.py,sha256=2o8cZebVQq3IlZWOsEUKQhQ2rd7qwhVQIKyXuLPJU84,23
+rbx/__version__.py,sha256=HIE5Jc7SwUm2bW0faT5SNcHY73Dx3WUhAQX-Zx0vGlg,23
 rbx/annotations.py,sha256=_TkLhgZWiUyon3bonHwUo03ls1jY8LwgcR4bVgtgnc0,3519
 rbx/autoenum.py,sha256=cusv8ClXRlDVvhZ8eDrtYcL_2peXlHugAey_ht8roXk,12025
 rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ rbx/box/creation.py,sha256=oTAC11XV2Pw2YAlF_d11Eo7A1fD6ItlpFMpLEzMLyFI,1331
 rbx/box/deferred.py,sha256=II3X9e87JCOZtmspnHh-n4PFqh-FsH_oc0XJHZ9ZYVQ,691
 rbx/box/download.py,sha256=tLW5gLVeLk0gHMEMwScSoHIXQPkXuPsqXzItsrsnUZY,3070
 rbx/box/dump_schemas.py,sha256=HXJ195h4e017DpfoFfW3MRDukON2ZhcKtJjkRPX-dX4,649
-rbx/box/environment.py,sha256=RBxFrcsjiMh80B6Pv21n047Yl96Vegwgo3HtPA-3QAE,14358
+rbx/box/environment.py,sha256=Sl3keR8ngb78L34m4PHG_QvGH0VC1Rsjia_9ft65YZE,14732
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
 rbx/box/fields.py,sha256=Gsox7Q1M7I8I2FtKvwiAfYUC6USpwghk8fel2Q9Eyhg,2291
 rbx/box/formatting.py,sha256=i3vXHpo_L_VpVPxOe4wHlai1WhlDJlfxUexS9DC0Szg,1249
@@ -34,10 +34,10 @@ rbx/box/limits_info.py,sha256=NTtcZTlDzemOtQQXbNbLORpl3RM9nYHc2-cGMnGYfF8,5370
 rbx/box/linting.py,sha256=wRE0hKCduTBHZYBFmmis_d9AMTsDu0Q-AjByCeTnkrY,3187
 rbx/box/main.py,sha256=a8CYi77kOywPFly4-ucEIJLXQW-1NFp91kK2fA42YTE,86
 rbx/box/naming.py,sha256=M6aYLIge8PHhIuCX50rwGe5VRzgUL--2BVtymIqeeXs,2389
-rbx/box/package.py,sha256=cNOvwE5_hedUFc9c2oHSCW0cj7qkxWXhEpqqhCbwUAc,15390
+rbx/box/package.py,sha256=pzViArUFKvQ_S_EWtuigDMZrDx1ymXGqbQ7H9Ieqmik,15611
 rbx/box/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/packaging/boca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbx/box/packaging/boca/boca_language_utils.py,sha256=bd5-KxN-0h6yg74Jx3NUsgwf_euBU95zC2GLw0MAFS4,1071
+rbx/box/packaging/boca/boca_language_utils.py,sha256=aLL58PLso1zdWuYBvTsFMT_IuJOHtTYe2CYtDQApey8,1300
 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=8dTGP6RMaWqd3a_3Tl2tEW-OuDgktXYsO8qoSuHHkPY,13909
@@ -85,7 +85,7 @@ rbx/box/testcases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 rbx/box/testcases/main.py,sha256=_I7h_obRcpNLRQ6dDJDIE5NAvTyn5nBOhdsBhRA_PvU,5442
 rbx/box/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/testing/testing_package.py,sha256=szNc8GcxI0ywCjzV8fOuZh5F0fMtQ6_tLOfivF7hu10,15401
-rbx/box/testing/testing_preset.py,sha256=pY8Vh0Y9emZXv6LPqYkXtARCBeTDvKe6c8-CX7mN_t8,5766
+rbx/box/testing/testing_preset.py,sha256=ODY0B8poW1ZvEb1xmxvC1-fny6RcbEjS50PtsTvPd00,5792
 rbx/box/testing/testing_shared.py,sha256=W4JCUo_tKvGRDSeeUx6THjGkzngSqjQlPjn_FYTa-kU,2720
 rbx/box/timing.py,sha256=vvghTagSTM9UiL98Tin6MMhDfE_9WMH8Vs-eFryMcIE,10268
 rbx/box/tooling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,7 +94,7 @@ rbx/box/tooling/boca/debug_utils.py,sha256=Rs1ptMWsy32jl_DJZASeOfyqh8HCJdhIXufdb
 rbx/box/tooling/boca/main.py,sha256=knl1rpaHIwA63KkzMJMZQrejzMpbTPBhYqGx1IpuNm4,289
 rbx/box/tooling/boca/manual_scrape.py,sha256=iuNtOHrWczdaWNNRMKGYkgr-wSwgtjZedpz5-sX5IRQ,724
 rbx/box/tooling/boca/scrape.py,sha256=7p4DW0smqX0_6o-C1KFIAve3YI7zfIZkP0Y9kAgHDLE,956
-rbx/box/tooling/boca/scraper.py,sha256=Tak3VMMveMu-1OiOiXg1mlL2URjk4lCIPudhCu0Im1o,33742
+rbx/box/tooling/boca/scraper.py,sha256=sVovn0pc8J3Euj8M-MzEX9QtRbmgj6PvchJZ1HbiNFA,35508
 rbx/box/tooling/converter.py,sha256=cTRUuZ7GToMuAUo6VE7tOtaeNkXHJZE29me0yopvvsY,2544
 rbx/box/tooling/main.py,sha256=uj6XHjJMF3nyb4enbbTK8XbUAuiRLT_RP1kVwSMqV5E,2003
 rbx/box/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -200,13 +200,13 @@ rbx/resources/presets/default/contest/statement/contest.rbx.tex,sha256=Jx6op_WdV
 rbx/resources/presets/default/contest/statement/info.rbx.tex,sha256=Wz8Tbmi2lPWMgDbJsJolUi1xaQMwSnHmpZ3JwAy_Tb0,998
 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=af11icSgwlw80ouYpY_2Eb5N1D4J-v1QKLeIes5Bi94,2008
-rbx/resources/presets/default/preset.rbx.yml,sha256=ULKYyTybsFPOivzfWfGHwLeUPkC3f6tGLkJI_1zxuBM,520
+rbx/resources/presets/default/env.rbx.yml,sha256=iOV0L8rRHoU6RJGGabjh0a7z54lRrS-JmzAe4R-t0MI,2105
+rbx/resources/presets/default/preset.rbx.yml,sha256=S24hjmIuS5X-5kVsGSHb4PSt8Bn77hDia4EnYmfqa1Y,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
 rbx/resources/presets/default/problem/manual_tests/samples/001.in,sha256=P4QInDX87xXoDWu4PVIzUeNW5LtTlUKbMCvJ9uZOPGw,20
-rbx/resources/presets/default/problem/problem.rbx.yml,sha256=DkGgyy7bAjR8ZPlKjXmF3POv_m9MR3qUqd7WzE88GUI,2218
+rbx/resources/presets/default/problem/problem.rbx.yml,sha256=f7_PgPWvT0_7TZGPQsMhtzSXo_-iWN-uQQNk6dv1xuU,2205
 rbx/resources/presets/default/problem/rbx.h,sha256=iMNSI9tKGK8KJkl0Cgw1jhGdlRjqN_frFs-MFFS5Oq8,3760
 rbx/resources/presets/default/problem/sols/main.cpp,sha256=AW-j65DiFYUN18rddTKCWc_VyYCMgCbjZ0jAJ-0JLuA,124
 rbx/resources/presets/default/problem/sols/wa-overflow.cpp,sha256=Bj7tejPIlXG_JqUHWY1zi9TDbHdRZzgT_JDbCLRdhbQ,136
@@ -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=zOXjEkEN9tlzLliWpssNTSmcvdgveUWDdo427qI3dhM,12225
-rbx_cp-0.18.1.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.18.1.dist-info/METADATA,sha256=N6exVvO8bgDLebW5exIGhjnDdiEuv6-N_Q_vAGC3iRQ,4845
-rbx_cp-0.18.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-rbx_cp-0.18.1.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
-rbx_cp-0.18.1.dist-info/RECORD,,
+rbx_cp-0.18.3.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.18.3.dist-info/METADATA,sha256=0wX2MVzc6Bs2Ut4bXz9yszTYOI6-7pZe1eAiYDePOcw,4845
+rbx_cp-0.18.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.18.3.dist-info/entry_points.txt,sha256=Gw2_BZ5Jon61biaH_ETbAQGXy8fR5On9gw2U4A1erpo,40
+rbx_cp-0.18.3.dist-info/RECORD,,

{rbx_cp-0.18.1.dist-info → rbx_cp-0.18.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any