fix: rename modules that shadow python built-ins (#664)

* fix: rename modules that shadow python built-ins

* fix: actually save the changes this time

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.9.3
     hooks:
       - id: ruff-format
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.0
+    rev: v1.14.1
     hooks:
       - id: mypy
         additional_dependencies:

pyproject.toml

@@ -46,8 +46,8 @@ pre-commit = { version = ">=4.0,<5", python = ">=3.9" }
 snakeviz = "^2.1.1"
 
 [tool.poetry.group.static.dependencies]
-ruff = "^0.5"
-mypy = "^1.11"
+ruff = "^0.9.3"
+mypy = "^1.14"
 
 [tool.poetry.group.test.dependencies]
 black = "^24"

src/sqlfmt/actions.py

@@ -8,7 +8,7 @@
 from sqlfmt.line import Line
 from sqlfmt.node import Node, get_previous_token
 from sqlfmt.rule import MAYBE_WHITESPACES, Rule
-from sqlfmt.token import Token, TokenType
+from sqlfmt.tokens import Token, TokenType
 
 if TYPE_CHECKING:
     from sqlfmt.analyzer import Analyzer
@@ -29,7 +29,7 @@ def raise_sqlfmt_bracket_error(
     raise SqlfmtBracketError(
         f"Encountered closing bracket '{raw_token}' at position"
         f" {spos}, before matching opening bracket. Context:"
-        f" {source_string[spos:spos+50]}"
+        f" {source_string[spos : spos + 50]}"
     )
 
 
@@ -193,7 +193,7 @@ def handle_ddl_as(
         assert analyzer.rule_stack, (
             "Internal Error! Open an issue. Could not parse DDL 'as' "
             f"at pos {analyzer.pos}. Context: "
-            f"{source_string[analyzer.pos :analyzer.pos+50]}"
+            f"{source_string[analyzer.pos : analyzer.pos + 50]}"
         )
         analyzer.pop_rules()
 
@@ -228,7 +228,7 @@ def handle_closing_angle_bracket(
         assert operator_match, (
             "Internal Error! Open an issue. Could not parse closing bracket '>' "
             f"at pos {analyzer.pos}. Context: "
-            f"{source_string[analyzer.pos :analyzer.pos+10]}"
+            f"{source_string[analyzer.pos : analyzer.pos + 10]}"
         )
         add_node_to_buffer(
             analyzer=analyzer,

src/sqlfmt/analyzer.py

@@ -136,7 +136,7 @@ def lex_one(self, source_string: str) -> None:
         else:
             raise SqlfmtParsingError(
                 f"Could not parse SQL at position {self.pos}:"
-                f" '{source_string[self.pos:self.pos+50].strip()}'"
+                f" '{source_string[self.pos : self.pos + 50].strip()}'"
             )
 
     def lex(self, source_string: str, eof_pos: int = -1) -> None:

src/sqlfmt/api.py

@@ -25,9 +25,9 @@
 from sqlfmt.analyzer import Analyzer
 from sqlfmt.cache import Cache, check_cache, clear_cache, load_cache, write_cache
 from sqlfmt.exception import SqlfmtEquivalenceError, SqlfmtError, SqlfmtUnicodeError
-from sqlfmt.formatter import QueryFormatter
 from sqlfmt.mode import Mode as Mode
 from sqlfmt.query import Query
+from sqlfmt.query_formatter import QueryFormatter
 from sqlfmt.report import STDIN_PATH, Report, SqlFormatResult
 
 T = TypeVar("T")

src/sqlfmt/cli.py

@@ -8,7 +8,7 @@
 from sqlfmt.mode import Mode
 
 
-@click.command()  # type: ignore
+@click.command()
 @click.version_option(package_name="shandy-sqlfmt")
 @click.option(
     "--check",

src/sqlfmt/comment.py

@@ -3,7 +3,7 @@
 from typing import ClassVar, Iterator, Optional, Tuple
 
 from sqlfmt.node import Node
-from sqlfmt.token import Token, TokenType
+from sqlfmt.tokens import Token, TokenType
 
 
 @dataclass

src/sqlfmt/jinjafmt.py

@@ -329,7 +329,7 @@ def _remove_trailing_comma(self) -> None:
         trailing_comma_match = trailing_comma_prog.search(source_string)
         if trailing_comma_match:
             idx = trailing_comma_match.span()[0]
-            processed_string = f"{source_string[:idx]}{source_string[idx+1:]}"
+            processed_string = f"{source_string[:idx]}{source_string[idx + 1 :]}"
             self.code = processed_string
 
     @classmethod

src/sqlfmt/line.py

@@ -3,7 +3,7 @@
 
 from sqlfmt.comment import Comment
 from sqlfmt.node import Node, get_previous_token
-from sqlfmt.token import Token, TokenType
+from sqlfmt.tokens import Token, TokenType
 
 
 @dataclass

src/sqlfmt/node.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Optional, Tuple
 
-from sqlfmt.token import Token, TokenType
+from sqlfmt.tokens import Token, TokenType
 
 
 def get_previous_token(prev_node: Optional["Node"]) -> Tuple[Optional[Token], bool]:

src/sqlfmt/node_manager.py

@@ -4,7 +4,7 @@
 from sqlfmt.exception import SqlfmtBracketError
 from sqlfmt.line import Line
 from sqlfmt.node import Node, get_previous_token
-from sqlfmt.token import Token, TokenType
+from sqlfmt.tokens import Token, TokenType
 
 
 class NodeManager:

src/sqlfmt/operator_precedence.py

@@ -3,7 +3,7 @@
 from typing import Callable, List
 
 from sqlfmt.node import Node
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 
 class OperatorPrecedence(IntEnum):
@@ -37,9 +37,9 @@ def tiers() -> List["OperatorPrecedence"]:
 
     @classmethod
     def from_node(cls, node: Node) -> "OperatorPrecedence":
-        assert (
-            node.is_operator
-        ), f"Internal error! {node} is not an operator. Please open an issue"
+        assert node.is_operator, (
+            f"Internal error! {node} is not an operator. Please open an issue"
+        )
         return cls._function_lookup(token_type=node.token.type)(node)
 
     @classmethod

src/sqlfmt/query.py

@@ -3,7 +3,7 @@
 
 from sqlfmt.line import Line
 from sqlfmt.node import Node
-from sqlfmt.token import Token
+from sqlfmt.tokens import Token
 
 
 @dataclass

src/sqlfmt/rules/__init__.py

@@ -17,7 +17,7 @@
 from sqlfmt.rules.jinja import JINJA as JINJA  # noqa
 from sqlfmt.rules.unsupported import UNSUPPORTED as UNSUPPORTED
 from sqlfmt.rules.warehouse import WAREHOUSE as WAREHOUSE
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 MAIN = [
     *CORE,

src/sqlfmt/rules/clone.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import CREATE_CLONABLE, group
 from sqlfmt.rules.core import CORE
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 CLONE = [
     *CORE,

src/sqlfmt/rules/core.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import EOL, NEWLINE, SQL_COMMENT, SQL_QUOTED_EXP, group
 from sqlfmt.rules.jinja import JINJA
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 ALWAYS = [
     Rule(

src/sqlfmt/rules/function.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import ALTER_DROP_FUNCTION, CREATE_FUNCTION, group
 from sqlfmt.rules.core import CORE
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 FUNCTION = [
     *CORE,

src/sqlfmt/rules/grant.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import group
 from sqlfmt.rules.core import CORE
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 GRANT = [
     *CORE,

src/sqlfmt/rules/jinja.py

@@ -3,7 +3,7 @@
 from sqlfmt import actions
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import NEWLINE, group
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 JINJA_SHARED_PATTERNS = {
     "set": r"\{%-?\s*set\s+[^=]+?-?%\}",

src/sqlfmt/rules/unsupported.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import NEWLINE, group
 from sqlfmt.rules.core import ALWAYS
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 UNSUPPORTED = [
     *ALWAYS,

src/sqlfmt/rules/warehouse.py

@@ -4,7 +4,7 @@
 from sqlfmt.rule import Rule
 from sqlfmt.rules.common import ALTER_WAREHOUSE, CREATE_WAREHOUSE, group
 from sqlfmt.rules.core import CORE
-from sqlfmt.token import TokenType
+from sqlfmt.tokens import TokenType
 
 WAREHOUSE = [
     *CORE,

src/sqlfmt/splitter.py

@@ -35,9 +35,9 @@ def maybe_split(self, line: Line) -> List[Line]:
                     new_line, comments = self.split_at_index(
                         line, head, i, comments, no_tail=True
                     )
-                    assert (
-                        not comments
-                    ), "Comments must be empty here or we'll drop them"
+                    assert not comments, (
+                        "Comments must be empty here or we'll drop them"
+                    )
                     new_lines.append(new_line)
                 return new_lines
             elif (

src/sqlfmt_primer/primer.py

@@ -8,6 +8,7 @@
 import click
 from git.repo import Repo
 from platformdirs import user_cache_dir
+
 from sqlfmt.api import get_matching_paths, initialize_progress_bar, run
 from sqlfmt.cache import get_cache_file
 from sqlfmt.mode import Mode

tests/conftest.py

@@ -6,9 +6,9 @@
 
 import pytest
 from click.testing import CliRunner
+
 from sqlfmt.analyzer import Analyzer
 from sqlfmt.mode import Mode
-
 from tests.util import copy_test_data_to_tmp
 
 # make tests module importable
@@ -21,7 +21,6 @@ def pytest_sessionstart(session: pytest.Session) -> None:
     before performing collection and entering the run test loop.
     """
     from sqlfmt.cache import clear_cache
-
     from tests.util import delete_results_dir
 
     delete_results_dir()

tests/functional_tests/test_end_to_end.py

@@ -2,6 +2,7 @@
 
 import pytest
 from click.testing import CliRunner
+
 from sqlfmt.cli import sqlfmt as sqlfmt_main
 
 

tests/functional_tests/test_general_formatting.py

@@ -1,7 +1,7 @@
 import pytest
+
 from sqlfmt.api import format_string
 from sqlfmt.mode import Mode
-
 from tests.util import check_formatting, read_test_data