isort

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: flake8
         args: ["--show-source"]
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.1
+    rev: 5.12.0
     hooks:
       - id: isort
         args: ["--profile", "black"]

aider/coder.py

@@ -2,21 +2,19 @@
 
 import os
 import sys
-import traceback
 import time
-from openai.error import RateLimitError
+import traceback
-
-from rich.console import Console
-from rich.live import Live
-from rich.markdown import Markdown
 from pathlib import Path
 
 import git
 import openai
+from openai.error import RateLimitError
+from rich.console import Console
+from rich.live import Live
+from rich.markdown import Markdown
 
 # from aider.dump import dump
-from aider import utils
+from aider import prompts, utils
-from aider import prompts
 from aider.commands import Commands
 from aider.repomap import RepoMap
 

aider/commands.py

@@ -1,9 +1,11 @@
-import sys
 import os
-import git
-import subprocess
 import shlex
+import subprocess
+import sys
+
+import git
 from prompt_toolkit.completion import Completion
+
 from aider import prompts
 
 

aider/dump.py

@@ -1,5 +1,5 @@
-import traceback
 import json
+import traceback
 
 
 def cvt(s):

aider/io.py

@@ -1,19 +1,18 @@
 import os
 import os.path
-from pygments.lexers import guess_lexer_for_filename
+from collections import defaultdict
-from pygments.token import Token
+from datetime import datetime
-from prompt_toolkit.styles import Style
+from pathlib import Path
-from pygments.util import ClassNotFound
+
-from prompt_toolkit.shortcuts import PromptSession, prompt
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.history import FileHistory
-from prompt_toolkit.shortcuts import CompleteStyle
+from prompt_toolkit.shortcuts import CompleteStyle, PromptSession, prompt
+from prompt_toolkit.styles import Style
+from pygments.lexers import guess_lexer_for_filename
+from pygments.token import Token
+from pygments.util import ClassNotFound
 from rich.console import Console
 from rich.text import Text
-from pathlib import Path
-from datetime import datetime
-
-from collections import defaultdict
 
 
 class FileContentCompleter(Completer):

aider/main.py

@@ -1,7 +1,9 @@
 import os
 import sys
-import git
+
 import configargparse
+import git
+
 from aider.coder import Coder
 from aider.io import InputOutput
 

aider/repomap.py

@@ -1,10 +1,11 @@
-import os
 import json
-import sys
+import os
 import subprocess
-import tiktoken
+import sys
 import tempfile
 
+import tiktoken
+
 from aider import prompts
 
 # Global cache for tags

aider/utils.py

@@ -1,6 +1,5 @@
-import re
 import math
-
+import re
 from difflib import SequenceMatcher
 from pathlib import Path
 

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 with open("requirements.txt") as f:
     requirements = f.read().splitlines()

tests/test_coder.py

@@ -1,6 +1,7 @@
 import os
 import unittest
 from unittest.mock import MagicMock
+
 from aider.coder import Coder
 
 

tests/test_commands.py

@@ -1,10 +1,11 @@
 import os
+import shutil
 import tempfile
 from unittest import TestCase
+
 from aider.commands import Commands
 from aider.io import InputOutput
 
-import shutil
 
 class TestCommands(TestCase):
     def setUp(self):

tests/test_io.py

@@ -1,13 +1,16 @@
 import os
 import unittest
 from unittest.mock import patch
+
 from aider.io import InputOutput
 
+
 class TestInputOutput(unittest.TestCase):
     def test_no_color_environment_variable(self):
         with patch.dict(os.environ, {"NO_COLOR": "1"}):
             io = InputOutput()
             self.assertFalse(io.pretty)
 
+
 if __name__ == "__main__":
     unittest.main()

tests/test_main.py

@@ -1,14 +1,16 @@
 import os
-import tempfile
-import subprocess
 import shutil
+import subprocess
+import tempfile
+from io import StringIO
 from unittest import TestCase
 from unittest.mock import patch
-from aider.main import main
+
 from prompt_toolkit.input import create_input
-from io import StringIO
 from prompt_toolkit.output import DummyOutput
 
+from aider.main import main
+
 
 class TestMain(TestCase):
     def setUp(self):

tests/test_repomap.py

@@ -1,9 +1,11 @@
 import os
 import tempfile
 import unittest
-from aider.repomap import RepoMap
-from unittest.mock import patch
 from subprocess import CompletedProcess
+from unittest.mock import patch
+
+from aider.repomap import RepoMap
+
 
 class TestRepoMap(unittest.TestCase):
     def test_get_tags_map(self):
@@ -65,7 +67,14 @@ def my_function(arg1, arg2):
 
     def test_check_for_ctags_success(self):
         with patch("subprocess.run") as mock_run:
-            mock_run.return_value = CompletedProcess(args=["ctags", "--version"], returncode=0, stdout=b'{"_type": "tag", "name": "status", "path": "aider/main.py", "pattern": "/^    status = main()$/", "kind": "variable"}')
+            mock_run.return_value = CompletedProcess(
+                args=["ctags", "--version"],
+                returncode=0,
+                stdout=(
+                    b'{"_type": "tag", "name": "status", "path": "aider/main.py", "pattern": "/^   '
+                    b' status = main()$/", "kind": "variable"}'
+                ),
+            )
             repo_map = RepoMap(use_ctags=True)
             result = repo_map.check_for_ctags()
             self.assertTrue(result)

tests/test_utils.py

@@ -1,6 +1,7 @@
 # flake8: noqa: E501
 
 import unittest
+
 from aider import utils