Format the code

Author: Peng Ren

.github/workflows/ci.yml

@@ -55,6 +55,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements-test.txt
+        pip install black isort
 
     - name: Wait for MongoDB to be ready
       run: |
@@ -68,6 +69,14 @@ jobs:
           sleep 2
         done
 
+    - name: Check code formatting with Black
+      run: |
+        black --check --diff pymongosql/
+        
+    - name: Check import sorting with isort
+      run: |
+        isort --check-only --diff pymongosql/
+        
     - name: Check code style with flake8
       run: |
         flake8 pymongosql/ --count --statistics

pymongosql/connection.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 import logging
-from typing import Optional, Type, Union, Sequence, Any
+from typing import Any, Optional, Sequence, Type, Union
 
+from bson.codec_options import TypeRegistry
 from pymongo import MongoClient
-from pymongo.database import Database
-from pymongo.collection import Collection
 from pymongo.client_session import ClientSession
+from pymongo.collection import Collection
+from pymongo.database import Database
 from pymongo.errors import ConnectionFailure
-from bson.codec_options import TypeRegistry
 
-from .error import NotSupportedError, DatabaseError, OperationalError
 from .common import BaseCursor
 from .cursor import Cursor
+from .error import DatabaseError, NotSupportedError, OperationalError
 
 _logger = logging.getLogger(__name__)
 

pymongosql/cursor.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 import logging
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, TypeVar, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, TypeVar
 
 from pymongo.cursor import Cursor as MongoCursor
 from pymongo.errors import PyMongoError
 
 from .common import BaseCursor, CursorIterator
-from .sql.parser import SQLParser
-from .sql.builder import QueryPlan
 from .error import DatabaseError, OperationalError, ProgrammingError, SqlSyntaxError
 from .result_set import ResultSet
+from .sql.builder import QueryPlan
+from .sql.parser import SQLParser
 
 if TYPE_CHECKING:
     from .connection import Connection

pymongosql/result_set.py

@@ -5,8 +5,8 @@
 from pymongo.cursor import Cursor as MongoCursor
 from pymongo.errors import PyMongoError
 
-from .error import ProgrammingError, DatabaseError
 from .common import CursorIterator
+from .error import DatabaseError, ProgrammingError
 from .sql.builder import QueryPlan
 
 _logger = logging.getLogger(__name__)

pymongosql/sql/ast.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Dict
 import logging
+from typing import Any, Dict
 
+from ..error import SqlSyntaxError
+from .builder import QueryPlan
+from .handler import BaseHandler, HandlerFactory, ParseResult
 from .partiql.PartiQLLexer import PartiQLLexer
 from .partiql.PartiQLParser import PartiQLParser
 from .partiql.PartiQLParserVisitor import PartiQLParserVisitor
-from .builder import QueryPlan
-from ..error import SqlSyntaxError
-from .handler import ParseResult, BaseHandler, HandlerFactory
 
 _logger = logging.getLogger(__name__)
 

pymongosql/sql/builder.py

@@ -2,9 +2,9 @@
 """
 Query builder for constructing MongoDB queries in a fluent, readable way
 """
-from typing import Any, Dict, List, Optional, Union
-from dataclasses import dataclass, field
 import logging
+from dataclasses import dataclass, field
+from typing import Any, Dict, List, Optional, Union
 
 _logger = logging.getLogger(__name__)
 

pymongosql/sql/handler.py

@@ -2,12 +2,12 @@
 """
 Expression handlers for converting SQL expressions to MongoDB query format
 """
-from typing import Any, Dict, List, Optional, Tuple
-from abc import ABC, abstractmethod
-from dataclasses import dataclass, field
 import logging
-import time
 import re
+import time
+from abc import ABC, abstractmethod
+from dataclasses import dataclass, field
+from typing import Any, Dict, List, Optional, Tuple
 
 from .partiql.PartiQLParser import PartiQLParser
 

pymongosql/sql/parser.py

@@ -2,12 +2,13 @@
 import logging
 from abc import ABCMeta
 from typing import Any, Optional
+
 from antlr4 import CommonTokenStream, InputStream
 from antlr4.error.ErrorListener import ErrorListener
 
+from ..error import SqlSyntaxError
 from .ast import MongoSQLLexer, MongoSQLParser, MongoSQLParserVisitor
 from .builder import QueryPlan
-from ..error import SqlSyntaxError
 
 _logger = logging.getLogger(__name__)
 

tests/run_test_server.py

@@ -5,11 +5,12 @@
 
 This script helps manage MongoDB instances for testing PyMongoSQL.
 """
-import subprocess
-import time
-import sys
 import json
 import os
+import subprocess
+import sys
+import time
+
 import pymongo
 from pymongo.errors import ServerSelectionTimeoutError
 

tests/test_cursor.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 import pytest
+
 from pymongosql.connection import Connection
 from pymongosql.cursor import Cursor
-from pymongosql.result_set import ResultSet
 from pymongosql.error import ProgrammingError
+from pymongosql.result_set import ResultSet
 
 
 class TestCursor: