mdb-engine 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

mdb_engine/database/abstraction.py

@@ -24,7 +24,8 @@ Usage:
 """
 
 import logging
-from typing import Any, Callable, Dict, List, Optional
+from collections.abc import Callable
+from typing import Any
 
 from ..exceptions import MongoDBEngineError
 from .scoped_wrapper import ScopedMongoWrapper
@@ -88,8 +89,8 @@ class Collection:
         self._collection = scoped_collection
 
     async def find_one(
-        self, filter: Optional[Dict[str, Any]] = None, *args, **kwargs
-    ) -> Optional[Dict[str, Any]]:
+        self, filter: dict[str, Any] | None = None, *args, **kwargs
+    ) -> dict[str, Any] | None:
         """
         Find a single document matching the filter.
 
@@ -120,7 +121,7 @@ class Collection:
                 context={"operation": "find_one"},
             ) from e
 
-    def find(self, filter: Optional[Dict[str, Any]] = None, *args, **kwargs) -> AsyncIOMotorCursor:
+    def find(self, filter: dict[str, Any] | None = None, *args, **kwargs) -> AsyncIOMotorCursor:
         """
         Find documents matching the filter.
 
@@ -146,7 +147,7 @@ class Collection:
         """
         return self._collection.find(filter or {}, *args, **kwargs)
 
-    async def insert_one(self, document: Dict[str, Any], *args, **kwargs) -> InsertOneResult:
+    async def insert_one(self, document: dict[str, Any], *args, **kwargs) -> InsertOneResult:
         """
         Insert a single document.
 
@@ -178,7 +179,7 @@ class Collection:
             ) from e
 
     async def insert_many(
-        self, documents: List[Dict[str, Any]], *args, **kwargs
+        self, documents: list[dict[str, Any]], *args, **kwargs
     ) -> InsertManyResult:
         """
         Insert multiple documents at once.
@@ -213,7 +214,7 @@ class Collection:
             ) from e
 
     async def update_one(
-        self, filter: Dict[str, Any], update: Dict[str, Any], *args, **kwargs
+        self, filter: dict[str, Any], update: dict[str, Any], *args, **kwargs
     ) -> UpdateResult:
         """
         Update a single document matching the filter.
@@ -251,7 +252,7 @@ class Collection:
             ) from e
 
     async def update_many(
-        self, filter: Dict[str, Any], update: Dict[str, Any], *args, **kwargs
+        self, filter: dict[str, Any], update: dict[str, Any], *args, **kwargs
     ) -> UpdateResult:
         """
         Update multiple documents matching the filter.
@@ -288,7 +289,7 @@ class Collection:
             ) from e
 
     async def replace_one(
-        self, filter: Dict[str, Any], replacement: Dict[str, Any], *args, **kwargs
+        self, filter: dict[str, Any], replacement: dict[str, Any], *args, **kwargs
     ) -> UpdateResult:
         """
         Replace a single document matching the filter.
@@ -367,7 +368,7 @@ class Collection:
                 context={"operation": "replace_one"},
             ) from e
 
-    async def delete_one(self, filter: Dict[str, Any], *args, **kwargs) -> DeleteResult:
+    async def delete_one(self, filter: dict[str, Any], *args, **kwargs) -> DeleteResult:
         """
         Delete a single document matching the filter.
 
@@ -400,7 +401,7 @@ class Collection:
             ) from e
 
     async def delete_many(
-        self, filter: Optional[Dict[str, Any]] = None, *args, **kwargs
+        self, filter: dict[str, Any] | None = None, *args, **kwargs
     ) -> DeleteResult:
         """
         Delete multiple documents matching the filter.
@@ -432,9 +433,7 @@ class Collection:
                 context={"operation": "delete_many"},
             ) from e
 
-    async def count_documents(
-        self, filter: Optional[Dict[str, Any]] = None, *args, **kwargs
-    ) -> int:
+    async def count_documents(self, filter: dict[str, Any] | None = None, *args, **kwargs) -> int:
         """
         Count documents matching the filter.
 
@@ -464,7 +463,7 @@ class Collection:
                 context={"operation": "count_documents"},
             ) from e
 
-    def aggregate(self, pipeline: List[Dict[str, Any]], *args, **kwargs) -> AsyncIOMotorCursor:
+    def aggregate(self, pipeline: list[dict[str, Any]], *args, **kwargs) -> AsyncIOMotorCursor:
         """
         Perform aggregation pipeline.
 
@@ -520,7 +519,7 @@ class AppDB:
             raise RuntimeError("ScopedMongoWrapper is not available. Check imports.")
 
         self._wrapper = scoped_wrapper
-        self._collection_cache: Dict[str, Collection] = {}
+        self._collection_cache: dict[str, Collection] = {}
 
     def collection(self, name: str) -> Collection:
         """

mdb_engine/database/connection.py

@@ -23,7 +23,7 @@ Usage:
 import logging
 import os
 import threading
-from typing import Any, Dict, Optional
+from typing import Any
 
 from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo.errors import (
@@ -36,7 +36,7 @@ from pymongo.errors import (
 logger = logging.getLogger(__name__)
 
 # Global singleton instance
-_shared_client: Optional[AsyncIOMotorClient] = None
+_shared_client: AsyncIOMotorClient | None = None
 # Use threading.Lock for cross-thread safety in multi-threaded environments
 # asyncio.Lock isn't sufficient for thread-safe initialization
 _init_lock = threading.Lock()
@@ -44,8 +44,8 @@ _init_lock = threading.Lock()
 
 def get_shared_mongo_client(
     mongo_uri: str,
-    max_pool_size: Optional[int] = None,
-    min_pool_size: Optional[int] = None,
+    max_pool_size: int | None = None,
+    min_pool_size: int | None = None,
     server_selection_timeout_ms: int = 5000,
     max_idle_time_ms: int = 45000,
     retry_writes: bool = True,
@@ -203,8 +203,8 @@ def register_client_for_metrics(client: AsyncIOMotorClient) -> None:
 
 
 async def get_pool_metrics(
-    client: Optional[AsyncIOMotorClient] = None,
-) -> Dict[str, Any]:
+    client: AsyncIOMotorClient | None = None,
+) -> dict[str, Any]:
     """
     Gets connection pool metrics for monitoring.
     Returns information about pool size, active connections, etc.
@@ -247,7 +247,7 @@ async def get_pool_metrics(
     }
 
 
-async def _get_client_pool_metrics(client: AsyncIOMotorClient) -> Dict[str, Any]:
+async def _get_client_pool_metrics(client: AsyncIOMotorClient) -> dict[str, Any]:
     """
     Internal helper to get pool metrics from a specific client.
 
@@ -299,10 +299,32 @@ async def _get_client_pool_metrics(client: AsyncIOMotorClient) -> Dict[str, Any]
 
         try:
             server_status = await client.admin.command("serverStatus")
-            connections = server_status.get("connections", {})
-            current_connections = connections.get("current", 0)
-            available_connections = connections.get("available", 0)
-            total_created = connections.get("totalCreated", 0)
+            if not isinstance(server_status, dict):
+                # Mock or invalid response - skip connection metrics
+                current_connections = None
+                available_connections = None
+                total_created = None
+            else:
+                connections = server_status.get("connections", {})
+                if not isinstance(connections, dict):
+                    # Mock or invalid response - skip connection metrics
+                    current_connections = None
+                    available_connections = None
+                    total_created = None
+                else:
+                    # Get values, ensuring they're numeric (not MagicMocks)
+                    current_raw = connections.get("current", 0)
+                    available_raw = connections.get("available", 0)
+                    total_raw = connections.get("totalCreated", 0)
+
+                    # Only use if actually numeric
+                    current_connections = (
+                        int(current_raw) if isinstance(current_raw, int | float) else None
+                    )
+                    available_connections = (
+                        int(available_raw) if isinstance(available_raw, int | float) else None
+                    )
+                    total_created = int(total_raw) if isinstance(total_raw, int | float) else None
         except (
             OperationFailure,
             ConnectionFailure,
@@ -330,7 +352,13 @@ async def _get_client_pool_metrics(client: AsyncIOMotorClient) -> Dict[str, Any]
             metrics["total_connections_created"] = total_created
 
         # Calculate pool usage if we have max_pool_size and current connections
-        if max_pool_size and current_connections is not None:
+        # Ensure both are numeric (not MagicMock or other types)
+        if (
+            max_pool_size
+            and current_connections is not None
+            and isinstance(max_pool_size, int | float)
+            and isinstance(current_connections, int | float)
+        ):
             usage_percent = (current_connections / max_pool_size) * 100
             metrics["pool_usage_percent"] = round(usage_percent, 2)
             metrics["active_connections"] = current_connections  # Alias for compatibility

mdb_engine/database/query_validator.py

@@ -14,7 +14,7 @@ Security Features:
 
 import logging
 import re
-from typing import Any, Dict, List, Optional, Set
+from typing import Any
 
 from ..constants import (
     DANGEROUS_OPERATORS,
@@ -46,7 +46,7 @@ class QueryValidator:
         max_pipeline_stages: int = MAX_PIPELINE_STAGES,
         max_regex_length: int = MAX_REGEX_LENGTH,
         max_regex_complexity: int = MAX_REGEX_COMPLEXITY,
-        dangerous_operators: Optional[Set[str]] = None,
+        dangerous_operators: set[str] | None = None,
     ):
         """
         Initialize the query validator.
@@ -80,7 +80,7 @@ class QueryValidator:
                 else DANGEROUS_OPERATORS
             )
 
-    def validate_filter(self, filter: Optional[Dict[str, Any]], path: str = "") -> None:
+    def validate_filter(self, filter: dict[str, Any] | None, path: str = "") -> None:
         """
         Validate a MongoDB query filter.
 
@@ -105,7 +105,7 @@ class QueryValidator:
         self._check_dangerous_operators(filter, path)
         self._check_query_depth(filter, path, depth=0)
 
-    def validate_pipeline(self, pipeline: List[Dict[str, Any]]) -> None:
+    def validate_pipeline(self, pipeline: list[dict[str, Any]]) -> None:
         """
         Validate an aggregation pipeline.
 
@@ -201,7 +201,7 @@ class QueryValidator:
                 path=path,
             ) from e
 
-    def validate_sort(self, sort: Optional[Any]) -> None:
+    def validate_sort(self, sort: Any | None) -> None:
         """
         Validate a sort specification.
 
@@ -228,7 +228,7 @@ class QueryValidator:
             )
 
     def _check_dangerous_operators(
-        self, query: Dict[str, Any], path: str = "", depth: int = 0
+        self, query: dict[str, Any], path: str = "", depth: int = 0
     ) -> None:
         """
         Recursively check for dangerous operators in a query.
@@ -287,7 +287,7 @@ class QueryValidator:
                 # Direct $regex value (less common but possible)
                 self.validate_regex(value, current_path)
 
-    def _check_query_depth(self, query: Dict[str, Any], path: str = "", depth: int = 0) -> None:
+    def _check_query_depth(self, query: dict[str, Any], path: str = "", depth: int = 0) -> None:
         """
         Check query nesting depth.
 
@@ -348,7 +348,7 @@ class QueryValidator:
 
         return complexity
 
-    def _extract_sort_fields(self, sort: Any) -> List[str]:
+    def _extract_sort_fields(self, sort: Any) -> list[str]:
         """
         Extract field names from a sort specification.
 

mdb_engine/database/resource_limiter.py

@@ -12,7 +12,7 @@ Features:
 """
 
 import logging
-from typing import Any, Dict, Optional
+from typing import Any
 
 from bson import encode as bson_encode
 from bson.errors import InvalidDocument
@@ -65,8 +65,8 @@ class ResourceLimiter:
         self.max_document_size = max_document_size
 
     def enforce_query_timeout(
-        self, kwargs: Dict[str, Any], default_timeout: Optional[int] = None
-    ) -> Dict[str, Any]:
+        self, kwargs: dict[str, Any], default_timeout: int | None = None
+    ) -> dict[str, Any]:
         """
         Enforce query timeout by adding maxTimeMS if not present.
 
@@ -97,7 +97,7 @@ class ResourceLimiter:
 
         return kwargs
 
-    def enforce_result_limit(self, limit: Optional[int], max_limit: Optional[int] = None) -> int:
+    def enforce_result_limit(self, limit: int | None, max_limit: int | None = None) -> int:
         """
         Enforce maximum result limit.
 
@@ -122,7 +122,7 @@ class ResourceLimiter:
 
         return limit
 
-    def enforce_batch_size(self, batch_size: Optional[int], max_batch: Optional[int] = None) -> int:
+    def enforce_batch_size(self, batch_size: int | None, max_batch: int | None = None) -> int:
         """
         Enforce maximum batch size for cursor operations.
 
@@ -147,7 +147,7 @@ class ResourceLimiter:
 
         return batch_size
 
-    def validate_document_size(self, document: Dict[str, Any]) -> None:
+    def validate_document_size(self, document: dict[str, Any]) -> None:
         """
         Validate that a document doesn't exceed size limits.
 
@@ -180,7 +180,7 @@ class ResourceLimiter:
             # MongoDB will catch this anyway during actual insert
             logger.warning(f"Could not encode document as BSON for size validation: {e}")
 
-    def validate_documents_size(self, documents: list[Dict[str, Any]]) -> None:
+    def validate_documents_size(self, documents: list[dict[str, Any]]) -> None:
         """
         Validate that multiple documents don't exceed size limits.