Refactor ORM interfaces and enhance dependency resolution features

pyrannic/contracts/container/container.py

@@ -103,7 +103,12 @@ async def resolve(
         """Resolve the given type from the container."""
 
     @abstractmethod
-    async def call(self, callback: type[T] | Callable[..., Any]) -> T:
+    async def call(
+        self,
+        callback: type[T] | Callable[..., Any],
+        *args: Any,
+        **kwargs: Any,
+    ) -> T:
         """Call the given callback (Closure, class@method...) and inject its dependencies."""
 
     @abstractmethod

pyrannic/orm/sqlalchemy/__init__.py

@@ -2,6 +2,7 @@
 from .async_repository import AsyncRepository as AsyncRepository
 from .connector import AsyncConnector as AsyncConnector
 from .connector import Connector as Connector
+from .mixins.has_timestamps import HasTimestamp as HasTimestamp
 from .mixins.has_timestamps import HasTimestamps as HasTimestamps
 from .mixins.soft_deletes import SoftDeletes as SoftDeletes
 from .model import Model as Model

pyrannic/orm/sqlalchemy/abstract_query_builder.py

@@ -145,12 +145,12 @@ def filter(self, *filters: ColumnExpressionArgument[Any]) -> Self:
 
     @overload
     def filter(self, **kwargs: Any) -> Self:
-        self._prepare_query()
-
-        if isinstance(self._query, (Select, Delete)):
-            self._query = self._query.filter_by(**kwargs)
+        """
+        Apply filtering conditions to the query using keyword arguments.
 
-        return self
+        :param kwargs: Column-value pairs for filtering.
+        :return: The current instance of the query builder.
+        """
 
     def filter(self, *filters: ColumnExpressionArgument[Any], **kwargs: Any) -> Self:
         self._prepare_query()

pyrannic/orm/sqlalchemy/serializable.py

@@ -24,18 +24,15 @@ def to_dict(
         :return: dict
         """
         result = dict[str, Any]()
-        columns: list[str] = self.columns + self.properties  # pyright: ignore[reportUnknownMemberType]
+        columns: list[str] = self.columns + self.properties
 
         if exclude is None:
             view_cols = columns
         else:
             view_cols = filter(lambda e: e not in exclude, columns)
 
         for key in view_cols:
-            try:
-                result[key] = getattr(self, key)
-            except Exception as e:
-                print(key, e)
+            result[key] = getattr(self, key)
 
         if hybrid_attributes:
             for key in self.hybrid_properties:

pyrannic/support/string.py

@@ -1,6 +1,18 @@
 import re
 
 
+def to_kebab_case(value: str) -> str:
+    """Convert a string to kebab case."""
+
+    value = (
+        re.sub(r"(?<=[a-z])(?=[A-Z])|[^a-zA-Z0-9]", " ", value)
+        .strip()
+        .replace(" ", "-")
+    )
+
+    return "".join(value.lower())
+
+
 def to_snake_case(value: str) -> str:
     """Convert a string to snake case."""
 

tests/application/app/http/middlewares/middleware_a.py

@@ -6,7 +6,5 @@
 
 class A_Middleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("A_Middleware: Before request")
         response = await call_next(request)
-        print("A_Middleware: After request")
         return response

tests/application/app/http/middlewares/middleware_b.py

@@ -6,7 +6,5 @@
 
 class B_Middleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("B_Middleware: Before request")
         response = await call_next(request)
-        print("B_Middleware: After request")
         return response

tests/application/app/http/routers/heroes.py

@@ -27,13 +27,6 @@ def index(
     repository: HeroesRepository = Depends(),
     # repository: Scoped[Repository[HeroModel]],
 ) -> HeroesCollection:
-    print(
-        "Container in index endpoint",
-        repository,
-        # repository2,
-        # foo.get_app_name(),
-        # bar.foo.get_app_name(),
-    )
     return HeroesCollection(repository.where(HeroModel.name.like("%man%")).paginate())
 
 

tests/unit/container/container/test_make.py

@@ -71,7 +71,6 @@ async def test_make_with_interface_not_bound(container: ContainerInterface):
         await container.make(FooInterface)
 
     error = str(exc_info.value)
-    print(error)
     assert "No binding found for interface FooInterface" in error
 
 
@@ -81,5 +80,4 @@ async def test_make_with_key_not_bound(container: ContainerInterface):
         await container.make("FooInterface")
 
     error = str(exc_info.value)
-    print(error)
     assert "No binding found for key FooInterface" in error

tests/unit/container/container/test_resolve.py

@@ -71,7 +71,6 @@ async def test_resolve_with_interface_not_bound(container: ContainerInterface):
         await container.resolve(FooInterface)
 
     error = str(exc_info.value)
-    print(error)
     assert "No binding found for interface FooInterface" in error
 
 
@@ -81,5 +80,4 @@ async def test_resolve_with_key_not_bound(container: ContainerInterface):
         await container.resolve("FooInterface")
 
     error = str(exc_info.value)
-    print(error)
     assert "No binding found for key FooInterface" in error

tests/unit/http/providers/application/app/http/middlewares/middleware_a.py

@@ -6,7 +6,5 @@
 
 class A_Middleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("A_Middleware: Before request")
         response = await call_next(request)
-        print("A_Middleware: After request")
         return response

tests/unit/http/providers/application/app/http/middlewares/middleware_b.py

@@ -6,7 +6,5 @@
 
 class B_Middleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("B_Middleware: Before request")
         response = await call_next(request)
-        print("B_Middleware: After request")
         return response

tests/unit/http/providers/application/app/http/routers/heroes.py

@@ -3,8 +3,8 @@
 from fastapi import APIRouter, Depends
 
 from pyrannic import ResourceNotFoundException
-from pyrannic.ioc import App, Container, Resolve
 from pyrannic.contracts import ContainerInterface
+from pyrannic.ioc import App, Container, Resolve
 from tests.application.app.http.resources.hero import Hero, HeroesCollection
 from tests.application.app.models.hero import Hero as HeroModel
 from tests.application.app.repositories.heroes import HeroesRepository
@@ -28,11 +28,6 @@ def index(
     bar: Resolve[BarService],
     repository2: HeroesRepository = Depends(),
 ) -> HeroesCollection:
-    print(
-        "Container in index endpoint",
-        foo.get_app_name(),
-        bar.foo.get_app_name(),
-    )
     return HeroesCollection(
         repository2.where(HeroModel.name.like("%batman%")).paginate()
     )

tests/unit/http/providers/application_no_providers/app/http/middlewares/a_middleware.py

@@ -6,7 +6,5 @@
 
 class AMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("A_Middleware: Before request")
         response = await call_next(request)
-        print("A_Middleware: After request")
         return response

tests/unit/http/providers/application_no_providers/app/http/middlewares/b_middleware.py

@@ -6,7 +6,5 @@
 
 class BMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable[..., Any]) -> Any:
-        print("B_Middleware: Before request")
         response = await call_next(request)
-        print("B_Middleware: After request")
         return response

tests/unit/http/providers/application_no_providers/app/http/routers/heroes.py

@@ -3,8 +3,8 @@
 from fastapi import APIRouter, Depends
 
 from pyrannic import ResourceNotFoundException
-from pyrannic.ioc import App, Container, Resolve
 from pyrannic.contracts import ContainerInterface
+from pyrannic.ioc import App, Container, Resolve
 from tests.application.app.http.resources.hero import Hero, HeroesCollection
 from tests.application.app.models.hero import Hero as HeroModel
 from tests.application.app.repositories.heroes import HeroesRepository
@@ -28,11 +28,6 @@ def index(
     bar: Resolve[BarService],
     repository2: HeroesRepository = Depends(),
 ) -> HeroesCollection:
-    print(
-        "Container in index endpoint",
-        foo.get_app_name(),
-        bar.foo.get_app_name(),
-    )
     return HeroesCollection(
         repository2.where(HeroModel.name.like("%batman%")).paginate()
     )

tests/unit/http/resources/utils.py

@@ -35,9 +35,6 @@ class FooResourceWithRelationships(Resource, HasTimestamps, SoftDeletes):
 
     @classmethod
     def _relationships(cls, model: SerializableInterface) -> dict[str, Any]:
-
-        print("_relationships called with model:", getattr(model, "children", []))
-
         return {
             "children": [
                 FooResourceWithRelationships.from_model(child)

tests/unit/orm/sqlalchemy/mixins/test_sa_has_timestamp.py

@@ -0,0 +1,21 @@
+from datetime import datetime, timezone
+
+from pyrannic.support.datetime import get_current_utc_datetime
+from tests.unit.orm.sqlalchemy.utils import HasTimestampModel
+
+
+def test_initial_created_at() -> None:
+    created_at = get_current_utc_datetime()
+    model = HasTimestampModel()
+
+    assert model.created_at.tzinfo == timezone.utc
+    assert abs((model.created_at - created_at).total_seconds()) < 1
+
+
+def test_set_created_at() -> None:
+    model = HasTimestampModel()
+    assert model.created_at is not None
+
+    new_created_at = datetime(2024, 1, 1, 12, 0, 0)
+    model.set_created_at(new_created_at)
+    assert model.created_at == new_created_at

tests/unit/orm/sqlalchemy/mixins/test_sa_has_timestamps.py

@@ -0,0 +1,38 @@
+from datetime import datetime, timezone
+
+from pyrannic.support.datetime import get_current_utc_datetime
+from tests.unit.orm.sqlalchemy.utils import HasTimestampsModel
+
+
+def test_initial_created_at() -> None:
+    created_at = get_current_utc_datetime()
+    model = HasTimestampsModel()
+
+    assert model.created_at.tzinfo == timezone.utc
+    assert abs((model.created_at - created_at).total_seconds()) < 1
+
+
+def test_set_created_at() -> None:
+    model = HasTimestampsModel()
+    assert model.created_at is not None
+
+    new_created_at = datetime(2024, 1, 1, 12, 0, 0)
+    model.set_created_at(new_created_at)
+    assert model.created_at == new_created_at
+
+
+def test_initial_updated_at() -> None:
+    updated_at = get_current_utc_datetime()
+    model = HasTimestampsModel()
+
+    assert model.updated_at.tzinfo == timezone.utc
+    assert abs((model.updated_at - updated_at).total_seconds()) < 1
+
+
+def test_set_updated_at() -> None:
+    model = HasTimestampsModel()
+    assert model.updated_at is not None
+
+    new_updated_at = datetime(2024, 1, 1, 12, 0, 0)
+    model.set_updated_at(new_updated_at)
+    assert model.updated_at == new_updated_at

tests/unit/orm/sqlalchemy/mixins/test_sa_soft_deletes.py

@@ -0,0 +1,29 @@
+from datetime import datetime
+
+from tests.unit.orm.sqlalchemy.utils import SoftDeletesModel
+
+
+def test_initial_deleted_at() -> None:
+    model = SoftDeletesModel()
+    assert model.deleted_at is None
+
+
+def test_set_deleted_at() -> None:
+    model = SoftDeletesModel()
+    assert model.deleted_at is None
+
+    new_deleted_at = datetime(2024, 1, 1, 12, 0, 0)
+    model.set_deleted_at(new_deleted_at)
+    assert model.deleted_at == new_deleted_at
+
+
+def test_is_deleted_property() -> None:
+    model = SoftDeletesModel()
+    assert model.is_deleted is False
+
+    model.set_deleted_at(datetime(2024, 1, 1, 12, 0, 0))
+    assert model.is_deleted is True
+
+
+def test_deleted_at_column_name() -> None:
+    assert SoftDeletesModel.deleted_at_column() == "deleted_at"

tests/unit/orm/sqlalchemy/test_sa_connector.py

@@ -0,0 +1,49 @@
+from logging import Logger
+from unittest.mock import Mock
+
+import pytest
+from pytest import MonkeyPatch
+from sqlalchemy.ext.asyncio import AsyncEngine
+
+from pyrannic.contracts import ApplicationInterface
+from pyrannic.orm.sqlalchemy import AsyncConnector, Connector
+
+
+@pytest.mark.asyncio
+async def test_connector_disconnect(
+    application: ApplicationInterface,
+    monkeypatch: MonkeyPatch,
+) -> None:
+    container = application.container
+    connector = Connector(
+        application,
+        await container.resolve(Logger),
+        await container.resolve("config"),
+    )
+
+    mock = Mock()
+
+    monkeypatch.setattr(connector, "_engine", mock)
+
+    await connector.disconnect()
+    mock.dispose.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_async_connector_disconnect(
+    application: ApplicationInterface,
+    monkeypatch: MonkeyPatch,
+) -> None:
+    container = application.container
+    connector = AsyncConnector(
+        application,
+        await container.resolve(Logger),
+        await container.resolve("config"),
+    )
+
+    mock = Mock(spec=AsyncEngine)
+
+    monkeypatch.setattr(connector, "_engine", mock)
+
+    await connector.disconnect()
+    mock.dispose.assert_called_once()