ipulse-shared-core-ftredge 23.1.1__tar.gz → 24.2.1__tar.gz

{ipulse_shared_core_ftredge-23.1.1/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-24.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 23.1.1
+Version: 24.2.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
@@ -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==10.2.1
+Requires-Dist: ipulse_shared_base_ftredge==11.1.1
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='23.1.1',
+    version='24.2.1',
     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==10.2.1',
+        'ipulse_shared_base_ftredge==11.1.1',
     ],
     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-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/dependencies/auth_firebase_token_validation.py

@@ -72,7 +72,7 @@ async def verify_firebase_token(
             email=email,
             password=None,  # No password for token-based auth
             display_name=decoded_token.get('name'),
-            firebase_uid=decoded_token.get('uid'),
+            user_uid=decoded_token.get('uid'),
             email_verified=decoded_token.get('email_verified', False),
             custom_claims=decoded_token.get('custom_claims', {}),
             phone_number=decoded_token.get('phone_number'),

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/models/__init__.py

@@ -1,4 +1,4 @@
 from .base_data_model import BaseDataModel
 from .base_api_response import BaseAPIResponse , CustomJSONResponse, CreditChargeableAPIResponse, UserCreditBalance, UpdatedUserCreditInfo
-from .user import UserProfile, UserSubscription, UserStatus, UserAuth, UserPermission
+from .user import UserProfile, UserSubscription, UserStatus, UserAuth, UserAuthCreateNew, UserPermission
 from .catalog import SubscriptionPlan, ProrationMethod, PlanUpgradePath, UserType

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/models/user/__init__.py

@@ -2,4 +2,4 @@ from .userprofile import UserProfile
 from .user_subscription import UserSubscription
 from .user_permissions import UserPermission
 from .userstatus import UserStatus
-from .userauth import UserAuth
+from .userauth import UserAuth, UserAuthCreateNew

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/models/user/user_permissions.py

@@ -28,9 +28,9 @@ class UserPermission(BaseModel):
         ...,
         description="Source of this assignment (e.g., subscription plan ID, 'manual_grant')"
     )
-    expires_at: Optional[datetime] = Field(
-        default=None,
-        description="When this assignment expires (None for permanent)"
+    expires_at: datetime = Field(
+        ...,
+        description="When this assignment expires (mandatory - no permanent permissions)"
     )
     granted_at: datetime = Field(
         default_factory=lambda: datetime.now(timezone.utc),
@@ -47,9 +47,6 @@ class UserPermission(BaseModel):
 
     def is_valid(self) -> bool:
         """Check if the permission is currently valid (not expired)."""
-        if self.expires_at is None:
-            return True
-
         # Ensure both datetimes are timezone-aware for comparison
         current_time = datetime.now(timezone.utc)
         expires_time = self.expires_at
@@ -62,5 +59,4 @@ class UserPermission(BaseModel):
 
     def __str__(self) -> str:
         """Human-readable representation of the permission."""
-        expiry = f" (expires: {self.expires_at})" if self.expires_at else " (permanent)"
-        return f"{self.domain}/{self.iam_unit_type}/{self.permission_ref} from {self.source}{expiry}"
+        return f"{self.domain}/{self.iam_unit_type}/{self.permission_ref} from {self.source} (expires: {self.expires_at})"

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/models/user/userauth.py

@@ -2,17 +2,60 @@ from typing import Optional, Dict, Any, List
 from datetime import datetime
 from pydantic import BaseModel, Field, EmailStr, ConfigDict, field_validator, model_validator
 
+class UserAuthCreateNew(BaseModel):
+    """Model for creating new Firebase Auth users - does not include user_uid"""
+    model_config = ConfigDict(extra="forbid")
+
+    # Core authentication fields for new user creation
+    email: EmailStr = Field(..., description="User's email address")
+    password: str = Field(..., min_length=6, description="User's password (min 6 characters)")
+    display_name: Optional[str] = Field(None, description="User's display name")
+    phone_number: Optional[str] = Field(None, description="Phone number in E.164 format (e.g. +1234567890)")
+    email_verified: bool = Field(default=False, description="Whether the email is already verified")
+    disabled: bool = Field(default=False, description="Whether the user should be disabled on creation")
+
+    # Custom claims for new user
+    custom_claims: Dict[str, Any] = Field(default_factory=dict, description="Firebase custom claims")
+
+    @field_validator('phone_number')
+    @classmethod
+    def validate_phone_number(cls, v: Optional[str]) -> Optional[str]:
+        """Validate phone number format if provided"""
+        if v is None:
+            return v
+        # Basic E.164 format validation
+        if not v.startswith('+') or not v[1:].isdigit() or len(v) < 8 or len(v) > 16:
+            raise ValueError('Phone number must be in E.164 format (+1234567890)')
+        return v
+
+    @field_validator('custom_claims')
+    @classmethod
+    def validate_custom_claims(cls, v: Dict[str, Any]) -> Dict[str, Any]:
+        """Validate custom claims don't contain reserved Firebase claims"""
+        reserved_claims = {
+            'iss', 'aud', 'auth_time', 'user_id', 'sub', 'iat', 'exp', 'email',
+            'email_verified', 'phone_number', 'name', 'picture', 'firebase'
+        }
+
+        for claim in v.keys():
+            if claim in reserved_claims:
+                raise ValueError(f'Custom claim "{claim}" is reserved by Firebase')
+
+        return v
+
 class UserAuth(BaseModel):
-    """Comprehensive authentication model for user credentials and auth operations"""
+    """Comprehensive authentication model for existing user credentials and auth operations"""
     model_config = ConfigDict(extra="forbid")
 
+    # Firebase UID - required for existing users (generated by Firebase when user was created)
+    user_uid: str = Field(..., description="Firebase Auth UID - required for existing users")
+
     # Core authentication fields
     email: EmailStr = Field(..., description="User's email address")
     display_name: Optional[str] = Field(None, description="User's display name")
-    password: Optional[str] = Field(None, min_length=6, description="User's password (for creation/update only)")
+    password: Optional[str] = Field(None, min_length=6, description="User's password (for updates only)")
 
     # Firebase Auth specific fields
-    firebase_uid: Optional[str] = Field(default=None, description="Firebase Auth UID")
     provider_id: str = Field(default="password", description="Authentication provider ID")
     email_verified: bool = Field(default=False, description="Whether email is verified")
     disabled: bool = Field(default=False, description="Whether user account is disabled")

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/models/user/userstatus.py

@@ -187,7 +187,7 @@ class UserStatus(BaseDataModel):
         iam_unit_type: IAMUnit,
         permission_ref: str,
         source: str,
-        expires_at: Optional[datetime] = None,
+        expires_at: datetime,
         granted_by: Optional[str] = None,
         metadata: Optional[Dict[str, Any]] = None
     ) -> None:
@@ -199,7 +199,7 @@ class UserStatus(BaseDataModel):
             iam_unit_type: Type of IAM assignment (GROUP, ROLE, etc.)
             permission_ref: The name/identifier of the permission to add
             source: Source identifier for this assignment (e.g., subscription ID)
-            expires_at: Optional expiration date
+            expires_at: Expiration date (mandatory - no permanent permissions)
             granted_by: Who granted this permission
             metadata: Optional metadata for the assignment
         """
@@ -329,7 +329,7 @@ class UserStatus(BaseDataModel):
                 iam_unit_type=permission.iam_unit_type,
                 permission_ref=permission.permission_ref,
                 source=source,
-                expires_at=subscription.cycle_end_datetime,
+                expires_at=subscription.cycle_end_datetime_safe,
                 granted_by=granted_by
             )
             added_count += 1

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/services/user/user_core_service.py

@@ -18,7 +18,7 @@ from datetime import datetime
 from google.cloud import firestore
 from firebase_admin.auth import UserRecord
 from ipulse_shared_base_ftredge import ApprovalStatus, IAMUnit, IAMUserType
-from ...models import UserProfile, UserStatus, UserAuth, UserSubscription, UserType, SubscriptionPlan, UserPermission
+from ...models import UserProfile, UserStatus, UserAuth, UserAuthCreateNew, UserSubscription, UserType, SubscriptionPlan, UserPermission
 
 
 # Import specialized operation classes
@@ -132,7 +132,7 @@ class UserCoreService:
         self,
         userprofile: UserProfile,
         userstatus: UserStatus,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         validate_userauth_consistency: bool = False,
         validate_userauth_exists: bool = False
     ) -> Tuple[str, UserProfile, UserStatus]:
@@ -153,7 +153,7 @@ class UserCoreService:
         self,
         userprofile: UserProfile,
         usertype: UserType,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         extra_insight_credits_override: Optional[int] = None,
         voting_credits_override: Optional[int] = None,
         subscriptionplan_id_override: Optional[str] = None,
@@ -184,7 +184,7 @@ class UserCoreService:
         self,
         usertype_id: str,
         userprofile: UserProfile,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         extra_insight_credits_override: Optional[int] = None,
         voting_credits_override: Optional[int] = None,
         subscriptionplan_id_override: Optional[str] = None,
@@ -294,7 +294,7 @@ class UserCoreService:
     ######################### UserAuth Operations ########################
     ######################################################################
 
-    async def create_userauth(self, userauth: UserAuth) -> str:
+    async def create_userauth(self, userauth: UserAuthCreateNew) -> str:
         """Create a Firebase Auth user"""
         return await self.userauth_ops.create_userauth(user_auth=userauth)
 

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/services/user/user_multistep_operations.py

@@ -8,7 +8,7 @@ import asyncio
 import logging
 from typing import Dict, Any, Optional, List, Tuple, cast
 from ipulse_shared_base_ftredge.enums import IAMUserType
-from ...models import UserProfile, UserStatus, UserAuth, UserType
+from ...models import UserProfile, UserStatus, UserAuth, UserAuthCreateNew, UserType
 from .userauth_operations import UserauthOperations
 from .userprofile_operations import UserprofileOperations
 from .userstatus_operations import UserstatusOperations
@@ -130,12 +130,12 @@ class UsermultistepOperations:
         self,
         userprofile: UserProfile,
         userstatus: UserStatus,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         validate_userauth_consistency: bool = False,
         validate_userauth_exists: bool = False
     ) -> Tuple[str, UserProfile, UserStatus]:
         """
-        Create a complete user from ready UserAuth, UserProfile, and UserStatus models.
+        Create a complete user from ready UserAuthCreateNew, UserProfile, and UserStatus models.
 
         This method efficiently commits pre-configured models to database.
 
@@ -151,7 +151,7 @@ class UsermultistepOperations:
         Args:
             userprofile: Complete UserProfile model (template for new user, or ready for existing user)
             userstatus: Complete UserStatus model (template for new user, or ready for existing user)
-            userauth: Optional UserAuth model. If provided, creates new Firebase Auth user
+            userauth: Optional UserAuthCreateNew model. If provided, creates new Firebase Auth user
             validate_userauth_consistency: If True, validates userauth is consistent with userprofile
             validate_userauth_exists: If True, validates userauth exists in Firebase Auth
 
@@ -242,7 +242,7 @@ class UsermultistepOperations:
         self,
         userprofile: UserProfile,
         usertype: UserType,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         extra_insight_credits_override: Optional[int] = None,
         voting_credits_override: Optional[int] = None,
         subscriptionplan_id_override: Optional[str] = None,
@@ -344,7 +344,7 @@ class UsermultistepOperations:
         self,
         usertype_id: str,
         userprofile: UserProfile,
-        userauth: Optional[UserAuth] = None,
+        userauth: Optional[UserAuthCreateNew] = None,
         extra_insight_credits_override: Optional[int] = None,
         voting_credits_override: Optional[int] = None,
         subscriptionplan_id_override: Optional[str] = None,
@@ -647,7 +647,7 @@ class UsermultistepOperations:
                 validation_results["validation_errors"].append("User email is not verified")
 
             # 3. UID consistency validation
-            auth_uid = getattr(userauth_record, 'uid', None) or getattr(userauth_record, 'firebase_uid', None)
+            auth_uid = getattr(userauth_record, 'uid', None) or getattr(userauth_record, 'user_uid', None)
             uids_consistent = (
                 auth_uid == user_uid and
                 userprofile.user_uid == user_uid and

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/src/ipulse_shared_core_ftredge/services/user/userauth_operations.py

@@ -9,7 +9,7 @@ from typing import Dict, Any, Optional, Union
 from firebase_admin import auth
 from google.cloud import firestore
 from ipulse_shared_base_ftredge.enums import ApprovalStatus
-from ...models import UserAuth
+from ...models import UserAuth, UserAuthCreateNew
 from ...exceptions import UserAuthError
 from ..base import BaseFirestoreService
 
@@ -48,9 +48,14 @@ class UserauthOperations:
 
     async def create_userauth(
         self,
-        user_auth: UserAuth
+        user_auth: UserAuthCreateNew
     ) -> str:
-        """Creates a new Firebase Auth user and returns the UID."""
+        """
+        Creates a new Firebase Auth user and returns the UID.
+
+        Args:
+            user_auth: UserAuthCreateNew model for new user creation
+        """
         self.logger.info(f"Creating Firebase Auth user for email: {user_auth.email}")
         try:
             # Create user synchronously
@@ -191,7 +196,7 @@ class UserauthOperations:
         userauth_data = {
             "email": user_record.email,
             "display_name": user_record.display_name,
-            "firebase_uid": user_record.uid,
+            "user_uid": user_record.uid,
             "email_verified": user_record.email_verified,
             "disabled": user_record.disabled,
             "phone_number": user_record.phone_number,

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 23.1.1
+Version: 24.2.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
@@ -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==10.2.1
+Requires-Dist: ipulse_shared_base_ftredge==11.1.1
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-23.1.1 → ipulse_shared_core_ftredge-24.2.1}/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==10.2.1
+ipulse_shared_base_ftredge==11.1.1