Use ruff instead of isort

Nick Sullivan · Nick Sullivan · commit 6688fc32b914 · 2025-08-23T20:36:40.000-05:00
- Reorganize imports across multiple files for better readability
- Use absolute imports instead of relative imports
- Remove unused imports and sort remaining imports alphabetically
- Apply consistent import formatting across the project
diff --git a/aicodebot/cli.py b/aicodebot/cli.py
@@ -1,8 +1,14 @@
-from aicodebot import AICODEBOT, version as aicodebot_version
+import os
+import sys
+
+import click
+import langchain_core
+
+from aicodebot import AICODEBOT
+from aicodebot import version as aicodebot_version
 from aicodebot.commands import alignment, commit, configure, debug, review, sidekick
 from aicodebot.config import read_config
 from aicodebot.output import get_console
-import click, langchain_core, os, sys
 
 # -------------------------- Top level command group ------------------------- #
 
diff --git a/aicodebot/coder.py b/aicodebot/coder.py
@@ -1,8 +1,13 @@
-from aicodebot.helpers import exec_and_get_output, logger
-from aicodebot.lm import token_size
+import fnmatch
+import mimetypes
+import re
+import subprocess
 from pathlib import Path
+
 from pygments.lexers import ClassNotFound, get_lexer_for_mimetype, guess_lexer_for_filename
-import fnmatch, mimetypes, re, subprocess
+
+from aicodebot.helpers import exec_and_get_output, logger
+from aicodebot.lm import token_size
 
 
 class Coder:
diff --git a/aicodebot/commands/alignment.py b/aicodebot/commands/alignment.py
@@ -1,9 +1,10 @@
+import click
+from rich.live import Live
+
 from aicodebot.helpers import logger
 from aicodebot.lm import CREATIVE_TEMPERATURE, LanguageModelManager
 from aicodebot.output import OurMarkdown, RichLiveCallbackHandler, get_console
 from aicodebot.prompts import get_prompt
-from rich.live import Live
-import click
 
 
 @click.command()
diff --git a/aicodebot/commands/debug.py b/aicodebot/commands/debug.py
@@ -1,15 +1,19 @@
+import subprocess
+import sys
+
+import click
+from rich.live import Live
+
 from aicodebot.helpers import logger
 from aicodebot.lm import LanguageModelManager
 from aicodebot.output import OurMarkdown, RichLiveCallbackHandler, get_console
 from aicodebot.prompts import get_prompt
-from rich.live import Live
-import click, subprocess, sys
 
 
 @click.command(context_settings={"ignore_unknown_options": True})
 @click.argument("command", nargs=-1)
 @click.pass_context
-def debug(ctx, command):
+def debug(ctx, command):  # ruff: noqa: ARG001 - ctx required by click decorator
     """Run a command and debug the output."""
     console = get_console()
 
diff --git a/aicodebot/commands/review.py b/aicodebot/commands/review.py
@@ -1,10 +1,14 @@
+import json
+import sys
+
+import click
+from rich.live import Live
+
 from aicodebot.coder import Coder
 from aicodebot.helpers import logger
 from aicodebot.lm import DEFAULT_RESPONSE_TOKENS, LanguageModelManager
 from aicodebot.output import OurMarkdown, RichLiveCallbackHandler, get_console
 from aicodebot.prompts import get_prompt
-from rich.live import Live
-import click, json, sys
 
 
 @click.command()
diff --git a/aicodebot/commands/sidekick.py b/aicodebot/commands/sidekick.py
@@ -1,3 +1,9 @@
+import sys
+
+import click
+from rich.live import Live
+from rich.panel import Panel
+
 from aicodebot import AICODEBOT
 from aicodebot.coder import Coder
 from aicodebot.config import Session
@@ -6,9 +12,6 @@
 from aicodebot.lm import DEFAULT_CONTEXT_TOKENS, LanguageModelManager
 from aicodebot.output import OurMarkdown, RichLiveCallbackHandler, get_console
 from aicodebot.prompts import generate_files_context, get_prompt
-from rich.live import Live
-from rich.panel import Panel
-import click, sys
 
 
 @click.command()
diff --git a/aicodebot/config.py b/aicodebot/config.py
@@ -1,6 +1,10 @@
-from aicodebot.helpers import create_and_write_file, logger
+import os
 from pathlib import Path
-import os, yaml
+
+import httpx
+import yaml
+
+from aicodebot.helpers import create_and_write_file, logger
 
 
 def get_local_data_dir():
diff --git a/aicodebot/helpers.py b/aicodebot/helpers.py
@@ -1,6 +1,9 @@
-from loguru import logger
+import os
+import subprocess
+import sys
 from pathlib import Path
-import os, subprocess, sys
+
+from loguru import logger
 
 # ---------------------------------------------------------------------------- #
 #                    Global logging configuration for loguru                   #
diff --git a/aicodebot/input.py b/aicodebot/input.py
@@ -1,15 +1,20 @@
-from aicodebot.coder import Coder
-from aicodebot.commands import commit, review
-from aicodebot.lm import token_size
-from aicodebot.patch import Patch
+import subprocess
 from pathlib import Path
+
+import click
+import humanize
+import pyperclip
 from prompt_toolkit import PromptSession
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.history import FileHistory
 from rich.panel import Panel
 from rich.table import Table
-import click, humanize, pyperclip, subprocess
+
+from aicodebot.coder import Coder
+from aicodebot.commands import commit, review
+from aicodebot.lm import token_size
+from aicodebot.patch import Patch
 
 
 class Chat:
diff --git a/aicodebot/lm.py b/aicodebot/lm.py
@@ -1,8 +1,11 @@
-from aicodebot.config import read_config
-from aicodebot.helpers import logger
+import os
+
+import tiktoken
 from langchain_anthropic import ChatAnthropic
 from langchain_openai import ChatOpenAI
-import os, tiktoken
+
+from aicodebot.config import read_config
+from aicodebot.helpers import logger
 
 DEFAULT_RESPONSE_TOKENS = 1_000
 DEFAULT_MEMORY_TOKENS = DEFAULT_RESPONSE_TOKENS * 2
diff --git a/aicodebot/output.py b/aicodebot/output.py
@@ -1,12 +1,14 @@
-from aicodebot.helpers import logger
 from functools import cache
+
 from langchain_core.callbacks import BaseCallbackHandler
 from rich.console import Console
 from rich.markdown import CodeBlock, Markdown
 from rich.panel import Panel
 from rich.style import Style
 from rich.syntax import Syntax
 
+from aicodebot.helpers import logger
+
 
 class RichLiveCallbackHandler(BaseCallbackHandler):
     """Our specialized output handler that does streaming, and prints out rich.Markdown, with a few other goodies"""
diff --git a/aicodebot/patch.py b/aicodebot/patch.py
@@ -1,7 +1,9 @@
-from aicodebot.helpers import logger
+import re
+import subprocess
 from pathlib import Path
 from types import SimpleNamespace
-import re, subprocess
+
+from aicodebot.helpers import logger
 
 
 class Patch:
diff --git a/aicodebot/prompts.py b/aicodebot/prompts.py
@@ -1,13 +1,17 @@
+import functools
+import os
+from pathlib import Path
+from types import SimpleNamespace
+
+import arrow
+from langchain_core.output_parsers.pydantic import PydanticOutputParser
+from langchain_core.prompts import PromptTemplate
+from pydantic import BaseModel, Field
+
 from aicodebot import AICODEBOT_NO_EMOJI
 from aicodebot.coder import Coder
 from aicodebot.config import read_config
 from aicodebot.helpers import logger
-from langchain_core.output_parsers.pydantic import PydanticOutputParser
-from langchain_core.prompts import PromptTemplate
-from pathlib import Path
-from pydantic import BaseModel, Field
-from types import SimpleNamespace
-import arrow, functools, os
 
 # ---------------------------------------------------------------------------- #
 #                              Personalities                                   #
diff --git a/setup.py b/setup.py
@@ -1,7 +1,9 @@
-from aicodebot import version
 from pathlib import Path
+
 from setuptools import find_packages, setup
 
+from aicodebot import version
+
 # Pull in the long description from the README
 long_description = Path("README.md").read_text(encoding="utf-8")
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,9 +1,12 @@
-from aicodebot.helpers import create_and_write_file
-from click.testing import CliRunner
+import os
 from contextlib import contextmanager
-from git import Repo
 from pathlib import Path
-import os, pytest
+
+import pytest
+from click.testing import CliRunner
+from git import Repo
+
+from aicodebot.helpers import create_and_write_file
 
 
 @pytest.fixture
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -1,12 +1,16 @@
+import json
+import os
+from pathlib import Path
+
+import pytest
+from git import Repo
+
 from aicodebot import version as aicodebot_version
 from aicodebot.cli import cli
 from aicodebot.config import read_config
 from aicodebot.helpers import create_and_write_file
 from aicodebot.prompts import DEFAULT_PERSONALITY
-from git import Repo
-from pathlib import Path
 from tests.conftest import in_temp_directory
-import json, os, pytest
 
 # smaller than the default size to speed up the tests
 TEST_RESPONSE_TOKEN_SIZE = 150
diff --git a/tests/test_coder.py b/tests/test_coder.py
@@ -1,8 +1,12 @@
+import os
+import tempfile
+from pathlib import Path
+
+import pytest
+
 from aicodebot.coder import Coder
 from aicodebot.helpers import create_and_write_file
-from pathlib import Path
 from tests.conftest import in_temp_directory
-import os, pytest, tempfile
 
 
 def test_generate_directory_structure(
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -1,7 +1,9 @@
-from aicodebot.helpers import create_and_write_file, exec_and_get_output
 from pathlib import Path
+
 import pytest
 
+from aicodebot.helpers import create_and_write_file, exec_and_get_output
+
 
 def test_create_and_write_file(tmp_path):
     # Test creating a file that does not exist
diff --git a/tests/test_input.py b/tests/test_input.py
@@ -1,10 +1,14 @@
+import textwrap
+from io import StringIO
+from pathlib import Path
+
+import pyperclip
+import pytest
+
 from aicodebot.helpers import create_and_write_file
 from aicodebot.input import Chat
 from aicodebot.output import get_console
-from io import StringIO
-from pathlib import Path
 from tests.conftest import in_temp_directory
-import pyperclip, pytest, textwrap
 
 
 class MockConsole:
diff --git a/tests/test_lm.py b/tests/test_lm.py
@@ -1,6 +1,7 @@
-from aicodebot.lm import LanguageModelManager, token_size
 from pathlib import Path
 
+from aicodebot.lm import LanguageModelManager, token_size
+
 
 def test_token_size(monkeypatch):
     monkeypatch.setenv("AICODEBOT_CONFIG_FILE", str(Path(__file__).parent / "test_config.yaml"))
diff --git a/tests/test_patch.py b/tests/test_patch.py
@@ -1,7 +1,11 @@
-from aicodebot.patch import Patch
+import shutil
+import textwrap
 from pathlib import Path
+
+import pytest
+
+from aicodebot.patch import Patch
 from tests.conftest import in_temp_directory
-import pytest, shutil, textwrap
 
 
 def test_apply_patch(temp_git_repo):
