ipulse-shared-core-ftredge 6.3.1__tar.gz → 6.6.1__tar.gz

{ipulse_shared_core_ftredge-6.3.1/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-6.6.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.3.1
+Version: 6.6.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
 License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
+Requires-Dist: fastapi~=0.115.8
 Requires-Dist: pytest~=7.1
 Requires-Dist: ipulse_shared_base_ftredge>=5.2.1
 Dynamic: author

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/setup.py

@@ -3,13 +3,14 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='6.3.1',
+    version='6.6.1',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[
         # List your dependencies here
         'pydantic[email]~=2.5',
         'python-dateutil~=2.8',
+        'fastapi~=0.115.8',
         'pytest~=7.1',
         'ipulse_shared_base_ftredge>=5.2.1',
     ],

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge/__init__.py

@@ -6,4 +6,4 @@ from .models import ( UserAuth, UserProfile,Subscription,
 
 
 from .services import (BaseFirestoreService,BaseServiceException, ResourceNotFoundError, AuthorizationError,
-                            ValidationError)
+                            ValidationError)

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge/dependencies/auth_router.py

@@ -10,12 +10,12 @@ def create_protected_router(
 ) -> APIRouter:
     """
     Creates an APIRouter with authentication enabled by default.
-    
+
     Args:
         prefix: Router prefix
         tags: OpenAPI tags
         public_paths: List of paths that should be public (no auth required)
-        
+
     Example:
         router = create_protected_router(
             prefix="/api/v1",
@@ -25,10 +25,10 @@ def create_protected_router(
     """
     public_paths = public_paths or []
     router = APIRouter(prefix=prefix, tags=tags)
-    
+
     # Store the original route registration method
     original_add_api_route = router.add_api_route
-    
+
     def add_api_route_with_auth(
         path: str,
         endpoint: Callable,
@@ -40,10 +40,10 @@ def create_protected_router(
         if path not in public_paths:
             dependencies = dependencies or []
             # Fix: Check if verify_firebase_token is already in dependencies
-            if not any(getattr(dep.dependency, '__name__', None) == 'verify_firebase_token' 
+            if not any(getattr(dep.dependency, '__name__', None) == 'verify_firebase_token'
                       for dep in dependencies):
                 dependencies.append(Depends(verify_firebase_token))
-        
+
         return original_add_api_route(
             path,
             endpoint,
@@ -51,8 +51,8 @@ def create_protected_router(
             dependencies=dependencies,
             **kwargs
         )
-    
+
     # Replace the route registration method with our custom one
     router.add_api_route = add_api_route_with_auth  # type: ignore
-    
+
     return router

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge/models/base_api_response.py

@@ -2,7 +2,7 @@ from typing import Generic, TypeVar, Optional, Any, Dict, List
 from pydantic import BaseModel, ConfigDict
 import datetime as dt
 from fastapi.responses import JSONResponse
-from ipulse_shared_core_ftredge.utils.json_encoder import CustomJSONEncoder
+from ipulse_shared_core_ftredge.utils  import CustomJSONEncoder
 import json
 
 

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge/models/base_data_model.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import ClassVar, Optional
+from typing import ClassVar
 from pydantic import BaseModel, Field, ConfigDict, field_validator
 import dateutil.parser
 

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge/services/fastapiservicemon.py

@@ -41,7 +41,7 @@ class FastAPIServiceMon(Servicemon):
                     return await call_next(request)
 
                 # Initialize ServiceMon
-                svcmon = Servicemon(
+                servicemon = Servicemon(
                     logger=logger,
                     base_context=f"API: {path}\nMethod: {method}",
                     service_name=f"API_{method}_{path.replace('/', '_')}"
@@ -50,11 +50,11 @@ class FastAPIServiceMon(Servicemon):
                 # Start monitoring
                 client_ip = request.client.host if request.client else "unknown"
                 user_agent = request.headers.get("user-agent", "unknown")
-                svcmon.start(f"API Request {method} {path}")
+                servicemon.start(f"API Request {method} {path}")
 
 
                 # Add request info
-                svcmon.log(
+                servicemon.log(
                     level=LogLevel.INFO,
                     description=f"Request received for {method} {path}. Client IP: {client_ip}. User Agent: {user_agent}",
                     resource=DataResource.API_INTERNAL,
@@ -65,7 +65,7 @@ class FastAPIServiceMon(Servicemon):
                 # Process the request and catch any errors
                 try:
                     # Store ServiceMon in request state for handlers to access
-                    request.state.svcmon = svcmon
+                    request.state.svcmon = servicemon
 
                     # Process request
                     start_time = time.time()
@@ -86,7 +86,7 @@ class FastAPIServiceMon(Servicemon):
                         else LogLevel.INFO
                     )
 
-                    svcmon.log(
+                    servicemon.log(
                         level=log_level,
                         description=f"Response sent: {status_code} in {process_time}ms for {method} {path}",
                         resource=DataResource.API_INTERNAL,
@@ -96,18 +96,20 @@ class FastAPIServiceMon(Servicemon):
                     )
 
                     # Finalize monitoring
-                    svcmon.end(status=progress_status)
+                    servicemon.end(status=progress_status)
                     return response
 
                 except Exception as exc:
-                    svcmon.error(
-                        f"Error processing request: {str(exc)}",
+                    # Log error and re-raise
+                    servicemon.log(
+                        level=LogLevel.ERROR,
+                        description=f"Error processing request: {exc}",
                         resource=DataResource.API_INTERNAL,
                         action=Action.EXECUTE,
-                        progress_status=ProgressStatus.FAILED,
-                        e=exc
+                        progress_status=ProgressStatus.FAILED
                     )
-                    svcmon.end(status=ProgressStatus.FAILED)
+
+                    servicemon.end(status=ProgressStatus.FAILED)
                     raise
 
         return ServiceMonMiddleware

ipulse_shared_core_ftredge-6.6.1/src/ipulse_shared_core_ftredge/utils/__init__.py

@@ -0,0 +1 @@
+from .json_encoder import CustomJSONEncoder

ipulse_shared_core_ftredge-6.6.1/src/ipulse_shared_core_ftredge/utils/json_encoder.py

@@ -0,0 +1,13 @@
+import json
+from datetime import datetime
+from google.cloud.firestore_v1._helpers import DatetimeWithNanoseconds
+from google.api_core import datetime_helpers
+
+class CustomJSONEncoder(json.JSONEncoder):
+    """Custom JSON encoder that handles Firestore datetime types."""
+    def default(self, obj):
+        if isinstance(obj, (datetime, DatetimeWithNanoseconds)):
+            return obj.isoformat()
+        if isinstance(obj, datetime_helpers.DatetimeWithNanoseconds):
+            return obj.isoformat()
+        return super().default(obj)

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.2
 Name: ipulse_shared_core_ftredge
-Version: 6.3.1
+Version: 6.6.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
 License-File: LICENCE
 Requires-Dist: pydantic[email]~=2.5
 Requires-Dist: python-dateutil~=2.8
+Requires-Dist: fastapi~=0.115.8
 Requires-Dist: pytest~=7.1
 Requires-Dist: ipulse_shared_base_ftredge>=5.2.1
 Dynamic: author

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt

@@ -27,4 +27,6 @@ src/ipulse_shared_core_ftredge/services/__init__.py
 src/ipulse_shared_core_ftredge/services/base_exceptions.py
 src/ipulse_shared_core_ftredge/services/base_firestore_service.py
 src/ipulse_shared_core_ftredge/services/fastapiservicemon.py
-src/ipulse_shared_core_ftredge/services/servicemon.py
+src/ipulse_shared_core_ftredge/services/servicemon.py
+src/ipulse_shared_core_ftredge/utils/__init__.py
+src/ipulse_shared_core_ftredge/utils/json_encoder.py

{ipulse_shared_core_ftredge-6.3.1 → ipulse_shared_core_ftredge-6.6.1}/src/ipulse_shared_core_ftredge.egg-info/requires.txt

@@ -1,4 +1,5 @@
 pydantic[email]~=2.5
 python-dateutil~=2.8
+fastapi~=0.115.8
 pytest~=7.1
 ipulse_shared_base_ftredge>=5.2.1