motor -> pymongo

HardMax71 · HardMax71 · commit a5949f5771ce · 2025-12-28T00:13:45.000+01:00
diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
@@ -128,7 +128,7 @@ jobs:
           docker compose -f docker-compose.ci.yaml up -d --wait --wait-timeout 120
           docker compose -f docker-compose.ci.yaml ps
 
-      - name: Run integration tests (non-k8s)
+      - name: Run integration tests
         timeout-minutes: 10
         env:
           MONGO_ROOT_USER: root
@@ -144,7 +144,7 @@ jobs:
           COVERAGE_CORE: sysmon
         run: |
           cd backend
-          uv run pytest tests/integration -v -rs \
+          uv run pytest tests/integration -p no:xdist -v -rs \
             --ignore=tests/integration/k8s \
             --cov=app --cov-branch \
             --cov-report=xml --cov-report=term
diff --git a/backend/app/core/database_context.py b/backend/app/core/database_context.py
@@ -4,25 +4,23 @@
 from dataclasses import dataclass
 from typing import Any, AsyncContextManager, Protocol, TypeVar, runtime_checkable
 
-from motor.motor_asyncio import (
-    AsyncIOMotorClient,
-    AsyncIOMotorClientSession,
-    AsyncIOMotorCollection,
-    AsyncIOMotorCursor,
-    AsyncIOMotorDatabase,
-)
+from pymongo.asynchronous.client_session import AsyncClientSession
+from pymongo.asynchronous.collection import AsyncCollection
+from pymongo.asynchronous.cursor import AsyncCursor
+from pymongo.asynchronous.database import AsyncDatabase
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 from pymongo.errors import ServerSelectionTimeoutError
 
 from app.core.logging import logger
 
 # Python 3.12 type aliases using the new 'type' statement
-# MongoDocument represents the raw document type returned by Motor operations
+# MongoDocument represents the raw document type returned by PyMongo operations
 type MongoDocument = dict[str, Any]
-type DBClient = AsyncIOMotorClient[MongoDocument]
-type Database = AsyncIOMotorDatabase[MongoDocument]
-type Collection = AsyncIOMotorCollection[MongoDocument]
-type Cursor = AsyncIOMotorCursor[MongoDocument]
-type DBSession = AsyncIOMotorClientSession
+type DBClient = AsyncMongoClient[MongoDocument]
+type Database = AsyncDatabase[MongoDocument]
+type Collection = AsyncCollection[MongoDocument]
+type Cursor = AsyncCursor[MongoDocument]
+type DBSession = AsyncClientSession
 
 # Type variable for generic database provider
 T = TypeVar("T")
@@ -106,10 +104,8 @@ async def connect(self) -> None:
 
         logger.info(f"Connecting to MongoDB database: {self._db_name}")
 
-        # Always explicitly bind to current event loop for consistency
-        import asyncio
-
-        client: DBClient = AsyncIOMotorClient(
+        # PyMongo Async automatically uses the current event loop
+        client: DBClient = AsyncMongoClient(
             self._config.mongodb_url,
             serverSelectionTimeoutMS=self._config.server_selection_timeout_ms,
             connectTimeoutMS=self._config.connect_timeout_ms,
@@ -119,7 +115,6 @@ async def connect(self) -> None:
             retryReads=self._config.retry_reads,
             w=self._config.write_concern,
             journal=self._config.journal,
-            io_loop=asyncio.get_running_loop(),  # Always bind to current loop
         )
 
         # Verify connection
@@ -128,7 +123,7 @@ async def connect(self) -> None:
             logger.info("Successfully connected to MongoDB")
         except ServerSelectionTimeoutError as e:
             logger.error(f"Failed to connect to MongoDB: {e}")
-            client.close()
+            await client.close()
             raise
 
         self._client = client
@@ -137,7 +132,7 @@ async def connect(self) -> None:
     async def disconnect(self) -> None:
         if self._client is not None:
             logger.info("Closing MongoDB connection")
-            self._client.close()
+            await self._client.close()
             self._client = None
             self._database = None
 
diff --git a/backend/app/services/coordinator/coordinator.py b/backend/app/services/coordinator/coordinator.py
@@ -6,7 +6,7 @@
 from uuid import uuid4
 
 import redis.asyncio as redis
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 from app.core.database_context import DBClient
 from app.core.lifecycle import LifecycleEnabled
@@ -500,7 +500,7 @@ async def run_coordinator() -> None:
     config = ProducerConfig(bootstrap_servers=settings.KAFKA_BOOTSTRAP_SERVERS)
     producer = UnifiedProducer(config, schema_registry_manager)
 
-    db_client: DBClient = AsyncIOMotorClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
+    db_client: DBClient = AsyncMongoClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
     db_name = settings.DATABASE_NAME
     database = db_client[db_name]
 
diff --git a/backend/app/services/k8s_worker/worker.py b/backend/app/services/k8s_worker/worker.py
@@ -9,7 +9,7 @@
 from kubernetes import client as k8s_client
 from kubernetes import config as k8s_config
 from kubernetes.client.rest import ApiException
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 from app.core.database_context import Database, DBClient
 from app.core.lifecycle import LifecycleEnabled
@@ -521,7 +521,7 @@ async def run_kubernetes_worker() -> None:
 
     logger.info("Initializing database connection...")
     settings = get_settings()
-    db_client: DBClient = AsyncIOMotorClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
+    db_client: DBClient = AsyncMongoClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
     db_name = settings.DATABASE_NAME
     database = db_client[db_name]
     await db_client.admin.command("ping")
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -55,7 +55,6 @@ dependencies = [
     "markdown-it-py==4.0.0",
     "MarkupSafe==3.0.2",
     "mdurl==0.1.2",
-    "motor==3.6.0",
     "msgpack==1.1.0",
     "multidict==6.7.0",
     "oauthlib==3.2.2",
diff --git a/backend/scripts/seed_users.py b/backend/scripts/seed_users.py
@@ -18,14 +18,15 @@
 from typing import Any
 
 from bson import ObjectId
-from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
 from passlib.context import CryptContext
+from pymongo.asynchronous.database import AsyncDatabase
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 
 async def upsert_user(
-    db: AsyncIOMotorDatabase[dict[str, Any]],
+    db: AsyncDatabase[dict[str, Any]],
     username: str,
     email: str,
     password: str,
@@ -73,7 +74,7 @@ async def seed_users() -> None:
 
     print(f"Connecting to MongoDB (database: {db_name})...")
 
-    client: AsyncIOMotorClient[dict[str, Any]] = AsyncIOMotorClient(mongodb_url)
+    client: AsyncMongoClient[dict[str, Any]] = AsyncMongoClient(mongodb_url)
     db = client[db_name]
 
     # Default user
diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
@@ -11,7 +11,7 @@
 from dishka import AsyncContainer
 from dotenv import load_dotenv
 from httpx import ASGITransport
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 import redis.asyncio as redis
 
 # Load test environment variables BEFORE any app imports
diff --git a/backend/tests/fixtures/real_services.py b/backend/tests/fixtures/real_services.py
@@ -9,7 +9,8 @@
 
 import pytest
 import pytest_asyncio
-from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
+from pymongo.asynchronous.mongo_client import AsyncMongoClient as AsyncIOMotorClient
 import redis.asyncio as redis
 from aiokafka import AIOKafkaProducer, AIOKafkaConsumer
 from aiokafka.errors import KafkaConnectionError
diff --git a/backend/tests/integration/conftest.py b/backend/tests/integration/conftest.py
@@ -1,6 +1,6 @@
 """Integration tests conftest - with infrastructure cleanup."""
 import pytest_asyncio
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 import redis.asyncio as redis
 
 
diff --git a/backend/tests/integration/core/test_container.py b/backend/tests/integration/core/test_container.py
@@ -1,6 +1,6 @@
 import pytest
 from dishka import AsyncContainer
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.services.event_service import EventService
 
diff --git a/backend/tests/integration/core/test_database_context.py b/backend/tests/integration/core/test_database_context.py
@@ -1,7 +1,7 @@
 import pytest
 
 from app.core.database_context import AsyncDatabaseConnection, ContextualDatabaseProvider, DatabaseNotInitializedError
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 pytestmark = [pytest.mark.integration, pytest.mark.mongodb]
 
diff --git a/backend/tests/integration/events/test_event_store.py b/backend/tests/integration/events/test_event_store.py
@@ -7,7 +7,7 @@
 from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.pod import PodCreatedEvent
 from app.infrastructure.kafka.events.user import UserLoggedInEvent
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 pytestmark = [pytest.mark.integration, pytest.mark.mongodb]
 
diff --git a/backend/tests/integration/events/test_event_store_consumer.py b/backend/tests/integration/events/test_event_store_consumer.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.domain.enums.kafka import KafkaTopic
 from app.events.core import UnifiedProducer
diff --git a/backend/tests/integration/events/test_event_store_consumer_flush_e2e.py b/backend/tests/integration/events/test_event_store_consumer_flush_e2e.py
@@ -2,7 +2,7 @@
 from uuid import uuid4
 
 import pytest
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.domain.enums.events import EventType
 from app.domain.enums.kafka import KafkaTopic
diff --git a/backend/tests/integration/events/test_event_store_e2e.py b/backend/tests/integration/events/test_event_store_e2e.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timezone, timedelta
 
 import pytest
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.domain.enums.events import EventType
 from app.events.event_store import EventStore
diff --git a/backend/tests/integration/k8s/test_k8s_worker_create_pod.py b/backend/tests/integration/k8s/test_k8s_worker_create_pod.py
@@ -9,7 +9,7 @@
 from app.services.k8s_worker.config import K8sWorkerConfig
 from app.services.k8s_worker.worker import KubernetesWorker
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 from app.events.event_store import EventStore
 from app.events.schema.schema_registry import SchemaRegistryManager
 from app.events.core import UnifiedProducer
diff --git a/backend/tests/integration/result_processor/test_result_processor.py b/backend/tests/integration/result_processor/test_result_processor.py
@@ -3,7 +3,7 @@
 from tests.helpers.eventually import eventually
 import pytest
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.db.repositories.execution_repository import ExecutionRepository
 from app.domain.enums.events import EventType
diff --git a/backend/tests/integration/services/admin/test_admin_user_service.py b/backend/tests/integration/services/admin/test_admin_user_service.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 
 import pytest
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.asynchronous.database import AsyncDatabase as AsyncIOMotorDatabase
 
 from app.domain.enums.user import UserRole
 from app.services.admin import AdminUserService
diff --git a/backend/uv.lock b/backend/uv.lock
diff --git a/backend/workers/dlq_processor.py b/backend/workers/dlq_processor.py
@@ -8,7 +8,7 @@
 from app.dlq.manager import DLQManager, create_dlq_manager
 from app.domain.enums.kafka import KafkaTopic
 from app.settings import get_settings
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 
 def _configure_retry_policies(manager: DLQManager) -> None:
@@ -100,7 +100,7 @@ async def alert_on_discard(message: DLQMessage, reason: str) -> None:
 
 async def main() -> None:
     settings = get_settings()
-    db_client: DBClient = AsyncIOMotorClient(
+    db_client: DBClient = AsyncMongoClient(
         settings.MONGODB_URL,
         tz_aware=True,
         serverSelectionTimeoutMS=5000,
diff --git a/backend/workers/run_event_replay.py b/backend/workers/run_event_replay.py
@@ -12,7 +12,7 @@
 from app.events.schema.schema_registry import SchemaRegistryManager
 from app.services.event_replay.replay_service import EventReplayService
 from app.settings import get_settings
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 
 async def cleanup_task(replay_service: EventReplayService, interval_hours: int = 6) -> None:
@@ -36,7 +36,7 @@ async def run_replay_service() -> None:
     settings = get_settings()
 
     # Create database connection
-    db_client: DBClient = AsyncIOMotorClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
+    db_client: DBClient = AsyncMongoClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
     db_name = settings.DATABASE_NAME
     database = db_client[db_name]
 
diff --git a/backend/workers/run_saga_orchestrator.py b/backend/workers/run_saga_orchestrator.py
@@ -17,7 +17,7 @@
 from app.services.idempotency.redis_repository import RedisIdempotencyRepository
 from app.services.saga import create_saga_orchestrator
 from app.settings import get_settings
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.asynchronous.mongo_client import AsyncMongoClient
 
 
 async def run_saga_orchestrator() -> None:
@@ -27,7 +27,7 @@ async def run_saga_orchestrator() -> None:
     logger = logging.getLogger(__name__)
 
     # Create database connection
-    db_client: DBClient = AsyncIOMotorClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
+    db_client: DBClient = AsyncMongoClient(settings.MONGODB_URL, tz_aware=True, serverSelectionTimeoutMS=5000)
     db_name = settings.DATABASE_NAME
     database = db_client[db_name]
 
