ipulse-shared-core-ftredge 2.5__py3-none-any.whl → 2.6.1__py3-none-any.whl

ipulse_shared_core_ftredge/models/organisation.py

@@ -1,65 +1,71 @@
-from pydantic import BaseModel, validator, ValidationError, Field
-from typing import Set, Optional
-import uuid
-from datetime import datetime
-from . import pulse_enums as enums
-import dateutil.parser
+# pylint: disable=missing-module-docstring
+# pylint: disable=missing-function-docstring
+# pylint: disable=missing-class-docstring
+# pylint: disable=broad-exception-caught
+# pylint: disable=line-too-long
+# pylint: disable=unused-variable
+# pylint: disable=broad-exception-caught
+# from pydantic import BaseModel, validator, ValidationError, Field
+# from typing import Set, Optional
+# import uuid
+# from datetime import datetime
+# import dateutil.parser
 
-CLASS_VERSION= 1.0
-MODULE= "core"
-CLASS_REF="orgn"
+# CLASS_VERSION= 1.0
+# MODULE= "core"
+# CLASS_REF="orgn"
 
 
-class Organisation(BaseModel):
-    puid: str = Field(default_factory=lambda: f"{datetime.utcnow().strftime('%Y%m%d%H%M')}{uuid.uuid4().hex[:8]}_{MODULE}{CLASS_REF}".lower())
-    name: str
-    creat_date: datetime = Field(default_factory=lambda:datetime.utcnow()) 
-    updt_date: datetime = Field(default_factory=lambda:datetime.utcnow())
-    creat_by_user: Optional[str] = None  
-    updt_by_user: Optional[str] = None 
-    relations: Optional[Set[str]]=None
-    description: Optional[str] = None  # Updated to use Optional
-    industries: Optional[Set[str]] = None  # Updated to use Optional
-    website: Optional[str] = None  # Updated to use Optional
-    org_admin_user_uids: Optional[Set[str]] = None  # Updated to use Optional
-    class Config:
-            extra = "forbid"
+# class Organisation(BaseModel):
+#     puid: str = Field(default_factory=f"{datetime.utcnow().strftime('%Y%m%d%H%M')}{uuid.uuid4().hex[:8]}_{MODULE}{CLASS_REF}".lower())
+#     name: str
+#     creat_date: datetime = Field(default_factory=datetime.utcnow()) 
+#     updt_date: datetime = Field(default_factory=datetime.utcnow())
+#     creat_by_user: Optional[str] = None 
+#     updt_by_user: Optional[str] = None
+#     relations: Optional[Set[str]]=None
+#     description: Optional[str] = None  # Updated to use Optional
+#     industries: Optional[Set[str]] = None  # Updated to use Optional
+#     website: Optional[str] = None  # Updated to use Optional
+#     org_admin_user_uids: Optional[Set[str]] = None  # Updated to use Optional
+#     class Config:
+#             extra = "forbid"
 
 
-    @validator('relations', pre=True, always=True)
-    def validate_relations(cls, relations):
-        if not set(relations).issubset(enums.organisation_relations):
-            raise ValueError("Invalid relation values provided.")
-        return relations
+    # @validator('relations', pre=True, always=True)
+    # def validate_relations(cls, relations):
+    #     if not set(relations).issubset(enums.organisation_relations):
+    #         raise ValueError("Invalid relation values provided.")
+    #     return relations
 
    
-    @validator('industries', pre=True, always=True)
-    def validate_industries(cls, industries):
-        if industries is not None and not set(industries).issubset(enums.organisation_industries):
-            raise ValueError("Invalid industry values provided.")
-        return industries
+    # @validator('industries', pre=True, always=True)
+    # def validate_industries(cls, industries):
+    #     if industries is not None and not set(industries).issubset(enums.organisation_industries):
+    #         raise ValueError("Invalid industry values provided.")
+    #     return industries
     
-    @validator('creat_date', 'updt_date', pre=True)
-    def parse_date(cls, value):
-        if value is None:
-            return value
-        if isinstance(value, datetime):
-            return value
-        try:
-            # Assuming Firestore returns an ISO 8601 string, adjust if necessary
-            print("Putting Updt or Creat date in a valid format in a Validator when creating Organisation object")
-            return dateutil.parser.isoparse(value)
-        except (TypeError, ValueError):
-            raise ValidationError(f"Invalid datetime format inside Organisation: {value}")
+    # @validator('creat_date', 'updt_date', pre=True)
+    # def parse_date(cls, value):
+    #     if value is None:
+    #         return value
+    #     if isinstance(value, datetime):
+    #         return value
+    #     try:
+    #         # Assuming Firestore returns an ISO 8601 string, adjust if necessary
+    #         print("Putting Updt or Creat date in a valid format in a Validator when creating Organisation object")
+    #         return dateutil.parser.isoparse(value)
+    #     except (TypeError, ValueError):
+    #         raise ValidationError(f"Invalid datetime format inside Organisation: {value}")
 
 
-    ### Description, Industries, and Website are optional for Retail Customer and mandatory for Non Retail Customer
-    @validator('description', 'industries', 'website', pre=True, always=True)
-    def validate_optional_fields(cls, value, values):
-        if values.get('name') == 'Retail Customer' and values.get('relations') == {"retail_customer"} or  values.get('relations') == ["retail_customer"]:
-            if value is not None:
-                raise ValueError("For 'Retail Customer' with only 'retail_customer' relations, description, industries, and website should not be provided.")
-        else:
-            if value is None:
-                raise ValueError("For Non Retail Customer, description, industries, and website are mandatory.")
-        return value
+    # ### Description, Industries, and Website are optional for Retail Customer and mandatory for Non Retail Customer
+    # @validator('description', 'industries', 'website', pre=True, always=True)
+    # def validate_optional_fields(cls, value, values):
+    #     if values.get('name') == 'Retail Customer' and values.get('relations') == {"retail_customer"} or  values.get('relations') == ["retail_customer"]:
+    #         if value is not None:
+    #             raise ValueError("For 'Retail Customer' with only 'retail_customer' relations, description, industries, and website should not be provided.")
+    #     else:
+    #         if value is None:
+    #             raise ValueError("For Non Retail Customer, description, industries, and website are mandatory.")
+    #     return value

ipulse_shared_core_ftredge/models/resource_catalog_item.py

@@ -1,189 +1,115 @@
-import uuid
-from datetime import datetime
-from pydantic import BaseModel, validator, ValidationError
-from typing import Dict, Any, Set, Optional
-from . import pulse_enums as enums
+# import uuid
+# from datetime import datetime
+# from pydantic import BaseModel, validator, ValidationError
+# from typing import Dict, Any, Set, Optional
 
-import dateutil.parser
+# import dateutil.parser
 
-CLASS_VERSION = 1.0
-CLASS_REF = "resdes"
-MODULE = "core"
+# CLASS_VERSION = 1.0
+# CLASS_REF = "resdes"
+# MODULE = "core"
 
-        # metadata = {
-        #     "resr_puid_or_name":"Users",
-        #     "resr_path":"firestore/Users",
-        #     "resr_name":"Users",
-        #     "resr_pulse_module":MODULE,
-        #     "resr_type":"firestore_collection",
-        #     "resr_classifications":{ "auth_required_confidential"},
-        #     "resr_contents":{"user_core_profile"},
-        #     "resr_original_or_processed":"original_source",
-        #     "resr_origin":"internal",
-        #     "resr_origin_organisations_uids":{"20231220futureedgegroup_coreorgn"},
-        # }
+# class ResourceCatalogItem(BaseModel):
 
-# Annotated[str, {"resr_classification":"auth_required_restricted",
-#                                 "resr_readable_by": ["owner", "selected_by_admin"],
-#                                 "resr_updatable_by": ["admin"],
-#                                 "resr_original_or_processed" : "original_source",
-#                                 "resr_origin":"internal",
-#                                 "resr_origin_organisation_uids":["20231220futureedgegroup_coreorgn"], 
-#                                 "resr_origin_description":"Original User field",
-#                                 "resr_creat_date":datetime(2023, 12, 23),
-#                                 "resr_creat_by_user":"Russlan Ramdowar;russlan@ftredge.com",
-#                                 "metadata_updt_date":datetime(2023, 12, 23), 
-#                                 "metadata_updt_by_user":"Russlan Ramdowar;russlan@ftredge.com"}] 
-
-#  metadata={"resr_classification":"auth_required_restricted",
-#                                 "resr_readable_by": ["owner", "selected_by_admin"],
-#                                 "resr_updatable_by": [],
-#                                 "resr_original_or_processed" : "original_source",
-#                                 "resr_origin":"internal",
-#                                 "resr_origin_organisation_uids":["20231220futureedgegroup_coreorgn"], 
-#                                 "resr_origin_description":"Original User field",
-#                                 "resr_creat_date":datetime(2023, 12, 23),
-#                                 "resr_creat_by_user":"Russlan Ramdowar;russlan@ftredge.com",
-#                                 "metadata_updt_date":datetime(2023, 12, 23), 
-#                                 "metadata_updt_by_user":"Russlan Ramdowar;russlan@ftredge.com"}
-
-#   metadata={"resr_classification":"auth_required_restricted",
-#                                 "resr_readable_by": ["owner", "selected_by_admin"],
-#                                 "resr_updatable_by": ["owner","admin"],
-#                                 "resr_original_or_processed" : "original_source",
-#                                 "resr_origin":"internal",
-#                                 "resr_origin_organisation_uids":["20231220futureedgegroup_coreorgn"], 
-#                                 "resr_origin_description":"Original User field",
-#                                 "resr_creat_date":datetime(2023, 12, 23),
-#                                 "resr_creat_by_user":"Russlan Ramdowar;russlan@ftredge.com",
-#                                 "metadata_updt_date":datetime(2023, 12, 23), 
-#                                 "metadata_updt_by_user":"Russlan Ramdowar;russlan@ftredge.com"}
-  
-#     metadata={"resr_classification":"auth_required_confidential",
-#                                 "resr_readable_by": ["owner", "selected_by_admin"],
-#                                 "resr_updatable_by": ["admin"],
-#                                 "resr_original_or_processed" : "original_source",
-#                                 "resr_origin":"internal",
-#                                 "resr_origin_organisation_uids":["20231220futureedgegroup_coreorgn"], 
-#                                 "resr_origin_description":"Original User field",
-#                                 "resr_creat_date":datetime(2023, 12, 23),
-#                                 "resr_creat_by_user":"Russlan Ramdowar",
-#                                 "metadata_updt_date":datetime(2023, 12, 23), 
-#                                 "metadata_updt_by_user":"Russlan Ramdowar"}
-    
-#      metadata={"resr_classification":"auth_required_confidential",
-#                                 "resr_readable_by": ["owner", "selected_by_admin"],
-#                                 "resr_updatable_by": ["selected_by_admin"],
-#                                 "resr_original_or_processed" : "original_source",
-#                                 "resr_origin":"internal",
-#                                 "resr_origin_organisation_uids":["20231220futureedgegroup_coreorgn"], 
-#                                 "resr_origin_description":"Original User field",
-#                                 "resr_creat_date":datetime(2023, 12, 23),
-#                                 "resr_creat_by_user":"Russlan Ramdowar",
-#                                 "metadata_updt_date":datetime(2023, 12, 23), 
-#                                 "metadata_updt_by_user":"Russlan Ramdowar"}
-
-class ResourceCatalogItem(BaseModel):
-
-    resr_puid_or_name: str #Ex: username
-    resr_path: str #Ex: ipulse-401013/cloud/firesotre/Users/{user_uid}/username
-    resr_name: str #Ex: username
-    resr_pulse_module: str  #Ex: core 
-    resr_type: str
-    resr_classifications: Set[str] 
-    resr_contents:Set[str]
-    resr_original_or_processed: str
-    resr_origin: str
-    resr_origin_organisations_uids: Set[str]
-    resr_origin_description: str
-    resr_licences_types: Set[str]
-    resr_description_details: str 
-    resr_updtbl_by_non_staff: bool
-    resr_creat_by_user_uid: str
-    resr_creat_date: datetime
-    class_version:float = CLASS_VERSION
-    resr_columns_count: int
-    resr_columns: Optional[Dict[Any, Any]] = None #OPTIONAL
-    resr_structure_version: Optional[str]=None # OPTIONAL
-    resr_structure_updt_date: Optional[str]=None #OPTIONAL
-    resr_structure_updt_by_user_uid: Optional[str]=None # OPTIONAL
-    resr_tags: Optional[Dict[Any, Any]] = None #OPTIONAL
-    resr_content_updt_date: Optional[str]=None #OPTIONAL
-    resr_content_updt_by_user_uid: Optional[str]=None # OPTIONAL
-    puid: Optional[str] = None #TO BE SETUP BY Validator
-    metadata_version: Optional[float] = None #TO BE SETUP BY  Validator
-    metadata_creat_date: Optional[datetime] = None #TO BE SETUP BY Management Service
-    metadata_creat_by: Optional[str] = None #TO BE SETUP BY Management Service
-    metadata_updt_date: Optional[datetime] = None #TO BE SETUP BY Management Service
-    metadata_updt_by: Optional[str] = None #TO BE SETUP BY Management Service
+#     resr_puid_or_name: str #Ex: username
+#     resr_path: str #Ex: ipulse-401013/cloud/firesotre/Users/{user_uid}/username
+#     resr_name: str #Ex: username
+#     resr_pulse_module: str  #Ex: core 
+#     resr_type: str
+#     resr_classifications: Set[str] 
+#     resr_contents:Set[str]
+#     resr_original_or_processed: str
+#     resr_origin: str
+#     resr_origin_organisations_uids: Set[str]
+#     resr_origin_description: str
+#     resr_licences_types: Set[str]
+#     resr_description_details: str 
+#     resr_updtbl_by_non_staff: bool
+#     resr_creat_by_user_uid: str
+#     resr_creat_date: datetime
+#     class_version:float = CLASS_VERSION
+#     resr_columns_count: int
+#     resr_columns: Optional[Dict[Any, Any]] = None #OPTIONAL
+#     resr_structure_version: Optional[str]=None # OPTIONAL
+#     resr_structure_updt_date: Optional[str]=None #OPTIONAL
+#     resr_structure_updt_by_user_uid: Optional[str]=None # OPTIONAL
+#     resr_tags: Optional[Dict[Any, Any]] = None #OPTIONAL
+#     resr_content_updt_date: Optional[str]=None #OPTIONAL
+#     resr_content_updt_by_user_uid: Optional[str]=None # OPTIONAL
+#     puid: Optional[str] = None #TO BE SETUP BY Validator
+#     metadata_version: Optional[float] = None #TO BE SETUP BY  Validator
+#     metadata_creat_date: Optional[datetime] = None #TO BE SETUP BY Management Service
+#     metadata_creat_by: Optional[str] = None #TO BE SETUP BY Management Service
+#     metadata_updt_date: Optional[datetime] = None #TO BE SETUP BY Management Service
+#     metadata_updt_by: Optional[str] = None #TO BE SETUP BY Management Service
      
-    @validator('puid', pre=True, always=True)
-    def set_puid(cls, puid, values):
-        if puid is None:
-            return f"{datetime.utcnow().strftime('%Y%m%d%H%M')}{uuid.uuid4().hex[:8]}_{MODULE}{CLASS_REF}".lower()
-        return puid
+    # @validator('puid', pre=True, always=True)
+    # def set_puid(cls, puid, values):
+    #     if puid is None:
+    #         return f"{datetime.utcnow().strftime('%Y%m%d%H%M')}{uuid.uuid4().hex[:8]}_{MODULE}{CLASS_REF}".lower()
+    #     return puid
     
-    @validator('metadata_version', pre=True, always=True)
-    def set_metadata_version(cls, metadata_version, values):
-        if metadata_version is None:
-            return 1.0
-        else: 
-            return metadata_version + 0.1
+    # @validator('metadata_version', pre=True, always=True)
+    # def set_metadata_version(cls, metadata_version, values):
+    #     if metadata_version is None:
+    #         return 1.0
+    #     else: 
+    #         return metadata_version + 0.1
 
 
-    @validator('resr_pulse_module', pre=True, always=True)
-    def validate_resr_pulse_module(cls, resr_pulse_modules):
-        if resr_pulse_modules not in enums.pulse_modules:
-            raise ValueError("Invalid pulse_modules values provided.")
-        return resr_pulse_modules
+    # @validator('resr_pulse_module', pre=True, always=True)
+    # def validate_resr_pulse_module(cls, resr_pulse_modules):
+    #     if resr_pulse_modules not in enums.pulse_modules:
+    #         raise ValueError("Invalid pulse_modules values provided.")
+    #     return resr_pulse_modules
     
-    @validator('resr_type', pre=True, always=True)
-    def validate_resr_type(cls, resr_type):
-        if  resr_type not in enums.resource_types:
-            raise ValueError("Invalid resource_types value provided.")
-        return resr_type
+    # @validator('resr_type', pre=True, always=True)
+    # def validate_resr_type(cls, resr_type):
+    #     if  resr_type not in enums.resource_types:
+    #         raise ValueError("Invalid resource_types value provided.")
+    #     return resr_type
     
-    @validator('resr_classifications', pre=True, always=True)
-    def validate_resr_classifications(cls, resr_classifications):
-        if not resr_classifications.issubset(enums.resource_classifications):
-            raise ValueError("Invalid resr_classifications values provided.")
-        return resr_classifications
+    # @validator('resr_classifications', pre=True, always=True)
+    # def validate_resr_classifications(cls, resr_classifications):
+    #     if not resr_classifications.issubset(enums.resource_classifications):
+    #         raise ValueError("Invalid resr_classifications values provided.")
+    #     return resr_classifications
 
-    @validator('resr_contents', pre=True, always=True)
-    def validate_resr_contents(cls, resr_contents):
-        if not resr_contents.issubset(enums.resource_contents):
-            raise ValueError("Invalid resr_contents values provided.")
-        return resr_contents
+    # @validator('resr_contents', pre=True, always=True)
+    # def validate_resr_contents(cls, resr_contents):
+    #     if not resr_contents.issubset(enums.resource_contents):
+    #         raise ValueError("Invalid resr_contents values provided.")
+    #     return resr_contents
 
-    @validator('resr_original_or_processed', pre=True, always=True)
-    def validate_resr_original_or_processed(cls, resr_original_or_processed):
-        if  resr_original_or_processed not in enums.resource_original_or_processed:
-            raise ValueError("Invalid resr_original_or_processed value provided.")
-        return resr_original_or_processed
+    # @validator('resr_original_or_processed', pre=True, always=True)
+    # def validate_resr_original_or_processed(cls, resr_original_or_processed):
+    #     if  resr_original_or_processed not in enums.resource_original_or_processed:
+    #         raise ValueError("Invalid resr_original_or_processed value provided.")
+    #     return resr_original_or_processed
     
-    @validator('resr_origin', pre=True, always=True)
-    def validate_resr_origin(cls, resr_origin):
-        if  resr_origin not in enums.resource_origins:
-            raise ValueError("Invalid resource_origins value provided.")
-        return resr_origin
+    # @validator('resr_origin', pre=True, always=True)
+    # def validate_resr_origin(cls, resr_origin):
+    #     if  resr_origin not in enums.resource_origins:
+    #         raise ValueError("Invalid resource_origins value provided.")
+    #     return resr_origin
        
 
-    @validator('metadata_creat_date', 'metadata_updt_date', pre=True)
-    def parse_date(cls, value):
-        if value is None:
-            return value
-        if isinstance(value, datetime):
-            return value
-        try:
-            # Assuming Firestore returns an ISO 8601 string, adjust if necessary
-            return dateutil.parser.isoparse(value)
-        except (TypeError, ValueError):
-            raise ValidationError(f"Invalid datetime format inside Resource Description: {value}")
+    # @validator('metadata_creat_date', 'metadata_updt_date', pre=True)
+    # def parse_date(cls, value):
+    #     if value is None:
+    #         return value
+    #     if isinstance(value, datetime):
+    #         return value
+    #     try:
+    #         # Assuming Firestore returns an ISO 8601 string, adjust if necessary
+    #         return dateutil.parser.isoparse(value)
+    #     except (TypeError, ValueError):
+    #         raise ValidationError(f"Invalid datetime format inside Resource Description: {value}")
 
 
     
-    @validator('metadata_updt_date', 'metadata_updt_date', pre=True, always=True)
-    def set_default_updt_date(cls, date, values):
-        if date is None:
-            return datetime.utcnow().isoformat()
-        return date
+    # @validator('metadata_updt_date', 'metadata_updt_date', pre=True, always=True)
+    # def set_default_updt_date(cls, date, values):
+    #     if date is None:
+    #         return datetime.utcnow().isoformat()
+    #     return date

ipulse_shared_core_ftredge/models/user_profile.py

@@ -11,6 +11,8 @@ CLASS_ORGIN_DATE=datetime(2024, 1, 16, 20, 5)
 CLASS_VERSION = 3.01
 CLASS_REVISION_AUTHOR="Russlan Ramdowar;russlan@ftredge.com"
 CLASS_REVISION_DATE=datetime(2024, 2, 13, 20, 15)
+LAST_MODIFICATION="Fixed typo"
+
 
 DOMAIN="user"
 OBJ_REF = "usprfl"
@@ -24,17 +26,16 @@ class UserProfile(BaseModel):
     email: EmailStr =  Field(frozen=True, description="Propagated from Firebase Auth" ) #User can Read only
     organizations_uids: Set[str] = Field( description="Depends on Subscription Plan, Regularly Updated") #User can Read only  
     creat_date: datetime #User can Read only
+    creat_by_user: str #User can Read only
+    updt_date: datetime #User can Read only
+    updt_by_user: str #User can Read only
+    aliases: Optional[Set[str]] = None #User can Read only
+    provider_id: str   #User can Read only
     
     username: Optional[str] = None #User can Read and Edit
-    dob: Optional[date] = None #User can Read and Edit 
-    first_name: Optional[str] = None #User can Read and Edit 
-    last_name: Optional[str] = None #User can Read and Edit 
+    dob: Optional[date] = None #User can Read and Edit
+    first_name: Optional[str] = None #User can Read and Edit
+    last_name: Optional[str] = None #User can Read and Edit
     mobile: Optional[str] = None #User can Read and Edit
-    
-    creat_by_user: str #User shouldn't see this or edit this
-    updt_date: datetime #User shouldn't see this or edit this
-    updt_by_user: str #User shouldn't see this or edit this
-    aliases: Optional[Set[str]] = None #User shouldn't see this or edit this
-    provider_id: str   #User shouldn't see this or edit this
     class Config:
         extra = "forbid"

ipulse_shared_core_ftredge/models/user_profile_update.py

@@ -1,18 +1,36 @@
-
 from typing import Optional, Set
-from pydantic import BaseModel
-from datetime import datetime , date
+from pydantic import BaseModel, Field, EmailStr
+from datetime import date, datetime
+
+
+CLASS_ORIGIN_AUTHOR="Russlan Ramdowar;russlan@ftredge.com"
+CLASS_ORGIN_DATE=datetime(2024, 3, 15, 20, 15)
+
+CLASS_VERSION = 2.01
+CLASS_REVISION_AUTHOR="Russlan Ramdowar;russlan@ftredge.com"
+CLASS_REVISION_DATE=datetime(2024, 3, 15, 20, 15)
+LAST_MODIFICATION="Created , with all fields Optional"
 
 class UserProfileUpdate(BaseModel):
-    email:  Optional[str] = None
-    username: Optional[str] = None
-    aliases: Optional[Set[str]] = None
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    mobile: Optional[str] = None
-    dob: Optional[date] = None 
-    updt_date: Optional[datetime] = None 
-    updt_by_user: Optional[str] = None
+    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="Depends on Subscription Plan, Regularly Updated")
+    creat_date: Optional[datetime] = Field(None, description="Creation date")
+    creat_by_user: Optional[str] = Field(None, description="Created by user")
+    updt_date: Optional[datetime] = Field(None, description="Update date")
+    updt_by_user: Optional[str] = Field(None, description="Updated by user")
+    aliases: Optional[Set[str]] = Field(None, description="User aliases")
+    provider_id: Optional[str] = Field(None, description="Provider ID")
+
+    username: Optional[str] = Field(None, description="Username")
+    dob: Optional[date] = Field(None, description="Date of Birth")
+    first_name: Optional[str] = Field(None, description="First Name")
+    last_name: Optional[str] = Field(None, description="Last Name")
+    mobile: Optional[str] = Field(None, description="Mobile Number")
     
-    def model_dump(self, **kwargs):
-            return super().model_dump(exclude_none=True, **kwargs)
+    # def model_dump(self, **kwargs):
+    #         return super().model_dump(exclude_none=True, **kwargs)
+        
+        
+        
+        

ipulse_shared_core_ftredge/models/user_status.py

@@ -1,36 +1,46 @@
 from pydantic import BaseModel, Field
+
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from typing import Set, Optional
-# import uuid
-from . import pulse_enums as enums
+from typing import Set, Optional, Dict, List
+
+
 
 
 CLASS_ORIGIN_AUTHOR="Russlan Ramdowar;russlan@ftredge.com"
 CLASS_ORGIN_DATE=datetime(2024, 2, 12, 20, 5)
 
-CLASS_VERSION = 2.1
+SCHEMA_VERSION = 2.3
 CLASS_REVISION_AUTHOR="Russlan Ramdowar;russlan@ftredge.com"
 CLASS_REVISION_DATE=datetime(2024, 2, 13, 20, 15)
+LAST_MODIFICATION="Changed default IAM_GROUPS"
 
 DOMAIN="user"
 OBJ_REF = "usrsttus"
+
+DEFAULT_IAM_GROUPS={"pulseroot":["full_open_read"]}
+DEFAULT_SUBSCRIPTION_PLAN="subscription_free"
+DEFAULT_SUBSCRIPTION_STATUS="active"
+DEFAULT_SUBSCRIPTION_INSIGHT_CREDITS=10
+DEFAULT_EXTRA_INSIGHT_CREDITS=0
+
+############################################ !!!!! ALWAYS UPDATE SCHEMA VERSION , IF SCHEMA IS BEING MODIFIED !!! ############################################
 class UserStatus(BaseModel):
-    schema_version: float = Field(default=CLASS_VERSION, description="Version of this Class == version of DB Schema") #User can Read only
+    schema_version: float = Field(default=SCHEMA_VERSION, description="Version of this Class == version of DB Schema") #User can Read only
     # uid: str = Field(frozen=True, description="Generated by Firebase Auth") #User can Read only
     # puid:str = Field(default_factory=lambda: f"{DOMAIN}{OBJ_REF}{datetime.utcnow().strftime('%Y%m%d%H%M')}{uuid.uuid4().hex[:8]}".lower(),
     #                   frozen=True, 
     #                   description="Generated Automatically by default_factory") #User can Read only
     
-    iam_groups: Set[str] = Field(default_factory=lambda:{"pulseroot__authuser_open"}, description="User's Groups, with a default one for all authenticated Pulse users") #User can Read only
-    sbscrptn_plan: str=Field(default_factory=lambda:"subscription_free", description="Subscription Plan ") #User can Read only
-    sbscrptn_status: str=Field(default_factory=lambda:"active", description="Subscription Status") #User can Read only
+    iam_groups: Dict[str, List[str]] = Field(default_factory=lambda:DEFAULT_IAM_GROUPS, description="User's Groups, with a default one for all authenticated Pulse users") #User can Read only
+    sbscrptn_plan: str=Field(default_factory=lambda:DEFAULT_SUBSCRIPTION_PLAN, description="Subscription Plan ") #User can Read only
+    sbscrptn_status: str=Field(default_factory=lambda:DEFAULT_SUBSCRIPTION_STATUS, description="Subscription Status") #User can Read only
     sbscrptn_start_date: datetime=Field(default_factory=lambda:datetime.utcnow(), description="Subscription Start Date") #User can Read only
     sbscrptn_end_date: datetime=Field(default_factory=lambda:datetime.utcnow()+relativedelta(years=1) , description="Subscription End Date") #User can Read only
-    sbscrptn_insight_credits: int= Field(default_factory=lambda:7, description="Depends on Subscription Plan, Set Amount udated at Regular Intervals or at Regular Time") #User can Read only
+    sbscrptn_insight_credits: int= Field(default_factory=lambda:DEFAULT_SUBSCRIPTION_INSIGHT_CREDITS, description="Depends on Subscription Plan, Set Amount udated at Regular Intervals or at Regular Time") #User can Read only
     sbscrptn_ins_crdts_updtd_since_datetime: datetime=Field(default_factory=lambda:datetime.utcnow(), description="Subscription Start Date") #User can Read only #User can Read only #User can Read only
-    extra_insigth_credits: int= Field(default_factory=lambda:0, description="If user purchased extra Insigth Credits they shouldn't Expire") #User can Read only
-    payment_ref_uids: Optional[Set[str]] = None #User can Read only
+    extra_insight_credits: int= Field(default_factory=lambda:DEFAULT_EXTRA_INSIGHT_CREDITS, description="If user purchased extra Insigth Credits they shouldn't Expire") #User can Read only
+    payment_refs_uids: Optional[Set[str]] = None #User can Read only
     
     creat_date: datetime #User can Read only
     creat_by_user: str #User can Read only / Ideally shouldn't be able to see even

ipulse_shared_core_ftredge/utils/__init__.py

@@ -0,0 +1,19 @@
+# pylint: disable=missing-module-docstring
+from .utils_common import (save_json_locally_extended)
+from .utils_collector_pipelinemon import ( Pipelinemon)
+
+from .utils_cloud_gcp import (setup_gcp_logging,
+                              create_bigquery_schema_from_json,
+                              read_csv_from_gcs, read_json_from_gcs,
+                                write_csv_to_gcs,write_json_to_gcs_extended)
+
+from .utils_cloud_gcp_with_collectors import (write_json_to_gcs_with_pipelinemon_extended )
+
+from .utils_cloud import (write_json_to_cloud_storage_extended,
+                          read_json_from_cloud_storage)
+from .utils_cloud_with_collectors import (write_json_to_cloud_storage_with_pipelinemon_extended)
+
+
+from .utils_templates_and_schemas import (check_format_against_schema_template)
+
+from .logs import (ContextLog, get_logger)

ipulse_shared_core_ftredge/utils/logs/__init__.py

@@ -0,0 +1,2 @@
+from .context_log import ContextLog
+from .get_logger import get_logger

ipulse_shared_core_ftredge/{models → utils/logs}/audit_log_firestore.py

@@ -9,4 +9,4 @@ class AuditLogFirestore(BaseModel):
     field_name: str
     old_value: str
     new_value: str
-    timestamp: datetime.utcnow()
+    timestamp: datetime