django-bulk-hooks 0.2.70__tar.gz → 0.2.71__tar.gz

{django_bulk_hooks-0.2.70 → django_bulk_hooks-0.2.71}/PKG-INFO

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

{django_bulk_hooks-0.2.70 → django_bulk_hooks-0.2.71}/django_bulk_hooks/dispatcher.py

@@ -106,12 +106,68 @@ class HookDispatcher:
         if not hooks:
             return
 
-        # Execute hooks in priority order
-        logger.info(f"🔥 HOOKS: Executing {len(hooks)} hooks for {changeset.model_cls.__name__}.{event}")
+        # Create an operation key that includes the changeset model to avoid
+        # deduplicating hooks across different operations on the same records
+        # This prevents the same hook from executing multiple times for MTI inheritance chains
+        # but allows different operations on the same records to execute their hooks
+        record_ids = set()
+        for change in changeset.changes:
+            if change.new_record and change.new_record.pk:
+                record_ids.add(change.new_record.pk)
+            if change.old_record and change.old_record.pk:
+                record_ids.add(change.old_record.pk)
+
+        # Sort record IDs safely (handle Mock objects and other non-comparable types)
+        try:
+            sorted_record_ids = tuple(sorted(record_ids, key=lambda x: str(x)))
+        except (TypeError, AttributeError):
+            # Fallback for non-comparable objects (like Mock objects in tests)
+            sorted_record_ids = tuple(record_ids)
+
+        # Include changeset model and operation details to make the key more specific
+        operation_meta = getattr(changeset, 'operation_meta', {}) or {}
+        operation_type = getattr(changeset, 'operation_type', 'unknown')
+
+        # Include update_kwargs if present to distinguish different queryset operations
+        update_kwargs = operation_meta.get('update_kwargs', {})
+        if update_kwargs:
+            try:
+                # Convert to a hashable representation
+                update_kwargs_key = tuple(sorted((k, str(v)) for k, v in update_kwargs.items()))
+            except (TypeError, AttributeError):
+                # Fallback if values are not convertible to string
+                update_kwargs_key = tuple(sorted(update_kwargs.keys()))
+        else:
+            update_kwargs_key = ()
+
+        operation_key = (event, changeset.model_cls.__name__, operation_type, sorted_record_ids, update_kwargs_key)
+
+        # Track executed hooks to prevent duplicates in MTI inheritance chains
+        if not hasattr(self, '_executed_hooks'):
+            self._executed_hooks = set()
+
+        # Filter out hooks that have already been executed for this operation
+        unique_hooks = []
         for handler_cls, method_name, condition, priority in hooks:
+            hook_key = (handler_cls, method_name, operation_key)
+            if hook_key not in self._executed_hooks:
+                unique_hooks.append((handler_cls, method_name, condition, priority))
+                self._executed_hooks.add(hook_key)
+
+
+        if not unique_hooks:
+            return
+
+        # Execute hooks in priority order
+        logger.info(f"🔥 HOOKS: Executing {len(unique_hooks)} hooks for {changeset.model_cls.__name__}.{event}")
+        for handler_cls, method_name, condition, priority in unique_hooks:
             logger.info(f"  → {handler_cls.__name__}.{method_name} (priority={priority})")
             self._execute_hook(handler_cls, method_name, condition, changeset, event)
 
+    def _reset_executed_hooks(self):
+        """Reset the executed hooks tracking for a new operation."""
+        self._executed_hooks = set()
+
     def _execute_hook(self, handler_cls, method_name, condition, changeset, event):
         """
         Execute a single hook with condition checking.

{django_bulk_hooks-0.2.70 → django_bulk_hooks-0.2.71}/django_bulk_hooks/operations/coordinator.py

@@ -700,6 +700,9 @@ class BulkOperationCoordinator:
         if bypass_hooks:
             return operation()
 
+        # Reset hook execution tracking for this new operation
+        self.dispatcher._reset_executed_hooks()
+
         # Get all models in inheritance chain
         models_in_chain = self._get_models_in_chain(changeset.model_cls)
 

{django_bulk_hooks-0.2.70 → django_bulk_hooks-0.2.71}/pyproject.toml

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