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

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

@@ -1,16 +1,22 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.8.1
+Version: 7.1.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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
 License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
-Requires-Dist: pytest~=7.1
-Requires-Dist: ipulse_shared_base_ftredge>=5.6.1
+Requires-Dist: pytest
+Requires-Dist: ipulse_shared_base_ftredge>=5.7.1
 Dynamic: author
+Dynamic: classifier
 Dynamic: home-page
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary

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

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='6.8.1',
+    version='7.1.1',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[
@@ -11,11 +11,17 @@ setup(
         'pydantic[email]~=2.5',
         'python-dateutil~=2.8',
         'fastapi~=0.115.8',
-        'pytest~=7.1',
-        'ipulse_shared_base_ftredge>=5.6.1',
+        'pytest',
+        'ipulse_shared_base_ftredge>=5.7.1',
     ],
     author='Russlan Ramdowar',
     description='Shared Core models and Logger util for the Pulse platform project. Using AI for financial advisory and investment management.',
     url='https://github.com/TheFutureEdge/ipulse_shared_core',
 
+    classifiers=[
+        'Programming Language :: Python :: 3',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+    ],
+    python_requires='>=3.11',
 )

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

@@ -1,11 +1,12 @@
 # pylint: disable=missing-module-docstring
 from .models import ( UserAuth, UserProfile,Subscription,
                      UserStatus, UserProfileUpdate,
-                     OrganizationProfile, BaseAPIResponse, CustomJSONResponse )
+                     OrganizationProfile, BaseAPIResponse,
+                      CustomJSONResponse )
 
 
 
 from .services import (BaseFirestoreService,BaseServiceException, ResourceNotFoundError, AuthorizationError,
                             ValidationError)
 
-from .utils import (CustomJSONEncoder)
+from .utils import (CustomJSONEncoder)

ipulse_shared_core_ftredge-7.1.1/src/ipulse_shared_core_ftredge/dependencies/__init__.py

@@ -0,0 +1 @@
+# from .auth_firebase_token_validation import verify_firebase_token

ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge/dependencies/token_validation.py → ipulse_shared_core_ftredge-7.1.1/src/ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py

@@ -22,7 +22,7 @@ async def verify_firebase_token(
     """
     # Get token from either x-forwarded-authorization or authorization header
     token = x_forwarded_authorization or authorization
-    
+
     if not token:
         raise HTTPException(
             status_code=401,
@@ -34,7 +34,7 @@ async def verify_firebase_token(
         token = token.replace("Bearer ", "")
         # Verify the token
         decoded_token = auth.verify_id_token(token)
-        
+
         # Create AuthenticatedUser instance
         user = AuthenticatedUser(
             uid=decoded_token.get('uid'),
@@ -42,17 +42,17 @@ async def verify_firebase_token(
             email_verified=decoded_token.get('email_verified', False),
             usertypes=decoded_token.get('usertypes', [])
         )
-        
+
         # Store user in request state for use in other parts of the application
         request.state.user = decoded_token
-        
+
         return user
 
     except Exception as e:
         raise HTTPException(
             status_code=401,
             detail=f"Invalid token: {str(e)}"
-        )
+        ) from e
 
 # Type alias for dependency injection
 AuthUser = Annotated[AuthenticatedUser, Depends(verify_firebase_token)]

ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge/dependencies/auth_router.py → ipulse_shared_core_ftredge-7.1.1/src/ipulse_shared_core_ftredge/dependencies/auth_protected_router.py

@@ -1,6 +1,6 @@
 from typing import Callable, Optional, List
 from fastapi import APIRouter, Depends
-from .token_validation import verify_firebase_token
+from .auth_firebase_token_validation import verify_firebase_token
 
 def create_protected_router(
     *,

ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge/dependencies/authorization_api.py → ipulse_shared_core_ftredge-7.1.1/src/ipulse_shared_core_ftredge/dependencies/authz_for_apis.py

@@ -126,27 +126,32 @@ def _validate_resource_fields(fields: Dict[str, Any]) -> List[str]:
 async def extract_request_fields(request: Request) -> Optional[List[str]]:
     """
     Extract fields from request body for both PATCH and POST methods.
+    For GET and DELETE methods, return None as they typically don't have a body.
     """
+    # Skip body extraction for GET and DELETE requests
+    if request.method.upper() in ["GET", "DELETE", "HEAD", "OPTIONS"]:
+        return None
+
     try:
         body = await request.json()
         if isinstance(body, dict):
-            if request.method == "PATCH":
+            if request.method.upper() == "PATCH":
                 return _validate_resource_fields(body)
-            if request.method == "POST":
+            if request.method.upper() == "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":
+            if request.method.upper() == "PATCH":
                 return _validate_resource_fields(data)
-            if request.method == "POST":
+            if request.method.upper() == "POST":
                 return list(data.keys())
 
         return None
 
     except Exception as e:
-        logger.error(f"Error extracting fields from request body: {str(e)}")
-        return None
+        logger.warning(f"Could not extract fields from request body: {str(e)}")
+        return None  # Return None instead of raising an error
 
 async def authorizeAPIRequest(
     request: Request,

ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge/dependencies/database.py → ipulse_shared_core_ftredge-7.1.1/src/ipulse_shared_core_ftredge/dependencies/firestore_client.py

@@ -1,8 +1,9 @@
 from typing import Annotated
 from fastapi import Depends
-from google.cloud import firestore
 from functools import lru_cache
 import logging
+from google.cloud import firestore
+
 
 logger = logging.getLogger(__name__)
 
@@ -10,10 +11,11 @@ logger = logging.getLogger(__name__)
 def get_db() -> firestore.Client:
     """
     Dependency function to inject the Firestore client.
-    Each service implementing this should override this function with their own Firebase initialization.
+    !!! THIS IS JUST AN EXAMPLE !!!
+    !!! Each service implementing this should override this function with their own Firebase initialization. !!!
     """
     logger.info("Base get_db dependency called - this should be overridden by the implementing service")
     return firestore.Client()
 
 # Base type for dependency injection that services will implement
-FirestoreDB = Annotated[firestore.Client, Depends(get_db)]
+FirestoreDBClient = Annotated[firestore.Client, Depends(get_db)]

{ipulse_shared_core_ftredge-6.8.1 → ipulse_shared_core_ftredge-7.1.1}/src/ipulse_shared_core_ftredge/models/__init__.py

@@ -4,7 +4,7 @@ from .user_status import UserStatus
 from .user_profile_update import UserProfileUpdate
 from .user_auth import UserAuth
 from .organization_profile import OrganizationProfile
-from .base_api_response import BaseAPIResponse, CustomJSONResponse
+from .base_api_response import BaseAPIResponse , CustomJSONResponse
 
 
 

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

@@ -3,7 +3,7 @@ import datetime as dt
 import json
 from pydantic import BaseModel, ConfigDict
 from fastapi.responses import JSONResponse
-from ipulse_shared_core_ftredge  import CustomJSONEncoder
+from ipulse_shared_core_ftredge.utils  import CustomJSONEncoder
 
 
 

{ipulse_shared_core_ftredge-6.8.1 → ipulse_shared_core_ftredge-7.1.1}/src/ipulse_shared_core_ftredge/services/__init__.py

@@ -1,6 +1,6 @@
 from .base_firestore_service  import BaseFirestoreService
 
-from .base_exceptions import (BaseServiceException, ResourceNotFoundError, AuthorizationError,
+from .base_service_exceptions import (BaseServiceException, ResourceNotFoundError, AuthorizationError,
                             ValidationError ,ServiceError)
 from .servicemon import Servicemon
 from .fastapiservicemon import FastAPIServiceMon

{ipulse_shared_core_ftredge-6.8.1 → ipulse_shared_core_ftredge-7.1.1}/src/ipulse_shared_core_ftredge/services/base_firestore_service.py

@@ -4,13 +4,13 @@ import logging
 from datetime import datetime, timezone
 from pydantic import BaseModel
 from google.cloud import firestore
-from .base_exceptions import ResourceNotFoundError, ValidationError, ServiceError
+from .base_service_exceptions import ResourceNotFoundError, ValidationError, ServiceError
 
 T = TypeVar('T', bound=BaseModel)
 
 class BaseFirestoreService(Generic[T]):
     """Base class for Firestore services with common CRUD operations"""
-    
+
     def __init__(self, db: firestore.Client, collection_name: str, resource_type: str, logger: logging.Logger):
         self.db = db
         self.collection_name = collection_name
@@ -22,7 +22,7 @@ class BaseFirestoreService(Generic[T]):
         try:
             current_time = datetime.now(timezone.utc)
             doc_data = data.model_dump(mode='json')
-            
+
             # Add audit fields
             doc_data.update({
                 'creat_date': current_time.isoformat(),
@@ -33,7 +33,7 @@ class BaseFirestoreService(Generic[T]):
 
             doc_ref = self.db.collection(self.collection_name).document(doc_id)
             doc_ref.set(doc_data)
-            
+
             self.logger.info(f"Created {self.resource_type}: {doc_id}")
             return doc_data
 
@@ -61,7 +61,7 @@ class BaseFirestoreService(Generic[T]):
                     'updt_date': current_time.isoformat(),
                     'updt_by_user': creator_uid
                 })
-                
+
                 doc_ref = self.db.collection(self.collection_name).document(doc_data.get('id'))
                 batch.set(doc_ref, doc_data)
                 created_docs.append(doc_data)
@@ -83,39 +83,39 @@ class BaseFirestoreService(Generic[T]):
         """Get a document by ID with standardized error handling"""
         doc_ref = self.db.collection(self.collection_name).document(doc_id)
         doc = doc_ref.get()
-        
+
         if not doc.exists:
             raise ResourceNotFoundError(
                 resource_type=self.resource_type,
                 resource_id=doc_id,
                 additional_info={"collection": self.collection_name}
             )
-            
+
         return doc.to_dict()
 
     async def update_document(self, doc_id: str, update_data: Dict[str, Any], updater_uid: str) -> Dict[str, Any]:
         """Standard update method with validation and audit fields"""
         try:
             doc_ref = self.db.collection(self.collection_name).document(doc_id)
-            
+
             if not doc_ref.get().exists:
                 raise ResourceNotFoundError(
                     resource_type=self.resource_type,
                     resource_id=doc_id,
                     additional_info={"collection": self.collection_name}
                 )
-            
+
             valid_fields = self._validate_update_fields(update_data)
-            
+
             # Add audit fields
             valid_fields.update({
                 'updt_date': datetime.now(timezone.utc).isoformat(),
                 'updt_by_user': updater_uid
             })
-            
+
             doc_ref.update(valid_fields)
             return doc_ref.get().to_dict()
-            
+
         except (ResourceNotFoundError, ValidationError):
             raise
         except Exception as e:
@@ -136,7 +136,7 @@ class BaseFirestoreService(Generic[T]):
                     resource_type=self.resource_type,
                     resource_id=doc_id
                 )
-                
+
             doc_ref.delete()
             self.logger.info(f"Deleted {self.resource_type}: {doc_id}")
 
@@ -155,17 +155,17 @@ class BaseFirestoreService(Generic[T]):
         """Centralized update fields validation"""
         if not isinstance(update_data, dict):
             update_data = update_data.model_dump(exclude_unset=True)
-            
+
         valid_fields = {
             k: v for k, v in update_data.items()
             if v is not None and not (isinstance(v, (list, dict, set)) and len(v) == 0)
         }
-        
+
         if not valid_fields:
             raise ValidationError(
                 resource_type=self.resource_type,
                 detail="No valid fields to update",
                 resource_id=None
             )
-            
+
         return valid_fields

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

@@ -1,16 +1,22 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.8.1
+Version: 7.1.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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
 License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
-Requires-Dist: pytest~=7.1
-Requires-Dist: ipulse_shared_base_ftredge>=5.6.1
+Requires-Dist: pytest
+Requires-Dist: ipulse_shared_base_ftredge>=5.7.1
 Dynamic: author
+Dynamic: classifier
 Dynamic: home-page
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary

{ipulse_shared_core_ftredge-6.8.1 → ipulse_shared_core_ftredge-7.1.1}/src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt

@@ -9,10 +9,10 @@ src/ipulse_shared_core_ftredge.egg-info/dependency_links.txt
 src/ipulse_shared_core_ftredge.egg-info/requires.txt
 src/ipulse_shared_core_ftredge.egg-info/top_level.txt
 src/ipulse_shared_core_ftredge/dependencies/__init__.py
-src/ipulse_shared_core_ftredge/dependencies/auth_router.py
-src/ipulse_shared_core_ftredge/dependencies/authorization_api.py
-src/ipulse_shared_core_ftredge/dependencies/database.py
-src/ipulse_shared_core_ftredge/dependencies/token_validation.py
+src/ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py
+src/ipulse_shared_core_ftredge/dependencies/auth_protected_router.py
+src/ipulse_shared_core_ftredge/dependencies/authz_for_apis.py
+src/ipulse_shared_core_ftredge/dependencies/firestore_client.py
 src/ipulse_shared_core_ftredge/models/__init__.py
 src/ipulse_shared_core_ftredge/models/base_api_response.py
 src/ipulse_shared_core_ftredge/models/base_data_model.py
@@ -24,8 +24,8 @@ src/ipulse_shared_core_ftredge/models/user_profile.py
 src/ipulse_shared_core_ftredge/models/user_profile_update.py
 src/ipulse_shared_core_ftredge/models/user_status.py
 src/ipulse_shared_core_ftredge/services/__init__.py
-src/ipulse_shared_core_ftredge/services/base_exceptions.py
 src/ipulse_shared_core_ftredge/services/base_firestore_service.py
+src/ipulse_shared_core_ftredge/services/base_service_exceptions.py
 src/ipulse_shared_core_ftredge/services/fastapiservicemon.py
 src/ipulse_shared_core_ftredge/services/servicemon.py
 src/ipulse_shared_core_ftredge/utils/__init__.py

{ipulse_shared_core_ftredge-6.8.1 → ipulse_shared_core_ftredge-7.1.1}/src/ipulse_shared_core_ftredge.egg-info/requires.txt

@@ -1,5 +1,5 @@
 pydantic[email]~=2.5
 python-dateutil~=2.8
 fastapi~=0.115.8
-pytest~=7.1
-ipulse_shared_base_ftredge>=5.6.1
+pytest
+ipulse_shared_base_ftredge>=5.7.1

ipulse_shared_core_ftredge-6.8.1/src/ipulse_shared_core_ftredge/dependencies/__init__.py

@@ -1 +0,0 @@
-from .token_validation import verify_firebase_token