#102 More types in util.py (#423)

* more types

* Update bin/util.py

Co-authored-by: Maarten Sijm <9739541+mpsijm@users.noreply.github.com>

* add Popen type

* fix

* add Named Type

---------

Co-authored-by: Maarten Sijm <9739541+mpsijm@users.noreply.github.com>

Author: mzuenni

bin/config.py

@@ -100,7 +100,7 @@
 # fmt: on
 
 
-def set_default_args():
+def set_default_args() -> None:
     # Set default argument values.
     for arg in ARGS_LIST:
         if not hasattr(args, arg):

bin/contest.py

@@ -1,3 +1,5 @@
+import config
+
 from pathlib import Path
 
 from util import *

bin/generate.py

@@ -128,7 +128,7 @@ def callback(program):
 
     # Return the form of the command used for caching.
     # This is independent of {name} and the actual run_command.
-    def cache_command(self, seed=None):
+    def cache_command(self, seed=None) -> str:
         command_string = self.command_string
         if seed:
             command_string = self.SEED_REGEX.sub(str(seed), command_string)
@@ -137,6 +137,7 @@ def cache_command(self, seed=None):
     def hash(self, seed=None):
         list = []
         if self.program is not None:
+            assert self.program.hash is not None
             list.append(self.program.hash)
         list.append(self.cache_command(seed))
         return combine_hashes(list)
@@ -605,13 +606,13 @@ def __init__(self, problem, generator_config, key, name: str, yaml, parent, coun
                 return
 
             # build ordered list of hashes we want to consider
-            self.hash = [hashes[ext] for ext in config.KNOWN_TESTCASE_EXTENSIONS if ext in hashes]
+            hs = [hashes[ext] for ext in config.KNOWN_TESTCASE_EXTENSIONS if ext in hashes]
 
             # combine hashes
-            if len(self.hash) == 1:
-                self.hash = self.hash[0]
+            if len(hs) == 1:
+                self.hash = hs[0]
             else:
-                self.hash = combine_hashes(self.hash)
+                self.hash = combine_hashes(hs)
 
             if self.hash in generator_config.rules_cache:
                 self.copy_of = generator_config.rules_cache[self.hash]
@@ -1081,13 +1082,13 @@ def add_testdata_to_cache():
                     hashes[ext] = hash_file(target_infile.with_suffix(ext))
 
             # build ordered list of hashes we want to consider
-            test_hash = [hashes[ext] for ext in extensions if ext in hashes]
+            hs = [hashes[ext] for ext in extensions if ext in hashes]
 
             # combine hashes
-            if len(test_hash) == 1:
-                test_hash = test_hash[0]
+            if len(hs) == 1:
+                test_hash = hs[0]
             else:
-                test_hash = combine_hashes(test_hash)
+                test_hash = combine_hashes(hs)
 
             # check for duplicates
             if test_hash not in generator_config.generated_testdata:

bin/program.py

@@ -145,7 +145,7 @@ def __init__(
                 problem.path.resolve() / self.subdir
             )
             self.short_path = relpath
-            self.name = str(relpath)
+            self.name: str = str(relpath)
             self.tmpdir = problem.tmpdir / self.subdir / relpath
         except ValueError:
             self.short_path = Path(path.name)

bin/run.py

@@ -30,7 +30,7 @@ def __init__(self, problem: "problem.Problem", submission, testcase):
         self.problem = problem
         self.submission = submission
         self.testcase = testcase
-        self.name = self.testcase.name
+        self.name: str = self.testcase.name
         self.result = None
 
         self.tmpdir = (
@@ -228,6 +228,7 @@ def _validate_output(self, bar):
             ret.err = ""
         if judgeerror.is_file():
             ret.err = judgeerror.read_text(errors="replace")
+        assert ret.err is not None
         if len(ret.err) == 0 and judgemessage.is_file():
             ret.err = judgemessage.read_text(errors="replace")
         if ret.err:

bin/stats.py

@@ -379,10 +379,6 @@ def get_submissions_row(display_name, names):
         error("git not found!")
         return
 
-    if not exec_command(["git", "rev-parse", "--is-inside-work-tree"]).out.startswith("true"):
-        error("not inside git")
-        return
-
     def git(*args):
         res = exec_command(
             ["git", *args],
@@ -392,6 +388,10 @@ def git(*args):
         )
         return res.out if res else ""
 
+    if not git("rev-parse", "--is-inside-work-tree").startswith("true"):
+        error("not inside git")
+        return
+
     print("-" * len(header), file=sys.stderr)
     testcases = [len(generate.testcases(p)) for p in problems]
     testcases += get_stats(testcases)