ipulse-shared-core-ftredge 8.1.1__tar.gz → 10.1.1__tar.gz

{ipulse_shared_core_ftredge-8.1.1/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-10.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 8.1.1
+Version: 10.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
@@ -13,7 +13,7 @@ Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
 Requires-Dist: pytest
-Requires-Dist: ipulse_shared_base_ftredge>=5.7.1
+Requires-Dist: ipulse_shared_base_ftredge>=6.4.1
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='8.1.1',
+    version='10.1.1',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[
@@ -12,7 +12,7 @@ setup(
         'python-dateutil~=2.8',
         'fastapi~=0.115.8',
         'pytest',
-        'ipulse_shared_base_ftredge>=5.7.1',
+        'ipulse_shared_base_ftredge>=6.4.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-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge/models/base_api_response.py

@@ -3,10 +3,7 @@ import datetime as dt
 import json
 from pydantic import BaseModel, ConfigDict
 from fastapi.responses import JSONResponse
-from ipulse_shared_core_ftredge.utils  import CustomJSONEncoder
-
-
-
+from ipulse_shared_core_ftredge.utils import CustomJSONEncoder
 
 
 T = TypeVar('T')
@@ -30,6 +27,17 @@ class PaginatedAPIResponse(BaseAPIResponse, Generic[T]):
 
 class CustomJSONResponse(JSONResponse):
     def render(self, content) -> bytes:
+        # Handle Pydantic models to exclude computed fields
+        if isinstance(content, dict) and "data" in content and hasattr(content["data"], "model_dump"):
+            # If content["data"] is a Pydantic model, use model_dump with exclude_unset=True
+            # and exclude_computed=True to prevent serialization of computed fields
+            content = dict(content)  # Create a copy to avoid modifying the original
+            content["data"] = content["data"].model_dump(
+                exclude_unset=True,
+                exclude_computed=True
+            )
+
+        # Use the CustomJSONEncoder for serialization
         return json.dumps(
             content,
             ensure_ascii=False,

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge/models/subscription.py

@@ -2,7 +2,7 @@ from datetime import datetime, timezone
 from dateutil.relativedelta import relativedelta
 import uuid
 from typing import Set, Optional, ClassVar, Dict, Any, List, Union
-from pydantic import Field, ConfigDict, computed_field
+from pydantic import Field, ConfigDict
 from ipulse_shared_base_ftredge import Layer, Module, list_as_lower_strings, Subject, SubscriptionPlan, SubscriptionStatus
 from ipulse_shared_base_ftredge.enums.enums_iam import IAMUnitType
 from .base_data_model import BaseDataModel
@@ -21,7 +21,7 @@ class Subscription(BaseDataModel):
 
     model_config = ConfigDict(frozen=True, extra="forbid")
 
-    VERSION: ClassVar[float] = 2.9  # Incremented version for new fields
+    VERSION: ClassVar[float] = 3.0  # Incremented version for direct fields instead of computed
     DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Subject.SUBSCRIPTION.name))
     OBJ_REF: ClassVar[str] = "subscription"
 
@@ -49,14 +49,11 @@ class Subscription(BaseDataModel):
         description="Version of the subscription plan"
     )
 
-    @computed_field
-    def plan_id(self) -> str:
-        """
-        Generate a plan identifier combining plan name and version.
-        Format: {plan_name}_{plan_version}
-        Example: "free_subscription_1"
-        """
-        return f"{self.plan_name.value}_{self.plan_version}"
+    # Direct field instead of computed
+    plan_id: str = Field(
+        ...,  # Required field, no default
+        description="Combined plan identifier (plan_name_plan_version)"
+    )
 
     # Cycle duration fields
     cycle_start_date: datetime = Field(
@@ -64,7 +61,13 @@ class Subscription(BaseDataModel):
         description="Subscription Cycle Start Date"
     )
 
-    # New fields for more flexible cycle management
+    # Direct field instead of computed
+    cycle_end_date: datetime = Field(
+        ...,  # Required field, no default
+        description="Subscription Cycle End Date"
+    )
+
+    # Fields for cycle calculation
     validity_time_length: int = Field(
         ...,  # Required field, no default
         description="Length of subscription validity period (e.g., 1, 3, 12)"
@@ -75,23 +78,6 @@ class Subscription(BaseDataModel):
         description="Unit of subscription validity ('minute', 'hour', 'day', 'week', 'month', 'year')"
     )
 
-    # Computed cycle_end_date based on start date and validity
-    @computed_field
-    def cycle_end_date(self) -> datetime:
-        """Calculate the end date based on start date and validity period."""
-        if self.validity_time_unit == "minute":
-            return self.cycle_start_date + relativedelta(minutes=self.validity_time_length)
-        elif self.validity_time_unit == "hour":
-            return self.cycle_start_date + relativedelta(hours=self.validity_time_length)
-        elif self.validity_time_unit == "day":
-            return self.cycle_start_date + relativedelta(days=self.validity_time_length)
-        elif self.validity_time_unit == "week":
-            return self.cycle_start_date + relativedelta(weeks=self.validity_time_length)
-        elif self.validity_time_unit == "year":
-            return self.cycle_start_date + relativedelta(years=self.validity_time_length)
-        else:  # Default to months
-            return self.cycle_start_date + relativedelta(months=self.validity_time_length)
-
     # Renewal and status fields
     auto_renew: bool = Field(
         ...,  # Required field, no default
@@ -103,9 +89,8 @@ class Subscription(BaseDataModel):
         description="Subscription Status (active, trial, pending_confirmation, etc.)"
     )
 
-    # New fields for enhanced subscription management
-    # Update the type definition to use string keys for IAMUnitType
-    iam_domain_permissions: Dict[str, Dict[str, List[str]]] = Field(
+    # IAM permissions structure
+    default_iam_domain_permissions: Dict[str, Dict[str, List[str]]] = Field(
         ...,  # Required field, no default
         description="IAM domain permissions granted by this subscription (domain -> IAM unit type -> list of unit references)"
     )
@@ -125,7 +110,7 @@ class Subscription(BaseDataModel):
         description="Reference to payment transaction"
     )
 
-    # New fields moved from metadata to direct attributes
+    # Credit management fields
     subscription_based_insight_credits_per_update: int = Field(
         default=0,
         description="Number of insight credits to add on each update"
@@ -157,6 +142,23 @@ class Subscription(BaseDataModel):
         description="Additional metadata for the subscription"
     )
 
+    # Helper method to calculate cycle end date
+    @classmethod
+    def calculate_cycle_end_date(cls, start_date: datetime, validity_length: int, validity_unit: str) -> datetime:
+        """Calculate the end date based on start date and validity period."""
+        if validity_unit == "minute":
+            return start_date + relativedelta(minutes=validity_length)
+        elif validity_unit == "hour":
+            return start_date + relativedelta(hours=validity_length)
+        elif validity_unit == "day":
+            return start_date + relativedelta(days=validity_length)
+        elif validity_unit == "week":
+            return start_date + relativedelta(weeks=validity_length)
+        elif validity_unit == "year":
+            return start_date + relativedelta(years=validity_length)
+        else:  # Default to months
+            return start_date + relativedelta(months=validity_length)
+
     # Methods for subscription management
     def is_active(self) -> bool:
         """Check if the subscription is currently active."""
@@ -176,4 +178,13 @@ class Subscription(BaseDataModel):
         now = datetime.now(timezone.utc)
         if now > self.cycle_end_date:
             return 0
-        return (self.cycle_end_date - now).days
+
+        # Get time difference
+        time_diff = self.cycle_end_date - now
+
+        # If there's any time remaining but less than a day, return 1
+        if time_diff.days == 0 and time_diff.seconds > 0:
+            return 1
+
+        # Otherwise return the number of complete days
+        return time_diff.days

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge/models/user_profile.py

@@ -16,7 +16,7 @@ class UserProfile(BaseDataModel):
     model_config = ConfigDict(frozen=False, extra="forbid")  # Allow field modification
 
     # Class constants
-    VERSION: ClassVar[float] = 5.0  # Incremented version for primary_user_type addition
+    VERSION: ClassVar[float] = 5.0  # Incremented version for primary_usertype addition
     DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Subject.USER.name))
     OBJ_REF: ClassVar[str] = "userprofile"
 
@@ -36,14 +36,14 @@ class UserProfile(BaseDataModel):
         description="User UID from Firebase Auth"
     )
 
-    # Added primary_user_type field for main role categorization
-    primary_user_type: str = Field(
+    # Added primary_usertype field for main role categorization
+    primary_usertype: str = Field(
         ...,
         description="Primary user type (e.g., customer, internal, admin, superadmin)"
     )
 
-    # Renamed user_types to secondary_user_types
-    secondary_user_types: List[str] = Field(
+    # Renamed user_types to secondary_usertypes
+    secondary_usertypes: List[str] = Field(
         default_factory=list,
         description="List of secondary user types"
     )

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge/models/user_status.py

@@ -47,7 +47,7 @@ class UserStatus(BaseDataModel):
     model_config = ConfigDict(frozen=False, extra="forbid")
 
     # Class constants
-    VERSION: ClassVar[float] = 5.0  # Incremented version for primary_user_type addition
+    VERSION: ClassVar[float] = 5.1  # Incremented version for removing computed fields
     DOMAIN: ClassVar[str] = "_".join(list_as_lower_strings(Layer.PULSE_APP, Module.CORE.name, Subject.USER.name))
     OBJ_REF: ClassVar[str] = "userstatus"
 
@@ -68,14 +68,14 @@ class UserStatus(BaseDataModel):
         description="User UID from Firebase Auth"
     )
 
-    # Added primary_user_type field for main role categorization
-    primary_user_type: str = Field(
+    # Added primary_usertype field for main role categorization
+    primary_usertype: str = Field(
         ...,
         description="Primary user type (e.g., customer, internal, admin, superadmin)"
     )
 
-    # Renamed user_types to secondary_user_types
-    secondary_user_types: List[str] = Field(
+    # Renamed user_types to secondary_usertypes
+    secondary_usertypes: List[str] = Field(
         default_factory=list,
         description="List of secondary user types/roles"
     )
@@ -321,7 +321,7 @@ class UserStatus(BaseDataModel):
         """
         added_count = 0
 
-        for domain, permissions_by_type in subscription.iam_domain_permissions.items():
+        for domain, permissions_by_type in subscription.default_iam_domain_permissions.items():
             for iam_unit_type_str, iam_unit_refs in permissions_by_type.items():
                 # Convert string to enum if needed for internal processing
                 try:
@@ -353,14 +353,14 @@ class UserStatus(BaseDataModel):
         """
         return self.update_iam_unit_refs_from_subscription(subscription)
 
-    @computed_field
+    # Method instead of computed field
     def is_subscription_active(self) -> bool:
         """Check if the user has an active subscription."""
         if self.active_subscription:
             return self.active_subscription.is_active()
         return False
 
-    @computed_field
+    # Method instead of computed field
     def subscription_expires_in_days(self) -> Optional[int]:
         """Get days until subscription expiration."""
         if self.active_subscription and self.active_subscription.is_active():
@@ -464,21 +464,31 @@ class UserStatus(BaseDataModel):
         if plan_version is None or validity_time_length is None or validity_time_unit is None:
             return
 
-        # Create temporary subscription object with direct attributes instead of metadata
+        # Calculate directly assigned fields
+        plan_id = f"{plan_name_str}_{plan_version}"
+        cycle_start_date = datetime.now(timezone.utc)
+        cycle_end_date = Subscription.calculate_cycle_end_date(
+            cycle_start_date,
+            validity_time_length,
+            validity_time_unit
+        )
+
+        # Create subscription object with direct fields instead of computed
         subscription = Subscription(
             plan_name=plan_name,
             plan_version=plan_version,
-            cycle_start_date=datetime.now(timezone.utc),
+            plan_id=plan_id,
+            cycle_start_date=cycle_start_date,
+            cycle_end_date=cycle_end_date,
             validity_time_length=validity_time_length,
             validity_time_unit=validity_time_unit,
-            auto_renew=plan_data.get("plan_auto_renewal", False),  # Default only for boolean fields
+            auto_renew=plan_data.get("plan_auto_renewal", False),
             status=SubscriptionStatus.ACTIVE,
-            iam_domain_permissions=iam_domain_permissions,
+            default_iam_domain_permissions=iam_domain_permissions,
             fallback_plan_id=plan_data.get("fallback_plan_id_if_current_plan_expired"),
             price_paid_usd=plan_data.get("plan_per_cycle_price_usd") or 0.0,
             created_by=source,
             updated_by=source,
-            # Direct attributes for credit-related fields
             subscription_based_insight_credits_per_update=plan_data.get("subscription_based_insight_credits_per_update") or 0,
             subscription_based_insight_credits_update_freq_h=plan_data.get("subscription_based_insight_credits_update_freq_h") or 24,
             extra_insight_credits_per_cycle=plan_data.get("extra_insight_credits_per_cycle") or 0,
@@ -491,14 +501,14 @@ class UserStatus(BaseDataModel):
 
     @staticmethod
     def fetch_user_status_defaults(firestore_client,
-                                   primary_user_type: str,
+                                   primary_usertype: str,
                                    collection: str = "papp_core_configs_user") -> Dict[str, Any]:
         """
         Fetch user status defaults from Firestore.
 
         Args:
             firestore_client: Initialized Firestore client
-            primary_user_type: Primary type of user (customer, internal, admin, etc)
+            primary_usertype: Primary type of user (customer, internal, admin, etc)
             collection: Collection name for user status defaults
 
         Returns:
@@ -521,7 +531,7 @@ class UserStatus(BaseDataModel):
 
             # Look for defaults with format "{user_type}_defaults_{version}"
             for key in data.keys():
-                if key.startswith(f"{primary_user_type}_defaults_"):
+                if key.startswith(f"{primary_usertype}_defaults_"):
                     try:
                         version = int(key.split("_")[-1])
                         if version > latest_version:

ipulse_shared_core_ftredge-10.1.1/src/ipulse_shared_core_ftredge/utils/custom_json_encoder.py

@@ -0,0 +1,46 @@
+import json
+import datetime
+from typing import Any
+from enum import Enum
+from uuid import UUID
+from decimal import Decimal
+from pydantic import BaseModel
+
+class CustomJSONEncoder(json.JSONEncoder):
+    """Custom JSON encoder to handle special types like datetimes, UUIDs, and Pydantic models."""
+
+    def default(self, obj: Any) -> Any:
+        # Handle datetime objects
+        if isinstance(obj, datetime.datetime):
+            return obj.isoformat()
+
+        # Handle date objects
+        elif isinstance(obj, datetime.date):
+            return obj.isoformat()
+
+        # Handle time objects
+        elif isinstance(obj, datetime.time):
+            return obj.isoformat()
+
+        # Handle UUID objects
+        elif isinstance(obj, UUID):
+            return str(obj)
+
+        # Handle Decimal objects
+        elif isinstance(obj, Decimal):
+            return float(obj)
+
+        # Handle Enum objects
+        elif isinstance(obj, Enum):
+            return obj.value
+
+        # Handle Pydantic models - exclude computed fields
+        elif isinstance(obj, BaseModel):
+            return obj.model_dump(exclude_computed=True)
+
+        # Handle sets by converting to sorted lists for consistent output
+        elif isinstance(obj, set):
+            return sorted(list(obj))
+
+        # For everything else, use the default encoder
+        return super().default(obj)

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipulse_shared_core_ftredge
-Version: 8.1.1
+Version: 10.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
@@ -13,7 +13,7 @@ Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
 Requires-Dist: fastapi~=0.115.8
 Requires-Dist: pytest
-Requires-Dist: ipulse_shared_base_ftredge>=5.7.1
+Requires-Dist: ipulse_shared_base_ftredge>=6.4.1
 Dynamic: author
 Dynamic: classifier
 Dynamic: home-page

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt

@@ -28,4 +28,5 @@ src/ipulse_shared_core_ftredge/services/base_service_exceptions.py
 src/ipulse_shared_core_ftredge/services/fastapiservicemon.py
 src/ipulse_shared_core_ftredge/services/servicemon.py
 src/ipulse_shared_core_ftredge/utils/__init__.py
+src/ipulse_shared_core_ftredge/utils/custom_json_encoder.py
 src/ipulse_shared_core_ftredge/utils/json_encoder.py

{ipulse_shared_core_ftredge-8.1.1 → ipulse_shared_core_ftredge-10.1.1}/src/ipulse_shared_core_ftredge.egg-info/requires.txt

@@ -2,4 +2,4 @@ pydantic[email]~=2.5
 python-dateutil~=2.8
 fastapi~=0.115.8
 pytest
-ipulse_shared_base_ftredge>=5.7.1
+ipulse_shared_base_ftredge>=6.4.1