kattis-cli 1.2.6__tar.gz → 1.2.7__tar.gz

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kattis-cli
-Version: 1.2.6
+Version: 1.2.7
 Summary: A command-line tool for Kattis
 License-File: LICENSE
 Author: Ram Basnet

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/pyproject.toml

@@ -2,7 +2,7 @@
 # PEP 621 metadata table for tools that expect [project].
 [project]
 name = "kattis-cli"
-version = "1.2.6"
+version = "1.2.7"
 description = "A command-line tool for Kattis"
 readme = "README.md"
 authors = [

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/src/kattis_cli/.kattis-cli.toml

@@ -15,12 +15,12 @@ execute = "python3 {mainfile}"
 mainfile = "{problemid}.py"
 
 [cpp]
-compile = "g++ -g -O2 -std=c++17 -Wall"
+compile = "g++ -g -O2 -std=gnu++23 -static -lrt -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
 execute = "./a.out"
 mainfile = "{problemid}.cpp"
 
 [c]
-compile = "gcc -g -O2 -std=gnu11 -Wall"
+compile = "gcc -g -O2 -std=gnu23 -static -lm"
 execute = "./a.out"
 mainfile = "{problemid}.c"
 

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/src/kattis_cli/main.py

@@ -2,10 +2,11 @@
 
 Change the __version__ to match in pyproject.toml
 """
-__version__ = '1.2.6'
+__version__ = '1.2.7'
 
 from math import inf
 import os
+from urllib.parse import urlparse
 from typing import Tuple
 from rich.console import Console
 import click
@@ -30,11 +31,24 @@ def main() -> None:
     pass
 
 
+def _normalize_problemid(problemid: str) -> str:
+    """Return a raw Kattis problem id from an id or full problem URL."""
+    parsed = urlparse(problemid)
+    if not parsed.scheme or not parsed.netloc:
+        return problemid
+
+    path_parts = [part for part in parsed.path.split('/') if part]
+    if not path_parts:
+        return problemid
+    return path_parts[-1]
+
+
 @main.command(help='Download sample data & metadata.')
 @click.argument('problemid')
 def get(problemid: str) -> None:
     """Command Line Interface for Kattis.
     """
+    problemid = _normalize_problemid(problemid)
     console = Console()
     console.print(
         f"Downloading metadata: [bold blue]{problemid}[/bold blue]")

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/src/kattis_cli/solution_tester.py

@@ -7,6 +7,7 @@ delegator for backward compatibility with the previous procedural API.
 from typing import Any, List, Dict, Optional
 from math import inf
 import glob
+import shlex
 import time
 import os
 from pathlib import Path
@@ -77,15 +78,22 @@ class SolutionTester:
             console.print("No sample input files found!", style="bold red")
             exit(1)
         in_files.sort()
+        compile_command = None
         if lang_config['compile']:
+            compile_command = run_program.build_compile_command(
+                lang_config,
+                files,
+            )
             ex_code, ans, error = run_program.compile_program(
                 lang_config,
                 files,
             )
             if ex_code != 0:  # compilation error; exit code
+                console.print(
+                    f"Compile command: {shlex.join(compile_command)}",
+                    style='bold blue')
                 console.print(escape(error), style='bold red')
                 exit(1)
-            console.print('Compiled successfully!', style='bold green')
 
         count = 0
         total = len(in_files)
@@ -94,6 +102,16 @@ class SolutionTester:
         main_src_file = next((f for f in files if f.endswith(mainclass)), None)
         if not main_src_file:
             main_src_file = mainclass
+        run_command = run_program.build_run_command(lang_config, main_src_file)
+
+        if compile_command:
+            console.print(
+                f"Compile command: {shlex.join(compile_command)}",
+                style='bold blue')
+            console.print('Compiled successfully!', style='bold green')
+        console.print(
+            f"Run command: {shlex.join(run_command)}",
+            style='bold blue')
 
         title += f" using {loc_language} 👷‍[/]"
         table.title = title

{kattis_cli-1.2.6 → kattis_cli-1.2.7}/src/kattis_cli/utils/run_program.py

@@ -1,10 +1,26 @@
 """Run the program with the given input file and return the output.
 """
 
+import shlex
 import subprocess
 from typing import Tuple, List, Dict, Any
 
 
+def build_compile_command(
+        lang_config: Dict[Any, Any], files: List[str]) -> List[str]:
+    """Build the compile command for the configured language."""
+    command = shlex.split(lang_config['compile'])
+    command.extend(files)
+    return command
+
+
+def build_run_command(
+        lang_config: Dict[Any, Any], mainclass: str) -> List[str]:
+    """Build the run command for the configured language."""
+    return shlex.split(
+        lang_config['execute'].replace("{mainfile}", mainclass))
+
+
 def compile_program(
         lang_config: Dict[Any, Any], files: List[str]) -> Tuple[int, str, str]:
     """Compile Program.
@@ -13,8 +29,7 @@ def compile_program(
         lang_config (Dict[Any, Any]): language config
         files (List[str]): List of files
     """
-    command = lang_config['compile'].split()
-    command.extend(files)
+    command = build_compile_command(lang_config, files)
     # print(f'{command=}')
     # print(f'{files}')
     # Set the g++ command and its arguments in a list
@@ -48,7 +63,7 @@ def run(lang_config: Dict[Any, Any],
         Tuple[str, str]: program output and error
     """
 
-    program = lang_config['execute'].replace("{mainfile}", mainclass).split()
+    program = build_run_command(lang_config, mainclass)
     # print(f'{program=}')
     code, ans, error = execute(program, input_file)
     return code, ans, error