django-bulk-hooks 0.1.213__tar.gz → 0.1.215__tar.gz

{django_bulk_hooks-0.1.213 → django_bulk_hooks-0.1.215}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.213
+Version: 0.1.215
 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.213 → django_bulk_hooks-0.1.215}/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-0.1.213 → django_bulk_hooks-0.1.215}/django_bulk_hooks/context.py

@@ -13,8 +13,9 @@ def get_hook_queue():
 
 
 class HookContext:
-    def __init__(self, model):
+    def __init__(self, model, bypass_hooks=False):
         self.model = model
+        self.bypass_hooks = bypass_hooks
 
     @property
     def is_executing(self):

{django_bulk_hooks-0.1.213 → django_bulk_hooks-0.1.215}/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-0.1.213 → django_bulk_hooks-0.1.215}/django_bulk_hooks/queryset.py

@@ -161,10 +161,12 @@ class HookQuerySetMixin:
 
         # Fire hooks before DB ops
         if not bypass_hooks:
-            ctx = HookContext(model_cls)
+            ctx = HookContext(model_cls, bypass_hooks=False)
             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)
 
         # For MTI models, we need to handle them specially
         if is_mti:
@@ -219,6 +221,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:
@@ -237,7 +243,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:
@@ -254,6 +260,7 @@ class HookQuerySetMixin:
                 fields = list(fields_set)
         else:
             print(f"DEBUG: bypass_hooks=True, skipping hooks for {len(objs)} objects")
+            ctx = HookContext(model_cls, bypass_hooks=True)
 
         # Handle auto_now fields like Django's update_or_create does
         fields_set = set(fields)
@@ -278,10 +285,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
-            with Hook.suspend():
-                result = super().bulk_update(objs, fields, **django_kwargs)
+            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-0.1.215/django_bulk_hooks/registry.py

@@ -0,0 +1,37 @@
+from collections.abc import Callable
+from typing import Union
+
+from django_bulk_hooks.priority import Priority
+
+_hooks: dict[tuple[type, str], list[tuple[type, str, Callable, int]]] = {}
+
+
+def register_hook(
+    model, event, handler_cls, method_name, condition, priority: Union[int, Priority]
+):
+    key = (model, event)
+    hooks = _hooks.setdefault(key, [])
+    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):
+    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
+
+
+def list_all_hooks():
+    """Debug function to list all registered hooks"""
+    return _hooks

{django_bulk_hooks-0.1.213 → django_bulk_hooks-0.1.215}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.213"
+version = "0.1.215"
 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"

django_bulk_hooks-0.1.213/django_bulk_hooks/registry.py

@@ -1,26 +0,0 @@
-from collections.abc import Callable
-from typing import Union
-
-from django_bulk_hooks.priority import Priority
-
-_hooks: dict[tuple[type, str], list[tuple[type, str, Callable, int]]] = {}
-
-
-def register_hook(
-    model, event, handler_cls, method_name, condition, priority: Union[int, Priority]
-):
-    key = (model, event)
-    hooks = _hooks.setdefault(key, [])
-    hooks.append((handler_cls, method_name, condition, priority))
-    # keep sorted by priority
-    hooks.sort(key=lambda x: x[3])
-
-
-def get_hooks(model, event):
-    hooks = _hooks.get((model, event), [])
-    return hooks
-
-
-def list_all_hooks():
-    """Debug function to list all registered hooks"""
-    return _hooks