fastapi-mongo-base 1.4.0__tar.gz → 1.4.2__tar.gz

{fastapi_mongo_base-1.4.0/src/fastapi_mongo_base.egg-info → fastapi_mongo_base-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 1.4.0
+Version: 1.4.2
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{fastapi_mongo_base-1.4.0 → fastapi_mongo_base-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-mongo-base"
-version = "1.4.0"
+version = "1.4.2"
 description = "A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB"
 readme = "README.md"
 requires-python = ">=3.10"

{fastapi_mongo_base-1.4.0 → fastapi_mongo_base-1.4.2}/src/fastapi_mongo_base/core/prometheus/mongo.py

@@ -21,15 +21,36 @@ try:
         ["database"],
     )
 
+    connections_ready_total = Counter(
+        "mongodb_pool_connections_ready_total",
+        "Total MongoDB connections ready for checkout",
+        ["database"],
+    )
+
     connections_closed_total = Counter(
         "mongodb_pool_connections_closed_total",
         "Total MongoDB connections closed",
         ["database"],
     )
+
+    checkouts_started_total = Counter(
+        "mongodb_pool_checkouts_started_total",
+        "Total MongoDB connection checkout attempts",
+        ["database"],
+    )
+
+    checkouts_failed_total = Counter(
+        "mongodb_pool_checkouts_failed_total",
+        "Total MongoDB connection checkout failures",
+        ["database", "reason"],
+    )
 except ImportError:
     pool_connections = None
     connections_created_total = None
+    connections_ready_total = None
     connections_closed_total = None
+    checkouts_started_total = None
+    checkouts_failed_total = None
 
 
 class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
@@ -54,6 +75,11 @@ class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
             state="in_use",
         ).set(self.in_use_connections)
 
+    def _reset_pool_metrics(self) -> None:
+        self.available_connections = 0
+        self.in_use_connections = 0
+        self._update_metrics()
+
     def pool_created(self, event: monitoring.PoolCreatedEvent) -> None:
         """Handle MongoDB pool creation events."""
         del event
@@ -66,10 +92,16 @@ class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
         """Handle MongoDB pool clearing events."""
         del event
 
+        with self._lock:
+            self._reset_pool_metrics()
+
     def pool_closed(self, event: monitoring.PoolClosedEvent) -> None:
         """Handle MongoDB pool closure events."""
         del event
 
+        with self._lock:
+            self._reset_pool_metrics()
+
     def connection_created(
         self,
         event: monitoring.ConnectionCreatedEvent,
@@ -77,10 +109,22 @@ class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
         """Record a MongoDB connection creation event."""
         del event
 
+        with self._lock:
+            connections_created_total.labels(
+                database=self.database_name,
+            ).inc()
+
+    def connection_ready(
+        self,
+        event: monitoring.ConnectionReadyEvent,
+    ) -> None:
+        """Record a MongoDB connection readiness event."""
+        del event
+
         with self._lock:
             self.available_connections += 1
 
-            connections_created_total.labels(
+            connections_ready_total.labels(
                 database=self.database_name,
             ).inc()
 
@@ -94,10 +138,13 @@ class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
         del event
 
         with self._lock:
-            self.available_connections = max(
-                0,
-                self.available_connections - 1,
-            )
+            if self.in_use_connections > 0:
+                self.in_use_connections -= 1
+            else:
+                self.available_connections = max(
+                    0,
+                    self.available_connections - 1,
+                )
 
             connections_closed_total.labels(
                 database=self.database_name,
@@ -105,6 +152,29 @@ class DatabasePoolMonitor(monitoring.ConnectionPoolListener):
 
             self._update_metrics()
 
+    def connection_check_out_started(
+        self,
+        event: monitoring.ConnectionCheckOutStartedEvent,
+    ) -> None:
+        """Record the start of a MongoDB connection checkout attempt."""
+        del event
+
+        with self._lock:
+            checkouts_started_total.labels(
+                database=self.database_name,
+            ).inc()
+
+    def connection_check_out_failed(
+        self,
+        event: monitoring.ConnectionCheckOutFailedEvent,
+    ) -> None:
+        """Record a failed MongoDB connection checkout attempt."""
+        with self._lock:
+            checkouts_failed_total.labels(
+                database=self.database_name,
+                reason=event.reason,
+            ).inc()
+
     def connection_checked_out(
         self,
         event: monitoring.ConnectionCheckedOutEvent,

{fastapi_mongo_base-1.4.0 → fastapi_mongo_base-1.4.2}/src/fastapi_mongo_base/utils/basic.py

@@ -328,9 +328,21 @@ async def gather_sync(
 R = TypeVar("R")
 
 
+def _resolve_mock(
+    mock_response: R | Callable[..., R | Awaitable[R]],
+    *args: object,
+    **kwargs: object,
+) -> R | Awaitable[R]:
+    if callable(mock_response):
+        return mock_response(*args, **kwargs)
+    return mock_response
+
+
 def debug_mode_mock(
     mock_response: R | Callable[..., R | Awaitable[R]],
-) -> Callable[[Callable[..., Awaitable[R]]], Callable[..., Awaitable[R]]]:
+) -> Callable[
+    [Callable[..., R | Awaitable[R]]], Callable[..., R | Awaitable[R]]
+]:
     """
     Return a mock response if debug is enabled.
 
@@ -340,22 +352,39 @@ def debug_mode_mock(
     Returns:
         A decorator that returns a mock response if debug is enabled.
     """
-    from ..core.config import Settings
 
     def decorator(
-        func: Callable[..., Awaitable[R]],
-    ) -> Callable[..., Awaitable[R]]:
+        func: Callable[..., R | Awaitable[R]],
+    ) -> Callable[..., R | Awaitable[R]]:
+
+        from ..core.config import Settings
+
         @functools.wraps(func)
-        async def wrapper(*args: object, **kwargs: object) -> R:
+        async def async_wrapper(*args: object, **kwargs: object) -> R:
             if Settings.debug:
-                if callable(mock_response):
-                    result = mock_response(*args, **kwargs)
-                    if isinstance(result, Awaitable):
-                        return await result
-                    return result
-                return mock_response
+                result = _resolve_mock(mock_response, *args, **kwargs)
+                if isinstance(result, Awaitable):
+                    return await result
+                return result
             return await func(*args, **kwargs)
 
-        return wrapper
+        @functools.wraps(func)
+        def sync_wrapper(*args: object, **kwargs: object) -> R:
+            if Settings.debug:
+                result = _resolve_mock(mock_response, *args, **kwargs)
+                if isinstance(result, Awaitable):
+                    msg = (
+                        "debug_mode_mock callable returned "
+                        "Awaitable for sync function"
+                    )
+                    raise TypeError(msg)
+                return result
+            return func(*args, **kwargs)
+
+        return (
+            async_wrapper
+            if inspect.iscoroutinefunction(func)
+            else sync_wrapper
+        )
 
     return decorator

{fastapi_mongo_base-1.4.0 → fastapi_mongo_base-1.4.2/src/fastapi_mongo_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 1.4.0
+Version: 1.4.2
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>