ipulse-shared-core-ftredge 2.25__tar.gz → 2.27__tar.gz

{ipulse_shared_core_ftredge-2.25/src/ipulse_shared_core_ftredge.egg-info → ipulse_shared_core_ftredge-2.27}/PKG-INFO

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

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

{ipulse_shared_core_ftredge-2.25 → ipulse_shared_core_ftredge-2.27}/src/ipulse_shared_core_ftredge/utils_templates_and_schemas.py

@@ -22,50 +22,67 @@ def update_check_with_dict_template(template, updates, logger):
 
 def update_check_with_schema_template(updates, schema, logger, dt_ts_to_str=True, check_max_length=True):
     """Ensure Update dict corresponds to the config schema, ensuring proper formats and lengths."""
-    template_dict = {field["name"]: None for field in schema}
+    valid_updates = {}
     schema_dict = {field["name"]: field for field in schema}
     
-    for field_name, value in updates.items():
-        if field_name in schema_dict:
-            field_type = schema_dict[field_name]["type"]
+    """Ensure Update dict corresponds to the config schema, ensuring proper formats and lengths."""
+    valid_updates = {}
+    schema_dict = {field["name"]: field for field in schema}
+    
+    # Process updates to conform to the schema
+    for field in schema:
+        field_name = field["name"]
+        field_type = field["type"]
+        mode = field["mode"]
+        
+        if field_name in updates:
+            value = updates[field_name]
             
+            # Handle date and timestamp formatting
             if dt_ts_to_str:
                 if field_type == "DATE":
                     value = handle_date_fields(field_name, value, logger)
                 elif field_type == "TIMESTAMP":
                     value = handle_timestamp_fields(field_name, value, logger)
             
-            if check_max_length and "max_length" in schema_dict[field_name]:
-                value = check_and_truncate_length(field_name, value, schema_dict[field_name]["max_length"], logger)
+            # Check and handle max length restriction
+            if check_max_length and "max_length" in field:
+                value = check_and_truncate_length(field_name, value, field["max_length"], logger)
             
-            # Set the value in the template dictionary based on the field type
-            if field_type == "STRING" and not isinstance(value, str):
-                logger.warning(f"Field {field_name} expected to be a string but got {type(value).__name__}.")
-                value = str(value)
-            elif field_type == "INT64" and not isinstance(value, int):
-                logger.warning(f"Field {field_name} expected to be an int but got {type(value).__name__}.")
-                try:
-                    value = int(value)
-                except ValueError:
-                    logger.warning(f"Cannot convert value {value} of field {field_name} to int.")
-                    value = None
-            elif field_type == "FLOAT64" and not isinstance(value, float):
-                logger.warning(f"Field {field_name} expected to be a float but got {type(value).__name__}.")
-                try:
-                    value = float(value)
-                except ValueError:
-                    logger.warning(f"Cannot convert value {value} of field {field_name} to float.")
-                    value = None
-            elif field_type == "BOOL" and not isinstance(value, bool):
-                logger.warning(f"Field {field_name} expected to be a bool but got {type(value).__name__}.")
-                value = bool(value)
-
-            template_dict[field_name] = value
-        else:
-            logger.warning(f"Field {field_name} not in schema template, it will be ignored.You probably forgot to update the Schema Config. Do so now. "
-            "And assess the manual work required to fix missed data.")
+            # Validate and convert types
+            if field_type == "STRING":
+                if not isinstance(value, str):
+                    logger.warning(f"Field {field_name} expected to be a string but got {type(value).__name__}.")
+                    value = str(value)
+            elif field_type == "INT64":
+                if not isinstance(value, int):
+                    logger.warning(f"Field {field_name} expected to be an int but got {type(value).__name__}.")
+                    try:
+                        value = int(value)
+                    except ValueError:
+                        logger.warning(f"Cannot convert value {value} of field {field_name} to int.")
+                        continue
+            elif field_type == "FLOAT64":
+                if not isinstance(value, float):
+                    logger.warning(f"Field {field_name} expected to be a float but got {type(value).__name__}.")
+                    try:
+                        value = float(value)
+                    except ValueError:
+                        logger.warning(f"Cannot convert value {value} of field {field_name} to float.")
+                        continue
+            elif field_type == "BOOL":
+                if not isinstance(value, bool):
+                    logger.warning(f"Field {field_name} expected to be a bool but got {type(value).__name__}.")
+                    value = bool(value)
+
+            # 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":
+            logger.warning(f"Required field '{field_name}' is missing in the updates.")
     
-    return template_dict
+    return valid_updates
 
 
 def check_updates_formatting(updates, schema, logger, dt_ts_to_str, check_max_length):

{ipulse_shared_core_ftredge-2.25 → ipulse_shared_core_ftredge-2.27/src/ipulse_shared_core_ftredge.egg-info}/PKG-INFO

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