trovesuite 1.0.14__tar.gz → 1.0.17__tar.gz

{trovesuite-1.0.14/src/trovesuite.egg-info → trovesuite-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.14
+Version: 1.0.17
 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.14 → trovesuite-1.0.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.14"
+version = "1.0.17"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 authors = ["brightgclt <brightgclt@gmail.com>"]
 license = "MIT"
@@ -58,7 +58,7 @@ Documentation = "https://dev.azure.com/brightgclt/trovesuite/_git/packages"
 
 [project]
 name = "trovesuite"
-version = "1.0.14"
+version = "1.0.17"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 readme = "README.md"
 license = {text = "MIT"}

{trovesuite-1.0.14 → trovesuite-1.0.17}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.14",
+    version="1.0.17",
     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.14 → trovesuite-1.0.17}/src/trovesuite/__init__.py

@@ -3,19 +3,21 @@ TroveSuite Package
 
 A comprehensive authentication, authorization, notification, and storage service for ERP systems.
 Provides JWT token validation, user authorization, permission checking, notification capabilities,
-and Azure Storage blob management.
+Azure Storage blob management, and utility functions for multi-tenant applications.
 """
 
 from .auth import AuthService
 from .notification import NotificationService
 from .storage import StorageService
+from .utils import Helper
 
-__version__ = "1.0.7"
+__version__ = "1.0.16"
 __author__ = "Bright Debrah Owusu"
 __email__ = "owusu.debrah@deladetech.com"
 
 __all__ = [
     "AuthService",
     "NotificationService",
-    "StorageService"
+    "StorageService",
+    "Helper",
 ]

{trovesuite-1.0.14 → trovesuite-1.0.17}/src/trovesuite/auth/auth_service.py

@@ -229,10 +229,10 @@ class AuthService:
             logger.info(f"Fetching system-level roles for user: {user_id}")
 
             system_roles = DatabaseManager.execute_query(
-                """
+                f"""
                     SELECT DISTINCT sug.group_id, sug.user_id, sar.role_id, sar.resource_type
-                    FROM main.system_user_groups sug
-                    INNER JOIN main.system_assign_roles sar ON sug.group_id = sar.group_id
+                    FROM {db_settings.MAIN_SYSTEM_USER_GROUPS_TABLE} sug
+                    INNER JOIN {db_settings.MAIN_SYSTEM_ASSIGN_ROLES_TABLE} sar ON sug.group_id = sar.group_id
                     WHERE sug.user_id = %s
                     AND sar.is_active = true
                     AND sar.delete_status = 'NOT_DELETED'
@@ -247,9 +247,9 @@ class AuthService:
 
             # ✅ NEW: Also check for direct system role assignments (user_id in system_assign_roles)
             direct_system_roles = DatabaseManager.execute_query(
-                """
+                f"""
                     SELECT DISTINCT NULL as group_id, sar.user_id, sar.role_id, sar.resource_type
-                    FROM main.system_assign_roles sar
+                    FROM {db_settings.MAIN_SYSTEM_ASSIGN_ROLES_TABLE} sar
                     WHERE sar.user_id = %s
                     AND sar.is_active = true
                     AND sar.delete_status = 'NOT_DELETED'

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

@@ -0,0 +1,98 @@
+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
+    DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
+    APP_NAME: str = os.getenv("APP_NAME", "Python Template API")
+    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
+    ALGORITHM: str = os.getenv("ALGORITHM")
+    SECRET_KEY: str = os.getenv("SECRET_KEY")
+    ENVIRONMENT: str = os.getenv("ENVIRONMENT")
+    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.tenants")
+    MAIN_TENANT_RESOURCE_ID_TABLE = os.getenv("MAIN_TENANT_RESOURCE_ID_TABLE", "main.tenant_resource_ids")
+    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE", "main.subscriptions")
+    MAIN_APPS_TABLE = os.getenv("MAIN_APPS_TABLE", "main.apps")
+    MAIN_USERS_TABLE = os.getenv("MAIN_USERS_TABLE", "main.users")
+    MAIN_RESOURCE_TYPES_TABLE = os.getenv("MAIN_RESOURCE_TYPES_TABLE", "main.resource_types")
+    MAIN_RESOURCE_ID_TABLE = os.getenv("MAIN_RESOURCE_ID_TABLE", "main.resource_ids")
+    MAIN_RESOURCES_TABLE = os.getenv("MAIN_RESOURCES_TABLE", "main.resources")
+    MAIN_PERMISSIONS_TABLE = os.getenv("MAIN_PERMISSIONS_TABLE", "main.permissions")
+    MAIN_ROLES_TABLE = os.getenv("MAIN_ROLES_TABLE", "main.roles")
+    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE", "main.role_permissions")
+    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE", "main.user_subscriptions")
+    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE", "main.user_subscription_history")
+    MAIN_OTP = os.getenv("MAIN_OTP", "main.otps")
+    MAIN_PASSWORD_POLICY = os.getenv("MAIN_PASSWORD_POLICY", "main.password_policies")
+    MAIN_MULTI_FACTOR_SETTINGS = os.getenv("MAIN_MULTI_FACTOR_SETTINGS", "main.multi_factor_settings")
+    MAIN_USER_LOGIN_TRACKING = os.getenv("MAIN_USER_LOGIN_TRACKING", "main.user_login_tracking")
+    MAIN_ENTERPRISE_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_ENTERPRISE_SUBSCRIPTIONS_TABLE", "main.enterprise_subscriptions")
+    MAIN_CHANGE_PASSWORD_POLICY_TABLE = os.getenv("MAIN_CHANGE_PASSWORD_POLICY_TABLE", "main.change_password_policy")
+
+    # System-level tables
+    MAIN_SYSTEM_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_GROUPS_TABLE", "main.system_groups")
+    MAIN_SYSTEM_USER_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_USER_GROUPS_TABLE", "main.system_user_groups")
+    MAIN_SYSTEM_ASSIGN_ROLES_TABLE = os.getenv("MAIN_SYSTEM_ASSIGN_ROLES_TABLE", "main.system_assign_roles")
+    
+    # =============================================================================
+    # TENANT-SPECIFIC TABLES (tenant schemas)
+    # =============================================================================
+    TENANT_SUBSCRIPTIONS_TABLE = os.getenv("TENANT_SUBSCRIPTIONS_TABLE")
+    TENANT_GROUPS_TABLE = os.getenv("TENANT_GROUPS_TABLE")
+    TENANT_LOGIN_SETTINGS_TABLE = os.getenv("TENANT_LOGIN_SETTINGS_TABLE")
+    TENANT_RESOURCES_TABLE = os.getenv("TENANT_RESOURCES_TABLE")
+    TENANT_ASSIGN_ROLES_TABLE = os.getenv("TENANT_ASSIGN_ROLES_TABLE")
+    TENANT_RESOURCE_ID_TABLE = os.getenv("TENANT_RESOURCE_ID_TABLE")
+    TENANT_SUBSCRIPTION_HISTORY_TABLE = os.getenv("TENANT_SUBSCRIPTION_HISTORY_TABLE")
+    TENANT_RESOURCE_DELETION_CHAT_HISTORY_TABLE = os.getenv("TENANT_RESOURCE_DELETION_CHAT_HISTORY_TABLE")
+    TENANT_USER_GROUPS_TABLE = os.getenv("TENANT_USER_GROUPS_TABLE")
+    TENANT_ACTIVITY_LOGS_TABLE = os.getenv("TENANT_ACTIVITY_LOGS_TABLE")
+    TENANT_ORGANIZATIONS_TABLE = os.getenv("TENANT_ORGANIZATIONS_TABLE", "organizations")
+    TENANT_BUSINESSES_TABLE = os.getenv("TENANT_BUSINESSES_TABLE", "businesses")
+    TENANT_BUSINESS_APPS_TABLE = os.getenv("TENANT_BUSINESS_APPS_TABLE", "business_apps")
+    TENANT_LOCATIONS_TABLE = os.getenv("TENANT_LOCATIONS_TABLE", "locations")
+    TENANT_ASSIGN_LOCATIONS_TABLE = os.getenv("TENANT_ASSIGN_LOCATIONS_TABLE", "assign_locations")
+    TENANT_UNIT_OF_MEASURE_TABLE = os.getenv("TENANT_UNIT_OF_MEASURE_TABLE")
+    TENANT_CURRENCY=os.getenv("TENANT_CURRENCY")
+
+    # Mail Configurations
+    MAIL_SENDER_EMAIL=os.getenv("MAIL_SENDER_EMAIL")
+    MAIL_SENDER_PWD=os.getenv("MAIL_SENDER_PWD")
+
+    # Application Configurations
+    APP_URL=os.getenv("APP_URL", "https://trovesuite.com")
+    USER_ASSIGNED_MANAGED_IDENTITY=os.getenv("USER_ASSIGNED_MANAGED_IDENTITY")
+
+    @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.14 → trovesuite-1.0.17}/src/trovesuite/utils/__init__.py

@@ -5,7 +5,9 @@ Utility functions and helpers for TroveSuite services.
 """
 
 from .helper import Helper
+from . import templates
 
 __all__ = [
-    "Helper"
+    "Helper",
+    "templates",
 ]