ipulse-shared-core-ftredge 26.1.1__tar.gz → 27.2.0__tar.gz

{ipulse_shared_core_ftredge-26.1.1/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-27.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 26.1.1
+Version: 27.2.0
 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
@@ -12,7 +12,7 @@ License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
-Requires-Dist: ipulse_shared_base_ftredge==11.1.1
+Requires-Dist: ipulse_shared_base_ftredge~=12.2.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='26.1.1',
+    version='27.2.0',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[
@@ -11,7 +11,7 @@ setup(
         'pydantic[email]~=2.5',
         'python-dateutil~=2.8',
         'fastapi~=0.115.8',
-        'ipulse_shared_base_ftredge==11.1.1',
+        'ipulse_shared_base_ftredge~=12.2.0',
     ],
     author='Russlan Ramdowar',
     description='Shared Core models and Logger util for the Pulse platform project. Using AI for financial advisory and investment management.',

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/dependencies/authz_for_apis.py

@@ -1,14 +1,13 @@
 import os
 import logging
-import asyncio
 from typing import Optional, Iterable, Dict, Any, List
 from datetime import datetime, timedelta, timezone
 import httpx
 from fastapi import HTTPException, Request
+from ipulse_shared_base_ftredge import ApprovalStatus
 from ipulse_shared_core_ftredge.exceptions import ServiceError, ResourceNotFoundError
 from ipulse_shared_core_ftredge.models import UserStatus
 from ipulse_shared_core_ftredge.services import UserCoreService
-from ipulse_shared_base_ftredge import ApprovalStatus
 
 # Cache TTL constant
 USERSTATUS_CACHE_TTL = 60 # 60 seconds
@@ -63,12 +62,13 @@ class UserStatusCache:
 userstatus_cache = UserStatusCache()
 
 # Replace the logger dependency with a standard logger
-logger = logging.getLogger(__name__)
+_module_logger = logging.getLogger(__name__)
 
 async def get_userstatus(
     user_uid: str,
     user_core_service: UserCoreService,
-    force_fresh: bool = False
+    force_fresh: bool = False,
+    logger: Optional[logging.Logger] = None
 ) -> tuple[UserStatus, bool]:
     """
     Lightweight fetch of user status with caching.
@@ -78,10 +78,12 @@ async def get_userstatus(
         user_uid: User ID to fetch status for
         user_core_service: UserCoreService for data retrieval
         force_fresh: Whether to bypass cache
+        logger: Optional logger instance to use.
 
     Returns:
         Tuple of (UserStatus object, whether cache was used)
     """
+    log = logger if logger else _module_logger
     cache_used = False
 
     # Check cache first unless forced fresh
@@ -109,7 +111,7 @@ async def get_userstatus(
                 raise ValueError(f"Expected UserStatus object or dict, got {type(status_obj)}")
 
     except Exception as e:
-        logger.error(f"Error fetching user status via UserCoreService: {str(e)}")
+        log.error(f"Error fetching user status via UserCoreService: {str(e)}")
         raise ServiceError(
             operation="fetching user status for authz via UserCoreService",
             error=e,
@@ -134,11 +136,12 @@ def _validate_resource_fields(fields: Dict[str, Any]) -> List[str]:
     }
     return list(valid_fields.keys())
 
-async def extract_request_fields(request: Request) -> Optional[List[str]]:
+async def extract_request_fields(request: Request, logger: Optional[logging.Logger] = None) -> 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.
     """
+    log = logger if logger else _module_logger
     # Skip body extraction for GET and DELETE requests
     if request.method.upper() in ["GET", "DELETE", "HEAD", "OPTIONS"]:
         return None
@@ -161,7 +164,7 @@ async def extract_request_fields(request: Request) -> Optional[List[str]]:
         return None
 
     except Exception as e:
-        logger.warning(f"Could not extract fields from request body: {str(e)}")
+        log.warning(f"Could not extract fields from request body: {str(e)}")
         return None  # Return None instead of raising an error
 
 # Main authorization function with configurable timeout
@@ -169,6 +172,7 @@ async def authorizeAPIRequest(
     request: Request,
     user_core_service: UserCoreService,  # UserCoreService instance for better integration
     request_resource_fields: Optional[Iterable[str]] = None,
+    logger: Optional[logging.Logger] = None
 
 ) -> Dict[str, Any]:
     """
@@ -179,6 +183,7 @@ async def authorizeAPIRequest(
         request: The incoming request
         user_core_service: UserCoreService instance for better integration
         request_resource_fields: Fields being accessed/modified in the request
+        logger: Optional logger instance to use.
 
     Returns:
         Authorization result containing decision details
@@ -186,18 +191,19 @@ async def authorizeAPIRequest(
     Raises:
         HTTPException: For authorization failures (403) or service errors (500)
     """
+    log = logger if logger else _module_logger
     opa_decision = None
     try:
         # Extract fields for both PATCH and POST if not provided
         if not request_resource_fields:
-            request_resource_fields = await extract_request_fields(request)
+            request_resource_fields = await extract_request_fields(request, logger=log)
 
         # Extract request context and Firebase user claims
         firebase_user = request.state.user
-        logger.debug(f"Firebase user: {firebase_user}")
+        log.debug(f"Firebase user: {firebase_user}")
         user_uid = firebase_user.get('uid')
         if not user_uid:
-            logger.debug(f"Authorization denied for {request.method} {request.url.path}: No user UID found")
+            log.debug(f"Authorization denied for {request.method} {request.url.path}: No user UID found")
             raise HTTPException(
                 status_code=403,
                 detail="Not authorized to access this resource"
@@ -214,10 +220,11 @@ async def authorizeAPIRequest(
             user_uid=user_uid,
             user_core_service=user_core_service,
             force_fresh=force_fresh,
+            logger=log
         )
 
         # Perform comprehensive review and cleanup synchronously to ensure accurate auth data
-        logger.debug(f"Comprehensive review for userstatus : {user_status_obj} during authz")
+        log.debug(f"Comprehensive review for userstatus : {user_status_obj} during authz")
         if user_core_service:
             try:
                 review_result = await user_core_service.review_and_clean_active_subscription_credits_and_permissions(
@@ -228,10 +235,10 @@ async def authorizeAPIRequest(
                     clean_expired_permissions=True,
                     review_credits=True
                 )
-                logger.debug(f"Review result for userstatus : {review_result} during authz")
+                log.debug(f"Review result for userstatus : {review_result} during authz")
                 # Refresh user status after comprehensive review if any actions were taken
                 if review_result.get('actions_taken'):
-                    logger.info(f"Auth middleware performed comprehensive review for user {user_uid}: {review_result['actions_taken']}")
+                    log.info(f"Authz middleware performed comprehensive review for user {user_uid}: {review_result['actions_taken']}")
                     # Use the updated UserStatus returned from the review function
                     if 'updated_userstatus' in review_result:
                         user_status_obj = review_result['updated_userstatus']
@@ -241,7 +248,7 @@ async def authorizeAPIRequest(
                         userstatus_cache.set(user_uid, user_status_obj)
 
             except Exception as e:
-                logger.warning(f"Comprehensive review failed for user {user_uid} during auth: {str(e)}")
+                log.warning(f"Comprehensive review failed for user {user_uid} during auth: {str(e)}")
                 # Continue with existing status if review fails
 
         # Get valid permissions after comprehensive review
@@ -299,17 +306,17 @@ async def authorizeAPIRequest(
                 )
 
                 if response.status_code != 200:
-                    logger.error(f"OPA authorization failed: {response.text}")
+                    log.error(f"OPA authorization failed: {response.text}")
                     raise HTTPException(
                         status_code=500,
                         detail="Authorization service error"
                     )
 
                 result = response.json()
-
+                log.debug(f"OPA response: {result}")
                 # Handle OPA response format
                 if "result" not in result:
-                    logger.warning("OPA response missing 'result' field")
+                    log.warning("OPA response missing 'result' field")
                     raise HTTPException(
                         status_code=500,
                         detail="Authorization service error: OPA response format unexpected"
@@ -320,14 +327,14 @@ async def authorizeAPIRequest(
 
                 # Handle authorization denial
                 if not allow:
-                    logger.debug(f"Authorization denied for {request.method} {request.url.path}")
+                    log.debug(f"Authorization denied for {request.method} {request.url.path}")
                     raise HTTPException(
                         status_code=403,
                         detail=f"Not authorized to {request.method} {request.url.path}"
                     )
 
             except httpx.RequestError as e:
-                logger.error(f"Failed to connect to OPA: {str(e)}")
+                log.error(f"Failed to connect to OPA: {str(e)}")
                 raise HTTPException(
                     status_code=500,
                     detail="Authorization service temporarily unavailable"
@@ -346,7 +353,7 @@ async def authorizeAPIRequest(
         raise
     except Exception as e:
         # Only log unexpected errors at ERROR level
-        logger.error(f"Unexpected error during authorization for {request.method} {request.url.path}: {str(e)}")
+        log.error(f"Unexpected error during authorization for {request.method} {request.url.path}: {str(e)}")
         raise HTTPException(
             status_code=500,
             detail="Internal authorization error"

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/models/catalog/subscriptionplan.py

@@ -10,7 +10,7 @@ from enum import StrEnum
 from datetime import datetime, timezone, timedelta
 from pydantic import Field, ConfigDict, field_validator,model_validator, BaseModel
 from ipulse_shared_base_ftredge import (Layer, Module, list_enums_as_lower_strings,
-                                        Subject, SubscriptionPlanName,ObjectOverallStatus,
+                                        SystemSubject, SubscriptionPlanName,ObjectOverallStatus,
                                         SubscriptionStatus, TimeUnit)
 from ..base_data_model import BaseDataModel
 from ..user.user_permissions import UserPermission
@@ -60,7 +60,7 @@ class SubscriptionPlan(BaseDataModel):
     model_config = ConfigDict(extra="forbid")
 
     VERSION: ClassVar[float] = 1.0
-    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, Subject.CATALOG))
+    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, SystemSubject.CATALOG))
     OBJ_REF: ClassVar[str] = "subscriptionplan"
 
     # System-managed fields

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/models/catalog/usertype.py

@@ -9,7 +9,7 @@ based on their user type (superadmin, admin, internal, authenticated, anonymous)
 from typing import Dict, Any, Optional, ClassVar, List
 from datetime import datetime
 from pydantic import Field, ConfigDict, field_validator, model_validator
-from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, Subject, ObjectOverallStatus
+from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, SystemSubject, ObjectOverallStatus
 from ipulse_shared_base_ftredge.enums.enums_iam import IAMUserType
 from ipulse_shared_core_ftredge.models.base_data_model import BaseDataModel
 from ipulse_shared_core_ftredge.models.user.user_permissions import UserPermission
@@ -28,7 +28,7 @@ class UserType(BaseDataModel):
     model_config = ConfigDict(extra="forbid")
 
     VERSION: ClassVar[float] = 1.0
-    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Subject.CATALOG.name))
+    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, SystemSubject.CATALOG.name))
     OBJ_REF: ClassVar[str] = "usertype"
 
     # System-managed fields

ipulse_shared_core_ftredge-27.2.0/src/ipulse_shared_core_ftredge/models/time_series_packaged_dataset_model.py

@@ -0,0 +1,43 @@
+# pylint: disable=missing-module-docstring, missing-class-docstring
+from typing import List, Optional, TypeVar, Generic
+from datetime import datetime
+from pydantic import Field, BaseModel
+from ipulse_shared_core_ftredge.models.base_data_model import BaseDataModel
+from ipulse_shared_base_ftredge.enums import DatasetLineage, DatasetScope
+
+# Generic type for the records within the dataset
+RecordsSamplingType = TypeVar('RecordsSamplingType', bound=BaseModel)
+
+class TimeSeriesPackagedDatasetModel(BaseDataModel, Generic[RecordsSamplingType]):
+    """
+    An intermediary model for time series datasets that holds aggregated records.
+    It provides a generic way to handle different types of time series records.
+    """
+    dataset_id: str = Field(..., description="The unique identifier for this dataset, often matching the asset ID.")
+
+    dataset_modality: str = Field(..., description="The modality of the dataset, e.g., 'time_series', 'cross_sectional'.")
+    dataset_lineage: DatasetLineage = Field(..., description="The lineage of the data, indicating its origin and transformations.")
+    dataset_partition: DatasetScope = Field(..., description="The partition type of the dataset, e.g., full, subsampled.")
+
+    # Generic lists for different temporal buckets of records
+    max_bulk_records: List[RecordsSamplingType] = Field(default_factory=list)
+    latest_bulk_records: Optional[List[RecordsSamplingType]] = Field(default_factory=list)
+    latest_intraday_records: Optional[List[RecordsSamplingType]] = Field(default_factory=list)
+
+    # Metadata fields
+    max_bulk_updated_at: Optional[datetime] = None
+    max_bulk_updated_by: Optional[str] = None
+    max_bulk_recent_date_id: Optional[datetime] = None
+    max_bulk_oldest_date_id: Optional[datetime] = None
+    latest_bulk_recent_date_id: Optional[datetime] = None
+    latest_bulk_oldest_date_id: Optional[datetime] = None
+    latest_record_updated_at: Optional[datetime] = None
+    latest_record_updated_by: Optional[str] = None
+    latest_record_change_id: Optional[str] = None
+    latest_intraday_bulk_updated_at: Optional[datetime] = None
+    latest_intraday_bulk_updated_by: Optional[str] = None
+
+    @property
+    def id(self) -> str:
+        """Return dataset_id for backward compatibility and consistency."""
+        return self.dataset_id

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/models/user/user_subscription.py

@@ -3,7 +3,7 @@ from dateutil.relativedelta import relativedelta
 import uuid
 from typing import Optional, ClassVar, Dict, Any, List
 from pydantic import Field, ConfigDict, model_validator
-from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, Subject, SubscriptionPlanName, SubscriptionStatus, TimeUnit
+from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, SystemSubject, SubscriptionPlanName, SubscriptionStatus, TimeUnit
 from ..base_data_model import BaseDataModel
 from .user_permissions import UserPermission
 # ORIGINAL AUTHOR ="russlan.ramdowar;russlan@ftredge.com"
@@ -22,7 +22,7 @@ class UserSubscription(BaseDataModel):
     model_config = ConfigDict(frozen=True, extra="forbid")
 
     VERSION: ClassVar[float] = 3.0  # Incremented version for direct fields instead of computed
-    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, Subject.SUBSCRIPTION))
+    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, SystemSubject.SUBSCRIPTION))
     OBJ_REF: ClassVar[str] = "subscription"
 
     # System-managed fields (read-only)

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/models/user/userprofile.py

@@ -3,7 +3,7 @@ from datetime import date, datetime
 import re  # Add re import
 from typing import Set, Optional, ClassVar, Dict, Any, List
 from pydantic import EmailStr, Field, ConfigDict, model_validator, field_validator
-from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, Subject, IAMUserType
+from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, SystemSubject, IAMUserType
 from ..base_data_model import BaseDataModel
 # ORIGINAL AUTHOR ="Russlan Ramdowar;russlan@ftredge.com"
 # CLASS_ORGIN_DATE=datetime(2024, 2, 12, 20, 5)
@@ -17,7 +17,7 @@ class UserProfile(BaseDataModel):
 
     # Class constants
     VERSION: ClassVar[float] = 5.0  # Incremented version for primary_usertype addition
-    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, Subject.USER))
+    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, SystemSubject.USER))
     OBJ_REF: ClassVar[str] = "userprofile"
 
     schema_version: float = Field(

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge/models/user/userstatus.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timezone, timedelta
 from typing import Set, Optional, Dict, List, ClassVar, Any
 from pydantic import Field, ConfigDict, model_validator, field_validator
-from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, Subject, TimeUnit
+from ipulse_shared_base_ftredge import Layer, Module, list_enums_as_lower_strings, SystemSubject, TimeUnit
 from ipulse_shared_base_ftredge.enums.enums_iam import IAMUnit
 from .user_subscription import UserSubscription
 from ..base_data_model import BaseDataModel
@@ -20,7 +20,7 @@ class UserStatus(BaseDataModel):
 
     # Class constants
     VERSION: ClassVar[float] = 7.0  # Major version bump for flattened IAM permissions structure
-    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, Subject.USER))
+    DOMAIN: ClassVar[str] = "_".join(list_enums_as_lower_strings(Layer.PULSE_APP, Module.CORE, SystemSubject.USER))
     OBJ_REF: ClassVar[str] = "userstatus"
 
     # Centralized collection name and document ID prefix

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 26.1.1
+Version: 27.2.0
 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
@@ -12,7 +12,7 @@ License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
-Requires-Dist: ipulse_shared_base_ftredge==11.1.1
+Requires-Dist: ipulse_shared_base_ftredge~=12.2.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ src/ipulse_shared_core_ftredge/models/base_api_response.py
 src/ipulse_shared_core_ftredge/models/base_data_model.py
 src/ipulse_shared_core_ftredge/models/credit_api_response.py
 src/ipulse_shared_core_ftredge/models/custom_json_response.py
+src/ipulse_shared_core_ftredge/models/time_series_packaged_dataset_model.py
 src/ipulse_shared_core_ftredge/models/catalog/__init__.py
 src/ipulse_shared_core_ftredge/models/catalog/subscriptionplan.py
 src/ipulse_shared_core_ftredge/models/catalog/usertype.py
@@ -54,6 +55,7 @@ src/ipulse_shared_core_ftredge/services/user/userauth_operations.py
 src/ipulse_shared_core_ftredge/services/user/userprofile_operations.py
 src/ipulse_shared_core_ftredge/services/user/userstatus_operations.py
 src/ipulse_shared_core_ftredge/utils/__init__.py
+src/ipulse_shared_core_ftredge/utils/authz_credit_extraction.py
 src/ipulse_shared_core_ftredge/utils/custom_json_encoder.py
 src/ipulse_shared_core_ftredge/utils/json_encoder.py
 tests/test_shared_cache.py

{ipulse_shared_core_ftredge-26.1.1 → ipulse_shared_core_ftredge-27.2.0}/src/ipulse_shared_core_ftredge.egg-info/requires.txt

@@ -1,4 +1,4 @@
 pydantic[email]~=2.5
 python-dateutil~=2.8
 fastapi~=0.115.8
-ipulse_shared_base_ftredge==11.1.1
+ipulse_shared_base_ftredge~=12.2.0