fix: incorporate CodeRabbit review feedback

- Fix ObjectId import to use bson module instead of pymongo.collection
- Update sanitize_collection_name to use COLLECTION_ALLOWED_CHARACTERS
- Fix test docstrings for migration tests
- Update function docstrings (value.dict → value.object)
- Fix import error message in sync module
- Fix class docstring in sync module (Motor → PyMongo)

Co-authored-by: William Easton <[email protected]>

Author: github-actions[bot]

key-value/key-value-aio/src/key_value/aio/stores/mongodb/store.py

@@ -39,7 +39,7 @@ def document_to_managed_entry(document: dict[str, Any]) -> ManagedEntry:
     """Convert a MongoDB document back to a ManagedEntry.
 
     This function deserializes a MongoDB document (created by `managed_entry_to_document`) back to a
-    ManagedEntry object. It supports both native BSON storage (dict in value.dict field) and legacy
+    ManagedEntry object. It supports both native BSON storage (dict in value.object field) and legacy
     JSON string storage (string in value.string field) for migration support.
 
     Args:
@@ -238,7 +238,7 @@ def _sanitize_collection_name(self, collection: str) -> str:
         Returns:
             A sanitized collection name that meets MongoDB requirements.
         """
-        return sanitize_string(value=collection, max_length=MAX_COLLECTION_LENGTH, allowed_characters=ALPHANUMERIC_CHARACTERS)
+        return sanitize_string(value=collection, max_length=MAX_COLLECTION_LENGTH, allowed_characters=COLLECTION_ALLOWED_CHARACTERS)
 
     @override
     async def _setup_collection(self, *, collection: str) -> None:

key-value/key-value-aio/tests/stores/mongodb/test_mongodb.py

@@ -8,8 +8,8 @@
 from inline_snapshot import snapshot
 from key_value.shared.stores.wait import async_wait_for_true
 from key_value.shared.utils.managed_entry import ManagedEntry
+from bson import ObjectId
 from pymongo import AsyncMongoClient
-from pymongo.collection import ObjectId
 from typing_extensions import override
 
 from key_value.aio.stores.base import BaseStore
@@ -210,7 +210,7 @@ async def test_value_stored_as_json(self, store: MongoDBStore):
         )
 
     async def test_migration_from_native_mode(self, store: MongoDBStore):
-        """Verify native mode can read native mode JSON string data."""
+        """Verify legacy mode can read native-mode object data."""
         # Manually insert a legacy document with JSON string value in the new format
         await store._setup_collection(collection="test")  # pyright: ignore[reportPrivateUsage]
         sanitized_collection = store._sanitize_collection_name(collection="test")  # pyright: ignore[reportPrivateUsage]

key-value/key-value-sync/src/key_value/sync/code_gen/stores/mongodb/store.py

@@ -24,7 +24,7 @@
     from pymongo.database import Database
     from pymongo.results import DeleteResult  # noqa: TC002
 except ImportError as e:
-    msg = "MongoDBStore requires py-key-value-aio[mongodb]"
+    msg = "MongoDBStore requires py-key-value-sync[mongodb]"
     raise ImportError(msg) from e
 
 DEFAULT_DB = "kv-store-adapter"
@@ -46,7 +46,7 @@ def document_to_managed_entry(document: dict[str, Any]) -> ManagedEntry:
     """Convert a MongoDB document back to a ManagedEntry.
 
     This function deserializes a MongoDB document (created by `managed_entry_to_document`) back to a
-    ManagedEntry object. It supports both native BSON storage (dict in value.dict field) and legacy
+    ManagedEntry object. It supports both native BSON storage (dict in value.object field) and legacy
     JSON string storage (string in value.string field) for migration support.
 
     Args:
@@ -134,7 +134,7 @@ def managed_entry_to_document(key: str, managed_entry: ManagedEntry, *, native_s
 
 
 class MongoDBStore(BaseEnumerateCollectionsStore, BaseDestroyCollectionStore, BaseContextManagerStore, BaseStore):
-    """MongoDB-based key-value store using Motor (sync MongoDB driver)."""
+    """MongoDB-based key-value store using PyMongo (sync MongoDB driver)."""
 
     _client: MongoClient[dict[str, Any]]
     _db: Database[dict[str, Any]]
@@ -245,7 +245,7 @@ def _sanitize_collection_name(self, collection: str) -> str:
         Returns:
             A sanitized collection name that meets MongoDB requirements.
         """
-        return sanitize_string(value=collection, max_length=MAX_COLLECTION_LENGTH, allowed_characters=ALPHANUMERIC_CHARACTERS)
+        return sanitize_string(value=collection, max_length=MAX_COLLECTION_LENGTH, allowed_characters=COLLECTION_ALLOWED_CHARACTERS)
 
     @override
     def _setup_collection(self, *, collection: str) -> None:

key-value/key-value-sync/tests/code_gen/stores/mongodb/test_mongodb.py

@@ -11,8 +11,8 @@
 from inline_snapshot import snapshot
 from key_value.shared.stores.wait import wait_for_true
 from key_value.shared.utils.managed_entry import ManagedEntry
+from bson import ObjectId
 from pymongo import MongoClient
-from pymongo.collection import ObjectId
 from typing_extensions import override
 
 from key_value.sync.code_gen.stores.base import BaseStore
@@ -207,7 +207,7 @@ def test_value_stored_as_json(self, store: MongoDBStore):
         )
 
     def test_migration_from_native_mode(self, store: MongoDBStore):
-        """Verify native mode can read native mode JSON string data."""
+        """Verify legacy mode can read native-mode object data."""
         # Manually insert a legacy document with JSON string value in the new format
         store._setup_collection(collection="test")  # pyright: ignore[reportPrivateUsage]
         sanitized_collection = store._sanitize_collection_name(collection="test")  # pyright: ignore[reportPrivateUsage]