django-bulk-hooks 0.1.71__py3-none-any.whl → 0.1.73__py3-none-any.whl

django_bulk_hooks/context.py

@@ -10,6 +10,16 @@ def get_hook_queue():
     return _hook_context.queue
 
 
+def is_in_bulk_operation():
+    """Check if we're currently in a bulk operation to prevent recursion."""
+    return getattr(_hook_context, "in_bulk_operation", False)
+
+
+def set_bulk_operation_flag(value):
+    """Set the bulk operation flag to prevent recursion."""
+    _hook_context.in_bulk_operation = value
+
+
 class HookContext:
     def __init__(self, model_cls, metadata=None):
         self.model_cls = model_cls

django_bulk_hooks/manager.py

@@ -1,4 +1,5 @@
 from django.db import models, transaction
+
 from django_bulk_hooks import engine
 from django_bulk_hooks.constants import (
     AFTER_CREATE,
@@ -8,10 +9,10 @@ from django_bulk_hooks.constants import (
     BEFORE_DELETE,
     BEFORE_UPDATE,
     VALIDATE_CREATE,
-    VALIDATE_UPDATE,
     VALIDATE_DELETE,
+    VALIDATE_UPDATE,
 )
-from django_bulk_hooks.context import HookContext
+from django_bulk_hooks.context import HookContext, is_in_bulk_operation, set_bulk_operation_flag
 from django_bulk_hooks.queryset import HookQuerySet
 
 
@@ -22,7 +23,9 @@ class BulkHookManager(models.Manager):
         return HookQuerySet(self.model, using=self._db)
 
     @transaction.atomic
-    def bulk_update(self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs):
+    def bulk_update(
+        self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
+    ):
         if not objs:
             return []
 
@@ -34,13 +37,27 @@ class BulkHookManager(models.Manager):
             )
 
         if not bypass_hooks:
-            originals = list(model_cls.objects.filter(pk__in=[obj.pk for obj in objs]))
+            # Check if we're already in a hook context (recursive call)
+            # If so, refetch the current database state like Salesforce does
+            import threading
+
+            if hasattr(threading.current_thread(), "_hook_context"):
+                # We're in a recursive call - refetch current DB state
+                originals = list(
+                    model_cls.objects.filter(pk__in=[obj.pk for obj in objs])
+                )
+            else:
+                # First call - use the passed originals
+                originals = list(
+                    model_cls.objects.filter(pk__in=[obj.pk for obj in objs])
+                )
+
             ctx = HookContext(model_cls)
-            
+
             # Run validation hooks first
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_UPDATE, objs, originals, ctx=ctx)
-            
+
             # Then run business logic hooks
             engine.run(model_cls, BEFORE_UPDATE, objs, originals, ctx=ctx)
 
@@ -118,11 +135,11 @@ class BulkHookManager(models.Manager):
 
         if not bypass_hooks:
             ctx = HookContext(model_cls)
-            
+
             # Run validation hooks first
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
-            
+
             # Then run business logic hooks
             engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
 
@@ -136,7 +153,9 @@ class BulkHookManager(models.Manager):
         return result
 
     @transaction.atomic
-    def bulk_delete(self, objs, batch_size=None, bypass_hooks=False, bypass_validation=False):
+    def bulk_delete(
+        self, objs, batch_size=None, bypass_hooks=False, bypass_validation=False
+    ):
         if not objs:
             return []
 
@@ -153,12 +172,19 @@ class BulkHookManager(models.Manager):
             # Run validation hooks first
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_DELETE, objs, ctx=ctx)
-            
+
             # Then run business logic hooks
             engine.run(model_cls, BEFORE_DELETE, objs, ctx=ctx)
 
         pks = [obj.pk for obj in objs if obj.pk is not None]
-        model_cls.objects.filter(pk__in=pks).delete()
+        
+        # Set flag to prevent recursion during the actual deletion
+        set_bulk_operation_flag(True)
+        try:
+            # Use the custom manager - hooks won't fire again due to the flag
+            model_cls.objects.filter(pk__in=pks).delete()
+        finally:
+            set_bulk_operation_flag(False)
 
         if not bypass_hooks:
             engine.run(model_cls, AFTER_DELETE, objs, ctx=ctx)

django_bulk_hooks/queryset.py

@@ -1,4 +1,5 @@
 from django.db import models, transaction
+from django_bulk_hooks.context import is_in_bulk_operation
 
 
 class HookQuerySet(models.QuerySet):
@@ -7,7 +8,13 @@ class HookQuerySet(models.QuerySet):
         objs = list(self)
         if not objs:
             return 0
-        return self.model.objects.bulk_delete(objs)
+        
+        # If we're already in a bulk operation, use base manager to prevent recursion
+        if is_in_bulk_operation():
+            return self.model._base_manager.bulk_delete(objs)
+        else:
+            # Normal case - use custom manager to ensure hooks fire
+            return self.model.objects.bulk_delete(objs)
 
     @transaction.atomic
     def update(self, **kwargs):
@@ -35,8 +42,14 @@ class HookQuerySet(models.QuerySet):
         engine.run(model_cls, "before_update", instances, originals, ctx=ctx)
 
         # Use Django's built-in update logic directly
-        queryset = self.model._base_manager.filter(pk__in=pks)
-        update_count = queryset.update(**kwargs)
+        # Set flag to prevent recursion during the actual update
+        from django_bulk_hooks.context import set_bulk_operation_flag
+        set_bulk_operation_flag(True)
+        try:
+            queryset = self.model.objects.filter(pk__in=pks)
+            update_count = queryset.update(**kwargs)
+        finally:
+            set_bulk_operation_flag(False)
 
         # Run AFTER_UPDATE hooks
         engine.run(model_cls, "after_update", instances, originals, ctx=ctx)

{django_bulk_hooks-0.1.71.dist-info → django_bulk_hooks-0.1.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.71
+Version: 0.1.73
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks

{django_bulk_hooks-0.1.71.dist-info → django_bulk_hooks-0.1.73.dist-info}/RECORD

@@ -1,17 +1,17 @@
 django_bulk_hooks/__init__.py,sha256=uUgpnb9AWjIAcWNpCMqBcOewSnpJjJYH6cjPbQkzoNU,140
 django_bulk_hooks/conditions.py,sha256=mTvlLcttixbXRkTSNZU5VewkPUavbXRuD2BkJbVWMkw,6041
 django_bulk_hooks/constants.py,sha256=3x1H1fSUUNo0DZONN7GUVDuySZctTR-jtByBHmAIX5w,303
-django_bulk_hooks/context.py,sha256=HVDT73uSzvgrOR6mdXTvsBm3hLOgBU8ant_mB7VlFuM,380
+django_bulk_hooks/context.py,sha256=4fUfw6eMDu2V4h9EFY7uy8uDcIL0v0Fk2YVSn6V1xMI,701
 django_bulk_hooks/decorators.py,sha256=tckDcxtOzKCbgvS9QydgeIAWTFDEl-ch3_Q--ruEGdQ,4831
 django_bulk_hooks/engine.py,sha256=3HbgV12JRYIy9IlygHPxZiHnFXj7EwzLyTuJNQeVIoI,1402
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,4854
-django_bulk_hooks/manager.py,sha256=8ifRsHFJZXViTHdKbVWFd35MF5xHvGqu9UttgsLrkVU,6911
+django_bulk_hooks/manager.py,sha256=PYPq0incwM16tULpCfbR93GrGHcPtGyj4w6s0w1HCn0,7788
 django_bulk_hooks/models.py,sha256=7RG7GrOdHXFjGVPV4FPRZVNMIHHW-hMCi6hn9LH_hVI,3331
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=nmVZ6cqkveSiBz_L4cRT-3u-mkcjkGQNJLhza8SSdKc,1398
+django_bulk_hooks/queryset.py,sha256=dFYBK-CEtWPTJ9zKSc6EJLaQ8oHxR49nnzQiEGKeyOo,1996
 django_bulk_hooks/registry.py,sha256=-mQBizJ06nz_tajZBinViKx_uP2Tbc1tIpTEMv7lwKA,705
-django_bulk_hooks-0.1.71.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.71.dist-info/METADATA,sha256=Ys-lGAZiQXE46EtkP8t_0DxNbqwtJPhisRDa2LWe-HA,5930
-django_bulk_hooks-0.1.71.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.1.71.dist-info/RECORD,,
+django_bulk_hooks-0.1.73.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.73.dist-info/METADATA,sha256=NFnctdgus6n6e96VVcR1IeNh8DDVa1WzI6XyDr2iHd4,5930
+django_bulk_hooks-0.1.73.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.73.dist-info/RECORD,,