Add support for Beanie >2.0.0

Author: frankie567

pyproject.toml

@@ -86,7 +86,7 @@ classifiers = [
 requires-python = ">=3.10"
 dependencies = [
     "fastapi-users >= 15.0.1",
-    "beanie >=1.11.0,<2.0.0",
+    "beanie >=2.0.0",
 ]
 
 [project.urls]

tests/test_access_token.py

@@ -5,7 +5,7 @@
 import pytest
 import pytest_asyncio
 from beanie import Document, PydanticObjectId, init_beanie
-from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
+from pymongo import AsyncMongoClient
 
 from fastapi_users_db_beanie.access_token import (
     BeanieAccessTokenDatabase,
@@ -19,7 +19,7 @@ class AccessToken(BeanieBaseAccessToken, Document):
 
 @pytest_asyncio.fixture
 async def mongodb_client():
-    client = AsyncIOMotorClient(
+    client = AsyncMongoClient(
         "mongodb://localhost:27017",
         serverSelectionTimeoutMS=10000,
         uuidRepresentation="standard",
@@ -28,17 +28,17 @@ async def mongodb_client():
     try:
         await client.server_info()
         yield client
-        client.close()
+        await client.close()
     except pymongo.errors.ServerSelectionTimeoutError:
         pytest.skip("MongoDB not available", allow_module_level=True)
         return
 
 
 @pytest_asyncio.fixture
 async def beanie_access_token_db(
-    mongodb_client: AsyncIOMotorClient,
+    mongodb_client: AsyncMongoClient,
 ) -> AsyncGenerator[BeanieAccessTokenDatabase, None]:
-    database: AsyncIOMotorDatabase = mongodb_client["test_database"]
+    database = mongodb_client["test_database"]
     await init_beanie(database=database, document_models=[AccessToken])
 
     yield BeanieAccessTokenDatabase(AccessToken)

tests/test_fastapi_users_db_beanie.py

@@ -6,8 +6,8 @@
 import pytest_asyncio
 from beanie import Document, PydanticObjectId, init_beanie
 from fastapi_users import InvalidID
-from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
 from pydantic import Field
+from pymongo import AsyncMongoClient
 
 from fastapi_users_db_beanie import (
     BaseOAuthAccount,
@@ -31,7 +31,7 @@ class UserOAuth(User):
 
 @pytest_asyncio.fixture
 async def mongodb_client():
-    client = AsyncIOMotorClient(
+    client = AsyncMongoClient(
         "mongodb://localhost:27017",
         serverSelectionTimeoutMS=10000,
         uuidRepresentation="standard",
@@ -40,17 +40,17 @@ async def mongodb_client():
     try:
         await client.server_info()
         yield client
-        client.close()
+        await client.close()
     except pymongo.errors.ServerSelectionTimeoutError:
         pytest.skip("MongoDB not available", allow_module_level=True)
         return
 
 
 @pytest_asyncio.fixture
 async def beanie_user_db(
-    mongodb_client: AsyncIOMotorClient,
+    mongodb_client: AsyncMongoClient,
 ) -> AsyncGenerator[BeanieUserDatabase, None]:
-    database: AsyncIOMotorDatabase = mongodb_client["test_database"]
+    database = mongodb_client["test_database"]
     await init_beanie(database=database, document_models=[User])
 
     yield BeanieUserDatabase(User)
@@ -60,9 +60,9 @@ async def beanie_user_db(
 
 @pytest_asyncio.fixture
 async def beanie_user_db_oauth(
-    mongodb_client: AsyncIOMotorClient,
+    mongodb_client: AsyncMongoClient,
 ) -> AsyncGenerator[BeanieUserDatabase, None]:
-    database: AsyncIOMotorDatabase = mongodb_client["test_database"]
+    database = mongodb_client["test_database"]
     await init_beanie(database=database, document_models=[UserOAuth])
 
     yield BeanieUserDatabase(UserOAuth, OAuthAccount)