ipulse-shared-core-ftredge 2.37__py3-none-any.whl → 2.39__py3-none-any.whl

ipulse_shared_core_ftredge/__init__.py

@@ -4,8 +4,9 @@ from .utils_gcp import (setup_gcp_logger_and_error_report,
                         read_csv_from_gcs, read_json_from_gcs, 
                         write_csv_to_gcs, write_json_to_gcs)
 from .utils_templates_and_schemas import (create_bigquery_schema_from_json,
-                                          update_check_with_schema_template,
-                                          create_data_check_notice)
+                                          update_check_with_schema_template)
+from .utils_common import (create_custom_notice, create_exception_notice)
+
 from .enums import (NoticeSeverity, Unit, Frequency,
                     Module, SubModule, BaseDataCategory,
                     FinCoreCategory, FincCoreSubCategory,

ipulse_shared_core_ftredge/utils_common.py

@@ -0,0 +1,24 @@
+# pylint: disable=missing-module-docstring
+# pylint: disable=missing-function-docstring
+# pylint: disable=logging-fstring-interpolation
+# pylint: disable=line-too-long
+
+def create_custom_notice(severity, subject, message):
+    return {
+        "severity_code": severity.value,
+        "severity_name": severity.name,
+        "subject": subject,
+        "message": message
+    }
+
+
+def create_exception_notice(severity, exception_code,exception_message, exception_traceback=None, subject=None, message=None):
+    return {
+        "severity_code": severity.value,
+        "severity_name": severity.name,
+        "subject": subject,
+        "message": message,
+        "exception_code": exception_code,
+        "exception_message": exception_message,
+        "exception_traceback": exception_traceback
+    }

ipulse_shared_core_ftredge/utils_templates_and_schemas.py

@@ -6,14 +6,8 @@
 import datetime
 from google.cloud import bigquery
 from ipulse_shared_core_ftredge.enums.enums_common_utils import NoticeSeverity
+from ipulse_shared_core_ftredge.utils_common import create_custom_notice
 
-def create_data_check_notice(severity, field_name, message):
-    return {
-        "severity_code": severity.value,
-        "severity_name": severity.name,
-        "subject": field_name,
-        "message": message
-    }
 
 def create_bigquery_schema_from_json(json_schema):
     schema = []
@@ -36,86 +30,95 @@ def update_check_with_schema_template(updates, schema, dt_ts_to_str=True, check_
         field_name = field["name"]
         field_type = field["type"]
         mode = field["mode"]
+        
+        # Initialize notice to None at the start of each field processing
+        notice = None
 
         if field_name in updates:
             value = updates[field_name]
 
             # Handle date and timestamp formatting
-            if dt_ts_to_str:
-                if field_type == "DATE":
-                    value, notice = handle_date_fields(field_name, value)
-                elif field_type == "TIMESTAMP":
-                    value,notice = handle_timestamp_fields(field_name, value)
-                if notice:
-                    notices.append(notice)
+            
+            # Validate and potentially convert date and timestamp fields
+            if field_type == "DATE":
+                value, notice = handle_date_fields(field_name, value, dt_ts_to_str)
+            elif field_type == "TIMESTAMP":
+                value, notice = handle_timestamp_fields(field_name, value, dt_ts_to_str)
+            elif field_type in ["STRING", "INT64", "FLOAT64", "BOOL"]:
+                value, notice = handle_type_conversion(field_type, field_name, value )
+
+            if notice:
+                notices.append(notice)
+
             # Check and handle max length restriction
             if check_max_length and "max_length" in field:
                 value,notice = check_and_truncate_length(field_name, value, field["max_length"])
                 if notice:
                     notices.append(notice)
-            # Validate and convert types
-            if field_type in ["STRING", "INT64", "FLOAT64", "BOOL"]:
-                value, notice = handle_type_conversion(field_type, field_name, value )
-                if notice:
-                    notices.append(notice)
-
+            
             # Only add to the dictionary if value is not None or the field is required
             if value is not None or mode == "REQUIRED":
                 valid_updates[field_name] = value
 
         elif mode == "REQUIRED":
-            notice=create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
-                             field_name,
-                             f"Required field '{field_name}' is missing in the updates.")
+            notice=create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                             subject=field_name,
+                             message=f"Required field '{field_name}' is missing in the updates.")
 
             notices.append(notice)
       
     return valid_updates, notices
 
-
-def handle_date_fields(field_name, value):
-    """Handles date fields, ensuring they are in the correct format.
-        Return is a tuple of the formatted date and a notice."""
+def handle_date_fields(field_name, value, dt_ts_to_str):
+    """Handles date fields, ensuring they are in the correct format and optionally converts them to string."""
     if isinstance(value, datetime.date):
-        return value.strftime("%Y-%m-%d"), None
+        if dt_ts_to_str:
+            return value.strftime("%Y-%m-%d"), None
+        return value, None
     elif isinstance(value, str):
         try:
-            datetime.datetime.strptime(value, "%Y-%m-%d")
-            return value, None
+            parsed_date = datetime.datetime.strptime(value, "%Y-%m-%d").date()
+            if dt_ts_to_str:
+                return value, None
+            return parsed_date, None
         except ValueError:
-            return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
-                             field_name,
-                             f"Expected a DATE or YYYY-MM-DD str format but got {value} of type {type(value).__name__}.")
+            return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                                  subject=field_name,
+                                                   message=f"Expected a DATE in YYYY-MM-DD format but got {value}.")
     else:
-        return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
-                             field_name,
-                             f"Expected a DATE or YYYY-MM-DD str format but got {value} of type {type(value).__name__}.")
+        return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                              subject=field_name,
+                                              message= f"Expected a DATE or YYYY-MM-DD str format but got {value} of type {type(value).__name__}.")
 
 
-def handle_timestamp_fields(field_name, value):
-    """Handles timestamp fields, ensuring they are in the correct format."""
+def handle_timestamp_fields(field_name, value, dt_ts_to_str):
+    """Handles timestamp fields, ensuring they are in the correct format and optionally converts them to ISO format string."""
     if isinstance(value, datetime.datetime):
-        return value.isoformat(), None
+        if dt_ts_to_str:
+            return value.isoformat(), None
+        return value, None
     elif isinstance(value, str):
         try:
-            datetime.datetime.fromisoformat(value)
-            return value, None
+            parsed_datetime = datetime.datetime.fromisoformat(value)
+            if dt_ts_to_str:
+                return value, None
+            return parsed_datetime, None
         except ValueError:
-            return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED, 
-                             field_name,
-                             f"Expected ISO format TIMESTAMP but got {value} of type {type(value).__name__}.")
+            return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                                  subject=field_name,
+                                                  message= f"Expected ISO format TIMESTAMP but got {value}.")
     else:
-        return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED, 
-                             field_name,
-                             f"Expected ISO format TIMESTAMP but got {value} of type {type(value).__name__}.")
+        return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                              subject=field_name,
+                                              message= f"Expected ISO format TIMESTAMP but got {value} of type {type(value).__name__}.")
 
 
 def check_and_truncate_length(field_name, value, max_length):
     """Checks and truncates the length of string fields if they exceed the max length."""
     if isinstance(value, str) and len(value) > max_length:
-        return value[:max_length], create_data_check_notice(NoticeSeverity.WARNING_ACTION_RECOMMENDED, 
-                             field_name,
-                             f"Field exceeds max length: {len(value)}/{max_length}. Truncating.")
+        return value[:max_length], create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_RECOMMENDED, 
+                            subject= field_name,
+                             message= f"Field exceeds max length: {len(value)}/{max_length}. Truncating.")
    
     return value, None
 
@@ -123,24 +126,24 @@ def check_and_truncate_length(field_name, value, max_length):
 
 def handle_type_conversion(field_type, field_name, value):
     if field_type == "STRING" and not isinstance(value, str):
-        return str(value), create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED, 
-                             field_name,
-                             f"Expected STRING but got {value} of type {type(value).__name__}.")
+        return str(value), create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED, 
+                             subject=field_name,
+                             message= f"Expected STRING but got {value} of type {type(value).__name__}.")
 
     if field_type == "INT64" and not isinstance(value, int):
         try:
             return int(value), None
         except ValueError:
-            return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
-                                                   field_name,
-                                                   f"Expected INTEGER, but got {value} of type {type(value).__name__}.")
+            return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                                subject= field_name,
+                                                message=f"Expected INTEGER, but got {value} of type {type(value).__name__}.")
     if field_type == "FLOAT64" and not isinstance(value, float):
         try:
             return float(value), None
         except ValueError:
-            return None, create_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED, 
-                                                  field_name,
-                                                  f"Expected FLOAT, but got  {value} of type {type(value).__name__}.")
+            return None, create_custom_notice(severity=NoticeSeverity.WARNING_ACTION_REQUIRED, 
+                                                  subject=field_name,
+                                                   message=f"Expected FLOAT, but got  {value} of type {type(value).__name__}.")
     if field_type == "BOOL" and not isinstance(value, bool):
         return bool(value), None
     

{ipulse_shared_core_ftredge-2.37.dist-info → ipulse_shared_core_ftredge-2.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipulse_shared_core_ftredge
-Version: 2.37
+Version: 2.39
 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.37.dist-info → ipulse_shared_core_ftredge-2.39.dist-info}/RECORD

@@ -1,6 +1,7 @@
-ipulse_shared_core_ftredge/__init__.py,sha256=snLFrVzGmYy6TmXM6-D7Yq4dkcJDRP3g9DeuJQDFPMc,895
+ipulse_shared_core_ftredge/__init__.py,sha256=87fWkJqrx0FMqOlzxclR6vBRJPisz3SbwhCWbeeP4kk,902
+ipulse_shared_core_ftredge/utils_common.py,sha256=Fs8-guNuz_UJd4p7Vh0bFDzxyE2YCVaj4bxJQynOLpk,803
 ipulse_shared_core_ftredge/utils_gcp.py,sha256=E8TvZ05fTjNr-VQXxSZNCiqT9PwPhtqeKOifIGhb2sg,6289
-ipulse_shared_core_ftredge/utils_templates_and_schemas.py,sha256=m5h8oWzmQhfFLjDNIg0-BAdxguR8Y-yqkBt91dXdLGw,6525
+ipulse_shared_core_ftredge/utils_templates_and_schemas.py,sha256=l70p5NV6R4pNEkqdSz0WOy8RPdsR8BqrP-qlZ7Jjep8,7075
 ipulse_shared_core_ftredge/enums/__init__.py,sha256=PjxJiUConI2TuaG_Ushe2BaFVjBDw1rbq1E9Vt9nXvE,801
 ipulse_shared_core_ftredge/enums/enums_common_utils.py,sha256=ukChcm8R2QwlK4NAfM291mWryCAZvfg7bMpdScQQfok,4360
 ipulse_shared_core_ftredge/enums/enums_data_eng.py,sha256=A8_uiGGacd-_AZP09Zft-DX3rF8aVqqFzFak8s4MsfY,1801
@@ -17,8 +18,8 @@ ipulse_shared_core_ftredge/models/user_profile_update.py,sha256=oKK0XsQDKkgDvjFP
 ipulse_shared_core_ftredge/models/user_status.py,sha256=8TyRd8tBK9_xb0MPKbI5pn9-lX7ovKbeiuWYYPtIOiw,3202
 ipulse_shared_core_ftredge/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipulse_shared_core_ftredge/tests/test.py,sha256=0lS8HP5Quo_BqNoscU40qOH9aJRaa1Pfam5VUBmdld8,682
-ipulse_shared_core_ftredge-2.37.dist-info/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
-ipulse_shared_core_ftredge-2.37.dist-info/METADATA,sha256=oG6P3XWAjyNWhGxICc7AAMYd4iYop4oK48JDmkkdGCI,561
-ipulse_shared_core_ftredge-2.37.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ipulse_shared_core_ftredge-2.37.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
-ipulse_shared_core_ftredge-2.37.dist-info/RECORD,,
+ipulse_shared_core_ftredge-2.39.dist-info/LICENCE,sha256=YBtYAXNqCCOo9Mr2hfkbSPAM9CeAr2j1VZBSwQTrNwE,1060
+ipulse_shared_core_ftredge-2.39.dist-info/METADATA,sha256=I99qJdttOu8XaJhp1dCaYAuJw-17QlN57kJtSghhtpM,561
+ipulse_shared_core_ftredge-2.39.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+ipulse_shared_core_ftredge-2.39.dist-info/top_level.txt,sha256=8sgYrptpexkA_6_HyGvho26cVFH9kmtGvaK8tHbsGHk,27
+ipulse_shared_core_ftredge-2.39.dist-info/RECORD,,

{ipulse_shared_core_ftredge-2.37.dist-info → ipulse_shared_core_ftredge-2.39.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any