ipulse-shared-core-ftredge 2.19__tar.gz → 2.21__tar.gz

{ipulse_shared_core_ftredge-2.19/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipulse_shared_core_ftredge
-Version: 2.19
+Version: 2.21
 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-2.19 → ipulse_shared_core_ftredge-2.21}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ipulse_shared_core_ftredge',
-    version='2.19',
+    version='2.21',
     package_dir={'': 'src'},  # Specify the source directory
     packages=find_packages(where='src'),  # Look for packages in 'src'
     install_requires=[

ipulse_shared_core_ftredge-2.21/src/ipulse_shared_core_ftredge/__init__.py

@@ -0,0 +1,5 @@
+from .models import Organisation, UserAuth, UserProfile, UserStatus, UserProfileUpdate, pulse_enums
+from .gcp_utils import setup_gcp_logger_and_error_report, read_csv_from_gcs, read_json_from_gcs, write_csv_to_gcs, write_json_to_gcs
+
+
+ 

ipulse_shared_core_ftredge-2.21/src/ipulse_shared_core_ftredge/gcp_utils.py

@@ -0,0 +1,150 @@
+import json
+import csv
+from io import StringIO
+import logging
+import os
+import traceback
+from google.cloud import error_reporting, logging as cloud_logging
+from google.api_core.exceptions import NotFound
+
+
+############################################################################
+##################### SETTING UP LOGGER ##########################
+
+####DEPCREACATED: THIS APPROACH WAS GOOD, BUT ERRORS WERE NOT REPORTED TO ERROR REPORTING
+# logging.basicConfig(level=logging.INFO)
+# logging_client = google.cloud.logging.Client()
+# logging_client.setup_logging()
+###################################
+
+
+##### THIS APPROACH IS USED NOW ########
+## TODO Fix the issue with POST 0B Nan.... printed in Cloud Logging , which is referring to posting to Cloud Logging probably.
+ENV = os.getenv('ENV', 'LOCAL').strip("'")
+
+def setup_gcp_logger_and_error_report(logger_name):
+    """Sets up a logger with Error Reporting and Cloud Logging handlers.
+
+    Args:
+        logger_name: The name of the logger.
+
+    Returns:
+        logging.Logger: The configured logger instance.
+    """
+
+    class ErrorReportingHandler(logging.Handler):
+        def __init__(self, level=logging.ERROR):
+            super().__init__(level)
+            self.error_client = error_reporting.Client()
+            self.propagate = True
+
+        def emit(self, record):
+            try:
+                if record.levelno >= logging.ERROR:
+                    message = self.format(record)
+                    if record.exc_info:
+                        message += "\n" + ''.join(traceback.format_exception(*record.exc_info))
+                    if hasattr(record, 'pathname') and hasattr(record, 'lineno'):
+                        message += f"\nFile: {record.pathname}, Line: {record.lineno}"
+                    self.error_client.report(message)
+            except Exception as e:
+                # Ensure no exceptions are raised during logging
+                self.handleError(record)
+
+    logger = logging.getLogger(logger_name)
+    logger.setLevel(logging.INFO)
+
+    # Create Error Reporting handler
+    error_reporting_handler = ErrorReportingHandler()
+
+    # Create Google Cloud Logging handler
+    cloud_logging_client = cloud_logging.Client()
+    cloud_logging_handler = cloud_logging_client.get_default_handler()
+
+    # Add handlers to the logger
+    logger.addHandler(error_reporting_handler)
+    logger.addHandler(cloud_logging_handler)
+
+    # Add a console handler for local development
+    if ENV == "LOCAL":
+        formatter = logging.Formatter('%(levelname)s : %(name)s : %(asctime)s : %(message)s')
+        console_handler = logging.StreamHandler()
+        console_handler.setFormatter(formatter)
+        logger.addHandler(console_handler)
+
+    return logger
+############################################################################
+
+
+############################################################################
+##################### GOOGLE  CLOUD STORAGE UTILS ##########################
+
+def read_json_from_gcs(bucket_name, file_name, stor_client, logger):
+    """ Helper function to read a JSON file from Google Cloud Storage """
+    try:
+        bucket = stor_client.bucket(bucket_name)
+        blob = bucket.blob(file_name)
+        data_string = blob.download_as_text()
+        data = json.loads(data_string)
+        return data
+    except NotFound:
+        logger.error(f"Error: The file {file_name} was not found in the bucket {bucket_name}.")
+        return None
+    except json.JSONDecodeError:
+        logger.error(f"Error: The file {file_name} could not be decoded as JSON.")
+        return None
+    except Exception as e:
+        logger.error(f"An unexpected error occurred: {e}", exc_info=True)
+        return None
+
+def read_csv_from_gcs(bucket_name, file_name, storage_client, logger):
+    """ Helper function to read a CSV file from Google Cloud Storage """
+    try:
+        bucket = storage_client.bucket(bucket_name)
+        blob = bucket.blob(file_name)
+        data_string = blob.download_as_text()
+        data_file = StringIO(data_string)
+        reader = csv.DictReader(data_file)
+        return list(reader)
+    except NotFound:
+        logger.error(f"Error: The file {file_name} was not found in the bucket {bucket_name}.")
+        return None
+    except csv.Error:
+        logger.error(f"Error: The file {file_name} could not be read as CSV.")
+        return None
+    except Exception as e:
+        logger.error(f"An unexpected error occurred: {e}", exc_info=True)
+        return None
+
+def write_json_to_gcs(bucket_name, file_name, data, stor_client, logger, log_info_verbose=True):
+    """ Helper function to write a JSON file to Google Cloud Storage """
+    try:
+        bucket = stor_client.bucket(bucket_name)
+        blob = bucket.blob(file_name)
+        data_string = json.dumps(data)
+        blob.upload_from_string(data_string, content_type='application/json')
+        if log_info_verbose:
+            logger.info(f"Successfully wrote JSON to {file_name} in bucket {bucket_name}.")
+    except Exception as e:
+        logger.error(f"An unexpected error occurred while writing JSON to GCS: {e}", exc_info=True)
+
+def write_csv_to_gcs(bucket_name, file_name, data, storage_client, logger,log_info_verbose=True):
+    """ Helper function to write a CSV file to Google Cloud Storage """
+    try:
+        bucket = storage_client.bucket(bucket_name)
+        blob = bucket.blob(file_name)
+        data_file = StringIO()
+        if data and isinstance(data, list) and isinstance(data[0], dict):
+            fieldnames = data[0].keys()
+            writer = csv.DictWriter(data_file, fieldnames=fieldnames)
+            writer.writeheader()
+            writer.writerows(data)
+        else:
+            raise ValueError("Data should be a list of dictionaries")
+        blob.upload_from_string(data_file.getvalue(), content_type='text/csv')
+        if log_info_verbose:
+            logger.info(f"Successfully wrote CSV to {file_name} in bucket {bucket_name}.")
+    except ValueError as e:
+        logger.error(f"ValueError: {e}")
+    except Exception as e:
+        logger.error(f"An unexpected error occurred while writing CSV to GCS: {e}", exc_info=True)

{ipulse_shared_core_ftredge-2.19 → ipulse_shared_core_ftredge-2.21/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipulse_shared_core_ftredge
-Version: 2.19
+Version: 2.21
 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-2.19 → ipulse_shared_core_ftredge-2.21}/src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt

@@ -3,7 +3,7 @@ README.md
 pyproject.toml
 setup.py
 src/ipulse_shared_core_ftredge/__init__.py
-src/ipulse_shared_core_ftredge/gcp_logger.py
+src/ipulse_shared_core_ftredge/gcp_utils.py
 src/ipulse_shared_core_ftredge.egg-info/PKG-INFO
 src/ipulse_shared_core_ftredge.egg-info/SOURCES.txt
 src/ipulse_shared_core_ftredge.egg-info/dependency_links.txt

ipulse_shared_core_ftredge-2.19/src/ipulse_shared_core_ftredge/__init__.py

@@ -1,5 +0,0 @@
-from .models import Organisation, UserAuth, UserProfile, UserStatus, UserProfileUpdate, pulse_enums
-from .gcp_logger import setup_gcp_logger_and_error_report
-
-
- 

ipulse_shared_core_ftredge-2.19/src/ipulse_shared_core_ftredge/gcp_logger.py

@@ -1,77 +0,0 @@
-import logging
-import os
-import traceback
-from google.cloud import error_reporting, logging as cloud_logging
-
-
-############################################################################
-##################### SETTING UP LOGGER ##########################
-##########
-
-####DEPCREACATED: THIS APPROACH WAS GOOD, BUT ERRORS WERE NOT REPORTED TO ERROR REPORTING
-
-# logging.basicConfig(level=logging.INFO)
-# logging_client = google.cloud.logging.Client()
-# # Retrieves a Cloud Logging handler based on the environment
-# # you're running in and integrates the handler with the
-# # Python logging module. By default this captures all logs
-# # at INFO level and higher
-# logging_client.setup_logging()
-###################################
-
-##### THIS APPROACH IS USED NOW ########
-## TODO Fix the issue with POST 0B Nan.... printed in Cloud Logging , which is referring to posting to Cloud Logging probably.
-
-ENV = os.getenv('ENV', 'LOCAL').strip("'")
-
-def setup_gcp_logger_and_error_report(logger_name):
-    """Sets up a logger with Error Reporting and Cloud Logging handlers.
-
-    Args:
-        logger_name: The name of the logger.
-
-    Returns:
-        logging.Logger: The configured logger instance.
-    """
-
-    class ErrorReportingHandler(logging.Handler):
-        def __init__(self, level=logging.ERROR):
-            super().__init__(level)
-            self.error_client = error_reporting.Client()
-            self.propagate = True
-
-        def emit(self, record):
-            try:
-                if record.levelno >= logging.ERROR:
-                    message = self.format(record)
-                    if record.exc_info:
-                        message += "\n" + ''.join(traceback.format_exception(*record.exc_info))
-                    if hasattr(record, 'pathname') and hasattr(record, 'lineno'):
-                        message += f"\nFile: {record.pathname}, Line: {record.lineno}"
-                    self.error_client.report(message)
-            except Exception as e:
-                # Ensure no exceptions are raised during logging
-                self.handleError(record)
-
-    logger = logging.getLogger(logger_name)
-    logger.setLevel(logging.INFO)
-
-    # Create Error Reporting handler
-    error_reporting_handler = ErrorReportingHandler()
-
-    # Create Google Cloud Logging handler
-    cloud_logging_client = cloud_logging.Client()
-    cloud_logging_handler = cloud_logging_client.get_default_handler()
-
-    # Add handlers to the logger
-    logger.addHandler(error_reporting_handler)
-    logger.addHandler(cloud_logging_handler)
-
-    # Add a console handler for local development
-    if ENV == "LOCAL":
-        formatter = logging.Formatter('%(levelname)s : %(name)s : %(asctime)s : %(message)s')
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-        logger.addHandler(console_handler)
-
-    return logger