trovesuite 1.0.2__tar.gz → 1.0.4__tar.gz

{trovesuite-1.0.2/src/trovesuite.egg-info → trovesuite-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.2
+Version: 1.0.4
 Summary: TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu
@@ -34,6 +34,8 @@ Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: python-jose[cryptography]>=3.3.0
 Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: passlib[argon2]<2.0.0,>=1.7.4
+Requires-Dist: uvicorn<0.39.0,>=0.38.0
+Requires-Dist: pyjwt<3.0.0,>=2.10.1
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.2; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.1; extra == "dev"

{trovesuite-1.0.2 → trovesuite-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.2"
+version = "1.0.4"
 description = "TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications"
 authors = ["brightgclt <brightgclt@gmail.com>"]
 license = "MIT"
@@ -56,7 +56,7 @@ Documentation = "https://dev.azure.com/brightgclt/trovesuite/_git/packages"
 
 [project]
 name = "trovesuite"
-version = "1.0.2"
+version = "1.0.4"
 description = "TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications"
 readme = "README.md"
 license = {text = "MIT"}
@@ -89,7 +89,9 @@ dependencies = [
     "python-multipart>=0.0.6",
     "python-jose[cryptography]>=3.3.0",
     "passlib[bcrypt]>=1.7.4",
-    "passlib[argon2] (>=1.7.4,<2.0.0)"
+    "passlib[argon2] (>=1.7.4,<2.0.0)",
+    "uvicorn (>=0.38.0,<0.39.0)",
+    "pyjwt (>=2.10.1,<3.0.0)"
 
 ]
 

{trovesuite-1.0.2 → trovesuite-1.0.4}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.2",
+    version="1.0.4",
     author="Bright Debrah Owusu",
     author_email="owusu.debrah@deladetech.com",
     description="TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications",

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite/auth/auth_controller.py

@@ -2,9 +2,10 @@ from fastapi import APIRouter
 from src.trovesuite.auth.auth_write_dto import AuthControllerWriteDto
 from src.trovesuite.auth.auth_read_dto import AuthControllerReadDto
 from src.trovesuite.auth.auth_service import AuthService
+from src.trovesuite.entities.sh_response import Respons
 
 auth_router = APIRouter()
 
-@auth_router.post("/auth", response_model=AuthControllerReadDto)
+@auth_router.post("/auth", response_model=Respons[AuthControllerReadDto])
 async def authorize(data: AuthControllerWriteDto):
     return AuthService.authorize(data=data)

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite/auth/auth_read_dto.py

@@ -11,7 +11,6 @@ class AuthControllerReadDto(BaseModel):
     role_id: Optional[str] = None
     tenant_id: Optional[str] = None
     permissions: Optional[List[str]] = None
-    shared_resource_id: Optional[str] = None
     resource_id: Optional[str] = None
 
 class AuthServiceReadDto(AuthControllerReadDto):

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite/auth/auth_service.py

@@ -48,7 +48,7 @@ class AuthService:
         
         user_id: str = data.user_id
         tenant_id: str = data.tenant_id
-
+        
         """Check if a user is authorized based on login settings and roles"""
         # Input validation
         if not user_id or not isinstance(user_id, str):
@@ -68,14 +68,14 @@ class AuthService:
                 status_code=400,
                 error="INVALID_TENANT_ID"
             )
-        
+
         try:
 
             is_tenant_verified = DatabaseManager.execute_query(
                 f"SELECT is_verified FROM {db_settings.MAIN_TENANTS_TABLE} WHERE delete_status = 'NOT_DELETED' AND id = %s",
                 (tenant_id,),
             )
-
+            
             if not is_tenant_verified or len(is_tenant_verified) == 0:
                 logger.warning("Login failed - tenant not found: %s", tenant_id)
                 return Respons[AuthServiceReadDto](
@@ -156,7 +156,7 @@ class AuthService:
             
             # 1️⃣ Get all groups the user belongs to
             user_groups = DatabaseManager.execute_query(
-                f"""SELECT group_id FROM "{tenant_id}".{db_settings.USER_GROUPS_TABLE}
+                f"""SELECT group_id FROM "{tenant_id}".{db_settings.TENANT_USER_GROUPS_TABLE}
                     WHERE delete_status = 'NOT_DELETED' AND is_active = true AND user_id = %s""",(user_id,),
             )
 
@@ -169,7 +169,7 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (org_id, group_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id)
                             org_id, group_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id
-                        FROM "{tenant_id}".{db_settings.ASSIGN_ROLES_TABLE}
+                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
                         WHERE delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND (user_id = %s OR group_id = ANY(%s))
@@ -183,7 +183,7 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (org_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id)
                             org_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id
-                        FROM "{tenant_id}".{db_settings.ASSIGN_ROLES_TABLE}
+                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
                         WHERE delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND user_id = %s
@@ -196,7 +196,7 @@ class AuthService:
             get_user_roles_with_tenant_and_permissions = []
             for role in get_user_roles:
                 permissions = DatabaseManager.execute_query(
-                    f"""SELECT permission_id FROM {db_settings.ROLE_PERMISSIONS_TABLE} WHERE role_id = %s""",
+                    f"""SELECT permission_id FROM {db_settings.MAIN_ROLE_PERMISSIONS_TABLE} WHERE role_id = %s""",
                     params=(role["role_id"],),)
 
                 role_dict = {**role, "tenant_id": tenant_id, "permissions": [p['permission_id'] for p in permissions]}

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite/auth/auth_write_dto.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 class AuthControllerWriteDto(BaseModel):
     user_id: Optional[str] = None
-    tenant: Optional[str] = None
+    tenant_id: Optional[str] = None
 
 class AuthServiceWriteDto(AuthControllerWriteDto):
     pass

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite/configs/database.py

@@ -13,7 +13,6 @@ logger = get_logger("database")
 
 # Database connection pool
 _connection_pool: Optional[psycopg2.pool.ThreadedConnectionPool] = None
-_sqlmodel_engine = None
 
 
 class DatabaseConfig:
@@ -21,16 +20,20 @@ class DatabaseConfig:
     
     def __init__(self):
         self.settings = db_settings
+        self.database_url = self.settings.database_url
         self.pool_size = 5
         self.max_overflow = 10
-    
-    @property
-    def database_url(self):
-        """Get database URL (lazy evaluation)"""
-        return self.settings.database_url
         
     def get_connection_params(self) -> dict:
         """Get database connection parameters"""
+        if self.settings.DATABASE_URL:
+            # Use full DATABASE_URL if available
+            return {
+                "dsn": self.settings.DATABASE_URL,
+                "cursor_factory": RealDictCursor
+            }
+
+        # fallback to individual DB_* variables
         return {
             "host": self.settings.DB_HOST,
             "port": self.settings.DB_PORT,
@@ -98,18 +101,19 @@ def get_connection_pool() -> psycopg2.pool.ThreadedConnectionPool:
     """Get the database connection pool"""
     global _connection_pool
     if _connection_pool is None:
-        raise Exception("Database not initialized. Call initialize_database() first.")
+        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."
+        )
+        logger.error(error_msg)
+        raise Exception(error_msg)
     return _connection_pool
 
 
-def get_sqlmodel_engine():
-    """Get the SQLModel engine"""
-    global _sqlmodel_engine
-    if _sqlmodel_engine is None:
-        raise Exception("Database not initialized. Call initialize_database() first.")
-    return _sqlmodel_engine
-
-
 @contextmanager
 def get_db_connection():
     """Get a database connection from the pool (context manager)"""
@@ -217,5 +221,13 @@ class DatabaseManager:
             }
 
 
-# Database initialization is done lazily when needed
-# Call initialize_database() explicitly when you need to use the database
+# Database initialization on module import
+try:
+    initialize_database()
+except Exception as e:
+    logger.error(f"Failed to initialize database on startup: {str(e)}")
+    logger.error("⚠️  CRITICAL: Application started without database connection!")
+    logger.error("⚠️  Please check your .env file and database configuration")
+    logger.error("⚠️  The application will not function properly without a database connection")
+    # Don't raise here to allow the app to start even if DB is unavailable
+    # But log it clearly so it's obvious what's wrong

trovesuite-1.0.4/src/trovesuite/configs/settings.py

@@ -0,0 +1,57 @@
+import os
+class Settings:
+
+    # Database URL
+    DATABASE_URL: str = os.getenv("DATABASE_URL")
+
+    DB_USER: str = os.getenv("DB_USER")
+    DB_HOST: str = os.getenv("DB_HOST")
+    DB_NAME: str = os.getenv("DB_NAME")
+    DB_PORT: str = os.getenv("DB_PORT")
+    DB_PASSWORD: str = os.getenv("DB_PASSWORD")
+
+    # Application settings
+    APP_NAME: str = os.getenv("APP_NAME", "Python Template API")
+    DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
+    APP_VERSION: str = os.getenv("APP_VERSION", "1.0.0")
+    
+    # Logging settings
+    LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
+    LOG_FORMAT: str = os.getenv("LOG_FORMAT", "detailed")  # detailed, json, simple
+    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() in ("true", 1)
+    LOG_MAX_SIZE: int = int(os.getenv("LOG_MAX_SIZE", "10485760"))  # 10MB
+    LOG_BACKUP_COUNT: int = int(os.getenv("LOG_BACKUP_COUNT", "5"))
+    LOG_DIR: str = os.getenv("LOG_DIR", "logs")
+        
+   # Security settings
+    ENVIRONMENT: str = os.getenv("ENVIRONMENT")
+    ALGORITHM: str = os.getenv("ALGORITHM")
+    SECRET_KEY: str = os.getenv("SECRET_KEY")
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "120"))
+    
+    # =============================================================================
+    # SHARED TABLES (main schema)
+    # =============================================================================
+    MAIN_TENANTS_TABLE = os.getenv("MAIN_TENANTS_TABLE")
+    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE")
+    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE")
+    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE")
+    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE")
+
+    # =============================================================================
+    # TENANT-SPECIFIC TABLES (tenant schemas)
+    # =============================================================================
+    TENANT_LOGIN_SETTINGS_TABLE = os.getenv("TENANT_LOGIN_SETTINGS_TABLE")
+    TENANT_ASSIGN_ROLES_TABLE = os.getenv("TENANT_ASSIGN_ROLES_TABLE")
+    TENANT_USER_GROUPS_TABLE = os.getenv("TENANT_USER_GROUPS_TABLE")
+
+    @property
+    def database_url(self) -> str:
+        if self.DATABASE_URL:
+            return self.DATABASE_URL
+
+        port = int(self.DB_PORT) if self.DB_PORT else 5432
+        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{port}/{self.DB_NAME}"
+
+# Global settings instance
+db_settings = Settings()

{trovesuite-1.0.2 → trovesuite-1.0.4/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.2
+Version: 1.0.4
 Summary: TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu
@@ -34,6 +34,8 @@ Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: python-jose[cryptography]>=3.3.0
 Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: passlib[argon2]<2.0.0,>=1.7.4
+Requires-Dist: uvicorn<0.39.0,>=0.38.0
+Requires-Dist: pyjwt<3.0.0,>=2.10.1
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.2; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.1; extra == "dev"

{trovesuite-1.0.2 → trovesuite-1.0.4}/src/trovesuite.egg-info/requires.txt

@@ -6,6 +6,8 @@ python-multipart>=0.0.6
 python-jose[cryptography]>=3.3.0
 passlib[bcrypt]>=1.7.4
 passlib[argon2]<2.0.0,>=1.7.4
+uvicorn<0.39.0,>=0.38.0
+pyjwt<3.0.0,>=2.10.1
 
 [dev]
 pytest>=8.4.2

trovesuite-1.0.2/src/trovesuite/configs/settings.py

@@ -1,153 +0,0 @@
-import os
-import warnings
-from typing import Optional
-
-class Settings:
-    """Settings configuration for TroveSuite Auth Service"""
-
-    # =============================================================================
-    # DATABASE CONFIGURATION
-    # =============================================================================
-    DATABASE_URL: str = os.getenv(
-        "DATABASE_URL", 
-        "postgresql://username:password@localhost:5432/database_name"
-    )
-
-    # Alternative database configuration
-    DB_USER: Optional[str] = os.getenv("DB_USER")
-    DB_HOST: Optional[str] = os.getenv("DB_HOST")
-    DB_NAME: Optional[str] = os.getenv("DB_NAME")
-    DB_PORT: int = int(os.getenv("DB_PORT", "5432"))
-    DB_PASSWORD: Optional[str] = os.getenv("DB_PASSWORD")
-    ENVIRONMENT: str = os.getenv("ENVIRONMENT", "development")
-
-    # =============================================================================
-    # APPLICATION SETTINGS
-    # =============================================================================
-    APP_NAME: str = os.getenv("APP_NAME", "TroveSuite Auth Service")
-    DEBUG: bool = os.getenv("DEBUG", "False").lower() == "true"
-    
-    # =============================================================================
-    # SECURITY SETTINGS
-    # =============================================================================
-    ALGORITHM: str = os.getenv("ALGORITHM", "HS256")
-    SECRET_KEY: str = os.getenv("SECRET_KEY", "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7")
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "60"))
-    
-    # =============================================================================
-    # LOGGING SETTINGS
-    # =============================================================================
-    LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
-    LOG_FORMAT: str = os.getenv("LOG_FORMAT", "detailed")  # detailed, json, simple
-    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() == "false"
-    LOG_MAX_SIZE: int = int(os.getenv("LOG_MAX_SIZE", "10485760"))  # 10MB
-    LOG_BACKUP_COUNT: int = int(os.getenv("LOG_BACKUP_COUNT", "5"))
-    LOG_DIR: str = os.getenv("LOG_DIR", "logs")
-
-    # =============================================================================
-    # DATABASE TABLE NAMES
-    # =============================================================================
-    # Main schema tables
-    MAIN_TENANTS_TABLE: str = os.getenv("MAIN_TENANTS_TABLE", "tenants")
-    ROLE_PERMISSIONS_TABLE: str = os.getenv("ROLE_PERMISSIONS_TABLE", "role_permissions")
-    
-    # Tenant-specific tables (used in queries with tenant schema)
-    TENANT_LOGIN_SETTINGS_TABLE: str = os.getenv("TENANT_LOGIN_SETTINGS_TABLE", "login_settings")
-    USER_GROUPS_TABLE: str = os.getenv("USER_GROUPS_TABLE", "user_groups")
-    ASSIGN_ROLES_TABLE: str = os.getenv("ASSIGN_ROLES_TABLE", "assign_roles")
-
-    # =============================================================================
-    # AZURE CONFIGURATION (Optional - for queue functionality)
-    # =============================================================================
-    STORAGE_ACCOUNT_NAME: str = os.getenv("STORAGE_ACCOUNT_NAME", "")
-    USER_ASSIGNED_MANAGED_IDENTITY: str = os.getenv("USER_ASSIGNED_MANAGED_IDENTITY", "")
-    
-    @property
-    def database_url(self) -> str:
-        """Get the database URL, either from DATABASE_URL or constructed from individual components"""
-        if self.DATABASE_URL != "postgresql://username:password@localhost:5432/database_name":
-            return self.DATABASE_URL
-        
-        # Validate individual components
-        if not all([self.DB_USER, self.DB_HOST, self.DB_NAME, self.DB_PASSWORD]):
-            missing = []
-            if not self.DB_USER:
-                missing.append("DB_USER")
-            if not self.DB_HOST:
-                missing.append("DB_HOST")
-            if not self.DB_NAME:
-                missing.append("DB_NAME")
-            if not self.DB_PASSWORD:
-                missing.append("DB_PASSWORD")
-            
-            raise ValueError(
-                f"Database configuration incomplete. Missing environment variables: {', '.join(missing)}. "
-                f"Please set these variables or provide a complete DATABASE_URL."
-            )
-        
-        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
-    
-    def validate_configuration(self) -> None:
-        """Validate the current configuration and warn about potential issues"""
-        warnings_list = []
-        
-        # Check for default secret key
-        if self.SECRET_KEY == "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7":
-            warnings_list.append(
-                "SECRET_KEY is using the default value. This is insecure for production. "
-                "Please set a strong, unique SECRET_KEY environment variable."
-            )
-        
-        # Check for development environment in production-like settings
-        if self.ENVIRONMENT == "development" and self.DEBUG is False:
-            warnings_list.append(
-                "ENVIRONMENT is set to 'development' but DEBUG is False. "
-                "Consider setting ENVIRONMENT to 'production' for production deployments."
-            )
-        
-        # Check database configuration
-        try:
-            self.database_url
-        except ValueError as e:
-            warnings_list.append(f"Database configuration issue: {str(e)}")
-        
-        # Check for missing Azure configuration if needed
-        if self.ENVIRONMENT == "production" and not self.STORAGE_ACCOUNT_NAME:
-            warnings_list.append(
-                "STORAGE_ACCOUNT_NAME is not set. Azure queue functionality may not work properly."
-            )
-        
-        # Emit warnings
-        for warning in warnings_list:
-            warnings.warn(warning, UserWarning)
-    
-    def get_configuration_summary(self) -> dict:
-        """Get a summary of the current configuration (excluding sensitive data)"""
-        return {
-            "app_name": self.APP_NAME,
-            "environment": self.ENVIRONMENT,
-            "debug": self.DEBUG,
-            "database_host": self.DB_HOST,
-            "database_port": self.DB_PORT,
-            "database_name": self.DB_NAME,
-            "database_user": self.DB_USER,
-            "log_level": self.LOG_LEVEL,
-            "log_format": self.LOG_FORMAT,
-            "log_to_file": self.LOG_TO_FILE,
-            "algorithm": self.ALGORITHM,
-            "access_token_expire_minutes": self.ACCESS_TOKEN_EXPIRE_MINUTES,
-            "MAIN_TENANTS_TABLE": self.MAIN_TENANTS_TABLE,
-            "role_permissions_table": self.ROLE_PERMISSIONS_TABLE,
-            "TENANT_LOGIN_SETTINGS_TABLE": self.TENANT_LOGIN_SETTINGS_TABLE,
-            "user_groups_table": self.USER_GROUPS_TABLE,
-            "assign_roles_table": self.ASSIGN_ROLES_TABLE,
-        }
-
-# Global settings instance
-db_settings = Settings()
-
-# Validate configuration on import
-try:
-    db_settings.validate_configuration()
-except Exception as e:
-    warnings.warn("Configuration validation failed: %s", str(e), UserWarning)