django-bulk-hooks 0.1.54__tar.gz → 0.1.56__tar.gz

{django_bulk_hooks-0.1.54 → django_bulk_hooks-0.1.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.54
+Version: 0.1.56
 Summary: Lifecycle-style hooks for Django bulk operations like bulk_create and bulk_update.
 Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT

{django_bulk_hooks-0.1.54 → django_bulk_hooks-0.1.56}/django_bulk_hooks/handler.py

@@ -7,7 +7,18 @@ from django_bulk_hooks.registry import get_hooks, register_hook
 
 logger = logging.getLogger(__name__)
 
-# Thread-local hook queue context
+# Thread-local hook context and trigger state
+class TriggerVars(threading.local):
+    def __init__(self):
+        self.new = None
+        self.old = None
+        self.event = None
+        self.model = None
+        self.depth = 0
+
+trigger = TriggerVars()
+
+# Hook queue per thread
 _hook_context = threading.local()
 
 def get_hook_queue():
@@ -15,6 +26,37 @@ def get_hook_queue():
         _hook_context.queue = deque()
     return _hook_context.queue
 
+class TriggerContextState:
+    @property
+    def is_before(self):
+        return trigger.event.startswith("before_") if trigger.event else False
+
+    @property
+    def is_after(self):
+        return trigger.event.startswith("after_") if trigger.event else False
+
+    @property
+    def is_create(self):
+        return "create" in trigger.event if trigger.event else False
+
+    @property
+    def is_update(self):
+        return "update" in trigger.event if trigger.event else False
+
+    @property
+    def new(self):
+        return trigger.new
+
+    @property
+    def old(self):
+        return trigger.old
+
+    @property
+    def model(self):
+        return trigger.model
+
+Trigger = TriggerContextState()
+
 class TriggerHandlerMeta(type):
     _registered = set()
 
@@ -67,6 +109,12 @@ class TriggerHandler(metaclass=TriggerHandlerMeta):
         old_records,
         **kwargs,
     ):
+        trigger.depth += 1
+        trigger.new = new_records
+        trigger.old = old_records
+        trigger.event = event
+        trigger.model = model
+
         hooks = sorted(get_hooks(model, event), key=lambda x: x[3])
         logger.debug("Processing %d hooks for %s.%s", len(hooks), model.__name__, event)
 
@@ -96,7 +144,14 @@ class TriggerHandler(metaclass=TriggerHandlerMeta):
                     logger.exception("Error in hook %s.%s", handler_cls.__name__, method_name)
 
         conn = transaction.get_connection()
-        if conn.in_atomic_block and event.startswith("after_"):
-            transaction.on_commit(_execute)
-        else:
-            _execute()
+        try:
+            if conn.in_atomic_block and event.startswith("after_"):
+                transaction.on_commit(_execute)
+            else:
+                _execute()
+        finally:
+            trigger.new = None
+            trigger.old = None
+            trigger.event = None
+            trigger.model = None
+            trigger.depth -= 1

django_bulk_hooks-0.1.56/django_bulk_hooks/queryset.py

@@ -0,0 +1,43 @@
+from django.db import models, transaction
+
+
+class LifecycleQuerySet(models.QuerySet):
+    @transaction.atomic
+    def delete(self):
+        objs = list(self)
+        if not objs:
+            return 0
+        return self.model.objects.bulk_delete(objs)
+
+    @transaction.atomic
+    def update(self, **kwargs):
+        instances = list(self)
+        if not instances:
+            return 0
+
+        model_cls = self.model
+        pks = [obj.pk for obj in instances]
+
+        # Load originals for hook comparison
+        originals = list(model_cls.objects.filter(pk__in=pks))
+        originals_by_pk = {obj.pk: obj for obj in originals}
+
+        # Apply field updates to instances
+        for obj in instances:
+            for field, value in kwargs.items():
+                setattr(obj, field, value)
+
+        # Run BEFORE_UPDATE hooks
+        from django_bulk_hooks.context import TriggerContext
+        from django_bulk_hooks import engine
+        ctx = TriggerContext(model_cls)
+        engine.run(model_cls, "before_update", instances, originals, ctx=ctx)
+
+        # Use Django's built-in update logic directly
+        update_count = super().update(**kwargs)
+
+        # Run AFTER_UPDATE hooks
+        engine.run(model_cls, "after_update", instances, originals, ctx=ctx)
+
+        return update_count
+

{django_bulk_hooks-0.1.54 → django_bulk_hooks-0.1.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.54"
+version = "0.1.56"
 description = "Lifecycle-style hooks for Django bulk operations like bulk_create and bulk_update."
 authors = ["Konrad Beck <konrad.beck@merchantcapital.co.za>"]
 readme = "README.md"

django_bulk_hooks-0.1.54/django_bulk_hooks/queryset.py

@@ -1,27 +0,0 @@
-from django.db import models, transaction
-
-
-class LifecycleQuerySet(models.QuerySet):
-    @transaction.atomic
-    def delete(self):
-        objs = list(self)
-        if not objs:
-            return 0
-        return self.model.objects.bulk_delete(objs)
-
-    @transaction.atomic
-    def update(self, **kwargs):
-        instances = list(self)
-        if not instances:
-            return 0
-
-        for obj in instances:
-            for field, value in kwargs.items():
-                setattr(obj, field, value)
-
-        self.model.objects.bulk_update(
-            instances,
-            fields=list(kwargs.keys()),
-        )
-
-        return len(instances)