trovesuite 1.0.3__tar.gz → 1.0.4__tar.gz

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.3"
+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.3"
+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.3 → 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.3",
+    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.3 → 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.3 → 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.3 → 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](

{trovesuite-1.0.3 → 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.3 → 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.3 → trovesuite-1.0.4/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.3
+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.3 → 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