django-bulk-hooks 0.1.74__tar.gz → 0.1.76__tar.gz

{django_bulk_hooks-0.1.74 → django_bulk_hooks-0.1.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.74
+Version: 0.1.76
 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.74 → django_bulk_hooks-0.1.76}/django_bulk_hooks/context.py

@@ -10,16 +10,6 @@ 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-0.1.74 → django_bulk_hooks-0.1.76}/django_bulk_hooks/manager.py

@@ -12,7 +12,7 @@ from django_bulk_hooks.constants import (
     VALIDATE_DELETE,
     VALIDATE_UPDATE,
 )
-from django_bulk_hooks.context import HookContext, is_in_bulk_operation, set_bulk_operation_flag
+from django_bulk_hooks.context import HookContext
 from django_bulk_hooks.queryset import HookQuerySet
 
 
@@ -37,20 +37,10 @@ class BulkHookManager(models.Manager):
             )
 
         if not bypass_hooks:
-            # 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])
-                )
+            # Load originals for hook comparison
+            originals = list(
+                model_cls.objects.filter(pk__in=[obj.pk for obj in objs])
+            )
 
             ctx = HookContext(model_cls)
 
@@ -178,13 +168,9 @@ class BulkHookManager(models.Manager):
 
         pks = [obj.pk for obj in objs if obj.pk is not None]
         
-        # 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)
+        # Use base manager for the actual deletion to prevent recursion
+        # The hooks have already been fired above, so we don't need them again
+        model_cls._base_manager.filter(pk__in=pks).delete()
 
         if not bypass_hooks:
             engine.run(model_cls, AFTER_DELETE, objs, ctx=ctx)

{django_bulk_hooks-0.1.74 → django_bulk_hooks-0.1.76}/django_bulk_hooks/queryset.py

@@ -1,5 +1,4 @@
 from django.db import models, transaction
-from django_bulk_hooks.context import is_in_bulk_operation
 
 
 class HookQuerySet(models.QuerySet):
@@ -8,15 +7,7 @@ class HookQuerySet(models.QuerySet):
         objs = list(self)
         if not objs:
             return 0
-        
-        # If we're already in a bulk operation, use base manager to prevent recursion
-        if is_in_bulk_operation():
-            # Use standard Django delete method on base manager
-            pks = [obj.pk for obj in objs if obj.pk is not None]
-            return self.model._base_manager.filter(pk__in=pks).delete()[0]
-        else:
-            # Normal case - use custom manager to ensure hooks fire
-            return self.model.objects.bulk_delete(objs)
+        return self.model.objects.bulk_delete(objs)
 
     @transaction.atomic
     def update(self, **kwargs):
@@ -29,7 +20,6 @@ class HookQuerySet(models.QuerySet):
 
         # 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:
@@ -44,14 +34,8 @@ class HookQuerySet(models.QuerySet):
         engine.run(model_cls, "before_update", instances, originals, ctx=ctx)
 
         # Use Django's built-in update logic directly
-        # 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)
+        queryset = self.model.objects.filter(pk__in=pks)
+        update_count = queryset.update(**kwargs)
 
         # Run AFTER_UPDATE hooks
         engine.run(model_cls, "after_update", instances, originals, ctx=ctx)

{django_bulk_hooks-0.1.74 → django_bulk_hooks-0.1.76}/pyproject.toml

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