ipulse-shared-core-ftredge 2.37__tar.gz → 2.38__tar.gz

{ipulse_shared_core_ftredge-2.37/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-2.38}/PKG-INFO

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

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

{ipulse_shared_core_ftredge-2.37 → ipulse_shared_core_ftredge-2.38}/src/ipulse_shared_core_ftredge/utils_templates_and_schemas.py

@@ -36,29 +36,32 @@ 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
@@ -72,42 +75,48 @@ def update_check_with_schema_template(updates, schema, dt_ts_to_str=True, check_
       
     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__}.")
+                                                  field_name,
+                                                  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__}.")
+                                              field_name,
+                                              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_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                                  field_name,
+                                                  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_data_check_notice(NoticeSeverity.WARNING_ACTION_REQUIRED,
+                                              field_name,
+                                              f"Expected ISO format TIMESTAMP but got {value} of type {type(value).__name__}.")
 
 
 def check_and_truncate_length(field_name, value, max_length):

{ipulse_shared_core_ftredge-2.37 → ipulse_shared_core_ftredge-2.38/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipulse_shared_core_ftredge
-Version: 2.37
+Version: 2.38
 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