rbx.cp 0.5.23__py3-none-any.whl → 0.5.25__py3-none-any.whl

rbx/box/code.py

@@ -75,7 +75,7 @@ def is_executable_sanitized(executable: DigestOrSource) -> bool:
 
 def add_sanitizer_flags_to_command(command: str) -> str:
     if is_cxx_command(command):
-        return command + ' -fsanitize=address,undefined -fno-omit-frame-pointer'
+        return command + ' -fsanitize=address,undefined -fno-omit-frame-pointer -g'
     return command
 
 
@@ -122,11 +122,31 @@ def _add_warning_pragmas(code: str) -> str:
     )
 
 
+def _add_warning_pragmas_around(code: str) -> str:
+    flags = CXX_WARNING_FLAGS.split()
+    pragma_lines = '\n'.join(
+        [
+            f'#pragma GCC diagnostic ignored "{flag}"'
+            for flag in flags
+            if not flag.startswith('-Wno-')
+        ]
+    )
+
+    return (
+        '#pragma GCC diagnostic push\n'
+        + pragma_lines
+        + '\n'
+        + code
+        + '\n'
+        + '#pragma GCC diagnostic pop\n'
+    )
+
+
 def _ignore_warning_in_cxx_input(input: GradingFileInput):
-    if input.src is None or input.src.suffix not in ('.cpp', '.c', '.cc', '.cxx'):
+    if input.src is None or input.src.suffix not in ('.h', '.hpp'):
         return
     preprocessed_path = package.get_problem_preprocessed_path(input.src)
-    preprocessed_path.write_text(_add_warning_pragmas(input.src.read_text()))
+    preprocessed_path.write_text(_add_warning_pragmas_around(input.src.read_text()))
     input.src = preprocessed_path
 
 
@@ -185,9 +205,6 @@ def compile_item(
         GradingFileInput(src=generator_path, dest=PosixPath(file_mapping.compilable))
     )
 
-    for input in artifacts.inputs:
-        _ignore_warning_in_cxx_input(input)
-
     artifacts.outputs.append(
         GradingFileOutput(
             src=PosixPath(file_mapping.executable),
@@ -196,6 +213,9 @@ def compile_item(
         )
     )
 
+    for input in artifacts.inputs:
+        _ignore_warning_in_cxx_input(input)
+
     if not steps_with_caching.compile(
         commands,
         params=sandbox_params,

rbx/box/main.py

@@ -42,6 +42,7 @@ from rbx.box.solutions import (
     estimate_time_limit,
     get_exact_matching_solutions,
     get_matching_solutions,
+    pick_solutions,
     print_run_report,
     run_and_print_interactive_solutions,
     run_solutions,
@@ -143,6 +144,13 @@ def run(
         '-s',
         help='Whether to compile the solutions with sanitizers enabled.',
     ),
+    choice: bool = typer.Option(
+        False,
+        '--choice',
+        '--choose',
+        '-c',
+        help='Whether to pick solutions interactively.',
+    ),
 ):
     main_solution = package.get_main_solution()
     if check and main_solution is None:
@@ -174,31 +182,37 @@ def run(
         if override_tl is None:
             raise typer.Exit(1)
 
-    with utils.StatusProgress('Running solutions...') as s:
-        if sanitized:
-            console.console.print(
-                '[warning]Sanitizers are running, so the time limit for the problem will be dropped, '
-                'and the environment default time limit will be used instead.[/warning]'
-            )
+    if sanitized:
+        console.console.print(
+            '[warning]Sanitizers are running, so the time limit for the problem will be dropped, '
+            'and the environment default time limit will be used instead.[/warning]'
+        )
 
-        tracked_solutions = None
-        if outcome is not None:
-            tracked_solutions = {
-                str(solution.path)
-                for solution in get_matching_solutions(ExpectedOutcome(outcome))
-            }
-        if solution:
-            tracked_solutions = {solution}
+    tracked_solutions = None
+    if outcome is not None:
+        tracked_solutions = {
+            str(solution.path)
+            for solution in get_matching_solutions(ExpectedOutcome(outcome))
+        }
+    if solution:
+        tracked_solutions = {solution}
 
-        if sanitized and tracked_solutions is None:
-            console.console.print(
-                '[warning]Sanitizers are running, and no solutions were specified to run. Will only run [item]ACCEPTED[/item] solutions.'
-            )
-            tracked_solutions = {
-                str(solution.path)
-                for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
-            }
+    if sanitized and tracked_solutions is None:
+        console.console.print(
+            '[warning]Sanitizers are running, and no solutions were specified to run. Will only run [item]ACCEPTED[/item] solutions.'
+        )
+        tracked_solutions = {
+            str(solution.path)
+            for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
+        }
+
+    if choice:
+        tracked_solutions = set(pick_solutions(tracked_solutions))
+        if not tracked_solutions:
+            console.console.print('[error]No solutions selected. Exiting.[/error]')
+            raise typer.Exit(1)
 
+    with utils.StatusProgress('Running solutions...') as s:
         solution_result = run_solutions(
             progress=s,
             tracked_solutions=tracked_solutions,
@@ -338,6 +352,13 @@ def irun(
         '-s',
         help='Whether to compile the solutions with sanitizers enabled.',
     ),
+    choice: bool = typer.Option(
+        False,
+        '--choice',
+        '--choose',
+        '-c',
+        help='Whether to pick solutions interactively.',
+    ),
 ):
     if not print:
         console.console.print(
@@ -373,18 +394,26 @@ def irun(
             for solution in get_exact_matching_solutions(ExpectedOutcome.ACCEPTED)
         }
 
-    asyncio.run(
-        run_and_print_interactive_solutions(
-            tracked_solutions=tracked_solutions,
-            check=check,
-            verification=VerificationLevel(verification),
-            generator=generators.get_call_from_string(generator)
-            if generator is not None
-            else None,
-            print=print,
-            sanitized=sanitized,
+    if choice:
+        tracked_solutions = set(pick_solutions(tracked_solutions))
+        if not tracked_solutions:
+            console.console.print('[error]No solutions selected. Exiting.[/error]')
+            raise typer.Exit(1)
+
+    with utils.StatusProgress('Running solutions...') as s:
+        asyncio.run(
+            run_and_print_interactive_solutions(
+                progress=s,
+                tracked_solutions=tracked_solutions,
+                check=check,
+                verification=VerificationLevel(verification),
+                generator=generators.get_call_from_string(generator)
+                if generator is not None
+                else None,
+                print=print,
+                sanitized=sanitized,
+            )
         )
-    )
 
 
 @app.command('create, c', help='Create a new problem package.')
@@ -551,7 +580,10 @@ def stress(
 @app.command('compile', help='Compile an asset given its path.')
 @package.within_problem
 def compile_command(
-    path: Annotated[str, typer.Argument(help='Path to the asset to compile.')],
+    path: Annotated[
+        Optional[str],
+        typer.Argument(help='Path to the asset to compile.'),
+    ] = None,
     sanitized: bool = typer.Option(
         False,
         '--sanitized',
@@ -565,6 +597,12 @@ def compile_command(
         help='Whether to compile the asset with warnings enabled.',
     ),
 ):
+    if path is None:
+        path = questionary.path("What's the path to your asset?").ask()
+        if path is None:
+            console.console.print('[error]No path specified.[/error]')
+            raise typer.Exit(1)
+
     compile.any(path, sanitized, warnings)
 
 

rbx/box/package.py

@@ -163,16 +163,12 @@ def get_problem_preprocessed_path(
 ) -> pathlib.Path:
     root_resolved = root.resolve()
     item_resolved = item.resolve()
+
     if not item_resolved.is_relative_to(root_resolved):
-        console.console.print(
-            f'[error]Item [item]{item}[/item] is not under the root [item]{root}[/item].[/error]'
-        )
-        raise typer.Exit(1)
-    path = (
-        get_problem_cache_dir(root)
-        / '.preprocessed'
-        / item_resolved.relative_to(root_resolved)
-    )
+        final_path = pathlib.Path('remote') / item_resolved.name
+    else:
+        final_path = item_resolved.relative_to(root_resolved)
+    path = get_problem_cache_dir(root) / '.preprocessed' / final_path
     path.parent.mkdir(parents=True, exist_ok=True)
     return path
 

rbx/box/solutions.py

@@ -7,6 +7,7 @@ import shutil
 from collections.abc import Iterator
 from typing import Dict, Iterable, List, Optional, Set, Tuple
 
+import questionary
 import rich
 import rich.live
 import rich.markup
@@ -410,6 +411,7 @@ def run_solutions(
 
 
 def _run_interactive_solutions(
+    progress: Optional[StatusProgress] = None,
     tracked_solutions: Optional[Set[str]] = None,
     verification: VerificationLevel = VerificationLevel.NONE,
     generator: Optional[GeneratorCall] = None,
@@ -423,7 +425,7 @@ def _run_interactive_solutions(
 
     checker_digest = checkers.compile_checker() if check else None
     compiled_solutions = compile_solutions(
-        tracked_solutions=tracked_solutions, sanitized=sanitized
+        progress=progress, tracked_solutions=tracked_solutions, sanitized=sanitized
     )
 
     main_solution_digest = None
@@ -498,6 +500,7 @@ def _run_interactive_solutions(
 
 
 async def run_and_print_interactive_solutions(
+    progress: Optional[StatusProgress] = None,
     tracked_solutions: Optional[Set[str]] = None,
     verification: VerificationLevel = VerificationLevel.NONE,
     generator: Optional[GeneratorCall] = None,
@@ -507,6 +510,7 @@ async def run_and_print_interactive_solutions(
 ):
     pkg = package.find_problem_package_or_die()
     items = _run_interactive_solutions(
+        progress=progress,
         tracked_solutions=tracked_solutions,
         verification=verification,
         check=check,
@@ -515,6 +519,9 @@ async def run_and_print_interactive_solutions(
         print=print,
     )
 
+    if progress:
+        progress.stop()
+
     for item in items:
         sol = pkg.solutions[item.solution_index]
         _print_solution_header(sol, console.console, is_irun=True)
@@ -540,6 +547,16 @@ async def run_and_print_interactive_solutions(
             console.console.print()
 
 
+def pick_solutions(tracked_solutions: Optional[Set[str]]) -> List[str]:
+    pkg = package.find_problem_package_or_die()
+    if tracked_solutions is None:
+        tracked_solutions = set(str(sol.path) for sol in pkg.solutions)
+
+    return questionary.checkbox(
+        'Select solutions', choices=list(tracked_solutions)
+    ).ask()
+
+
 def get_outcome_style_verdict(outcome: Outcome) -> str:
     if outcome == Outcome.ACCEPTED:
         return 'green'
@@ -554,21 +571,25 @@ def get_outcome_style_verdict(outcome: Outcome) -> str:
     return 'magenta'
 
 
-def get_testcase_markup_verdict(eval: Evaluation) -> str:
+def get_outcome_markup_verdict(outcome: Outcome) -> str:
     res = '✓'
-    if eval.result.outcome != Outcome.ACCEPTED:
+    if outcome != Outcome.ACCEPTED:
         res = '✗'
-    if eval.result.outcome == Outcome.TIME_LIMIT_EXCEEDED:
+    if outcome == Outcome.TIME_LIMIT_EXCEEDED:
         res = '⧖'
-    if eval.result.outcome == Outcome.RUNTIME_ERROR:
+    if outcome == Outcome.RUNTIME_ERROR:
         res = '✗'
-    style = get_outcome_style_verdict(eval.result.outcome)
+    style = get_outcome_style_verdict(outcome)
     res = f'[{style}]{res}[/{style}]'
+    return res
+
+
+def get_testcase_markup_verdict(eval: Evaluation) -> str:
     # if eval.log.stdout_absolute_path:
     #     output_path = eval.log.stdout_absolute_path.resolve()
     #     output_link = f'file://{output_path}'
     #     res = f'[link={output_link}]{res}[/link]'
-    return res
+    return get_outcome_markup_verdict(eval.result.outcome)
 
 
 def _get_evals_time_in_ms(evals: List[Evaluation]) -> int:
@@ -632,6 +653,10 @@ def get_evals_formatted_memory(evals: List[Evaluation]) -> str:
     return get_formatted_memory(max_memory)
 
 
+def get_worst_outcome(evals: List[Evaluation]) -> Outcome:
+    return Outcome.worst_outcome(eval.result.outcome for eval in evals)
+
+
 def _print_solution_outcome(
     solution: Solution,
     evals: List[Evaluation],
@@ -880,7 +905,11 @@ async def _render_detailed_group_table(
                     solution, non_null_evals, verification
                 )
                 formatted_memory = get_evals_formatted_memory(non_null_evals)
-                summary_row.append(('', '', formatted_time, '/', formatted_memory, ''))
+                worst_outcome = get_worst_outcome(non_null_evals)
+                verdict = get_outcome_markup_verdict(worst_outcome)
+                summary_row.append(
+                    ('', verdict, formatted_time, '/', formatted_memory, '')
+                )
             padded_rows.append(summary_row)
 
         for row in _render_padded_rows(padded_rows):
@@ -1020,12 +1049,13 @@ async def print_run_report(
             )
             console.print()
 
-        ok = ok and _print_solution_outcome(
+        cur_ok = _print_solution_outcome(
             solution,
             solution_evals,
             console,
             verification=verification,
         )
+        ok = ok and cur_ok
         console.print()
 
     await _print_timing(console, result.skeleton, structured_evaluations)

rbx/grading/steps.py

@@ -6,7 +6,7 @@ import shutil
 import subprocess
 import sys
 from enum import Enum
-from typing import IO, Any, Dict, List, Optional, Tuple, Union
+from typing import IO, Any, Dict, Iterable, List, Optional, Tuple, Union
 
 import typer
 from pydantic import BaseModel
@@ -24,13 +24,20 @@ MAX_STDOUT_LEN = 1024 * 1024 * 128  # 128 MB
 class Outcome(Enum):
     ACCEPTED = 'accepted'
     WRONG_ANSWER = 'wrong-answer'
-    JUDGE_FAILED = 'judge-failed'
-    RUNTIME_ERROR = 'runtime-error'
-    TIME_LIMIT_EXCEEDED = 'time-limit-exceeded'
     MEMORY_LIMIT_EXCEEDED = 'memory-limit-exceeded'
+    TIME_LIMIT_EXCEEDED = 'time-limit-exceeded'
+    RUNTIME_ERROR = 'runtime-error'
     OUTPUT_LIMIT_EXCEEDED = 'output-limit-exceeded'
+    JUDGE_FAILED = 'judge-failed'
     INTERNAL_ERROR = 'internal-error'
 
+    @classmethod
+    def worst_outcome(cls, outcomes: Iterable['Outcome']) -> 'Outcome':
+        def _outcome_to_int(o: 'Outcome') -> int:
+            return cls._member_names_.index(o.name)
+
+        return max(outcomes, key=_outcome_to_int)
+
 
 class DigestHolder(BaseModel):
     value: Optional[str] = None

{rbx_cp-0.5.23.dist-info → rbx_cp-0.5.25.dist-info}/METADATA

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

{rbx_cp-0.5.23.dist-info → rbx_cp-0.5.25.dist-info}/RECORD

@@ -5,7 +5,7 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=0TiRQJoHqLHAI8QwBrscbaJmhdcmialVtP_oEkfHcs0,3260
 rbx/box/cd.py,sha256=9a_SOnzoJBXxxffp4Wbf3UKXIwKuN3Hvj7K6SocALwE,1194
 rbx/box/checkers.py,sha256=VpgDzevOK7hrffG2zJGxquNiu-a9Fl3wquLn7xadcK0,6285
-rbx/box/code.py,sha256=gdiNwp0Wv-cxejGL-xQQW1UV9RI4KuaUXtRRfM7ma5c,11091
+rbx/box/code.py,sha256=N2pjerRsESDqQ0G8NNeUJQgXxlJTZwNmanhhXZn5tN8,11531
 rbx/box/compile.py,sha256=OJLthDQ921w9vyoE6Gk1Df54i5RwtRJ2YG-8XEfefcs,2489
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,8 +22,8 @@ rbx/box/environment.py,sha256=47NtyuVC6zSQKAtQaXPEXvqcD-KJiuWRpWF8pYvcG4c,11158
 rbx/box/extensions.py,sha256=gIC73VbF1897er3iIMhaIw6GE8o1t43M7q97Iz7-_lg,503
 rbx/box/generators.py,sha256=bzURQrNEscCO8_3BYXCyGK9ZneX4-eOJZP5JJV28f3I,16350
 rbx/box/generators_test.py,sha256=mQqHepAMYa6zV_PseQALI0nIX6AdQktt6lh94muFhNw,1758
-rbx/box/main.py,sha256=pc7DiIaPnq50DUPsPhtzr4kiPu5c2TrK0QaS21wcmwY,22067
-rbx/box/package.py,sha256=AfzjdBA9LTq2jORAP1OHrPl2lHrHa5K_Lzi5re0SRfI,11942
+rbx/box/main.py,sha256=MPMIyd8IzuwMJX1XSPESp1Ky33WCtxVmyhtHzSJQtAU,23199
+rbx/box/package.py,sha256=SSckCXo7Zh412_qjYhSNwConjhR0Sk8911qGJU34Hac,11851
 rbx/box/packaging/boca/extension.py,sha256=hQhcbocNfW2ESv5RalS1wf6uvOoOfOnR_gHvbXUbSzY,852
 rbx/box/packaging/boca/packager.py,sha256=FOhSRg5K5Y4qNB0WyTR3DKgrpObf9I0JbyGpJHOtxpo,10673
 rbx/box/packaging/contest_main.py,sha256=Hbxh7geNqrePs5tWhPgdg5W2qhaW5yoreK_VP0Sm19k,2727
@@ -39,7 +39,7 @@ rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,196
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
 rbx/box/schema.py,sha256=mPEOchzoGDwk_S9wUw1DKqwJWJ0S5GTxQnZIlm9BFwo,13709
 rbx/box/setter_config.py,sha256=6nGTPMvnJ7y1sM-EBuI493NSZOIiOZ1DTypSXrL-HRY,3686
-rbx/box/solutions.py,sha256=0kVFY_RdQQ-wK9hk4XY4VeJv5oPNkkq28x1sk8RNP3o,36584
+rbx/box/solutions.py,sha256=nnirg9ifs2EdyhXVhSZ0rUhobZMdRF-WdYfLbdNyTwI,37523
 rbx/box/solutions_test.py,sha256=Cx7Goon_0sz_PaUcD8qa8gmjgzOVub6VHss3CB0GaA0,1524
 rbx/box/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/statements/build_statements.py,sha256=upsMT-cAnSvbmKgtijdFc0OxPcyeBxRG92hY6dN-ZOk,11920
@@ -81,7 +81,7 @@ rbx/grading/judge/sandboxes/timeit.py,sha256=xScfasI2lsSQGZVpIZ7qBZfi0IaKC-1k8wO
 rbx/grading/judge/storage.py,sha256=FirqjwDqb0m0h2OTFyWrZL7CQ4XjZNxhqB4JpnDIhZY,9485
 rbx/grading/judge/test.py,sha256=ll0Iw7zyOpGdKPD_PGH7dvUkb4stQLu-ikbQnqJvuAc,944
 rbx/grading/judge/testiso.py,sha256=v14DtkWiZFJ9AKMzrb0_vZKPWDt8jz8iIw1Z2O-Advk,1397
-rbx/grading/steps.py,sha256=S1ozeLrteAMEHiNKXYxHUK90VQQoFz-lIcIkh6RU6uU,22784
+rbx/grading/steps.py,sha256=EKH9k5buU69f8wgek6rAk72oAnDJ22nOp2Rw-touk_Q,23037
 rbx/grading/steps_with_caching.py,sha256=5cI71VSjEaDzCPQikpamG_EjZqkkFKKdBtyJeA4QB7Q,1531
 rbx/grading/steps_with_caching_run_test.py,sha256=nRzB4OcXkb-kQ4WCj0iTGVfBACllxZ0Ek5RSwfoJRgo,15262
 rbx/grading_utils.py,sha256=lL2KtSkOsMElqrRoApQTbFcqVOeHVWUDTMCa3IsLpC4,4484
@@ -162,8 +162,8 @@ rbx/testdata/caching/executable.py,sha256=WKRHNf_fprFJd1Fq1ubmQtR3mZzTYVNwKPLWuZ
 rbx/testdata/compatible,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/testing_utils.py,sha256=ZZLKMUHlZ4HwsuNY50jqSBJ9HhpnFdba7opjDsvXE1U,2084
 rbx/utils.py,sha256=WlmnF4whc0-6ksVZoOhmom2bR2spT6zETFHjnpJOCsA,4383
-rbx_cp-0.5.23.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.23.dist-info/METADATA,sha256=FTieHquNJ9a92eDcndLKo_8wBmYx8-vVX6hQZcAWIWA,3290
-rbx_cp-0.5.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rbx_cp-0.5.23.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.23.dist-info/RECORD,,
+rbx_cp-0.5.25.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.25.dist-info/METADATA,sha256=EVWrYcC_J1TlCXE7aXFyRLTbcezWHkauiwvrva1kF_o,3290
+rbx_cp-0.5.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rbx_cp-0.5.25.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.25.dist-info/RECORD,,