velocity-python 0.0.112__py3-none-any.whl → 0.0.115__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.112"
+__version__ = version = "0.0.115"
 
 from . import aws
 from . import db

velocity/aws/handlers/context.py

@@ -1,4 +1,10 @@
+import os
+import boto3
+import uuid
 import support.app
+from velocity.misc.format import to_json
+from velocity.misc.merge import deep_merge
+from datetime import datetime
 
 engine = support.app.postgres()
 
@@ -68,3 +74,138 @@ class Context:
                 print(f"{function}: {message}")
             else:
                 print(f"{message}")
+
+    def updateJob(self, tx, data=None):
+        """Update job status and message in aws_job_activity table."""
+        if not data:
+            return
+        if self.postdata("job_id"):
+            # Sanitize data before storing in database
+            sanitized_data = self._sanitize_job_data(data)
+            tx.table("aws_job_activity").update(sanitized_data, {"job_id": self.postdata("job_id")})
+            tx.commit()
+
+    def _sanitize_job_data(self, data):
+        """Sanitize sensitive data before storing in aws_job_activity table."""
+        if not isinstance(data, dict):
+            return data
+            
+        sanitized = {}
+        
+        # List of sensitive field patterns to sanitize
+        sensitive_patterns = [
+            'password', 'token', 'secret', 'key', 'credential', 'auth',
+            'cognito_user', 'session', 'cookie', 'authorization'
+        ]
+        
+        for key, value in data.items():
+            # Check if key contains sensitive patterns
+            if any(pattern in key.lower() for pattern in sensitive_patterns):
+                sanitized[key] = "[REDACTED]" if value else value
+            elif key == 'error' and value:
+                # Sanitize error messages - keep first 500 chars and remove potential sensitive info
+                error_str = str(value)[:500]
+                for pattern in sensitive_patterns:
+                    if pattern in error_str.lower():
+                        # Replace potential sensitive values with placeholder
+                        import re
+                        # Remove patterns like password=value, token=value, etc.
+                        error_str = re.sub(
+                            rf'{pattern}[=:]\s*[^\s,\]}}]+', 
+                            f'{pattern}=[REDACTED]', 
+                            error_str, 
+                            flags=re.IGNORECASE
+                        )
+                sanitized[key] = error_str
+            elif key == 'traceback' and value:
+                # Sanitize traceback - keep structure but remove sensitive values
+                tb_str = str(value)
+                for pattern in sensitive_patterns:
+                    if pattern in tb_str.lower():
+                        import re
+                        # Remove patterns like password=value, token=value, etc.
+                        tb_str = re.sub(
+                            rf'{pattern}[=:]\s*[^\s,\]}}]+', 
+                            f'{pattern}=[REDACTED]', 
+                            tb_str, 
+                            flags=re.IGNORECASE
+                        )
+                # Limit traceback size to prevent DB bloat
+                sanitized[key] = tb_str[:2000]
+            elif key == 'message' and value:
+                # Sanitize message field
+                message_str = str(value)
+                for pattern in sensitive_patterns:
+                    if pattern in message_str.lower():
+                        import re
+                        message_str = re.sub(
+                            rf'{pattern}[=:]\s*[^\s,\]}}]+', 
+                            f'{pattern}=[REDACTED]', 
+                            message_str, 
+                            flags=re.IGNORECASE
+                        )
+                sanitized[key] = message_str[:1000]  # Limit message size
+            else:
+                # For other fields, copy as-is but check for nested dicts
+                if isinstance(value, dict):
+                    sanitized[key] = self._sanitize_job_data(value)
+                elif isinstance(value, str) and len(value) > 5000:
+                    # Limit very large string fields
+                    sanitized[key] = value[:5000] + "...[TRUNCATED]"
+                else:
+                    sanitized[key] = value
+                    
+        return sanitized
+
+    def enqueue(self, action, payload={}, user=None, suppress_job_activity=False):
+        """
+        Enqueue jobs to SQS with independent job activity tracking.
+        
+        This method uses its own transaction for aws_job_activity updates to ensure
+        job tracking is never rolled back with other operations.
+        """
+        batch_id = str(uuid.uuid4())
+        results = {"batch_id": batch_id}
+        queue = boto3.resource("sqs").get_queue_by_name(
+            QueueName=os.environ["SqsWorkQueue"]
+        )
+        if isinstance(payload, dict):
+            payload = [payload]
+        messages = []
+        if user==None:
+            user = self.session.get("email_address") or "EnqueueTasks"
+        for item in payload:
+            message = {"action": action, "payload": item}
+            id = str(uuid.uuid4()).split("-")[0]
+            if suppress_job_activity:
+                messages.append({"Id": id, "MessageBody": to_json(message)})
+            else:
+                message["job_id"] = id
+                # Use separate transaction for job activity - this should never be rolled back
+                with engine.transaction as job_tx:
+                    job_tx.table("aws_job_activity").insert(
+                        {
+                            "action": action,
+                            "initial_timestamp": datetime.now(),
+                            "created_by": user,
+                            "sys_modified_by": user,
+                            "payload": to_json(message),
+                            "batch_id": str(batch_id),
+                            "job_id": id,
+                            "status": "Initialized",
+                            "message": f"Job Initialized"
+                        }
+                    )
+                    job_tx.commit()
+                messages.append({"Id": id, "MessageBody": to_json(message)})
+            
+            if len(messages) == 10:
+                result = queue.send_messages(Entries=messages)
+                results = deep_merge(results, result)
+                messages.clear()
+        
+        if messages:
+            result = queue.send_messages(Entries=messages)
+            results = deep_merge(results, result)
+        
+        return results

velocity/aws/handlers/lambda_handler.py

@@ -4,7 +4,7 @@ import sys
 import os
 import traceback
 from support.app import DEBUG
-from support.app import helpers, AlertError, enqueue
+from support.app import helpers, AlertError
 
 from velocity.aws.handlers import Response
 
@@ -164,6 +164,3 @@ class LambdaHandler:
 
     def OnActionTracking(self, tx, context):
         self.track(tx, context.payload().get("data", {}))
-
-    def enqueue(self, tx, action, payload={}):
-        enqueue(tx, action, payload, self.session["email_address"])

{velocity_python-0.0.112.dist-info → velocity_python-0.0.115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.112
+Version: 0.0.115
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.0.112.dist-info → velocity_python-0.0.115.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=iH2m31ZNvp-oPV3zuzJRMhEbgHm_d-Gs5k6ljPudBlg,107
+velocity/__init__.py,sha256=89oRDLFlR3tlSTcYrvhfokSBF3tLPmP4nt_p9ayIScY,107
 velocity/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/invoices.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/orders.py,sha256=W-HAXEwY8-IFXbKh82HnMeRVZM7P-TWGEQOWtkLIzI4,6298
@@ -7,8 +7,8 @@ velocity/app/purchase_orders.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 velocity/aws/__init__.py,sha256=tj9-NliYxRVPYLnnDuA4FMwBHbbH4ed8gtHgwRskNgY,647
 velocity/aws/amplify.py,sha256=n6ttzHmbF8tc0ZDN8LIA6s_fnkZ3ylu3AAUAYyD9MzE,15048
 velocity/aws/handlers/__init__.py,sha256=xnpFZJVlC2uoeeFW4zuPST8wA8ajaQDky5Y6iXZzi3A,172
-velocity/aws/handlers/context.py,sha256=UIjNR83y2NSIyK8HMPX8t5tpJHFNabiZvNgmmdQL3HA,1822
-velocity/aws/handlers/lambda_handler.py,sha256=0KrT6UIxDILzBRpoRSvwDgHpQ-vWfubcZFOCbJsewDc,6516
+velocity/aws/handlers/context.py,sha256=saeK-2hpfbuOZvA76C1_2ZJSblPO_tDuKeaeDVfli1w,8052
+velocity/aws/handlers/lambda_handler.py,sha256=k8ZTj4vhuDbB9xinQ1-s7hKgx5JznldTNT3-udfMw04,6391
 velocity/aws/handlers/response.py,sha256=LXhtizLKnVBWjtHyE0h0bk-NYDrRpj7CHa7tRz9KkC4,9324
 velocity/aws/handlers/sqs_handler.py,sha256=nqt8NMOc5yO-L6CZo7NjgR8Q4KPKTDFBO-0eHu6oxkY,7149
 velocity/db/__init__.py,sha256=t7YJT42U19Vkd4MMz5MhU8IFryKfblNPLJcPqzpb4HQ,566
@@ -49,8 +49,8 @@ velocity/misc/tools.py,sha256=_bGneHHA_BV-kUonzw5H3hdJ5AOJRCKfzhgpkFbGqIo,1502
 velocity/misc/conv/__init__.py,sha256=MLYF58QHjzfDSxb1rdnmLnuEQCa3gnhzzZ30CwZVvQo,40
 velocity/misc/conv/iconv.py,sha256=d4_BucW8HTIkGNurJ7GWrtuptqUf-9t79ObzjJ5N76U,10603
 velocity/misc/conv/oconv.py,sha256=h5Lo05DqOQnxoD3y6Px_MQP_V-pBbWf8Hkgkb9Xp1jk,6032
-velocity_python-0.0.112.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.112.dist-info/METADATA,sha256=LEPElQOJU4yBn0Zwdw4VzpLRNhC4M6MM1_6Qa28VBDU,34262
-velocity_python-0.0.112.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-velocity_python-0.0.112.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.112.dist-info/RECORD,,
+velocity_python-0.0.115.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.115.dist-info/METADATA,sha256=mH47xoUtbkjBSArI6QU7Mtx9qLjyPguYdAcVbPwtSLw,34262
+velocity_python-0.0.115.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+velocity_python-0.0.115.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.115.dist-info/RECORD,,