crisp: fix many type errors found by mypy and ty

crisp/analysis.py

@@ -214,9 +214,9 @@ def crisp_git_state(subdir=None) -> str:
         return "unknown"
     rev = p.stdout.decode("utf-8").strip()
 
-    status_cmd = ("git", "status", "--porcelain=v1", "-z")
+    status_cmd = ["git", "status", "--porcelain=v1", "-z"]
     if subdir is not None:
-        status_cmd = status_cmd + (subdir,)
+        status_cmd.append(subdir)
     p = subprocess.run(status_cmd, cwd=_CRISP_DIR, check=True, stdout=subprocess.PIPE)
 
     parts = p.stdout.split(b"\0")
@@ -297,6 +297,6 @@ def _find_unsafe_impl(
     return n
 
 
-def find_unsafe(cfg: Config, mvir: MVIR, code: TreeNode) -> CompileCommandsOpNode:
+def find_unsafe(cfg: Config, mvir: MVIR, code: TreeNode) -> FindUnsafeAnalysisNode:
     commit = crisp_git_state("tools/find_unsafe")
     return _find_unsafe_impl(cfg, mvir, code, commit)

crisp/git.py

@@ -1,6 +1,6 @@
 import os
 import pygit2
-from typing import Optional
+from typing import Optional, TypeAlias
 
 from . import mvir as mvir_module
 from .mvir import MVIR, TreeNode, FileNode
@@ -15,15 +15,15 @@ def get_repo(mvir: MVIR) -> pygit2.Repository:
 
     try:
         return pygit2.Repository(
-            path,
-            pygit2.GIT_REPOSITORY_OPEN_NO_SEARCH
+            path=path,
+            flags=pygit2.GIT_REPOSITORY_OPEN_NO_SEARCH
             | pygit2.GIT_REPOSITORY_OPEN_BARE
             | pygit2.GIT_REPOSITORY_OPEN_NO_DOTGIT,
         )
     except pygit2.GitError:
         return pygit2.init_repository(
-            path,
-            pygit2.GIT_REPOSITORY_INIT_BARE
+            path=path,
+            flags=pygit2.GIT_REPOSITORY_INIT_BARE
             | pygit2.GIT_REPOSITORY_INIT_NO_REINIT
             | pygit2.GIT_REPOSITORY_INIT_NO_DOTGIT_DIR,
         )
@@ -76,6 +76,9 @@ def render(mvir: MVIR, target: TreeNode) -> pygit2.Oid:
     return commit
 
 
+Tree: TypeAlias = dict[str, "Tree" | FileNode]
+
+
 def commit_tree(
     mvir: MVIR,
     repo: pygit2.Repository,
@@ -86,7 +89,7 @@ def commit_tree(
     # Convert the `TreeNode`'s flat path->ID mapping to a nested structure like
     # the one used by git tree objects.  At each level, each entry is either a
     # `FileNode` or a dict representing a directory.
-    tree_files = {}
+    tree_files: Tree = {}
 
     def get_parent_and_name(path):
         head, tail = os.path.split(path)

crisp/llm.py

@@ -3,6 +3,7 @@
 import os
 import pathlib
 import re
+from typing import Iterable
 import requests
 
 from .config import Config, ModelConfig
@@ -41,9 +42,9 @@ def emit_file(n: FileNode, path, file_type="Rust"):
 def emit_files(
     mvir: MVIR,
     n: TreeNode,
-    glob_filter: str = None,
+    glob_filter: Iterable[str] | str | None = None,
     file_type_map: dict[str, str] = DEFAULT_FILE_TYPE_MAP,
-) -> (str, dict[str, str]):
+) -> tuple[str, dict[str, str]]:
     """
     Generate markdown-formatted text giving the contents of files in `n`, along
     with a dict mapping short path names used in the output to full paths as
@@ -53,8 +54,13 @@ def emit_files(
     """
     assert isinstance(n, TreeNode)
 
-    if isinstance(glob_filter, str):
-        glob_filter = (glob_filter,)
+    glob_filters: Iterable[str] | None
+    if glob_filter is None:
+        glob_filters = None
+    elif isinstance(glob_filter, str):
+        glob_filters = (glob_filter,)
+    else:
+        glob_filters = glob_filter
 
     if len(n.files) == 0:
         common_prefix = ""
@@ -66,9 +72,9 @@ def emit_files(
     parts = []
     short_path_map = {}
     for path, child_id in n.files.items():
-        if glob_filter is not None:
+        if glob_filters is not None:
             path_obj = pathlib.Path(path)
-            glob_match = any(path_obj.match(g) for g in glob_filter)
+            glob_match = any(path_obj.match(g) for g in glob_filters)
             if not glob_match:
                 continue
 
@@ -325,7 +331,7 @@ def run_rewrite(
     file_type_map=DEFAULT_FILE_TYPE_MAP,
     format_kwargs: dict = {},
     think: bool = False,
-) -> TreeNode:
+) -> tuple[TreeNode, LlmOpNode]:
     model = API_MODEL or cfg.model
     if model is None:
         model = get_default_model()