Gradual typing

.github/workflows/lint.yml

@@ -0,0 +1,43 @@
+---
+name: Linting
+
+on:
+  push:
+    paths-ignore:
+      - 'aider/website/**'
+      - README.md
+      - HISTORY.md
+    branches:
+      - main
+  pull_request:
+    paths-ignore:
+      - 'aider/website/**'
+      - README.md
+    branches:
+      - main
+
+jobs:
+  mypy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install '.[browser,dev,playwright,mypy]'
+
+    - name: Run Mypy
+      uses: wearerequired/[email protected]
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        mypy: true
+        mypy_args: "."
+        continue_on_error: false

aider/coders/__init__.py

@@ -12,15 +12,15 @@
 # from .single_wholefile_func_coder import SingleWholeFileFunctionCoder
 
 __all__ = [
-    HelpCoder,
-    AskCoder,
-    Coder,
-    EditBlockCoder,
-    EditBlockFencedCoder,
-    WholeFileCoder,
-    UnifiedDiffCoder,
-    #    SingleWholeFileFunctionCoder,
-    ArchitectCoder,
-    EditorEditBlockCoder,
-    EditorWholeFileCoder,
+    "HelpCoder",
+    "AskCoder",
+    "Coder",
+    "EditBlockCoder",
+    "EditBlockFencedCoder",
+    "WholeFileCoder",
+    "UnifiedDiffCoder",
+    #    "SingleWholeFileFunctionCoder",
+    "ArchitectCoder",
+    "EditorEditBlockCoder",
+    "EditorWholeFileCoder",
 ]

aider/coders/ask_coder.py

@@ -1,9 +1,10 @@
 from .ask_prompts import AskPrompts
 from .base_coder import Coder
+from .base_prompts import CoderPrompts
 
 
 class AskCoder(Coder):
     """Ask questions about code without making any changes."""
 
     edit_format = "ask"
-    gpt_prompts = AskPrompts()
+    gpt_prompts: CoderPrompts = AskPrompts()

aider/coders/base_coder.py

@@ -896,7 +896,7 @@ def check_and_open_urls(self, exc, friendly_msg=None):
             self.io.offer_url(url)
         return urls
 
-    def check_for_urls(self, inp: str) -> List[str]:
+    def check_for_urls(self, inp: str) -> str:
         """Check input for URLs and offer to add them to the chat."""
         if not self.detect_urls:
             return inp

aider/coders/base_prompts.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class CoderPrompts:
     system_reminder = ""
 
@@ -37,7 +40,7 @@ class CoderPrompts:
         " stop and wait for your approval."
     )
 
-    repo_content_prefix = """Here are summaries of some files present in my git repository.
+    repo_content_prefix: str | None = """Here are summaries of some files present in my git repository.
 Do not propose changes to these files, treat them as *read-only*.
 If you need to edit any of these files, ask me to *add them to the chat* first.
 """

aider/coders/search_replace.py

@@ -2,11 +2,15 @@
 
 import sys
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-try:
+if TYPE_CHECKING:
     import git
-except ImportError:
-    git = None
+else:
+    try:
+        import git
+    except ImportError:
+        git = None
 
 from diff_match_patch import diff_match_patch
 from tqdm import tqdm

aider/exceptions.py

@@ -5,7 +5,7 @@
 class ExInfo:
     name: str
     retry: bool
-    description: str
+    description: str | None
 
 
 EXCEPTIONS = [

aider/io.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import base64
 import os
 import signal
@@ -36,7 +38,7 @@
 
 @dataclass
 class ConfirmGroup:
-    preference: str = None
+    preference: str | None = None
     show_group: bool = True
 
     def __init__(self, items=None):

aider/llm.py

@@ -42,4 +42,4 @@ def _load_litellm(self):
 
 litellm = LazyLiteLLM()
 
-__all__ = [litellm]
+__all__ = ["litellm"]

aider/main.py

@@ -8,11 +8,15 @@
 import webbrowser
 from dataclasses import fields
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-try:
+if TYPE_CHECKING:
     import git
-except ImportError:
-    git = None
+else:
+    try:
+        import git
+    except ImportError:
+        git = None
 
 import importlib_resources
 from dotenv import load_dotenv

aider/models.py

@@ -20,7 +20,7 @@
 DEFAULT_MODEL_NAME = "gpt-4o"
 ANTHROPIC_BETA_HEADER = "prompt-caching-2024-07-31,pdfs-2024-09-25"
 
-OPENAI_MODELS = """
+_OPENAI_MODELS = """
 gpt-4
 gpt-4o
 gpt-4o-2024-05-13
@@ -47,9 +47,9 @@
 gpt-3.5-turbo-16k-0613
 """
 
-OPENAI_MODELS = [ln.strip() for ln in OPENAI_MODELS.splitlines() if ln.strip()]
+OPENAI_MODELS = [ln.strip() for ln in _OPENAI_MODELS.splitlines() if ln.strip()]
 
-ANTHROPIC_MODELS = """
+_ANTHROPIC_MODELS = """
 claude-2
 claude-2.1
 claude-3-haiku-20240307
@@ -60,7 +60,7 @@
 claude-3-5-sonnet-20241022
 """
 
-ANTHROPIC_MODELS = [ln.strip() for ln in ANTHROPIC_MODELS.splitlines() if ln.strip()]
+ANTHROPIC_MODELS = [ln.strip() for ln in _ANTHROPIC_MODELS.splitlines() if ln.strip()]
 
 # Mapping of model aliases to their canonical names
 MODEL_ALIASES = {

aider/repo.py

@@ -1,18 +1,23 @@
 import os
 import time
 from pathlib import Path, PurePosixPath
+from typing import TYPE_CHECKING
 
-try:
+if TYPE_CHECKING:
     import git
-
-    ANY_GIT_ERROR = [
-        git.exc.ODBError,
-        git.exc.GitError,
-        git.exc.InvalidGitRepositoryError,
-    ]
-except ImportError:
-    git = None
-    ANY_GIT_ERROR = []
+    _ANY_GIT_ERROR = []
+else:
+    try:
+        import git
+
+        _ANY_GIT_ERROR = [
+            git.exc.ODBError,
+            git.exc.GitError,
+            git.exc.InvalidGitRepositoryError,
+        ]
+    except ImportError:
+        git = None
+        _ANY_GIT_ERROR = []
 
 import pathspec
 
@@ -21,7 +26,7 @@
 
 from .dump import dump  # noqa: F401
 
-ANY_GIT_ERROR += [
+_ANY_GIT_ERROR += [
     OSError,
     IndexError,
     BufferError,
@@ -30,8 +35,7 @@
     AttributeError,
     AssertionError,
 ]
-ANY_GIT_ERROR = tuple(ANY_GIT_ERROR)
-
+ANY_GIT_ERROR = tuple(_ANY_GIT_ERROR)
 
 class GitRepo:
     repo = None

aider/repomap.py

@@ -25,7 +25,7 @@
 warnings.simplefilter("ignore", category=FutureWarning)
 from tree_sitter_languages import get_language, get_parser  # noqa: E402
 
-Tag = namedtuple("Tag", "rel_fname fname line name kind".split())
+Tag = namedtuple("Tag", ("rel_fname", "fname", "line", "name", "kind"))
 
 
 SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError, OSError)

mypy.ini

@@ -0,0 +1,46 @@
+[mypy]
+exclude = (?x)(
+      ^\.git/
+    | ^benchmark/$
+    | ^build/$
+    | ^dist/$
+    | ^scripts/$
+  )
+allow_untyped_globals = True
+check_untyped_defs = False
+
+[mypy-configargparse]
+ignore_missing_imports = True
+
+[mypy-diff_match_patch]
+ignore_missing_imports = True
+
+[mypy-diskcache]
+ignore_missing_imports = True
+
+[mypy-grep_ast.*]
+ignore_missing_imports = True
+
+[mypy-imgcat]
+ignore_missing_imports = True
+
+[mypy-llama_index.*]
+ignore_missing_imports = True
+
+[mypy-mixpanel]
+ignore_missing_imports = True
+
+[mypy-pydub]
+ignore_missing_imports = True
+
+[mypy-pypandoc]
+ignore_missing_imports = True
+
+[mypy-pyperclip]
+ignore_missing_imports = True
+
+[mypy-soundfile]
+ignore_missing_imports = True
+
+[mypy-sounddevice]
+ignore_missing_imports = True

pyproject.toml

@@ -33,6 +33,7 @@ dev = { file = "requirements/requirements-dev.txt" }
 help = { file = "requirements/requirements-help.txt" }
 browser = { file = "requirements/requirements-browser.txt" }
 playwright = { file = "requirements/requirements-playwright.txt" }
+mypy = { file = "requirements/requirements-mypy.txt" }
 
 [tool.setuptools]
 include-package-data = true

requirements/requirements-mypy.in

@@ -0,0 +1,13 @@
+-c ../requirements.txt
+
+mypy
+types-Pygments
+types-PyYAML
+types-beautifulsoup4
+types-jsonschema
+types-networkx
+types-pexpect
+types-psutil
+types-requests
+types-tqdm
+types-tree-sitter-languages