ipulse-shared-core-ftredge 24.2.1__py3-none-any.whl → 25.1.1__py3-none-any.whl

ipulse_shared_core_ftredge/dependencies/__init__.py

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

ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py

@@ -93,4 +93,3 @@ async def verify_firebase_token(
 
 # Type alias for dependency injection
 AuthUser = Annotated[UserAuth, Depends(verify_firebase_token)]
-

ipulse_shared_core_ftredge/dependencies/authz_for_apis.py

@@ -203,10 +203,9 @@ async def authorizeAPIRequest(
             )
 
         # Get usertype information from Firebase custom claims (primary source)
-        custom_claims = firebase_user.get('custom_claims', {}) or firebase_user.get('claims', {})
-        primary_usertype = custom_claims.get('primary_usertype')
-        secondary_usertypes = custom_claims.get('secondary_usertypes', [])
-        user_approval_status = custom_claims.get('user_approval_status', str(ApprovalStatus.UNKNOWN))
+        primary_usertype = firebase_user.get('primary_usertype')
+        secondary_usertypes = firebase_user.get('secondary_usertypes', [])
+        user_approval_status = firebase_user.get('user_approval_status', str(ApprovalStatus.UNKNOWN))
 
         # Determine if we need fresh status for permissions and credits
         force_fresh = _should_force_fresh_status(request)
@@ -217,6 +216,7 @@ async def authorizeAPIRequest(
         )
 
         # Perform comprehensive review and cleanup synchronously to ensure accurate auth data
+        logger.info(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(
@@ -227,7 +227,7 @@ async def authorizeAPIRequest(
                     clean_expired_permissions=True,
                     review_credits=True
                 )
-
+                logger.info(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']}")
@@ -268,7 +268,6 @@ async def authorizeAPIRequest(
                 "uid": user_uid,
                 "primary_usertype": primary_usertype,
                 "secondary_usertypes": secondary_usertypes,
-                "usertypes": [primary_usertype] + secondary_usertypes if primary_usertype else secondary_usertypes,
                 "email_verified": firebase_user.get("email_verified", False),
                 "user_approval_status": user_approval_status,
                 "iam_permissions": valid_permissions,

ipulse_shared_core_ftredge/models/user/user_subscription.py

@@ -56,7 +56,7 @@ class UserSubscription(BaseDataModel):
     )
 
     # Cycle duration fields
-    cycle_start_date: datetime = Field(
+    cycle_start_datetime: datetime = Field(
         ...,  # Required field, no default
         description="Subscription Cycle Start Date"
     )
@@ -163,7 +163,7 @@ class UserSubscription(BaseDataModel):
     @classmethod
     def auto_calculate_cycle_end_date(cls, data: Dict[str, Any]) -> Dict[str, Any]:
         """
-        Auto-calculate cycle_end_datetime if not provided, based on cycle_start_date,
+        Auto-calculate cycle_end_datetime if not provided, based on cycle_start_datetime,
         validity_time_length, and validity_time_unit.
         """
         if not isinstance(data, dict):
@@ -176,19 +176,19 @@ class UserSubscription(BaseDataModel):
             (isinstance(data.get('cycle_end_datetime'), datetime) and
              abs((data['cycle_end_datetime'] - datetime.now(timezone.utc)).total_seconds()) < 5)):
 
-            cycle_start_date = data.get('cycle_start_date')
+            cycle_start_datetime = data.get('cycle_start_datetime')
             validity_time_length = data.get('validity_time_length')
             validity_time_unit = data.get('validity_time_unit')
 
-            if cycle_start_date and validity_time_length and validity_time_unit:
+            if cycle_start_datetime and validity_time_length and validity_time_unit:
                 data['cycle_end_datetime'] = cls.calculate_cycle_end_date(
-                    cycle_start_date, validity_time_length, validity_time_unit
+                    cycle_start_datetime, validity_time_length, validity_time_unit
                 )
             else:
                 raise ValueError(
                     "Cannot create subscription without cycle_end_datetime. "
                     "Either provide cycle_end_datetime directly or provide "
-                    "cycle_start_date, validity_time_length, and validity_time_unit for auto-calculation."
+                    "cycle_start_datetime, validity_time_length, and validity_time_unit for auto-calculation."
                 )
 
         return data
@@ -242,7 +242,7 @@ class UserSubscription(BaseDataModel):
         now = datetime.now(timezone.utc)
         return (
             self.status == SubscriptionStatus.ACTIVE and
-            self.cycle_start_date <= now <= self.cycle_end_datetime_safe
+            self.cycle_start_datetime <= now <= self.cycle_end_datetime_safe
         )
 
     def is_expired(self) -> bool:

ipulse_shared_core_ftredge/models/user/userstatus.py

@@ -442,7 +442,7 @@ class UserStatus(BaseDataModel):
             return False
 
         now = datetime.now(timezone.utc)
-        cycle_start = self.active_subscription.cycle_start_date
+        cycle_start = self.active_subscription.cycle_start_datetime
         update_frequency_hours = self.active_subscription.subscription_based_insight_credits_update_freq_h
 
         # Calculate when the next credit update should happen based on cycle start

ipulse_shared_core_ftredge/services/charging_processors.py

@@ -91,7 +91,7 @@ class ChargingProcessor:
 
             # Verify credit service is available
             if not self.user_charging_service:
-                self.logger.error("ChargingService not initialized.")
+                self.logger.error("UserChargingService not initialized.")
                 return {
                     'access_granted': False,
                     'charge_successful': False,
@@ -268,7 +268,7 @@ class ChargingProcessor:
 
         # Verify credit service is available
         if not self.user_charging_service:
-            self.logger.error("ChargingService not initialized for batch processing.")
+            self.logger.error("UserChargingService not initialized for batch processing.")
             return {
                 'accessible_items': free_items,
                 'charge_successful': False,

ipulse_shared_core_ftredge/services/user/user_subscription_operations.py

@@ -86,7 +86,7 @@ class UsersubscriptionOperations:
             plan_name=plan_name_enum,
             plan_version=plan.plan_version,
             plan_id=plan.id or f"{plan.plan_name}_{plan.plan_version}",
-            cycle_start_date=start_date,
+            cycle_start_datetime=start_date,
             cycle_end_datetime=end_date,
             validity_time_length=plan.plan_validity_cycle_length,
             validity_time_unit=plan.plan_validity_cycle_unit,

ipulse_shared_core_ftredge/services/user/userstatus_operations.py

@@ -361,7 +361,7 @@ class UserstatusOperations:
                     # Create new subscription with updated cycle start date
                     subscription_dict = subscription.model_dump()
                     subscription_dict.update({
-                        'cycle_start_date': new_cycle_start,
+                        'cycle_start_datetime': new_cycle_start,
                         'cycle_end_datetime': None,  # Let the model auto-calculate this
                         'updated_at': now,
                         'updated_by': f"UserstatusOperations.auto_renew:{updater_uid}"

ipulse_shared_core_ftredge/services/user_charging_service.py

@@ -37,7 +37,7 @@ class UserChargingService:
         self.timeout = firestore_timeout
 
         self.logger.info(
-            f"ChargingService initialized using UserStatus constants. Collection: {self.users_status_collection_name}, "
+            f"UserChargingService initialized using UserStatus constants. Collection: {self.users_status_collection_name}, "
             f"Doc Prefix: {self.userstatus_doc_prefix}, Timeout: {self.timeout}s"
         )
 

{ipulse_shared_core_ftredge-24.2.1.dist-info → ipulse_shared_core_ftredge-25.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 24.2.1
+Version: 25.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

{ipulse_shared_core_ftredge-24.2.1.dist-info → ipulse_shared_core_ftredge-25.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ipulse_shared_core_ftredge/__init__.py,sha256=-KbdF_YW8pgf7pVv9qh_cA1xrNm_B9zigHYDo7ZA4eU,42
 ipulse_shared_core_ftredge/cache/__init__.py,sha256=i2fPojmZiBwAoY5ovnnnME9USl4bi8MRPYkAgEfACfI,136
 ipulse_shared_core_ftredge/cache/shared_cache.py,sha256=BDJtkTsdfmVjKaUkbBXOhJ2Oib7Li0UCsPjWX7FLIPU,12940
-ipulse_shared_core_ftredge/dependencies/__init__.py,sha256=HGsR8HUguKTfjz_BorCILS4izX8CAjG-apE0kIPE0Yo,68
-ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py,sha256=S4A2oD1TyhBYGV13GjQbUFvW4d90NOHQ3foPetFiPcQ,3642
+ipulse_shared_core_ftredge/dependencies/__init__.py,sha256=0QEG_lQjtnxErpEDRHN8Q7Qz5dE8brzhFnmbIHVyoak,66
+ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py,sha256=3fHkjpcvywbWy_86iO_O1W75NiuTYMtP00LpA4ue-QU,3641
 ipulse_shared_core_ftredge/dependencies/auth_protected_router.py,sha256=em5D5tE7OkgZmuCtYCKuUAnIZCgRJhCF8Ye5QmtGWlk,1807
-ipulse_shared_core_ftredge/dependencies/authz_for_apis.py,sha256=t2hz1wAVxCT0lCDVf6gmcYeLuUCR7mIXYsThKg0cIlM,14992
+ipulse_shared_core_ftredge/dependencies/authz_for_apis.py,sha256=C424mYk2jtmkzC8su4uRJU_svI-vSRgX4j2DaYYNJx4,14962
 ipulse_shared_core_ftredge/dependencies/firestore_client.py,sha256=VbTb121nsc9EZPd1RDEsHBLW5pIiVw6Wdo2JFL4afMg,714
 ipulse_shared_core_ftredge/exceptions/__init__.py,sha256=Cb_RsIie4DbT_NLwFVwjw4riDKsNNRQEuAvHvYa-Zco,1038
 ipulse_shared_core_ftredge/exceptions/base_exceptions.py,sha256=117YsiCbYLLBu_D0IffYFVSX2yh-pisALMtoSMwj6xI,5338
@@ -17,15 +17,15 @@ ipulse_shared_core_ftredge/models/catalog/subscriptionplan.py,sha256=WxKWzTmHJlv
 ipulse_shared_core_ftredge/models/catalog/usertype.py,sha256=E_qQCq7ytiFca6umaX_-_a6TuDh83YwSKtFKdeU4ErM,6584
 ipulse_shared_core_ftredge/models/user/__init__.py,sha256=1BKuWCvTTy6C5_vPPc0K3obRdpadiOVBzkFvKwzJ2vQ,215
 ipulse_shared_core_ftredge/models/user/user_permissions.py,sha256=3dK4idfS7tsIXzN-c5plcg3qO5GPMtxzUoGCeBfzCis,2281
-ipulse_shared_core_ftredge/models/user/user_subscription.py,sha256=83ncQUHUYF6S19KdZM7-nLEVjD4VPIO88ZRVkXeNnE8,13514
+ipulse_shared_core_ftredge/models/user/user_subscription.py,sha256=66JYG-6a25nMTT9w25ZgOkB--MIOBDrqgp56If_9NSI,13546
 ipulse_shared_core_ftredge/models/user/userauth.py,sha256=GYtRxYsbxEh3eBink7qr_CjxWu5W46G3gUL9_2QLw6U,5724
 ipulse_shared_core_ftredge/models/user/userprofile.py,sha256=7VbE4qiKpDxZsNTk-IJKA32QxW0JOo8KWPkj8h9J2-Y,6945
-ipulse_shared_core_ftredge/models/user/userstatus.py,sha256=2e17SpcW9JXpQsbcgAJZJXlWYRKuqc4EKYowWKuMmGQ,18794
+ipulse_shared_core_ftredge/models/user/userstatus.py,sha256=w6eWKfzZ1RP6u9wMrucXUV6XZpNcS-z8zEl8JNUt-o8,18798
 ipulse_shared_core_ftredge/monitoring/__init__.py,sha256=gUoJjT0wj-cQYnMWheWbh1mmRHmaeojmnBZTj7KPNus,61
 ipulse_shared_core_ftredge/monitoring/tracemon.py,sha256=Trku0qrwWvEcvKsBWiYokd_G3fcH-5uP2wRVgcgIz_k,11596
 ipulse_shared_core_ftredge/services/__init__.py,sha256=9AkMLCHNswhuNbQuJZaEVz4zt4F84PxfJLyU_bYk4Js,565
-ipulse_shared_core_ftredge/services/charging_processors.py,sha256=9Re24dyXdjKYbqwx6uNLu3JBzIaw87TAV7Oe__M1QnA,16308
-ipulse_shared_core_ftredge/services/user_charging_service.py,sha256=C3wMfgBXOz4RM1RLc7up2_pIPAnZv8ZYu-lLrkofTmc,14625
+ipulse_shared_core_ftredge/services/charging_processors.py,sha256=fug6Hr5JbkhV3TXNyHrN0U3hOYmD1frCpSXVu6CynXQ,16316
+ipulse_shared_core_ftredge/services/user_charging_service.py,sha256=wlQDURVRWAv8g_StQ9Ybbn2G_OWw6gYD47yWWk9Bd9A,14629
 ipulse_shared_core_ftredge/services/base/__init__.py,sha256=zhyrHQMM0cLJr4spk2b6VsgJXuWBy7hUBzhrq_Seg9k,389
 ipulse_shared_core_ftredge/services/base/base_firestore_service.py,sha256=leZFwxb1ruheypqudpKnuNtRQXtO4KNeoJk6ZACozHc,19512
 ipulse_shared_core_ftredge/services/base/cache_aware_firestore_service.py,sha256=ya5Asff9BQodYnJVAw6M_Pm8WtVRPpEK7izFlZ2MyjA,10016
@@ -36,15 +36,15 @@ ipulse_shared_core_ftredge/services/user/__init__.py,sha256=jmkD5XzAmaD8QV2UsgB5
 ipulse_shared_core_ftredge/services/user/user_core_service.py,sha256=rJF4ZDk1ANz-gk7wEEXBbgjaqS4r1Vdo8yC00fQDytQ,28324
 ipulse_shared_core_ftredge/services/user/user_multistep_operations.py,sha256=UlSNs_8ORuESfsxHljIdcaD6H8DDEXSU0CzJAr99T5M,39765
 ipulse_shared_core_ftredge/services/user/user_permissions_operations.py,sha256=FByszIWo-qooLVXFTw0tGLWksIJEqHUPc_ZGwue0_pM,15753
-ipulse_shared_core_ftredge/services/user/user_subscription_operations.py,sha256=z98EO67wHlnDj1V7JK14yq6yaIoTVcX5X5v4-taZFHw,21651
+ipulse_shared_core_ftredge/services/user/user_subscription_operations.py,sha256=P-Sif2tXXC6ifKZCEpkOLXP4kf1-kKH0tfo13XcRIqk,21655
 ipulse_shared_core_ftredge/services/user/userauth_operations.py,sha256=QY_ueDei4EeXl_EZLlhN13PF6k_qsPjlnP0dnv2m7KI,36246
 ipulse_shared_core_ftredge/services/user/userprofile_operations.py,sha256=_qyIEAQYCTV-subgP-5naMs_26apCpauomE6qmCCVWs,7333
-ipulse_shared_core_ftredge/services/user/userstatus_operations.py,sha256=sW4Q-aMG1mjKvqVKK5AA93-G57FPBCkxO7rPfCkhBd8,22726
+ipulse_shared_core_ftredge/services/user/userstatus_operations.py,sha256=Om9d94cM4uOdTmCNXECU0hFtsUZ-o-OLMEiLAG74YUQ,22730
 ipulse_shared_core_ftredge/utils/__init__.py,sha256=JnxUb8I2MRjJC7rBPXSrpwBIQDEOku5O9JsiTi3oun8,56
 ipulse_shared_core_ftredge/utils/custom_json_encoder.py,sha256=DblQLD0KOSNDyQ58wQRogBrShIXzPIZUw_oGOBATnJY,1366
 ipulse_shared_core_ftredge/utils/json_encoder.py,sha256=QkcaFneVv3-q-s__Dz4OiUWYnM6jgHDJrDMdPv09RCA,2093
-ipulse_shared_core_ftredge-24.2.1.dist-info/licenses/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
-ipulse_shared_core_ftredge-24.2.1.dist-info/METADATA,sha256=s6gP3vKGPYEeqDsalsdncmzYcekSPxVHS9vVt7nCqSg,782
-ipulse_shared_core_ftredge-24.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ipulse_shared_core_ftredge-24.2.1.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
-ipulse_shared_core_ftredge-24.2.1.dist-info/RECORD,,
+ipulse_shared_core_ftredge-25.1.1.dist-info/licenses/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
+ipulse_shared_core_ftredge-25.1.1.dist-info/METADATA,sha256=RQwjz526aJVLHzF5_ggRv_8WK2cJfpzEVkIs71E7hpk,782
+ipulse_shared_core_ftredge-25.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ipulse_shared_core_ftredge-25.1.1.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
+ipulse_shared_core_ftredge-25.1.1.dist-info/RECORD,,