Typing and codestyle

Author: febus982

tests/repository/conftest.py

@@ -1,5 +1,5 @@
 import os
-from typing import Iterator, Union
+from typing import Iterator, Type, Union
 from uuid import uuid4
 
 import pytest
@@ -49,7 +49,7 @@ def sync_async_sa_manager(multiple_config) -> Iterator[SQLAlchemyBindManager]:
 @pytest.fixture
 def repository_class(
     sa_bind: Union[SQLAlchemyBind, SQLAlchemyAsyncBind]
-) -> Union[SQLAlchemyAsyncRepository, SQLAlchemyRepository]:
+) -> Type[Union[SQLAlchemyAsyncRepository, SQLAlchemyRepository]]:
     base_class = (
         SQLAlchemyRepository
         if isinstance(sa_bind, SQLAlchemyBind)

tests/repository/test_delete_many.py

@@ -1,8 +1,9 @@
 import pytest
-from sqlalchemy import select
 
 
-async def test_can_delete_by_instance(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_can_delete_by_instance(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     model = model_class(
         model_id=1,
         name="Someone",
@@ -36,14 +37,16 @@ async def test_delete_inexistent_raises_exception(
         await sync_async_wrapper(repo.delete_many([4]))
 
     with pytest.raises(Exception):
-        await sync_async_wrapper(repo.delete_many(
-            [
-                model_class(
-                    model_id=823,
-                    name="Someone",
-                )
-            ]
-        ))
+        await sync_async_wrapper(
+            repo.delete_many(
+                [
+                    model_class(
+                        model_id=823,
+                        name="Someone",
+                    )
+                ]
+            )
+        )
 
 
 async def test_relationships_are_respected(

tests/repository/test_find.py

@@ -21,7 +21,9 @@ async def test_find(repository_class, model_class, sa_bind, sync_async_wrapper):
     assert len(results) == 3
 
 
-async def test_find_filtered(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_find_filtered(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     model = model_class(
         name="Someone",
     )
@@ -38,7 +40,9 @@ async def test_find_filtered(repository_class, model_class, sa_bind, sync_async_
     assert len(results) == 1
 
 
-async def test_find_filtered_fails_if_invalid_filter(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_find_filtered_fails_if_invalid_filter(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     repo = repository_class(bind=sa_bind, model_class=model_class)
     with pytest.raises(UnmappedProperty):
         await sync_async_wrapper(repo.find(search_params={"somename": "Someone"}))
@@ -58,16 +62,22 @@ async def test_find_ordered(repository_class, model_class, sa_bind, sync_async_w
     assert results[0].name == "Abbott"
     assert results[1].name == "Costello"
 
-    results2 = await sync_async_wrapper(repo.find(order_by=(("name", SortDirection.ASC),)))
+    results2 = await sync_async_wrapper(
+        repo.find(order_by=(("name", SortDirection.ASC),))
+    )
     assert results2[0].name == "Abbott"
     assert results2[1].name == "Costello"
 
-    results3 = await sync_async_wrapper(repo.find(order_by=(("name", SortDirection.DESC),)))
+    results3 = await sync_async_wrapper(
+        repo.find(order_by=(("name", SortDirection.DESC),))
+    )
     assert results3[1].name == "Abbott"
     assert results3[0].name == "Costello"
 
 
-async def test_find_ordered_fails_if_invalid_column(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_find_ordered_fails_if_invalid_column(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     repo = repository_class(bind=sa_bind, model_class=model_class)
     with pytest.raises(UnmappedProperty):
         await repo.find(order_by=("unexisting",))

tests/repository/test_get.py

@@ -1,7 +1,9 @@
 import pytest
 
 
-async def test_get_returns_model(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_get_returns_model(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     model = model_class(
         model_id=1,
         name="Someone",
@@ -19,7 +21,9 @@ async def test_get_returns_model(repository_class, model_class, sa_bind, sync_as
     assert isinstance(result, model_class)
 
 
-async def test_get_many_returns_models(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_get_many_returns_models(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     model = model_class(
         model_id=1,
         name="Someone",
@@ -52,7 +56,9 @@ async def test_get_many_returns_empty_list_if_nothing_found(
     assert len(result) == 0
 
 
-async def test_get_raises_exception_if_not_found(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_get_raises_exception_if_not_found(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     repo = repository_class(bind=sa_bind, model_class=model_class)
 
     with pytest.raises(Exception):

tests/repository/test_repository_lifecycle.py

@@ -10,7 +10,9 @@
 from sqlalchemy_bind_manager.repository import SQLAlchemyAsyncRepository
 
 
-def test_repository_fails_if_not_correct_bind(sa_manager, repository_class, model_class):
+def test_repository_fails_if_not_correct_bind(
+    sa_manager, repository_class, model_class
+):
     wrong_bind = "sync" if repository_class is SQLAlchemyAsyncRepository else "async"
 
     with pytest.raises(UnsupportedBind):

tests/repository/test_save.py

@@ -1,4 +1,4 @@
-from unittest.mock import AsyncMock, patch, MagicMock
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -17,7 +17,9 @@ async def test_save_model(repository_class, model_class, sa_bind, sync_async_wra
     assert model.model_id is not None
 
 
-async def test_save_many_models(repository_class, model_class, sa_bind, sync_async_wrapper):
+async def test_save_many_models(
+    repository_class, model_class, sa_bind, sync_async_wrapper
+):
     model = model_class(
         name="Someone",
     )
@@ -42,13 +44,18 @@ class SomeTestException(Exception):
         name="Someone",
     )
 
-    session_class = AsyncSession if isinstance(sa_bind, SQLAlchemyAsyncBind) else Session
+    session_class = (
+        AsyncSession if isinstance(sa_bind, SQLAlchemyAsyncBind) else Session
+    )
     session_mock = AsyncMock if isinstance(sa_bind, SQLAlchemyAsyncBind) else MagicMock
 
     with patch.object(
         session_class, "rollback", new_callable=session_mock, return_value=None
     ) as mocked_rollback, patch.object(
-        session_class, "commit", new_callable=session_mock, side_effect=SomeTestException
+        session_class,
+        "commit",
+        new_callable=session_mock,
+        side_effect=SomeTestException,
     ):
         repo = repository_class(bind=sa_bind, model_class=model_class)