Migrate from motor to pymongo native async client

Replace all motor.motor_asyncio imports with pymongo async equivalents:
- AsyncIOMotorClient → AsyncMongoClient
- AsyncIOMotorDatabase → AsyncDatabase
- AsyncIOMotorCollection → AsyncCollection
Remove motor from pyproject.toml dependencies.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: calmmage

botspot/components/data/access_control.py

@@ -14,7 +14,7 @@
 from pydantic_settings import BaseSettings
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection
+    from pymongo.asynchronous.collection import AsyncCollection
 
 logger = get_logger()
 
@@ -39,7 +39,7 @@ class AccessControl:
     """Manages persistent friends and admins lists with MongoDB support."""
 
     def __init__(
-        self, settings: AccessControlSettings, collection: Optional["AsyncIOMotorCollection"] = None
+        self, settings: AccessControlSettings, collection: Optional["AsyncCollection"] = None
     ):
         self.settings = settings
         self._mongo_available = None

botspot/components/data/contact_data.py

@@ -15,7 +15,8 @@
 # from botspot.utils.internal import get_logger
 #
 # if TYPE_CHECKING:
-#     from motor.motor_asyncio import AsyncIOMotorCollection, AsyncIOMotorDatabase  # noqa: F401
+#     from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
+#     from pymongo.asynchronous.database import AsyncDatabase  # noqa: F401
 #
 #     from botspot.core.botspot_settings import BotspotSettings
 #

botspot/components/data/mongo_database.py

@@ -6,8 +6,8 @@
 from botspot.utils.internal import get_logger
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorClient  # noqa: F401
-    from motor.motor_asyncio import AsyncIOMotorDatabase  # noqa: F401
+    from pymongo import AsyncMongoClient  # noqa: F401
+    from pymongo.asynchronous.database import AsyncDatabase  # noqa: F401
 
 logger = get_logger()
 
@@ -28,7 +28,7 @@ def setup_dispatcher(dp):
     return dp
 
 
-def get_database() -> "AsyncIOMotorDatabase":
+def get_database() -> "AsyncDatabase":
     """Get MongoDB database instance from dependency manager."""
     from botspot.core.dependency_manager import get_dependency_manager
 
@@ -38,7 +38,7 @@ def get_database() -> "AsyncIOMotorDatabase":
     return db
 
 
-def get_mongo_client() -> "AsyncIOMotorClient":
+def get_mongo_client() -> "AsyncMongoClient":
     """Get MongoDB client instance from dependency manager."""
     from botspot.core.dependency_manager import get_dependency_manager
 
@@ -52,34 +52,34 @@ def get_mongo_client() -> "AsyncIOMotorClient":
 
 def initialize(
     settings: MongoDatabaseSettings,
-) -> Tuple[Optional["AsyncIOMotorClient"], Optional["AsyncIOMotorDatabase"]]:
+) -> Tuple[Optional["AsyncMongoClient"], Optional["AsyncDatabase"]]:
     """Initialize MongoDB connection and return both client and database.
 
     Args:
         settings: MongoDB settings
 
     Returns:
-        Tuple of (AsyncIOMotorClient, AsyncIOMotorDatabase) or (None, None) if disabled
+        Tuple of (AsyncMongoClient, AsyncDatabase) or (None, None) if disabled
 
     Raises:
-        ImportError: If motor is not installed
+        ImportError: If pymongo is not installed
     """
     # Check if MongoDB is enabled
     if not settings.enabled:
         logger.info("MongoDB is disabled")
         return None, None
 
-    # Check if motor is installed
+    # Check if pymongo is installed
     try:
-        from motor.motor_asyncio import AsyncIOMotorClient
+        from pymongo import AsyncMongoClient
     except ImportError:
-        logger.error("motor package is not installed. Please install it to use MongoDB.")
+        logger.error("pymongo package is not installed. Please install it to use MongoDB.")
         raise ImportError(
-            "motor package is not installed. Run 'poetry add motor' or 'pip install motor'"
+            "pymongo package is not installed. Run 'uv add pymongo' or 'pip install pymongo'"
         )
 
     # Initialize client and database
-    client = AsyncIOMotorClient(settings.conn_str.get_secret_value())
+    client = AsyncMongoClient(settings.conn_str.get_secret_value())
     db = client[settings.database]
     logger.info(f"MongoDB client initialized. Database: {settings.database}")
     return client, db

botspot/components/data/user_data.py

@@ -10,8 +10,8 @@
 from botspot.utils.internal import get_logger
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
-    from motor.motor_asyncio import AsyncIOMotorDatabase  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
+    from pymongo.asynchronous.database import AsyncDatabase  # noqa: F401
 
     from botspot.core.botspot_settings import BotspotSettings
 
@@ -57,7 +57,7 @@ class UserManager(Generic[UserT]):
 
     def __init__(
         self,
-        db: "AsyncIOMotorDatabase",
+        db: "AsyncDatabase",
         collection: str,
         user_class: Type[UserT],
         settings: Optional["BotspotSettings"] = None,
@@ -108,7 +108,7 @@ async def has_user(self, user_id: int) -> bool:
         return bool(await self.get_user(user_id))
 
     @property
-    def users_collection(self) -> "AsyncIOMotorCollection":
+    def users_collection(self) -> "AsyncCollection":
         return self.db[self.collection]
 
     async def get_users(self, query: Optional[dict] = None) -> list[UserT]:
@@ -337,20 +337,20 @@ def initialize(settings: "BotspotSettings", user_class=None) -> UserManager:
 
     Raises:
         RuntimeError: If MongoDB is not enabled or initialized
-        ImportError: If motor package is not installed
+        ImportError: If pymongo package is not installed
     """
-    # Check that motor is installed
+    # Check that pymongo is installed
     try:
-        import motor  # noqa: F401
+        import pymongo  # noqa: F401
     except ImportError:
         from botspot.utils.internal import get_logger
 
         logger = get_logger()
         logger.error(
-            "motor package is not installed. Please install it to use the user_data component."
+            "pymongo package is not installed. Please install it to use the user_data component."
         )
         raise ImportError(
-            "motor package is not installed. Please install it with 'poetry add motor' or 'pip install motor' to use the user_data component."
+            "pymongo package is not installed. Please install it with 'uv add pymongo' or 'pip install pymongo' to use the user_data component."
         )
 
     # Check that MongoDB component is enabled

botspot/components/new/auto_archive.py

@@ -14,7 +14,7 @@
 from botspot.utils.send_safe import send_safe
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
 
 
 class CommandFilterMode(str, Enum):
@@ -52,7 +52,7 @@ def __init__(self, settings: AutoArchiveSettings) -> None:
         self._warning_sent: Set[int] = set()
         self._collection = None
 
-    async def _get_collection(self) -> "AsyncIOMotorCollection":
+    async def _get_collection(self) -> "AsyncCollection":
         if self._collection is None:
             db = get_database()
             self._collection = db["auto_archive_intro"]

botspot/components/new/chat_binder.py

@@ -21,7 +21,7 @@
 from botspot.utils.internal import get_logger
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
 
 logger = get_logger()
 
@@ -58,7 +58,7 @@ class BoundChatRecord(BaseModel):
 
 class ChatBinder:
     def __init__(
-        self, settings: ChatBinderSettings, collection: Optional["AsyncIOMotorCollection"] = None
+        self, settings: ChatBinderSettings, collection: Optional["AsyncCollection"] = None
     ):
         """Initialize the ChatBinder.
 

botspot/components/new/contact_manager.py

@@ -3,7 +3,7 @@
 from pydantic_settings import BaseSettings
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
 
 
 class ContactManagerSettings(BaseSettings):

botspot/components/new/context_builder.py

@@ -41,8 +41,8 @@
 from botspot.utils.internal import get_logger
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
-    from motor.motor_asyncio import AsyncIOMotorDatabase  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
+    from pymongo.asynchronous.database import AsyncDatabase  # noqa: F401
 
 logger = get_logger()
 

botspot/components/new/subscription_manager.py

@@ -3,7 +3,7 @@
 from pydantic_settings import BaseSettings
 
 if TYPE_CHECKING:
-    from motor.motor_asyncio import AsyncIOMotorCollection  # noqa: F401
+    from pymongo.asynchronous.collection import AsyncCollection  # noqa: F401
 
 
 class SubscriptionManagerSettings(BaseSettings):

botspot/core/dependency_manager.py

@@ -18,10 +18,8 @@
     from botspot.components.new.llm_provider import LLMProvider
     from botspot.components.new.queue_manager import QueueManager
     from botspot.components.new.s3_storage import S3StorageProvider
-    from motor.motor_asyncio import (
-        AsyncIOMotorClient,  # noqa: F401
-        AsyncIOMotorDatabase,  # noqa: F401
-    )
+    from pymongo import AsyncMongoClient  # noqa: F401
+    from pymongo.asynchronous.database import AsyncDatabase  # noqa: F401
 
 
 class DependencyManager(metaclass=Singleton):
@@ -30,8 +28,8 @@ def __init__(
         botspot_settings: Optional[BotspotSettings] = None,
         bot: Optional[Bot] = None,
         dispatcher: Optional[Dispatcher] = None,
-        mongo_client: Optional["AsyncIOMotorClient"] = None,
-        mongo_database: Optional["AsyncIOMotorDatabase"] = None,
+        mongo_client: Optional["AsyncMongoClient"] = None,
+        mongo_database: Optional["AsyncDatabase"] = None,
         **kwargs,
     ):
         self._botspot_settings = botspot_settings or BotspotSettings()
@@ -81,7 +79,7 @@ def dispatcher(self, value):
         self._dispatcher = value
 
     @property
-    def mongo_client(self) -> "AsyncIOMotorClient":
+    def mongo_client(self) -> "AsyncMongoClient":
         if self._mongo_client is None:
             raise BotspotError("MongoDB client is not initialized")
         return self._mongo_client
@@ -91,7 +89,7 @@ def mongo_client(self, value):
         self._mongo_client = value
 
     @property
-    def mongo_database(self) -> "AsyncIOMotorDatabase":
+    def mongo_database(self) -> "AsyncDatabase":
         if self._mongo_database is None:
             raise BotspotError("MongoDB database is not initialized")
         return self._mongo_database