django-bulk-hooks 0.1.214__py3-none-any.whl → 0.1.216__py3-none-any.whl

django_bulk_hooks/conditions.py

@@ -66,11 +66,25 @@ class HasChanged(HookCondition):
         self.has_changed = has_changed
 
     def check(self, instance, original_instance=None):
+        print(f"DEBUG: HasChanged.check called for field '{self.field}' on instance {getattr(instance, 'pk', 'No PK')}")
+        print(f"DEBUG: Original instance: {getattr(original_instance, 'pk', 'No PK') if original_instance else 'None'}")
+        
         if not original_instance:
+            print(f"DEBUG: No original instance, returning False")
             return False
+        
         current = resolve_dotted_attr(instance, self.field)
         previous = resolve_dotted_attr(original_instance, self.field)
-        return (current != previous) == self.has_changed
+        
+        # Add more detailed debugging
+        print(f"DEBUG: Field '{self.field}' - current value: {current} (type: {type(current)})")
+        print(f"DEBUG: Field '{self.field}' - previous value: {previous} (type: {type(previous)})")
+        print(f"DEBUG: Values are equal: {current == previous}")
+        
+        result = (current != previous) == self.has_changed
+        print(f"DEBUG: HasChanged result: current={current}, previous={previous}, has_changed={self.has_changed}, result={result}")
+        
+        return result
 
 
 class WasEqual(HookCondition):

django_bulk_hooks/context.py

@@ -12,9 +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):
+    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/engine.py

@@ -29,6 +29,12 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
     print(f"DEBUG: Call stack (last 3 frames):")
     for line in stack[-4:-1]:  # Show last 3 frames before this one
         print(f"  {line.strip()}")
+    print(f"DEBUG: Total hooks found: {len(hooks)}")
+    
+    # Check if we're in a bypass context
+    if ctx and hasattr(ctx, 'bypass_hooks') and ctx.bypass_hooks:
+        print(f"DEBUG: Context has bypass_hooks=True, skipping hook execution")
+        return
 
     # For BEFORE_* events, run model.clean() first for validation
     if event.startswith("before_"):
@@ -41,6 +47,7 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
 
     # Process hooks
     for handler_cls, method_name, condition, priority in hooks:
+        print(f"DEBUG: Processing hook {handler_cls.__name__}.{method_name} with condition: {condition}")
         handler_instance = handler_cls()
         func = getattr(handler_instance, method_name)
 
@@ -52,9 +59,16 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
             old_records or [None] * len(new_records),
             strict=True,
         ):
-            if not condition or condition.check(new, original):
+            if not condition:
+                print(f"DEBUG: No condition, adding record {new.pk if hasattr(new, 'pk') else 'No PK'}")
                 to_process_new.append(new)
                 to_process_old.append(original)
+            else:
+                condition_result = condition.check(new, original)
+                print(f"DEBUG: Condition {condition.__class__.__name__} check result: {condition_result} for record {new.pk if hasattr(new, 'pk') else 'No PK'}")
+                if condition_result:
+                    to_process_new.append(new)
+                    to_process_old.append(original)
 
         if to_process_new:
             print(
@@ -66,4 +80,7 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
                     old_records=to_process_old if any(to_process_old) else None,
                 )
             except Exception as e:
+                print(f"DEBUG: Hook execution failed: {e}")
                 raise
+        else:
+            print(f"DEBUG: No records to process for hook {handler_cls.__name__}.{method_name}")

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,10 +175,13 @@ class HookQuerySetMixin:
 
         # Fire hooks before DB ops
         if not bypass_hooks:
-            ctx = HookContext(model_cls)
+            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) # 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:
@@ -219,6 +236,10 @@ class HookQuerySetMixin:
                 f"bulk_update expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
             )
 
+        print(f"DEBUG: bulk_update called with bypass_hooks={bypass_hooks} (type: {type(bypass_hooks)}), bypass_validation={bypass_validation}")
+        print(f"DEBUG: bulk_update for model {model_cls.__name__} with {len(objs)} objects")
+        print(f"DEBUG: kwargs: {kwargs}")
+
         # Check for MTI
         is_mti = False
         for parent in model_cls._meta.all_parents:
@@ -227,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(
@@ -237,7 +257,7 @@ class HookQuerySetMixin:
             }
             originals = [original_map.get(obj.pk) for obj in objs]
 
-            ctx = HookContext(model_cls)
+            ctx = HookContext(model_cls, bypass_hooks=False)
 
             # Run validation hooks first
             if not bypass_validation:
@@ -253,7 +273,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)
@@ -278,7 +301,12 @@ class HookQuerySetMixin:
                 for k, v in kwargs.items()
                 if k not in ["bypass_hooks", "bypass_validation"]
             }
+            print(f"DEBUG: Calling Django's bulk_update with kwargs: {django_kwargs}")
+            # Call Django's bulk_update with hook suspension to prevent double execution
+            # Django's bulk_update internally calls .update() which would trigger our hooks again
+            print(f"DEBUG: About to call Django's bulk_update")
             result = super().bulk_update(objs, fields, **django_kwargs)
+            print(f"DEBUG: Django's bulk_update completed, result: {result}")
 
         if not bypass_hooks:
             print(

django_bulk_hooks/registry.py

@@ -14,10 +14,21 @@ def register_hook(
     hooks.append((handler_cls, method_name, condition, priority))
     # keep sorted by priority
     hooks.sort(key=lambda x: x[3])
+    print(f"DEBUG: Registered hook {handler_cls.__name__}.{method_name} for {model.__name__}.{event} with condition: {condition}")
+    print(f"DEBUG: Model class: {model} (id: {id(model)})")
+    print(f"DEBUG: Total hooks for {model.__name__}.{event}: {len(hooks)}")
 
 
 def get_hooks(model, event):
-    hooks = _hooks.get((model, event), [])
+    key = (model, event)
+    hooks = _hooks.get(key, [])
+    print(f"DEBUG: get_hooks called for {model.__name__}.{event}, found {len(hooks)} hooks")
+    print(f"DEBUG: Hook key: {key}")
+    print(f"DEBUG: Model class: {model} (id: {id(model)})")
+    print(f"DEBUG: All registered hook keys: {list(_hooks.keys())}")
+    for hook in hooks:
+        handler_cls, method_name, condition, priority = hook
+        print(f"DEBUG: Hook: {handler_cls.__name__}.{method_name} with condition: {condition}")
     return hooks
 
 

{django_bulk_hooks-0.1.214.dist-info → django_bulk_hooks-0.1.216.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.214
+Version: 0.1.216
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
-Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT
 Keywords: django,bulk,hooks
 Author: Konrad Beck
@@ -14,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: Django (>=4.0)
+Project-URL: Homepage, https://github.com/AugendLimited/django-bulk-hooks
 Project-URL: Repository, https://github.com/AugendLimited/django-bulk-hooks
 Description-Content-Type: text/markdown
 

django_bulk_hooks-0.1.216.dist-info/RECORD

@@ -0,0 +1,17 @@
+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=_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
+django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,4854
+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=Lo0_BIBRX_ADDyXUCeCQ-jw4Kr3XaThrOQTaERMEe-s,34033
+django_bulk_hooks/registry.py,sha256=fbr6T9MidCs0oV6LhocLIVo3TGs2EazGTVqapoUbm2U,1436
+django_bulk_hooks-0.1.216.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.216.dist-info/METADATA,sha256=AmuIXkrR8uVi8e88h74tUym5nS0WHkO0U_RJQu-uBwo,9061
+django_bulk_hooks-0.1.216.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.216.dist-info/RECORD,,

{django_bulk_hooks-0.1.214.dist-info → django_bulk_hooks-0.1.216.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

django_bulk_hooks-0.1.214.dist-info/RECORD

@@ -1,17 +0,0 @@
-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=4IPuOX8TBAYBEMzN0RNHWgE6Giy2ZnR5uRXfd1cpIwk,1051
-django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lkYQ,4896
-django_bulk_hooks/engine.py,sha256=aoeGCW9dne_5qB4-0YpndC3vnLGlLOYGwyWjmbFbZvg,2133
-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=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=AK4znACMv5tyZyFmPchreO8yn9xDERIkmerfiuSRURs,31941
-django_bulk_hooks/registry.py,sha256=-mQBizJ06nz_tajZBinViKx_uP2Tbc1tIpTEMv7lwKA,705
-django_bulk_hooks-0.1.214.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.214.dist-info/METADATA,sha256=S1UR9Sm-y6xTmf2Yi-QAIKwmt2p-dmqsJgJcrvPp2BE,9049
-django_bulk_hooks-0.1.214.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.214.dist-info/RECORD,,