velocity-python 0.0.158__py3-none-any.whl → 0.0.160__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.158"
+__version__ = version = "0.0.160"
 
 from . import aws
 from . import db

velocity/aws/handlers/context.py

@@ -1,3 +1,4 @@
+import json
 import os
 import boto3
 import uuid
@@ -24,6 +25,8 @@ class Context:
         self.__aws_event = aws_event
         self.__aws_context = aws_context
         self.__log = log
+        self._job_record_cache = {}
+        self._job_cancelled_flag = False
 
     def postdata(self, keys=-1, default=None):
         if keys == -1:
@@ -87,9 +90,9 @@ class Context:
         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")}
-            )
+            job_id = self.postdata("job_id")
+            tx.table("aws_job_activity").update(sanitized_data, {"job_id": job_id})
+            self._job_record_cache.pop(job_id, None)
             tx.commit()
 
     def create_job(self, tx, job_data=None):
@@ -98,6 +101,9 @@ class Context:
             return
         sanitized_data = self._sanitize_job_data(job_data)
         tx.table("aws_job_activity").insert(sanitized_data)
+        job_id = sanitized_data.get("job_id")
+        if job_id:
+            self._job_record_cache.pop(job_id, None)
         tx.commit()
 
     def _sanitize_job_data(self, data):
@@ -183,6 +189,84 @@ class Context:
 
         return sanitized
 
+    def _get_job_record(self, tx, job_id=None, refresh=False):
+        job_id = job_id or self.postdata("job_id")
+        if not job_id:
+            return None
+
+        if refresh or job_id not in self._job_record_cache:
+            record = tx.table("aws_job_activity").find({"job_id": job_id})
+            if record is not None:
+                self._job_record_cache[job_id] = record
+            elif job_id in self._job_record_cache:
+                del self._job_record_cache[job_id]
+
+        return self._job_record_cache.get(job_id)
+
+    def is_job_cancel_requested(self, tx, force_refresh=False):
+        job = self._get_job_record(tx, refresh=force_refresh)
+        if not job:
+            return False
+
+        status = (job.get("status") or "").lower()
+        if status in {"cancelrequested", "cancelled"}:
+            return True
+
+        message_raw = job.get("message")
+        if not message_raw:
+            return False
+
+        if isinstance(message_raw, dict):
+            message = message_raw
+        else:
+            try:
+                message = json.loads(message_raw)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                return False
+
+        return bool(message.get("cancel_requested") or message.get("cancelled"))
+
+    def mark_job_cancelled(self, tx, detail=None, requested_by=None):
+        job_id = self.postdata("job_id")
+        if not job_id:
+            return
+
+        job = self._get_job_record(tx, refresh=True) or {}
+        message_raw = job.get("message")
+        if isinstance(message_raw, dict):
+            message = dict(message_raw)
+        else:
+            try:
+                message = json.loads(message_raw) if message_raw else {}
+            except (TypeError, ValueError, json.JSONDecodeError):
+                message = {}
+
+        message.update(
+            {
+                "detail": detail or "Job cancelled",
+                "cancelled": True,
+            }
+        )
+
+        tx.table("aws_job_activity").update(
+            {
+                "status": "Cancelled",
+                "message": to_json(message),
+                "handler_complete_timestamp": datetime.now(),
+                "sys_modified": datetime.now(),
+                "sys_modified_by": requested_by
+                or self.session().get("email_address")
+                or "system",
+            },
+            {"job_id": job_id},
+        )
+        tx.commit()
+        self._job_record_cache.pop(job_id, None)
+        self._job_cancelled_flag = True
+
+    def was_job_cancelled(self):
+        return self._job_cancelled_flag
+
     def enqueue(self, action, payload={}, user=None, suppress_job_activity=False):
         """
         Enqueue jobs to SQS with independent job activity tracking.

{velocity_python-0.0.158.dist-info → velocity_python-0.0.160.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.158
+Version: 0.0.160
 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.158.dist-info → velocity_python-0.0.160.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=BblI9g448OMQsducxdjwOZ1xg9Ii6BTbRNFIckwZyAY,147
+velocity/__init__.py,sha256=t8R519NPfB30baxwfHpQFR_kMmzXUu0_bglALFT14QM,147
 velocity/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/invoices.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/orders.py,sha256=C7ewngMpO8nD3ul_82o4FhZBdRkWvJtnuEbEJUKDCno,6151
@@ -12,7 +12,7 @@ velocity/aws/__init__.py,sha256=0nEsX68Q4I7Z7ybECJnNWsC8QhWOijn4NpaFgyzyfXA,685
 velocity/aws/amplify.py,sha256=VgSgon0XxboIozz0tKyUohgLIigelhe4W7EH8kwbnLg,15330
 velocity/aws/handlers/__init__.py,sha256=4-NKj8dBzjYEdIlNdfm_Ip5mI0oOGcpjjBcMwU42yhQ,227
 velocity/aws/handlers/base_handler.py,sha256=bapdzWss5lXesoLPsVwJo9hQMZLdz7XOubo3sK70xC8,7960
-velocity/aws/handlers/context.py,sha256=0kPZ8y-XjmBZY5NcexynR5htnWYfF0nwM1n5UH-6c5w,8413
+velocity/aws/handlers/context.py,sha256=yL1oA8y6q0b1Vg3KUB0XWJ0hqnToScZuBXEHpWif8V0,11259
 velocity/aws/handlers/exceptions.py,sha256=i4wcB8ZSWUHglX2xnesDlWLsU9AMYU72cHCWRBDmjQ8,361
 velocity/aws/handlers/lambda_handler.py,sha256=0wa_CHyJOaI5RsHqB0Ae83-B-SwlKR0qkGUlc7jitQI,4427
 velocity/aws/handlers/response.py,sha256=s2Kw7yv5zAir1mEmfv6yBVIvRcRQ__xyryf1SrvtiRc,9317
@@ -122,8 +122,8 @@ velocity/misc/tests/test_merge.py,sha256=Vm5_jY5cVczw0hZF-3TYzmxFw81heJOJB-dvhCg
 velocity/misc/tests/test_oconv.py,sha256=fy4DwWGn_v486r2d_3ACpuBD-K1oOngNq1HJCGH7X-M,4694
 velocity/misc/tests/test_original_error.py,sha256=iWSd18tckOA54LoPQOGV5j9LAz2W-3_ZOwmyZ8-4YQc,1742
 velocity/misc/tests/test_timer.py,sha256=l9nrF84kHaFofvQYKInJmfoqC01wBhsUB18lVBgXCoo,2758
-velocity_python-0.0.158.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.158.dist-info/METADATA,sha256=LI9OtDa0mQD0qua0MhVSVa-EtZYMY3D5dksal4bSQT8,34266
-velocity_python-0.0.158.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-velocity_python-0.0.158.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.158.dist-info/RECORD,,
+velocity_python-0.0.160.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.160.dist-info/METADATA,sha256=Gq-LK_UyNdBt4epmv7xgrwbcsSPIRa8XsiyB_BoSQyo,34266
+velocity_python-0.0.160.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+velocity_python-0.0.160.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.160.dist-info/RECORD,,