trovesuite 1.0.28__py3-none-any.whl → 1.0.30__py3-none-any.whl

trovesuite/__init__.py

@@ -11,7 +11,7 @@ from .notification import NotificationService
 from .storage import StorageService
 from .utils import Helper
 
-__version__ = "1.0.20"
+__version__ = "1.0.29"
 __author__ = "Bright Debrah Owusu"
 __email__ = "owusu.debrah@deladetech.com"
 

trovesuite/configs/database.py

@@ -6,6 +6,7 @@ from typing import Generator, Optional
 import psycopg2
 import psycopg2.pool
 from psycopg2.extras import RealDictCursor
+import threading
 from .settings import db_settings
 from .logging import get_logger
 
@@ -13,16 +14,23 @@ logger = get_logger("database")
 
 # Database connection pool
 _connection_pool: Optional[psycopg2.pool.ThreadedConnectionPool] = None
+_initialization_lock = threading.Lock()
 
 
 class DatabaseConfig:
     """Database configuration and connection management"""
 
     def __init__(self):
+        import os
         self.settings = db_settings
         self.database_url = self.settings.database_url
-        self.pool_size = 5
-        self.max_overflow = 10
+        # CRITICAL: Azure PostgreSQL B_Standard_B1ms has very limited connections (~50 max, practical limit ~30-40)
+        # Default pool size is set to 1 to avoid connection exhaustion with multiple workers/replicas
+        # Formula: connections = pool_size × workers × replicas
+        # Example: 1 pool × 4 workers × 2 replicas = 8 connections (safe)
+        # With old default (5): 5 × 4 × 2 = 40 connections (exceeds limit!)
+        # Can be overridden with DB_POOL_SIZE environment variable
+        self.pool_size = int(os.getenv("DB_POOL_SIZE", "1"))
 
     def get_connection_params(self) -> dict:
         """Get database connection parameters"""
@@ -35,7 +43,7 @@ class DatabaseConfig:
                 "keepalives_idle": 30,
                 "keepalives_interval": 10,
                 "keepalives_count": 5,
-                "connect_timeout": 10
+                "connect_timeout": 30  # Increased timeout for Azure PostgreSQL
             }
 
         # fallback to individual DB_* variables
@@ -55,15 +63,54 @@ class DatabaseConfig:
         }
 
     def create_connection_pool(self) -> psycopg2.pool.ThreadedConnectionPool:
-        """Create a connection pool for psycopg2"""
+        """Create a connection pool for psycopg2
+        
+        Note: For Azure PostgreSQL B_Standard_B1ms, keep pool_size ≤ 1 per worker
+        to avoid connection exhaustion. Consider using PgBouncer for higher concurrency.
+        """
         try:
+            # For Azure PostgreSQL, use minimum pool size to avoid connection exhaustion
+            # Multiple replicas/workers can quickly exhaust database connections on Basic tier
+            import os
+            dsn = os.getenv("DATABASE_URL", "") or str(self.database_url or "")
+            is_azure = "database.azure.com" in dsn.lower()
+            
+            # Ensure pool size is appropriate for Azure Basic tier
+            pool_size = self.pool_size
+            if is_azure and pool_size > 2:
+                logger.warning(
+                    f"⚠️  Pool size {pool_size} may be too high for Azure Basic tier. "
+                    f"Recommended: 1-2 connections per worker. "
+                    f"Set DB_POOL_SIZE=1 to avoid connection exhaustion."
+                )
+            
             pool = psycopg2.pool.ThreadedConnectionPool(
                 minconn=1,
-                maxconn=self.pool_size,
+                maxconn=pool_size,
                 **self.get_connection_params()
             )
-            logger.info(f"Database connection pool created with {self.pool_size} connections")
+            logger.info(
+                f"Database connection pool created with {pool_size} connections "
+                f"(Azure: {is_azure}, DB_POOL_SIZE: {self.pool_size})"
+            )
             return pool
+        except psycopg2.OperationalError as e:
+            # Check if it's a connection limit error
+            error_str = str(e).lower()
+            if any(keyword in error_str for keyword in ["connection", "slot", "limit", "exhausted", "too many"]):
+                logger.error("⚠️  Database connection limit reached!")
+                logger.error("   Possible causes:")
+                logger.error("   1. Too many connections from multiple replicas/workers")
+                logger.error("   2. Pool size too high (DB_POOL_SIZE environment variable)")
+                logger.error("   3. Too many Gunicorn workers (GUNICORN_WORKERS environment variable)")
+                logger.error("   4. Connections not being properly returned to pool")
+                logger.error("   Solutions:")
+                logger.error("   - Set DB_POOL_SIZE=1 (recommended for Azure Basic tier)")
+                logger.error("   - Reduce GUNICORN_WORKERS (default: 4)")
+                logger.error("   - Consider using PgBouncer for connection pooling")
+                logger.error("   - Upgrade to a higher PostgreSQL tier if needed")
+            logger.error(f"Failed to create database connection pool: {str(e)}")
+            raise
         except Exception as e:
             logger.error(f"Failed to create database connection pool: {str(e)}")
             raise
@@ -91,6 +138,15 @@ db_config = DatabaseConfig()
 def initialize_database():
     """Initialize database connections and pool"""
     global _connection_pool
+    
+    # Close existing pool if it exists (cleanup before reinitializing)
+    if _connection_pool is not None:
+        try:
+            _connection_pool.closeall()
+            logger.info("Closed existing connection pool before reinitialization")
+        except Exception as e:
+            logger.warning(f"Error closing existing pool: {str(e)}")
+        _connection_pool = None
 
     try:
         # Test connection first
@@ -99,39 +155,131 @@ def initialize_database():
 
         # Create connection pool
         _connection_pool = db_config.create_connection_pool()
+        
+        # Verify pool was created successfully
+        if _connection_pool is None:
+            raise Exception("Connection pool creation returned None")
 
-        logger.info("Database initialization completed successfully")
+        logger.info("✅ Database initialization completed successfully")
 
     except Exception as e:
-        logger.error(f"Database initialization failed: {str(e)}")
+        logger.error(f"❌ Database initialization failed: {str(e)}")
+        _connection_pool = None  # Ensure pool is None on failure
         raise
 
 
+def _is_pool_valid(pool) -> bool:
+    """Check if the connection pool is valid and usable"""
+    if pool is None:
+        return False
+    try:
+        # ThreadedConnectionPool doesn't expose a direct "closed" attribute
+        # Check if pool has the necessary internal structures
+        if not hasattr(pool, '_pool'):
+            return False
+        if pool._pool is None:
+            return False
+        # Additional check: verify pool has connection parameters
+        if not hasattr(pool, '_kwargs'):
+            return False
+        return True
+    except (AttributeError, Exception) as e:
+        logger.debug(f"Pool validation check: {str(e)}")
+        return False
+
+
+def _recover_connection_pool() -> bool:
+    """Attempt to recover the connection pool with retry logic"""
+    global _connection_pool, _initialization_lock
+    import time
+    
+    with _initialization_lock:
+        # Double-check after acquiring lock
+        if _connection_pool is not None and _is_pool_valid(_connection_pool):
+            return True
+        
+        # Close invalid pool if it exists
+        if _connection_pool is not None:
+            try:
+                _connection_pool.closeall()
+                logger.info("Closed invalid connection pool")
+            except Exception as e:
+                logger.warning(f"Error closing invalid pool: {str(e)}")
+            _connection_pool = None
+        
+        # Retry with exponential backoff
+        max_retries = 3
+        base_delay = 1  # Start with 1 second
+        
+        for attempt in range(1, max_retries + 1):
+            try:
+                logger.warning(f"Attempting to reinitialize connection pool (attempt {attempt}/{max_retries})...")
+                initialize_database()
+                
+                if _connection_pool is not None and _is_pool_valid(_connection_pool):
+                    logger.info(f"✅ Connection pool reinitialized successfully (attempt {attempt})")
+                    return True
+                else:
+                    logger.warning(f"Pool initialized but validation failed (attempt {attempt})")
+                    
+            except Exception as e:
+                logger.error(f"Pool reinitialization attempt {attempt} failed: {str(e)}")
+                if attempt < max_retries:
+                    delay = base_delay * (2 ** (attempt - 1))  # Exponential backoff: 1s, 2s, 4s
+                    logger.info(f"Retrying in {delay} seconds...")
+                    time.sleep(delay)
+        
+        logger.error("❌ Failed to reinitialize connection pool after all retries")
+        return False
+
+
 def get_connection_pool() -> psycopg2.pool.ThreadedConnectionPool:
-    """Get the database connection pool"""
+    """Get the database connection pool, with automatic reinitialization if needed"""
     global _connection_pool
-    if _connection_pool is None:
+    
+    # Fast path: pool exists and is valid
+    if _connection_pool is not None and _is_pool_valid(_connection_pool):
+        return _connection_pool
+    
+    # Pool is None or invalid, attempt recovery
+    if not _recover_connection_pool():
         error_msg = (
-            "Database not initialized. This usually means:\n"
-            "1. Missing or incorrect .env file in app/ directory\n"
-            "2. Database credentials are wrong\n"
-            "3. Database container is not running\n"
-            "4. Database initialization failed during startup\n"
-            "Please check the startup logs for more details."
+            "Database connection pool is unavailable. This usually means:\n"
+            "1. Database server is unreachable or down\n"
+            "2. Network connectivity issues\n"
+            "3. Database credentials are incorrect\n"
+            "4. Connection pool exhausted or closed\n"
+            "5. Database initialization failed\n"
+            "Please check the startup logs and database status."
         )
         logger.error(error_msg)
         raise Exception(error_msg)
+    
+    if _connection_pool is None:
+        error_msg = "Connection pool recovery completed but pool is still None"
+        logger.error(error_msg)
+        raise Exception(error_msg)
+    
     return _connection_pool
 
 
 def _validate_connection(conn) -> bool:
     """Validate if a connection is still alive"""
     try:
+        # Check if connection is closed first
+        if conn.closed:
+            return False
+        
         # Test if connection is alive with a simple query
         with conn.cursor() as cursor:
             cursor.execute("SELECT 1")
+            cursor.fetchone()
         return True
-    except (psycopg2.OperationalError, psycopg2.InterfaceError):
+    except (psycopg2.OperationalError, psycopg2.InterfaceError, psycopg2.DatabaseError) as e:
+        logger.warning(f"Connection validation failed: {str(e)}")
+        return False
+    except Exception as e:
+        logger.warning(f"Unexpected error during connection validation: {str(e)}")
         return False
 
 

trovesuite/configs/settings.py

@@ -10,11 +10,6 @@ class Settings:
     DB_PORT: str = os.getenv("DB_PORT")
     DB_PASSWORD: str = os.getenv("DB_PASSWORD")
     
-    # CORS Endpoint
-    # LOCAL_HOST_URL = os.getenv("LOCAL_HOST_URL")
-    # FRONTEND_SERVER_URL_1 = os.getenv("FRONTEND_SERVER_URL")
-    # FRONTEND_SERVER_URL_2 = os.getenv("FRONTEND_SERVER_URL")
-
     # Application settings
     DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
     APP_NAME: str = os.getenv("APP_NAME", "Python Template API")

{trovesuite-1.0.28.dist-info → trovesuite-1.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.28
+Version: 1.0.30
 Summary: TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu

{trovesuite-1.0.28.dist-info → trovesuite-1.0.30.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trovesuite/__init__.py,sha256=vKnbXtMVw2mVbOuJLD1GhwcIx0oaNnyUL7Mrpk9Qa-I,646
+trovesuite/__init__.py,sha256=tcNxxwRpfYZ23yCEn4b5EHqGL5zRe_BqQHLcNAP23PQ,646
 trovesuite/auth/__init__.py,sha256=OjZllVvjul1glDazJ-d5TrNjgHFigFlQQi1G99DYshk,239
 trovesuite/auth/auth_base.py,sha256=rZHQVLeJRBQ8GClgF5UwG-er4_HXVX5-nt8o6_Z29uY,75
 trovesuite/auth/auth_controller.py,sha256=PAgaVlf5TYEfkSfK4vGGsvO84i8zEmeVVXyUF2YBppI,420
@@ -6,9 +6,9 @@ trovesuite/auth/auth_read_dto.py,sha256=e27JqKVPVUM83A_mYF452QCflsvGNo7aKje7q_ur
 trovesuite/auth/auth_service.py,sha256=TQOJFG0AzhPGwZBAXVxMkHxyG2wyct4Zcoq4z0cVBO4,22201
 trovesuite/auth/auth_write_dto.py,sha256=rdwI7w6-9QZGv1H0PAGrjkLBCzaMHjgPIXeLb9RmNec,234
 trovesuite/configs/__init__.py,sha256=h1mSZOaZ3kUy1ZMO_m9O9KklsxywM0RfMVZLh9h9WvQ,328
-trovesuite/configs/database.py,sha256=CdPurBNe2_Ymmn0fEkYHFPVaeCunGS1k0x1f3SfNlr4,11400
+trovesuite/configs/database.py,sha256=x6ucbF7lNLSNqeCqFgJ4NUbkkAvYifdcQbOd9kxZUPQ,18414
 trovesuite/configs/logging.py,sha256=mGjR2d4urVNry9l5_aXycMMtcY2RAFIpEL35hw33KZg,9308
-trovesuite/configs/settings.py,sha256=LvUNqs1Qsuu97b_RGaaphT2FQ4uqiXq_4WJw9OV6TUE,7113
+trovesuite/configs/settings.py,sha256=s-RvzFI7IR8-Q_A0ZRxlTr-iDoY6MvbxM0RkbhmJOL4,6915
 trovesuite/entities/__init__.py,sha256=Dbl_03Bueyh2vOP2hykd40MmNMrl5nNHSRGP-kqwwNo,160
 trovesuite/entities/health.py,sha256=KaW7yxTQdymIPlnkJJkDqEebBXkD0a7A66i5GgNZLoE,2700
 trovesuite/entities/sh_response.py,sha256=1_sw3PpVaDxWsNiBU0W9YLHZgTFxEj4JJBLBfSY63Ho,1579
@@ -27,8 +27,8 @@ trovesuite/storage/storage_write_dto.py,sha256=vl1iCZ93bpFmpvkCrn587QtMtOA_TPDse
 trovesuite/utils/__init__.py,sha256=mDZuY77BphvQFYLmcWxjP5Tcq9ZZ3WXJWBKB1v6wzHU,185
 trovesuite/utils/helper.py,sha256=qpd-EWPaX3-QJA5xvxb4s9rEb9W2RKPCDXcdAKSUwSM,30858
 trovesuite/utils/templates.py,sha256=_92k4-EkqWs-h0LNJxPgorbspmp24kDngS7O3qWIFyQ,20388
-trovesuite-1.0.28.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
-trovesuite-1.0.28.dist-info/METADATA,sha256=qeda1QfgQNPLyoSLdnhOympOq5BpJOqSyIs3iEoxQVE,21737
-trovesuite-1.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-trovesuite-1.0.28.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
-trovesuite-1.0.28.dist-info/RECORD,,
+trovesuite-1.0.30.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
+trovesuite-1.0.30.dist-info/METADATA,sha256=jlg46ILbbTBMpJ7SMUVcH9lBjA_HmnFm6oejaTshjX4,21737
+trovesuite-1.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+trovesuite-1.0.30.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
+trovesuite-1.0.30.dist-info/RECORD,,