rbx.cp 0.18.1__tar.gz → 0.18.3__tar.gz

{rbx_cp-0.18.1 → rbx_cp-0.18.3}/PKG-INFO

@@ -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 → rbx_cp-0.18.3}/pyproject.toml

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

rbx_cp-0.18.3/rbx/__version__.py

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

{rbx_cp-0.18.1 → rbx_cp-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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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_cp-0.18.1 → rbx_cp-0.18.3}/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/rbx/__version__.py

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