ipulse-shared-core-ftredge 5.1.1__py3-none-any.whl → 5.2.1__py3-none-any.whl

ipulse_shared_core_ftredge/models/organisation.py

@@ -13,7 +13,11 @@ import uuid
 import dateutil.parser
 from ipulse_shared_base_ftredge import (
     OrganizationRelation,
-    OrganizationIndustry
+    OrganizationIndustry,
+    Layer,
+    Module,
+    list_as_lower_strings,
+    Sector
 )
 
 class Organisation(BaseModel):
@@ -24,15 +28,27 @@ class Organisation(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid")
     
     # Class constants
-    VERSION: ClassVar[float] = 1.0
-    MODULE: ClassVar[str] = "core"
-    CLASS_REF: ClassVar[str] = "orgn"
+    VERSION: ClassVar[float] = 4.1
+    MODULE: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Sector.USERCORE.name))
+    OBJ_REF: ClassVar[str] = "orgprofile"
 
-    # Required fields
-    puid: str = Field(
-        default_factory=lambda: f"{datetime.utcnow().strftime('%Y%m%d%H%M%S')}_{uuid.uuid4().hex[:8]}_{Organisation.MODULE}{Organisation.CLASS_REF}".lower(),
-        description="Unique identifier for the organisation"
+    schema_version: float = Field(
+        default=VERSION,
+        description="Version of this Class == version of DB Schema",
+        frozen=True
     )
+    
+    org_uid: str = Field(
+        default_factory=lambda: uuid.uuid4().hex,
+        description="Unique identifier for the organisation",
+        frozen=True
+    )
+
+    id: str = Field(
+        default=None,
+        description="Organisation ID, format: {OBJ_REF}_{org_uid}"
+    )
+
     name: str = Field(..., min_length=1, max_length=100)
     relations: Set[OrganizationRelation] = Field(..., description="Organisation relations/types")
 
@@ -48,6 +64,15 @@ class Organisation(BaseModel):
     website: Optional[str] = Field(None, max_length=200)
     org_admin_user_uids: Optional[Set[str]] = None
 
+    @field_validator('id', mode='before')
+    @classmethod
+    def generate_id(cls, v: Optional[str], info) -> str:
+        values = info.data
+        org_uid = values.get('org_uid')
+        if not org_uid:
+            raise ValueError("org_uid must be set before generating id")
+        return f"{cls.OBJ_REF}_{org_uid}"
+
     @field_validator('relations')
     @classmethod
     def validate_relations(cls, v: Set[OrganizationRelation]) -> Set[OrganizationRelation]:

ipulse_shared_core_ftredge/models/subscription.py

@@ -2,20 +2,33 @@ from datetime import datetime, timezone
 from dateutil.relativedelta import relativedelta
 from typing import Set, Optional, Dict, List, ClassVar
 from pydantic import BaseModel, Field, ConfigDict
-from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings
+from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings, Sector, SubscriptionPlan
 # ORIGINAL AUTHOR ="Russlan Ramdowar;russlan@ftredge.com"
 # CLASS_ORGIN_DATE=datetime(2024, 2, 12, 20, 5)
 
 
-DEFAULT_SUBSCRIPTION_PLAN="subscription_free"
-DEFAULT_SUBSCRIPTION_STATUS="active"
+DEFAULT_SUBSCRIPTION_PLAN = SubscriptionPlan.FREE
+DEFAULT_SUBSCRIPTION_STATUS = "active"
 
 ############################################ !!!!! ALWAYS UPDATE SCHEMA VERSION , IF SCHEMA IS BEING MODIFIED !!! ############################################
 class Subscription(BaseModel):
     """
     Represents a single subscription cycle.
     """
-    plan_name: str = Field(
+
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
+    VERSION: ClassVar[float] = 1.1
+    DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Sector.LOOKUP.name))
+    
+    # System-managed fields (read-only)
+    schema_version: float = Field(
+        default=VERSION,
+        description="Version of this Class == version of DB Schema",
+        frozen=True
+    )
+
+    plan_name: SubscriptionPlan = Field(
         default=DEFAULT_SUBSCRIPTION_PLAN,
         description="Subscription Plan Name"
     )

ipulse_shared_core_ftredge/models/user_profile.py

@@ -1,7 +1,7 @@
 from datetime import datetime, date
 from typing import Set, Optional, ClassVar
 from pydantic import BaseModel, EmailStr, Field, ConfigDict
-from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings
+from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings, Sector
 
 # # Revision history (as model metadata)
 # CLASS_ORIGIN_AUTHOR: ClassVar[str] = "Russlan Ramdowar;russlan@ftredge.com"
@@ -14,8 +14,8 @@ class UserProfile(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid")
 
     # Metadata as class variables
-    VERSION: ClassVar[float] = 3.01
-    DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name))
+    VERSION: ClassVar[float] = 4.1
+    DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Sector.USERCORE.name))
     
     # System-managed fields (read-only)
     schema_version: float = Field(
@@ -23,6 +23,18 @@ class UserProfile(BaseModel):
         description="Version of this Class == version of DB Schema",
         frozen=True
     )
+    
+    id : str = Field(
+        ...,
+        description="User ID, propagated from Firebase Auth"
+    )
+
+    user_uid: str = Field(
+        ...,
+        description="User UID, propagated from Firebase Auth"
+    )
+
+
     email: EmailStr = Field(
         ...,
         description="Propagated from Firebase Auth",
@@ -30,8 +42,7 @@ class UserProfile(BaseModel):
     )
     organizations_uids: Set[str] = Field(
         default_factory=set,
-        description="Depends on Subscription Plan, Regularly Updated",
-        frozen=True
+        description="Depends on Subscription Plan, Regularly Updated"
     )
     
     # Timestamps and audit fields (read-only)
@@ -43,8 +54,7 @@ class UserProfile(BaseModel):
     # System identification (read-only)
     provider_id: str = Field(frozen=True)
     aliases: Optional[Set[str]] = Field(
-        default=None,
-        frozen=True
+        default=None
     )
     
     # User-editable fields
@@ -69,4 +79,10 @@ class UserProfile(BaseModel):
         default=None,
         pattern=r"^\+?[1-9]\d{1,14}$",  # Added 'r' prefix for raw string
         description="E.164 format phone number"
-    )
+    )
+
+    # Audit fields
+    creat_date: datetime = Field(default_factory=datetime.now)
+    creat_by_user: str = Field(frozen=True)
+    updt_date: datetime = Field(default_factory=datetime.now)
+    updt_by_user: str = Field(frozen=True)

ipulse_shared_core_ftredge/models/user_profile_update.py

@@ -2,6 +2,10 @@ from typing import Optional, Set, ClassVar
 from pydantic import BaseModel, Field, EmailStr, ConfigDict
 from datetime import date, datetime
 
+# CLASS_ORGIN_DATE: ClassVar[datetime] = datetime(2024, 3, 15, 20, 15)
+# CLASS_REVISION_DATE: ClassVar[datetime] = datetime(2024, 3, 15, 20, 15)
+
+
 class UserProfileUpdate(BaseModel):
     """
     User Profile Update model for partial updates of user information.
@@ -12,11 +16,9 @@ class UserProfileUpdate(BaseModel):
     # Metadata as class variables
     VERSION: ClassVar[float] = 2.01
     CLASS_ORIGIN_AUTHOR: ClassVar[str] = "Russlan Ramdowar;russlan@ftredge.com"
-    CLASS_ORGIN_DATE: ClassVar[datetime] = datetime(2024, 3, 15, 20, 15)
-    CLASS_REVISION_DATE: ClassVar[datetime] = datetime(2024, 3, 15, 20, 15)
+ 
 
     # System fields
-    schema_version: Optional[float] = Field(None, description="Version of this Class == version of DB Schema")
     email: Optional[EmailStr] = Field(None, description="Propagated from Firebase Auth")
     organizations_uids: Optional[Set[str]] = Field(None, description="Organization memberships")
     
@@ -37,6 +39,10 @@ class UserProfileUpdate(BaseModel):
     last_name: Optional[str] = Field(None, max_length=100)
     mobile: Optional[str] = Field(None, pattern=r"^\+?[1-9]\d{1,14}$")
 
+
+    
+
+
     def model_dump(self, **kwargs):
         kwargs.setdefault('exclude_none', True)
         return super().model_dump(**kwargs)

ipulse_shared_core_ftredge/models/user_status.py

@@ -1,16 +1,11 @@
-from datetime import datetime, timezone
-from dateutil.relativedelta import relativedelta
+from datetime import datetime
 from typing import Set, Optional, Dict, List, ClassVar
 from pydantic import BaseModel, Field, ConfigDict
 from .subscription import Subscription
-from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings
+from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings, Sector
 # ORIGINAL AUTHOR ="Russlan Ramdowar;russlan@ftredge.com"
 # CLASS_ORGIN_DATE=datetime(2024, 2, 12, 20, 5)
 
-DEFAULT_IAM_GROUPS={"pulseroot":["full_open_read"]}
-DEFAULT_SUBSCRIPTION_INSIGHT_CREDITS=10
-DEFAULT_EXTRA_INSIGHT_CREDITS=0
-
 ############################################ !!!!! ALWAYS UPDATE SCHEMA VERSION , IF SCHEMA IS BEING MODIFIED !!! ############################################
 class UserStatus(BaseModel):
     """
@@ -19,9 +14,9 @@ class UserStatus(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid")
 
     # Class constants
-    VERSION: ClassVar[float] = 2.3
-    DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name))
-    OBJ_REF: ClassVar[str] = "usrsttus"
+    VERSION: ClassVar[float] = 4.1
+    DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Sector.USERCORE.name))
+    OBJ_REF: ClassVar[str] = "userstatus"
     
     # Default values as class variables
     DEFAULT_IAM_GROUPS: ClassVar[Dict[str, List[str]]] = {"pulseroot": ["full_open_read"]}
@@ -30,12 +25,23 @@ class UserStatus(BaseModel):
     DEFAULT_SUBSCRIPTION_INSIGHT_CREDITS: ClassVar[int] = 10
     DEFAULT_EXTRA_INSIGHT_CREDITS: ClassVar[int] = 0
 
+
     # System-managed fields
     schema_version: float = Field(
         default=VERSION,
         description="Version of this Class == version of DB Schema"
     )
     
+    id : str = Field(
+        ...,
+        description="User ID, propagated from Firebase Auth"
+    )
+
+    user_uid: str = Field(
+        ...,
+        description="User UID, propagated from Firebase Auth"
+    )
+
     # IAM and subscription fields
     iam_groups: Dict[str, List[str]] = Field(
         default_factory=lambda: UserStatus.DEFAULT_IAM_GROUPS,
@@ -65,8 +71,8 @@ class UserStatus(BaseModel):
     # Optional fields
     payment_refs_uids: Optional[Set[str]] = None
     
-    # Audit fields
-    creat_date: datetime
-    creat_by_user: str
-    updt_date: datetime
-    updt_by_user: str
+        # Audit fields
+    creat_date: datetime = Field(default_factory=datetime.now)
+    creat_by_user: str = Field(frozen=True)
+    updt_date: datetime = Field(default_factory=datetime.now)
+    updt_by_user: str = Field(frozen=True)

{ipulse_shared_core_ftredge-5.1.1.dist-info → ipulse_shared_core_ftredge-5.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 5.1.1
+Version: 5.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

{ipulse_shared_core_ftredge-5.1.1.dist-info → ipulse_shared_core_ftredge-5.2.1.dist-info}/RECORD

@@ -6,18 +6,18 @@ ipulse_shared_core_ftredge/dependencies/database.py,sha256=I-5oXrtkcatBCZUxCyaHg
 ipulse_shared_core_ftredge/dependencies/token_validation.py,sha256=0j5bXdiJtaEcLvN5y39QJ0Te3h-nnn4bHh_sz3nbCwM,1909
 ipulse_shared_core_ftredge/models/__init__.py,sha256=fM9WUqC-UmmeAkZOBUz7BIJsmZHc3GsqcSDZKt2T97E,282
 ipulse_shared_core_ftredge/models/api_response.py,sha256=gtZAahaYfgKbk_6kEsnIoBjZkI6UBFwhvjusvbOSvfw,1057
-ipulse_shared_core_ftredge/models/organisation.py,sha256=Y0iX7EbcxsLuYnaizzPHsu5Ed5p4KNPhbsFZmeyWqr0,3565
+ipulse_shared_core_ftredge/models/organisation.py,sha256=3BBeZuOQQIpP8ZtYqNCsLHWqtV37U3PzF2lgiqMKjrU,4208
 ipulse_shared_core_ftredge/models/resource_catalog_item.py,sha256=mEGX8AftzrhEHqFVXjr62CuRnXC1vK4z3bHl_XBJodU,4964
-ipulse_shared_core_ftredge/models/subscription.py,sha256=i6jNEr7FYcniFY2EEBxztfkRNvBhY7aLiHI5eTH9FqI,1290
+ipulse_shared_core_ftredge/models/subscription.py,sha256=LfQa2iuYDJRoS-vICQEnbMtxKcDA7zUvnq5rvfCQTIk,1747
 ipulse_shared_core_ftredge/models/user_auth.py,sha256=YgCeK0uJ-JOkPavwzogl4wGC3RpA8PVfl-5MPS4Kxhk,432
-ipulse_shared_core_ftredge/models/user_profile.py,sha256=-Sk7Hl603Onni-B4kezlNNvNkhLYxBAxe2gtqhxW2xM,2311
-ipulse_shared_core_ftredge/models/user_profile_update.py,sha256=ac1vVROg01UjqiMkglMdtByClxDa2YUs3-3vlVOBY-Y,1754
-ipulse_shared_core_ftredge/models/user_status.py,sha256=KKmOZ-Rhs1XlYXmdCAXWaBa2Qseghyw8lJ1BcFSX9EM,2857
+ipulse_shared_core_ftredge/models/user_profile.py,sha256=O6EPC6H00Yk-_7jMOH2gLcUTNxbuABv36JOxM7psaY4,2748
+ipulse_shared_core_ftredge/models/user_profile_update.py,sha256=8xOAfHa7cpJRQAvnzAX9t77Fdde-nLdCB3ePUSoYLDY,1651
+ipulse_shared_core_ftredge/models/user_status.py,sha256=DiENlrYUYjNnXHrQjArn-S3M7VByFH64Y4RsQyIktkU,3040
 ipulse_shared_core_ftredge/services/__init__.py,sha256=lhmjDX__QbhDaz8sZAFIUwT4-76BZl2_LY3-MLxONE0,194
 ipulse_shared_core_ftredge/services/base_firestore_service.py,sha256=SHeYxBtM6bewgSxpyjlZ7JxjmW9xPv1qw42NpMsYN1s,2919
 ipulse_shared_core_ftredge/services/exceptions.py,sha256=OIHFxCc9cP_Ki05H8TsPIXbQM7PKEpyfbiTLZTsmx4Y,4216
-ipulse_shared_core_ftredge-5.1.1.dist-info/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
-ipulse_shared_core_ftredge-5.1.1.dist-info/METADATA,sha256=sWChZXnJ4mAnY6qW109VLiA9WTB4F0Z0xoc4khCNbOE,538
-ipulse_shared_core_ftredge-5.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ipulse_shared_core_ftredge-5.1.1.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
-ipulse_shared_core_ftredge-5.1.1.dist-info/RECORD,,
+ipulse_shared_core_ftredge-5.2.1.dist-info/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
+ipulse_shared_core_ftredge-5.2.1.dist-info/METADATA,sha256=-iXHOnhkb0sVtu4ogynIzTOU0t7ic8OsuEmUJihC4kg,538
+ipulse_shared_core_ftredge-5.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ipulse_shared_core_ftredge-5.2.1.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
+ipulse_shared_core_ftredge-5.2.1.dist-info/RECORD,,