kattis-cli 1.0.3__tar.gz → 1.0.5__tar.gz

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: kattis-cli
-Version: 1.0.3
+Version: 1.0.5
 Summary: A command-line tool for Kattis
 Home-page: https://github.com/rambasnet/kattis-cli
 Author: Ram Basnet
-Author-email: rambasnet@gmail.com
+Author-email: rbasnet@coloradomesa.edu
 Requires-Python: >=3.8,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/kattis_cli/download.py

@@ -2,14 +2,12 @@
     and save them to data folders.
 """
 
-# import sys
 import shutil
 from typing import Any, Dict
 from pathlib import Path
 import requests
 import yaml
 from bs4 import BeautifulSoup
-
 from .utils import config, utility
 from . import settings
 

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/kattis_cli/kattis.py

@@ -20,7 +20,7 @@ from rich.align import Align
 from rich.live import Live
 from rich.prompt import Confirm
 
-from kattis_cli.utils import utility
+from kattis_cli.utils import languages
 from kattis_cli.utils import config
 from kattis_cli import ui
 
@@ -182,7 +182,7 @@ def confirm_or_die(problem: str, language: str,
     console.print('Language:', language)
     console.print('Files:', ', '.join(files))
     if mainclass:
-        if language in utility.GUESS_MAINFILE:
+        if language in languages.GUESS_MAINFILE:
             console.print('Main file:', mainclass)
         else:
             console.print('Mainclass:', mainclass)

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/kattis_cli/main.py

@@ -7,7 +7,7 @@ build.sh script copies the contents of this file to main.py.
 Change the __version__ to match in pyproject.toml
 Has to be higher than the pypi version.
 """
-__version__ = '1.0.3'
+__version__ = '1.0.5'
 
 from math import inf
 from typing import Tuple
@@ -18,7 +18,7 @@ import kattis_cli.download as download
 import kattis_cli.ui as ui
 import kattis_cli.test_solution as test_solution
 import kattis_cli.kattis as kattis
-import kattis_cli.utils.utility as utility
+import kattis_cli.utils.languages as languages
 import kattis_cli.kattis_setup as kattis_setup
 
 
@@ -75,11 +75,11 @@ def test(
     """Test solution with sample files.
     """
     problemid, loc_language, mainclass, _files, root_folder, lang_config = \
-        utility.update_args(problemid, language, mainclass, list(files))
+        languages.update_args(problemid, language, mainclass, list(files))
     # print('After - ', f'{problemid=} {language=} {mainclass=} {_files=}')
     # lang_config = config.parse_config(language)
     if not mainclass:
-        mainclass = utility.guess_mainfile(
+        mainclass = languages.guess_mainfile(
             language, _files, problemid, lang_config)
 
     test_solution.test_samples(
@@ -111,14 +111,14 @@ def submit(problemid: str, language: str,
     """Submit a solution to Kattis.
     """
     problemid, language, mainclass, _files, _, lang_config = \
-        utility.update_args(
+        languages.update_args(
             problemid, language, mainclass, list(files))
     # Finally, submit the solution
     # print(f'{problemid=} {language=} {mainclass=} {tag=} {force=} {_files=}')
     if not mainclass:
-        mainclass = utility.guess_mainfile(
+        mainclass = languages.guess_mainfile(
             language, _files, problemid, lang_config)
-    kat_lang = utility.LOCAL_TO_KATTIS[language]
+    kat_lang = languages.LOCAL_TO_KATTIS[language]
     kattis.submit_solution(_files, problemid,
                            kat_lang, mainclass,
                            tag, force)

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/kattis_cli/test_solution.py

@@ -1,8 +1,8 @@
 """Tester module for Kattis.
 """
 
-from math import inf
 from typing import Any, List, Dict
+from math import inf
 import glob
 import time
 import os
@@ -17,26 +17,7 @@ from rich.prompt import Confirm
 from rich.markup import escape
 
 from kattis_cli import kattis
-from kattis_cli.utils import run_program, utility
-
-
-def compare_floats(expected: str, ans: str, places: float) -> bool:
-    """Compare two floating point numbers with given accuracy.
-
-    Args:
-        expected (str): expected result
-        ans (str): actual result
-        places (float): decimal places for approximation
-
-    Returns:
-        bool: True if the two numbers are equal within the given accuracy
-    """
-    try:
-        flt_expected = float(expected)
-        flt_ans = float(ans)
-        return abs(flt_expected - flt_ans) <= 10**(-places)
-    except ValueError:
-        return False
+from kattis_cli.utils import languages, run_program, utility
 
 
 def test_samples(
@@ -138,27 +119,31 @@ def test_samples(
                 input_content = f.read()
                 input_content.replace(b'\r\n', b'\n')  # Windows fix
             out_file = in_file.replace('.in', '.ans')
-            with open(out_file, 'rb') as f:
-                expected = f.read()
-                expected.replace(b'\r\n', b'\n')
+            try:
+                with open(out_file, 'rb') as f:
+                    expected = f.read()
+                    expected.replace(b'\r\n', b'\n')
+            except FileNotFoundError:
+                try:
+                    out_file = in_file.replace('.in', '.out')
+                    with open(out_file, 'rb') as f:
+                        expected = f.read()
+                        expected.replace(b'\r\n', b'\n')
+                except FileNotFoundError:
+                    expected = b"No .ans or .out file found!"
             # Run the program
             code, ans, error = run_program.run(lang_config, mainclass, in_file)
-            expected = expected.strip()
             if code != 0:
                 ans = error
             # console.print(f"{ans=} {error=}")
-            if accuracy == inf:  # string comparison
-                if expected == ans.encode('utf-8').strip():
-                    result = "[bold green]✅[/bold green]"
-                    count += 1
-                else:
-                    result = "[bold red]❌[/bold red]"
-            else:  # floating point comparison
-                if compare_floats(expected.decode('utf-8'), ans, accuracy):
-                    result = "[bold green]✅[/bold green]"
-                    count += 1
-                else:
-                    result = "[bold red]❌[/bold red]"
+
+            # floating point comparison
+            if utility.check_answer(expected.decode('utf-8'),
+                                    ans, accuracy):
+                result = "[bold green]✅[/bold green]"
+                count += 1
+            else:
+                result = "[bold red]❌[/bold red]"
 
             # UI Table Row ---
             in_filename = Path(in_file).parts[-1]
@@ -188,7 +173,7 @@ def test_samples(
             "Awesome... Time to submit it to :cat: Kattis! :cat:",
             style="bold green")
         if Confirm.ask("Submit to Kattis?", default=True):
-            kat_language = utility.LOCAL_TO_KATTIS.get(loc_language, '')
+            kat_language = languages.LOCAL_TO_KATTIS.get(loc_language, '')
             kattis.submit_solution(files, problemid,
                                    kat_language, mainclass,
                                    tag="", force=True)

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/kattis_cli/utils/config.py

@@ -9,7 +9,7 @@ import configparser
 from tomlkit import load
 import yaml
 
-from .utility import find_problem_root_folder
+from kattis_cli.utils.utility import find_problem_root_folder
 
 _DEFAULT_CONFIG = Path.home().joinpath('.kattisrc')
 

kattis_cli-1.0.3/kattis_cli/utils/utility.py → kattis_cli-1.0.5/kattis_cli/utils/languages.py

@@ -1,14 +1,14 @@
 """Module for language utilities.
 """
 
-from typing import List, Union, Any, Dict
+from typing import List, Dict, Any
 import sys
 import os
 import re
 from pathlib import Path
-import yaml
 from rich.console import Console
 from kattis_cli.utils import config
+from kattis_cli.utils.utility import find_problem_root_folder
 
 
 LANGUAGE_GUESS = {
@@ -248,60 +248,6 @@ def valid_extension(file: str) -> bool:
     return False
 
 
-def find_problem_root_folder(
-    cur_dir_path: Union[str, Path],
-    filename: str
-) -> Path:
-    """Find the root problem folder given a directory path and filename.
-
-    Args:
-        cur_dir_path (Union[str, Path]): String or Path
-            object of directory path
-        filename (str): filename to search for
-            including wildcard pattern
-
-    Returns:
-        Path: Path object of the root problem folder
-    """
-
-    def _check_file_match_folder(path: Path, filename: str) -> bool:
-        """ Check folder is same name as the filename given
-        filename including wildcard.
-
-        Args:
-            path (Path): Path object of directory path
-            filename (str): filename to search for
-                including wildcard pattern
-        Returns:
-            bool: True if path exists, False otherwise
-        """
-        for file in path.glob(filename):
-            name, ext = os.path.splitext(file.name)
-            folder_name = path.parts[-1]
-            # print(f'{name} {folder_name=} {name=} {ext=}')
-            if name == folder_name:
-                return True
-            # read yaml file
-            if ext == '.yaml':
-                with open(file, 'r', encoding='utf-8') as f:
-                    data = yaml.safe_load(f)
-                    if 'problemid' in data:
-                        return True
-        return False
-
-    # print(f'{cur_dir_path=} {filename=}')
-    if not filename:
-        filename = '.yaml'
-    cur_path = Path(cur_dir_path)
-    if _check_file_match_folder(cur_path, filename):
-        return cur_path
-    for parent in cur_path.parents:
-        # print('parent', parent, file=sys.stderr)
-        if _check_file_match_folder(parent, filename):
-            return parent
-    raise FileNotFoundError("Error: Problem root folder not found.")
-
-
 # flake8: noqa: C901
 def update_args(problemid: str,
                 loc_language: str,

kattis_cli-1.0.5/kattis_cli/utils/utility.py

@@ -0,0 +1,94 @@
+""" Utility functions. """
+
+from pathlib import Path
+import os
+from math import inf
+from typing import Union
+import yaml
+
+
+def find_problem_root_folder(
+    cur_dir_path: Union[str, Path],
+    filename: str
+) -> Path:
+    """Find the root problem folder given a directory path and filename.
+
+    Args:
+        cur_dir_path (Union[str, Path]): String or Path
+            object of directory path
+        filename (str): filename to search for
+            including wildcard pattern
+
+    Returns:
+        Path: Path object of the root problem folder
+    """
+
+    def _check_file_match_folder(path: Path, filename: str) -> bool:
+        """ Check folder is same name as the filename given
+        filename including wildcard.
+
+        Args:
+            path (Path): Path object of directory path
+            filename (str): filename to search for
+                including wildcard pattern
+        Returns:
+            bool: True if path exists, False otherwise
+        """
+        for file in path.glob(filename):
+            name, ext = os.path.splitext(file.name)
+            folder_name = path.parts[-1]
+            # print(f'{name} {folder_name=} {name=} {ext=}')
+            if name == folder_name:
+                return True
+            # read yaml file
+            if ext == '.yaml':
+                with open(file, 'r', encoding='utf-8') as f:
+                    data = yaml.safe_load(f)
+                    if 'problemid' in data:
+                        return True
+        return False
+
+    # print(f'{cur_dir_path=} {filename=}')
+    if not filename:
+        filename = '.yaml'
+    cur_path = Path(cur_dir_path)
+    if _check_file_match_folder(cur_path, filename):
+        return cur_path
+    for parent in cur_path.parents:
+        # print('parent', parent, file=sys.stderr)
+        if _check_file_match_folder(parent, filename):
+            return parent
+    raise FileNotFoundError("Error: Problem root folder not found.")
+
+
+def check_answer(expected: str, ans: str, places: float = inf) -> bool:
+    """Compare two numeric strings with given precision.
+
+    Args:
+        expected (str): expected result
+        ans (str): actual result
+        places (float): decimal places for approximation;
+        default inf for string comparison
+
+    Returns:
+        bool: True if the two values are equal, False otherwise
+    """
+    expect_ans = expected.strip().split('\n')
+    actual_ans = ans.strip().split('\n')
+    if len(expect_ans) != len(actual_ans):
+        return False
+
+    if places == inf:
+        if expect_ans == actual_ans:
+            return True
+        else:
+            return False
+    try:
+        for i, ex_ans in enumerate(expect_ans):
+            flt_expected = float(ex_ans)
+            flt_ans = float(actual_ans[i])
+            if abs(flt_expected - flt_ans) > 10**(-places):
+                return False
+        return True
+    except ValueError:
+        return False

{kattis_cli-1.0.3 → kattis_cli-1.0.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "kattis-cli"
-version = "1.0.3"
-authors = ["Ram Basnet <rambasnet@gmail.com>"]
+version = "1.0.5"
+authors = ["Ram Basnet <rbasnet@coloradomesa.edu>"]
 description = "A command-line tool for Kattis"
 readme = "README.md"
 repository = "https://github.com/rambasnet/kattis-cli"