velocity-python 0.0.113__tar.gz → 0.0.116__tar.gz

{velocity_python-0.0.113 → velocity_python-0.0.116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.113
+Version: 0.0.116
 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.113 → velocity_python-0.0.116}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.0.113"
+version = "0.0.116"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.0.113 → velocity_python-0.0.116}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.113"
+__version__ = version = "0.0.116"
 
 from . import aws
 from . import db

velocity_python-0.0.116/src/velocity/aws/handlers/context.py

@@ -0,0 +1,216 @@
+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()
+
+
+@engine.transaction
+class Context:
+
+    def __init__(
+        self, aws_event, aws_context, args, postdata, response, session, log=None
+    ):
+        self.__args = args
+        self.__postdata = postdata
+        self.__response = response
+        self.__session = session
+        self.__aws_event = aws_event
+        self.__aws_context = aws_context
+        self.__log = log
+
+    def postdata(self, keys=-1, default=None):
+        if keys == -1:
+            return self.__postdata
+        if not isinstance(keys, list):
+            keys = [keys]
+        data = self.__postdata
+        for key in keys:
+            if key in data:
+                data = data[key]
+            else:
+                return default
+        return data
+
+    def payload(self, keys=-1, default={}):
+        if "payload" not in self.__postdata:
+            return default
+        if keys == -1:
+            return self.__postdata["payload"]
+        if not isinstance(keys, list):
+            keys = [keys]
+        data = self.__postdata["payload"]
+        for key in keys:
+            if key in data:
+                data = data[key]
+            else:
+                return default
+        return data
+
+    def action(self):
+        return self.__postdata.get("action", self.__args.get("action", ""))
+
+    def args(self):
+        return self.__args
+
+    def response(self):
+        return self.__response
+
+    def session(self):
+        return self.__session
+
+    def dataset(self):
+        return self.payload().get("dataset", {})
+
+    def log(self, message, function=None):
+        if self.__log:
+            return self.__log(message, function)
+        else:
+            if function:
+                print(f"{function}: {message}")
+            else:
+                print(f"{message}")
+
+    def update_job(self, tx, data=None):
+        """Update job status and message in aws_job_activity table.
+        
+        This method only UPDATES existing jobs. For creating new jobs, use create_job.
+        """
+        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 create_job(self, job_data):
+        """Create a new job record in aws_job_activity table using independent transaction."""
+        sanitized_data = self._sanitize_job_data(job_data)
+        tx.table("aws_job_activity").insert(sanitized_data)
+        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
+                self.create_job({
+                    "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"
+                })
+                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_python-0.0.113 → velocity_python-0.0.116}/src/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={}):
-        return enqueue(tx, action, payload, self.session["email_address"])

{velocity_python-0.0.113 → velocity_python-0.0.116}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.113
+Version: 0.0.116
 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.113/src/velocity/aws/handlers/context.py

@@ -1,70 +0,0 @@
-import support.app
-
-engine = support.app.postgres()
-
-
-@engine.transaction
-class Context:
-
-    def __init__(
-        self, aws_event, aws_context, args, postdata, response, session, log=None
-    ):
-        self.__args = args
-        self.__postdata = postdata
-        self.__response = response
-        self.__session = session
-        self.__aws_event = aws_event
-        self.__aws_context = aws_context
-        self.__log = log
-
-    def postdata(self, keys=-1, default=None):
-        if keys == -1:
-            return self.__postdata
-        if not isinstance(keys, list):
-            keys = [keys]
-        data = self.__postdata
-        for key in keys:
-            if key in data:
-                data = data[key]
-            else:
-                return default
-        return data
-
-    def payload(self, keys=-1, default={}):
-        if "payload" not in self.__postdata:
-            return default
-        if keys == -1:
-            return self.__postdata["payload"]
-        if not isinstance(keys, list):
-            keys = [keys]
-        data = self.__postdata["payload"]
-        for key in keys:
-            if key in data:
-                data = data[key]
-            else:
-                return default
-        return data
-
-    def action(self):
-        return self.__postdata.get("action", self.__args.get("action", ""))
-
-    def args(self):
-        return self.__args
-
-    def response(self):
-        return self.__response
-
-    def session(self):
-        return self.__session
-
-    def dataset(self):
-        return self.payload().get("dataset", {})
-
-    def log(self, message, function=None):
-        if self.__log:
-            return self.__log(message, function)
-        else:
-            if function:
-                print(f"{function}: {message}")
-            else:
-                print(f"{message}")