fastapi-mongo-base 1.7.1__tar.gz → 1.7.2__tar.gz

{fastapi_mongo_base-1.7.1/src/fastapi_mongo_base.egg-info → fastapi_mongo_base-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 1.7.1
+Version: 1.7.2
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{fastapi_mongo_base-1.7.1 → fastapi_mongo_base-1.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-mongo-base"
-version = "1.7.1"
+version = "1.7.2"
 description = "A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB"
 readme = "README.md"
 requires-python = ">=3.10"

{fastapi_mongo_base-1.7.1 → fastapi_mongo_base-1.7.2}/src/fastapi_mongo_base/utils/mongo_aggregate.py

@@ -9,6 +9,19 @@ if TYPE_CHECKING:
     from beanie import Document
 
 
+def _get_collection(model: type[Document]) -> object:
+    """Return the Beanie collection (Beanie 2 pymongo or Beanie 1 motor)."""
+    getter = getattr(model, "get_pymongo_collection", None) or getattr(
+        model, "get_motor_collection", None
+    )
+    if getter is None:
+        raise AttributeError(
+            f"{model.__name__} has neither get_pymongo_collection "
+            "nor get_motor_collection"
+        )
+    return getter()
+
+
 async def aggregate_to_list(
     model: type[Document],
     pipeline: list[dict[str, object]],
@@ -21,9 +34,10 @@ async def aggregate_to_list(
 
     Beanie's ``aggregate().to_list()`` assumes Motor cursors; PyMongo 4.x
     native async may return a coroutine from ``aggregate()`` — this helper
-    supports both drivers.
+    supports both drivers. Collection access works with Beanie 2
+    (``get_pymongo_collection``) and Beanie 1 (``get_motor_collection``).
     """
-    collection = model.get_motor_collection()
+    collection = _get_collection(model)
     cursor = collection.aggregate(pipeline, **kwargs)
     if inspect.isawaitable(cursor):
         cursor = await cursor

{fastapi_mongo_base-1.7.1 → fastapi_mongo_base-1.7.2/src/fastapi_mongo_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 1.7.1
+Version: 1.7.2
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{fastapi_mongo_base-1.7.1 → fastapi_mongo_base-1.7.2}/tests/test_mongo_aggregate.py

@@ -11,33 +11,36 @@ from src.fastapi_mongo_base.utils.mongo_aggregate import aggregate_to_list
 
 
 @pytest.mark.asyncio
-async def test_aggregate_to_list_sync_cursor_and_to_list() -> None:
-    """Motor-style: aggregate and to_list are both synchronous."""
+async def test_aggregate_to_list_beanie2_pymongo_collection() -> None:
+    """Beanie 2: use get_pymongo_collection; aggregate/to_list may be sync."""
     docs = [{"_id": 1}]
     cursor = MagicMock()
     cursor.to_list.return_value = docs
     collection = MagicMock()
     collection.aggregate.return_value = cursor
-    model = MagicMock()
-    model.get_motor_collection.return_value = collection
+    model = MagicMock(spec=["get_pymongo_collection"])
+    model.get_pymongo_collection.return_value = collection
+    model.__name__ = "Doc"
 
     result = await aggregate_to_list(model, [{"$match": {}}], length=10)
 
     assert result == docs
+    model.get_pymongo_collection.assert_called_once_with()
     collection.aggregate.assert_called_once_with([{"$match": {}}])
     cursor.to_list.assert_called_once_with(length=10)
 
 
 @pytest.mark.asyncio
-async def test_aggregate_to_list_awaitable_cursor_and_to_list() -> None:
-    """PyMongo async-style: both aggregate and to_list are awaitable."""
+async def test_aggregate_to_list_beanie1_motor_fallback() -> None:
+    """Beanie 1: fall back to get_motor_collection."""
     docs = [{"_id": 2}]
     cursor = MagicMock()
     cursor.to_list = AsyncMock(return_value=docs)
     collection = MagicMock()
     collection.aggregate = AsyncMock(return_value=cursor)
-    model = MagicMock()
+    model = MagicMock(spec=["get_motor_collection"])
     model.get_motor_collection.return_value = collection
+    model.__name__ = "Doc"
 
     pipeline: list[dict[str, Any]] = [{"$group": {"_id": None}}]
     result = await aggregate_to_list(
@@ -45,5 +48,16 @@ async def test_aggregate_to_list_awaitable_cursor_and_to_list() -> None:
     )
 
     assert result == docs
+    model.get_motor_collection.assert_called_once_with()
     collection.aggregate.assert_awaited_once_with(pipeline, allowDiskUse=True)
     cursor.to_list.assert_awaited_once_with(length=None)
+
+
+@pytest.mark.asyncio
+async def test_aggregate_to_list_missing_collection_getter() -> None:
+    """Raise when the model exposes neither collection getter."""
+    model = MagicMock(spec=[])
+    model.__name__ = "Broken"
+
+    with pytest.raises(AttributeError, match="get_pymongo_collection"):
+        await aggregate_to_list(model, [])