ipulse-shared-core-ftredge 6.7.1__tar.gz → 6.8.1__tar.gz

{ipulse_shared_core_ftredge-6.7.1/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-6.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.7.1
+Version: 6.8.1
 Summary: Shared Core models and Logger util for the Pulse platform project. Using AI for financial advisory and investment management.
 Home-page: https://github.com/TheFutureEdge/ipulse_shared_core
 Author: Russlan Ramdowar

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='6.7.1',
+    version='6.8.1',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1}/src/ipulse_shared_core_ftredge/__init__.py

@@ -7,3 +7,5 @@ from .models import ( UserAuth, UserProfile,Subscription,
 
 from .services import (BaseFirestoreService,BaseServiceException, ResourceNotFoundError, AuthorizationError,
                             ValidationError)
+
+from .utils import (CustomJSONEncoder)

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1}/src/ipulse_shared_core_ftredge/dependencies/authorization_api.py

@@ -6,24 +6,25 @@ import httpx
 from fastapi import HTTPException, Request
 from google.cloud import firestore
 from ipulse_shared_core_ftredge.services import ServiceError, AuthorizationError, ResourceNotFoundError
+from ipulse_shared_core_ftredge.models import UserStatus
 
 # Constants
-USERS_STATUS_COLLECTION_NAME = "user-statuses"
-USERS_STATUS_DOC_REF = "userusrsttus_"
+USERS_STATUS_COLLECTION_NAME = UserStatus.get_collection_name()
+USERS_STATUS_DOC_REF = "userstatus_"
 CACHE_TTL = 60 # 60 seconds
 class UserStatusCache:
     """Manages user status caching with dynamic invalidation"""
     def __init__(self):
         self._cache: Dict[str, Dict[str, Any]] = {}
         self._timestamps: Dict[str, datetime] = {}
-        
+
     def get(self, user_uid: str) -> Optional[Dict[str, Any]]:
         """
         Retrieves user status from cache if available and valid.
 
         Args:
             user_uid (str): The user ID.
-            
+
         """
         if user_uid in self._cache:
             status_data = self._cache[user_uid]
@@ -33,7 +34,7 @@ class UserStatusCache:
                 return status_data
             self.invalidate(user_uid)
         return None
-    
+
     def set(self, user_uid: str, data: Dict[str, Any]) -> None:
         """
         Sets user status data in the cache.
@@ -44,7 +45,7 @@ class UserStatusCache:
         """
         self._cache[user_uid] = data
         self._timestamps[user_uid] = datetime.now()
-    
+
     def invalidate(self, user_uid: str) -> None:
         """
         Invalidates (removes) user status from the cache.
@@ -56,13 +57,13 @@ class UserStatusCache:
         self._timestamps.pop(user_uid, None)
 
 # Global cache instance
-user_status_cache = UserStatusCache()
+userstatus_cache = UserStatusCache()
 
 # Replace the logger dependency with a standard logger
 logger = logging.getLogger(__name__)
 
-async def get_user_status(
-    user_uid: str, 
+async def get_userstatus(
+    user_uid: str,
     db: firestore.Client,  # Note: This expects the actual client, not a Depends
     force_fresh: bool = False
 ) -> tuple[Dict[str, Any], bool]:
@@ -71,39 +72,39 @@ async def get_user_status(
     """
     cache_used = False
     if not force_fresh:
-        cached_status = user_status_cache.get(user_uid)
+        cached_status = userstatus_cache.get(user_uid)
         if cached_status:
             cache_used = True
             return cached_status, cache_used
 
     try:
         # Get reference to the document
-        user_status_id = USERS_STATUS_DOC_REF + user_uid
-        user_ref = db.collection(USERS_STATUS_COLLECTION_NAME).document(user_status_id)
-        
+        userstatus_id = USERS_STATUS_DOC_REF + user_uid
+        user_ref = db.collection(USERS_STATUS_COLLECTION_NAME).document(userstatus_id)
+
         # Get the document
         snapshot = user_ref.get()
         if not snapshot.exists:
             raise ResourceNotFoundError(
-                resource_type="user_status",
-                resource_id=user_status_id,
+                resource_type="authorization userstatus",
+                resource_id=userstatus_id,
                 additional_info={"user_uid": user_uid}
             )
-        
+
         status_data = snapshot.to_dict()
-        
+
         # Only cache if not forced fresh
         if not force_fresh:
-            user_status_cache.set(user_uid, status_data)
+            userstatus_cache.set(user_uid, status_data)
         return status_data, cache_used
-        
+
     except ResourceNotFoundError:
         raise
     except Exception as e:
         raise ServiceError(
             operation=f"fetching user status",
             error=e,
-            resource_type="user_status",
+            resource_type="userstatus",
             resource_id=user_uid,
             additional_info={
                 "force_fresh": force_fresh,
@@ -131,18 +132,18 @@ async def extract_request_fields(request: Request) -> Optional[List[str]]:
         if isinstance(body, dict):
             if request.method == "PATCH":
                 return _validate_resource_fields(body)
-            elif request.method == "POST":
+            if request.method == "POST":
                 # For POST, we want to include all fields being set
                 return list(body.keys())
         elif hasattr(body, 'model_dump'):
             data = body.model_dump(exclude_unset=True)
             if request.method == "PATCH":
                 return _validate_resource_fields(data)
-            elif request.method == "POST":
+            if request.method == "POST":
                 return list(data.keys())
-        
+
         return None
-            
+
     except Exception as e:
         logger.error(f"Error extracting fields from request body: {str(e)}")
         return None
@@ -172,8 +173,8 @@ async def authorizeAPIRequest(
 
         # Determine if we need fresh status
         force_fresh = _should_force_fresh_status(request)
-        user_status, cache_used = await get_user_status(user_uid, db, force_fresh=force_fresh)
-        
+        userstatus, cache_used = await get_userstatus(user_uid, db, force_fresh=force_fresh)
+
         # Prepare authorization input
         auth_input = {
             "api_url": request.url.path,
@@ -181,10 +182,10 @@ async def authorizeAPIRequest(
                 "uid": user_uid,
                 "usertypes": request.state.user.get("usertypes"),
                 "email_verified": request.state.user.get("email_verified"),
-                "iam_groups": user_status.get("iam_groups"),
-                "subscriptions": user_status.get("subscriptions"),
-                "sbscrptn_based_insight_credits": user_status.get("sbscrptn_based_insight_credits"),
-                "extra_insight_credits": user_status.get("extra_insight_credits")
+                "iam_groups": userstatus.get("iam_groups"),
+                "subscriptions": userstatus.get("subscriptions"),
+                "sbscrptn_based_insight_credits": userstatus.get("sbscrptn_based_insight_credits"),
+                "extra_insight_credits": userstatus.get("extra_insight_credits")
             },
             "method": request.method.lower(),
             "request_resource_fields": request_resource_fields
@@ -192,13 +193,28 @@ async def authorizeAPIRequest(
 
         # Query OPA
         opa_url = f"{os.getenv('OPA_SERVER_URL', 'http://localhost:8181')}{os.getenv('OPA_DECISION_PATH', '/v1/data/http/authz/ingress/decision')}"
+        logger.debug(f"Attempting to connect to OPA at: {opa_url}")
+        logger.debug(f"Authorization input: {auth_input}")
         async with httpx.AsyncClient() as client:
-            response = await client.post(
-                opa_url,
-                json={"input": auth_input},
-                timeout=5.0  # 5 seconds timeout
-            )
-            
+            try:
+                response = await client.post(
+                    opa_url,
+                    json={"input": auth_input},
+                    timeout=5.0  # 5 seconds timeout
+                )
+                logger.debug(f"OPA Response Status: {response.status_code}")
+                logger.debug(f"OPA Response Body: {response.text}")
+            except httpx.RequestError as e:
+                logger.error(f"Failed to connect to OPA: {str(e)}")
+                raise ServiceError(
+                    operation="API authorization",
+                    error=e,
+                    resource_type="authorization",
+                    additional_info={
+                        "opa_url": opa_url,
+                        "connection_error": str(e)
+                    }
+                ) from e
             if response.status_code != 200:
                 logger.error(f"OPA authorization failed: {response.text}")
                 raise HTTPException(
@@ -236,7 +252,7 @@ async def authorizeAPIRequest(
                 "user_uid": request.state.user.get('uid'),
                 "resource_fields": request_resource_fields
             }
-        )
+        ) from e
 
 def _should_force_fresh_status(request: Request) -> bool:
     """
@@ -250,10 +266,10 @@ def _should_force_fresh_status(request: Request) -> bool:
     ]
     # Methods that require fresh status
     sensitive_methods = {'post', 'patch', 'put', 'delete'}
-    
+
     path = request.url.path.lower()
     method = request.method.lower()
-    
+
     return (
         any(pattern in path for pattern in credit_sensitive_patterns) or
         method in sensitive_methods

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1}/src/ipulse_shared_core_ftredge/models/base_api_response.py

@@ -1,9 +1,12 @@
 from typing import Generic, TypeVar, Optional, Any, Dict, List
-from pydantic import BaseModel, ConfigDict
 import datetime as dt
-from fastapi.responses import JSONResponse
-from ipulse_shared_core_ftredge.utils  import CustomJSONEncoder
 import json
+from pydantic import BaseModel, ConfigDict
+from fastapi.responses import JSONResponse
+from ipulse_shared_core_ftredge  import CustomJSONEncoder
+
+
+
 
 
 T = TypeVar('T')

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1}/src/ipulse_shared_core_ftredge/services/base_exceptions.py

@@ -19,7 +19,7 @@ class BaseServiceException(HTTPException):
         self.resource_id = resource_id
         self.additional_info = additional_info or {}
         self.original_error = original_error
-        
+
         # Get full traceback if there's an original error
         if original_error:
             self.traceback = ''.join(traceback.format_exception(
@@ -29,14 +29,14 @@ class BaseServiceException(HTTPException):
             ))
         else:
             self.traceback = ''.join(traceback.format_stack())
-        
+
         # Build detailed message
         detail_msg = f"{detail}"
         if resource_type:
             detail_msg += f" [Resource Type: {resource_type}]"
         if resource_id:
             detail_msg += f" [ID: {resource_id}]"
-        
+
         super().__init__(status_code=status_code, detail=detail_msg)
 
     def log_error(self, logger: logging.Logger):
@@ -48,7 +48,7 @@ class BaseServiceException(HTTPException):
             "detail": self.detail,
             **self.additional_info
         }
-        
+
         log_message = f"""
             Service Error Occurred:
             Status Code: {self.status_code}
@@ -60,7 +60,7 @@ class BaseServiceException(HTTPException):
             Traceback:
             {self.traceback}
                     """
-                    
+
         logger.error(log_message, extra=error_context)
 
 

{ipulse_shared_core_ftredge-6.7.1 → ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.7.1
+Version: 6.8.1
 Summary: Shared Core models and Logger util for the Pulse platform project. Using AI for financial advisory and investment management.
 Home-page: https://github.com/TheFutureEdge/ipulse_shared_core
 Author: Russlan Ramdowar