Continue implementing new realization. Clippy. pre-commit enabled.

Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>

Author: chandr-andr

python/psqlpy/__init__.py

@@ -1,18 +1,23 @@
-from typing import Optional
-from psqlpy._internal import Connection, ConnectionPool, QueryResult, Transaction, Cursor
-
-
-# class Cursor(Cursor):
-#     async def __anext__(self) -> Optional[QueryResult]:
-#         results = await self.fetch(10)
-#         if not results.result():
-#             return StopAsyncIteration
-#         return results
-
+from psqlpy._internal import (
+    Connection,
+    ConnectionPool,
+    ConnRecyclingMethod,
+    Cursor,
+    IsolationLevel,
+    QueryResult,
+    ReadVariant,
+    SingleQueryResult,
+    Transaction,
+)
 
 __all__ = [
     "ConnectionPool",
     "Transaction",
     "Connection",
     "Cursor",
+    "QueryResult",
+    "SingleQueryResult",
+    "ConnRecyclingMethod",
+    "IsolationLevel",
+    "ReadVariant",
 ]

python/psqlpy/_internal/__init__.pyi

@@ -854,93 +854,6 @@ class Connection:
         - `deferrable`: configure deferrable of the transaction.
         """
 
-class PSQLPool:
-    """Connection pool for executing queries.
-
-    This is the main entrypoint in the library.
-    """
-
-    def __init__(
-        self: Self,
-        dsn: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        db_name: Optional[str] = None,
-        max_db_pool_size: int = 2,
-        conn_recycling_method: Optional[ConnRecyclingMethod] = None,
-    ) -> None:
-        """Create new PostgreSQL connection pool.
-
-        It connects to the database and create pool.
-
-        You cannot set the minimum size for the connection
-        pool, by default it is 1.
-
-        This connection pool can:
-        - Startup itself with `startup` method
-        - Execute queries and return `QueryResult` class as a result
-        - Create new instance of `Transaction`
-
-        ### Parameters:
-        - `dsn`: full dsn connection string.
-            `postgres://postgres:postgres@localhost:5432/postgres?target_session_attrs=read-write`
-        - `username`: username of the user in postgres
-        - `password`: password of the user in postgres
-        - `host`: host of postgres
-        - `port`: port of postgres
-        - `db_name`: name of the database in postgres
-        - `max_db_pool_size`: maximum size of the connection pool
-        - `conn_recycling_method`: how a connection is recycled.
-        """
-    async def close(self: Self) -> None:
-        """Close the connection pool.
-
-        By default it will be closed automatically,
-        but you can call it manually.
-        """
-    async def execute(
-        self: Self,
-        querystring: str,
-        parameters: list[Any] | None = None,
-        prepared: bool = True,
-    ) -> QueryResult:
-        """Execute the query.
-
-        Querystring can contain `$<number>` parameters
-        for converting them in the driver side.
-
-        ### Parameters:
-        - `querystring`: querystring to execute.
-        - `parameters`: list of parameters to pass in the query.
-        - `prepared`: should the querystring be prepared before the request.
-            By default any querystring will be prepared.
-
-        ### Example:
-        ```python
-        import asyncio
-
-        from psqlpy import PSQLPool, QueryResult
-
-
-        async def main() -> None:
-            db_pool = PSQLPool()
-            query_result: QueryResult = await psqlpy.execute(
-                "SELECT username FROM users WHERE id = $1",
-                [100],
-            )
-            dict_result: List[Dict[Any, Any]] = query_result.result()
-            # you don't need to close the pool,
-            # it will be dropped on Rust side.
-        ```
-        """
-    async def connection(self: Self) -> Connection:
-        """Create new connection.
-
-        It acquires new connection from the database pool.
-        """
-
 class ConnectionPool:
     """Connection pool for executing queries.
 
@@ -1021,3 +934,5 @@ class ConnectionPool:
 
         It acquires new connection from the database pool.
         """
+    def close(self: Self) -> None:
+        """Close the connection pool."""

python/tests/conftest.py

@@ -5,7 +5,7 @@
 import pytest
 from pydantic import BaseModel
 
-from psqlpy import Cursor, PSQLPool
+from psqlpy import ConnectionPool, Cursor
 
 
 class DefaultPydanticModel(BaseModel):
@@ -80,8 +80,8 @@ async def psql_pool(
     postgres_password: str,
     postgres_port: int,
     postgres_dbname: str,
-) -> PSQLPool:
-    return PSQLPool(
+) -> ConnectionPool:
+    return ConnectionPool(
         username=postgres_user,
         password=postgres_password,
         host=postgres_host,
@@ -92,7 +92,7 @@ async def psql_pool(
 
 @pytest.fixture(autouse=True)
 async def create_deafult_data_for_tests(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
     number_database_records: int,
 ) -> AsyncGenerator[None, None]:
@@ -114,7 +114,7 @@ async def create_deafult_data_for_tests(
 
 @pytest.fixture()
 async def test_cursor(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
 ) -> AsyncGenerator[Cursor, None]:
     connection = await psql_pool.connection()

python/tests/test_connection.py

@@ -5,14 +5,14 @@
 import pytest
 from tests.helpers import count_rows_in_test_table
 
-from psqlpy import PSQLPool, QueryResult, Transaction
+from psqlpy import ConnectionPool, QueryResult, Transaction
 from psqlpy.exceptions import RustPSQLDriverPyBaseError, TransactionError
 
 pytestmark = pytest.mark.anyio
 
 
 async def test_connection_execute(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
     number_database_records: int,
 ) -> None:
@@ -27,7 +27,7 @@ async def test_connection_execute(
 
 
 async def test_connection_connection(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
 ) -> None:
     """Test that connection can create transactions."""
     connection = await psql_pool.connection()
@@ -46,7 +46,7 @@ async def test_connection_connection(
     ],
 )
 async def test_connection_execute_many(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
     number_database_records: int,
     insert_values: list[list[typing.Any]],
@@ -67,7 +67,7 @@ async def test_connection_execute_many(
 
 
 async def test_connection_fetch_row(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
 ) -> None:
     connection = await psql_pool.connection()
@@ -80,7 +80,7 @@ async def test_connection_fetch_row(
 
 
 async def test_connection_fetch_row_more_than_one_row(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
 ) -> None:
     connection = await psql_pool.connection()
@@ -92,7 +92,7 @@ async def test_connection_fetch_row_more_than_one_row(
 
 
 async def test_connection_fetch_val(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
 ) -> None:
     connection = await psql_pool.connection()
@@ -104,7 +104,7 @@ async def test_connection_fetch_val(
 
 
 async def test_connection_fetch_val_more_than_one_row(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
 ) -> None:
     connection = await psql_pool.connection()

python/tests/test_connection_pool.py

@@ -1,26 +1,26 @@
 import pytest
 
-from psqlpy import Connection, ConnRecyclingMethod, PSQLPool, QueryResult
+from psqlpy import Connection, ConnectionPool, ConnRecyclingMethod, QueryResult
 from psqlpy.exceptions import RustPSQLDriverPyBaseError
 
 pytestmark = pytest.mark.anyio
 
 
 async def test_pool_dsn_startup() -> None:
     """Test that connection pool can startup with dsn."""
-    pg_pool = PSQLPool(
+    pg_pool = ConnectionPool(
         dsn="postgres://postgres:postgres@localhost:5432/psqlpy_test",
     )
 
     await pg_pool.execute("SELECT 1")
 
 
 async def test_pool_execute(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
     number_database_records: int,
 ) -> None:
-    """Test that PSQLPool can execute queries."""
+    """Test that ConnectionPool can execute queries."""
     select_result = await psql_pool.execute(
         f"SELECT * FROM {table_name}",
     )
@@ -33,9 +33,9 @@ async def test_pool_execute(
 
 
 async def test_pool_connection(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
 ) -> None:
-    """Test that PSQLPool can return single connection from the pool."""
+    """Test that ConnectionPool can return single connection from the pool."""
     connection = await psql_pool.connection()
     assert isinstance(connection, Connection)
 
@@ -51,7 +51,7 @@ async def test_pool_connection(
 async def test_pool_conn_recycling_method(
     conn_recycling_method: ConnRecyclingMethod,
 ) -> None:
-    pg_pool = PSQLPool(
+    pg_pool = ConnectionPool(
         dsn="postgres://postgres:postgres@localhost:5432/psqlpy_test",
         conn_recycling_method=conn_recycling_method,
     )
@@ -61,13 +61,13 @@ async def test_pool_conn_recycling_method(
 
 async def test_close_connection_pool() -> None:
     """Test that `close` method closes connection pool."""
-    pg_pool = PSQLPool(
+    pg_pool = ConnectionPool(
         dsn="postgres://postgres:postgres@localhost:5432/psqlpy_test",
     )
 
     await pg_pool.execute("SELECT 1")
 
-    await pg_pool.close()
+    pg_pool.close()
 
     with pytest.raises(expected_exception=RustPSQLDriverPyBaseError):
         await pg_pool.execute("SELECT 1")

python/tests/test_cursor.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from psqlpy import Cursor, PSQLPool, QueryResult, Transaction
+from psqlpy import ConnectionPool, Cursor, QueryResult, Transaction
 
 pytestmark = pytest.mark.anyio
 
@@ -151,7 +151,7 @@ async def test_cursor_fetch_backward_all(
 
 
 async def test_cursor_as_async_manager(
-    psql_pool: PSQLPool,
+    psql_pool: ConnectionPool,
     table_name: str,
     number_database_records: int,
 ) -> None: