django-bulk-hooks 0.1.215__py3-none-any.whl → 0.1.217__py3-none-any.whl

django_bulk_hooks/context.py

@@ -12,10 +12,22 @@ def get_hook_queue():
     return _hook_context.queue
 
 
+def set_bypass_hooks(bypass_hooks):
+    """Set the current bypass_hooks state for the current thread."""
+    _hook_context.bypass_hooks = bypass_hooks
+
+
+def get_bypass_hooks():
+    """Get the current bypass_hooks state for the current thread."""
+    return getattr(_hook_context, 'bypass_hooks', False)
+
+
 class HookContext:
     def __init__(self, model, bypass_hooks=False):
         self.model = model
         self.bypass_hooks = bypass_hooks
+        # Set the thread-local bypass state when creating a context
+        set_bypass_hooks(bypass_hooks)
 
     @property
     def is_executing(self):

django_bulk_hooks/queryset.py

@@ -72,9 +72,19 @@ class HookQuerySetMixin:
             for field, value in kwargs.items():
                 setattr(obj, field, value)
 
-        # Run BEFORE_UPDATE hooks
-        ctx = HookContext(model_cls)
-        engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
+        # Check if we're in a bulk operation context to prevent double hook execution
+        from django_bulk_hooks.context import get_bypass_hooks
+        current_bypass_hooks = get_bypass_hooks()
+        
+        # If we're in a bulk operation context, skip hooks to prevent double execution
+        if current_bypass_hooks:
+            print(f"DEBUG: update method skipping hooks due to bulk operation context")
+            ctx = HookContext(model_cls, bypass_hooks=True)
+        else:
+            print(f"DEBUG: update method running hooks (standalone update)")
+            ctx = HookContext(model_cls, bypass_hooks=False)
+            # Run BEFORE_UPDATE hooks only for standalone updates
+            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
         # Use Django's built-in update logic directly
         # Call the base QuerySet implementation to avoid recursion
@@ -101,8 +111,12 @@ class HookQuerySetMixin:
                                 getattr(refreshed_instance, field.name),
                             )
 
-        # Run AFTER_UPDATE hooks
-        engine.run(model_cls, AFTER_UPDATE, instances, originals, ctx=ctx)
+        # Run AFTER_UPDATE hooks only for standalone updates
+        if not current_bypass_hooks:
+            print(f"DEBUG: update method running AFTER_UPDATE hooks")
+            engine.run(model_cls, AFTER_UPDATE, instances, originals, ctx=ctx)
+        else:
+            print(f"DEBUG: update method skipping AFTER_UPDATE hooks due to bulk operation context")
 
         return update_count
 
@@ -161,12 +175,13 @@ class HookQuerySetMixin:
 
         # Fire hooks before DB ops
         if not bypass_hooks:
-            ctx = HookContext(model_cls, bypass_hooks=False)
+            ctx = HookContext(model_cls, bypass_hooks=False) # Pass bypass_hooks
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
             engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
         else:
-            ctx = HookContext(model_cls, bypass_hooks=True)
+            ctx = HookContext(model_cls, bypass_hooks=True) # Pass bypass_hooks
+            print(f"DEBUG: Set thread-local bypass_hooks=True for nested calls in bulk_create")
 
         # For MTI models, we need to handle them specially
         if is_mti:
@@ -233,8 +248,7 @@ class HookQuerySetMixin:
                 break
 
         if not bypass_hooks:
-            print(f"DEBUG: bypass_hooks=False, running hooks for {len(objs)} objects")
-            # Load originals for hook comparison
+            print(f"DEBUG: bulk_update running hooks for {len(objs)} objects")
             original_map = {
                 obj.pk: obj
                 for obj in model_cls._base_manager.filter(
@@ -242,12 +256,9 @@ class HookQuerySetMixin:
                 )
             }
             originals = [original_map.get(obj.pk) for obj in objs]
-
             ctx = HookContext(model_cls, bypass_hooks=False)
-
             # Run validation hooks first
-            if not bypass_validation:
-                engine.run(model_cls, VALIDATE_UPDATE, objs, originals, ctx=ctx)
+            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)
@@ -259,8 +270,10 @@ class HookQuerySetMixin:
                 fields_set.update(modified_fields)
                 fields = list(fields_set)
         else:
-            print(f"DEBUG: bypass_hooks=True, skipping hooks for {len(objs)} objects")
+            print(f"DEBUG: bulk_update skipping hooks and setting bulk context to prevent double execution")
             ctx = HookContext(model_cls, bypass_hooks=True)
+            print(f"DEBUG: Set thread-local bypass_hooks=True to prevent nested update() calls from running hooks")
+            originals = [None] * len(objs)  # Ensure originals is defined for after_update call
 
         # Handle auto_now fields like Django's update_or_create does
         fields_set = set(fields)

{django_bulk_hooks-0.1.215.dist-info → django_bulk_hooks-0.1.217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.215
+Version: 0.1.217
 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.215.dist-info → django_bulk_hooks-0.1.217.dist-info}/RECORD

@@ -1,7 +1,7 @@
 django_bulk_hooks/__init__.py,sha256=uUgpnb9AWjIAcWNpCMqBcOewSnpJjJYH6cjPbQkzoNU,140
 django_bulk_hooks/conditions.py,sha256=0NEAtiIxS9DI4DcqvqGPaCJJR-5ldHqY9uQ9VuM2YYc,6865
 django_bulk_hooks/constants.py,sha256=3x1H1fSUUNo0DZONN7GUVDuySZctTR-jtByBHmAIX5w,303
-django_bulk_hooks/context.py,sha256=47T9FivluZjhH45kZOoPJC2HLyozRFcL1Sqk4LjJheY,1113
+django_bulk_hooks/context.py,sha256=_NbGWTq9s66g0vbFIaqN4GlIHWQmFg3EQ44qY8YvvEg,1537
 django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lkYQ,4896
 django_bulk_hooks/engine.py,sha256=pZGN3-O7SRZeMq69DVjtAAU7CQzcm8sj8GZyTUctBdc,3140
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
 django_bulk_hooks/models.py,sha256=TA2dBIA1nJBiYt6joefWkpFIQZWysF9kZlkBYvEe59c,4358
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=B7kJWRxmMpg40Q0hvwosxYC_1UXxs82SM_U1Il74nrY,32824
+django_bulk_hooks/queryset.py,sha256=hvi22HhnIpbZunSjdLgfBvkl_7JrIudMufDd2jKvS1c,33987
 django_bulk_hooks/registry.py,sha256=fbr6T9MidCs0oV6LhocLIVo3TGs2EazGTVqapoUbm2U,1436
-django_bulk_hooks-0.1.215.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.215.dist-info/METADATA,sha256=qAPe-zyNl6Ia1AXLJ0BOmLI20ug9elZyt_P4557VTeI,9061
-django_bulk_hooks-0.1.215.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.1.215.dist-info/RECORD,,
+django_bulk_hooks-0.1.217.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.217.dist-info/METADATA,sha256=Ae7ndlaxYXGMLgo3Waincm0GAHwBh9Wjul7suGDiqVo,9061
+django_bulk_hooks-0.1.217.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.217.dist-info/RECORD,,