django-bulk-hooks 0.2.70__py3-none-any.whl → 0.2.72__py3-none-any.whl

django_bulk_hooks/dispatcher.py

@@ -103,15 +103,83 @@ class HookDispatcher:
         # Get hooks sorted by priority (deterministic order)
         hooks = self.registry.get_hooks(changeset.model_cls, event)
 
+        logger.debug(f"🧵 DISPATCH: changeset.model_cls={changeset.model_cls.__name__}, event={event}")
+        logger.debug(f"🎣 HOOKS_FOUND: {len(hooks)} hooks for {changeset.model_cls.__name__}.{event}: {[f'{h[0].__name__}.{h[1]}' for h in hooks]}")
+
         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 = []
+        skipped_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)
+            else:
+                skipped_hooks.append((handler_cls.__name__, method_name))
+
+        # Debug logging for hook deduplication
+        if skipped_hooks:
+            logger.debug(f"⏭️ SKIPPED_DUPS: {len(skipped_hooks)} duplicate hooks: {[f'{cls}.{method}' for cls, method in skipped_hooks]}")
+
+        if unique_hooks:
+            logger.debug(f"✅ EXECUTING_UNIQUE: {len(unique_hooks)} unique hooks: {[f'{h[0].__name__}.{h[1]}' for h in unique_hooks]}")
+
+        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/operations/coordinator.py

@@ -142,8 +142,11 @@ class BulkOperationCoordinator:
             event_suffix: Event name suffix (e.g., 'before_create', 'validate_update')
             bypass_hooks: Whether to skip hook execution
         """
-        for model_cls in models_in_chain:
+        logger.debug(f"🔄 DISPATCH_MODELS: Iterating through {len(models_in_chain)} models for {event_suffix}: {[m.__name__ for m in models_in_chain]}")
+        for i, model_cls in enumerate(models_in_chain):
+            logger.debug(f"🔄 DISPATCH_ITERATION: {i+1}/{len(models_in_chain)} - Dispatching to {model_cls.__name__} for {event_suffix}")
             model_changeset = self._build_changeset_for_model(changeset, model_cls)
+            logger.debug(f"🔄 CHANGESET_MODEL: Created changeset with model_cls={model_changeset.model_cls.__name__}")
             self.dispatcher.dispatch(model_changeset, event_suffix, bypass_hooks=bypass_hooks)
 
     # ==================== PUBLIC API ====================
@@ -700,8 +703,13 @@ class BulkOperationCoordinator:
         if bypass_hooks:
             return operation()
 
+        # Reset hook execution tracking for this new operation
+        self.dispatcher._reset_executed_hooks()
+        logger.debug(f"🚀 MTI_OPERATION_START: {event_prefix} operation for {changeset.model_cls.__name__}")
+
         # Get all models in inheritance chain
         models_in_chain = self._get_models_in_chain(changeset.model_cls)
+        logger.debug(f"🔗 MTI_CHAIN_START: {len(models_in_chain)} models in chain for {changeset.model_cls.__name__}")
 
         # VALIDATE phase - for all models in chain
         if not bypass_validation:
@@ -796,6 +804,7 @@ class BulkOperationCoordinator:
             result_objects: List of objects returned from the operation
             models_in_chain: List of model classes in the MTI inheritance chain
         """
+        logger.debug(f"🔀 UPSERT_AFTER_START: Processing {len(result_objects)} result objects with {len(models_in_chain)} models in chain")
         # Split objects based on metadata set by the executor
         created_objects = []
         updated_objects = []
@@ -865,6 +874,7 @@ class BulkOperationCoordinator:
 
         # Dispatch after_create hooks for created objects
         if created_objects:
+            logger.debug(f"🔀 UPSERT_DISPATCH_CREATE: Dispatching after_create for {len(created_objects)} created objects")
             from django_bulk_hooks.helpers import build_changeset_for_create
 
             create_changeset = build_changeset_for_create(self.model_cls, created_objects)
@@ -873,6 +883,7 @@ class BulkOperationCoordinator:
 
         # Dispatch after_update hooks for updated objects
         if updated_objects:
+            logger.debug(f"🔀 UPSERT_DISPATCH_UPDATE: Dispatching after_update for {len(updated_objects)} updated objects")
             # Fetch old records for proper change detection
             old_records_map = self.analyzer.fetch_old_records_map(updated_objects)
 

django_bulk_hooks/operations/mti_handler.py

@@ -78,14 +78,17 @@ class MTIHandler:
         while current_model:
             if not current_model._meta.proxy and not current_model._meta.abstract:
                 chain.append(current_model)
+                logger.debug(f"🔗 MTI_CHAIN_ADD: Added {current_model.__name__} (abstract: {current_model._meta.abstract}, proxy: {current_model._meta.proxy})")
 
             # Get concrete parent models (not abstract, not proxy)
             parents = [parent for parent in current_model._meta.parents.keys() if not parent._meta.proxy and not parent._meta.abstract]
+            logger.debug(f"🔗 MTI_PARENTS: {current_model.__name__} has concrete parents: {[p.__name__ for p in parents]}")
 
             current_model = parents[0] if parents else None
 
         # Reverse to get root-to-child order
         chain.reverse()
+        logger.debug(f"🔗 MTI_CHAIN_FINAL: {[m.__name__ for m in chain]} (length: {len(chain)})")
         return chain
 
     def get_parent_models(self):

{django_bulk_hooks-0.2.70.dist-info → django_bulk_hooks-0.2.72.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ django_bulk_hooks/conditions.py,sha256=ar4pGjtxLKmgSIlO4S6aZFKmaBNchLtxMmWpkn4g9
 django_bulk_hooks/constants.py,sha256=PxpEETaO6gdENcTPoXS586lerGKVP3nmjpDvOkmhYxI,509
 django_bulk_hooks/context.py,sha256=mqaC5-yESDTA5ruI7fuXlt8qSgKuOFp0mjq7h1-4HdQ,1926
 django_bulk_hooks/decorators.py,sha256=TdkO4FJyFrVU2zqK6Y_6JjEJ4v3nbKkk7aa22jN10sk,11994
-django_bulk_hooks/dispatcher.py,sha256=mNRiv9SEf9PwRskGA1GxTIl0kp-CozAcScICqpPHxzM,18809
+django_bulk_hooks/dispatcher.py,sha256=AJJFpP5zvstF1VfKyduetDlor9Dskk-7VbwHkGHRMYM,22352
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/factory.py,sha256=ezrVM5U023KZqOBbJXb6lYUP-pE7WJmi8Olh2Ew-7RA,18085
 django_bulk_hooks/handler.py,sha256=SRCrMzgolrruTkvMnYBFmXLR-ABiw0JiH3605PEdCZM,4207
@@ -14,14 +14,14 @@ django_bulk_hooks/models.py,sha256=TWN_F-SsLGPx9jrkNT9pmJFR5VsZ0Z_QaVOZOmt7bpw,2
 django_bulk_hooks/operations/__init__.py,sha256=BtJYjmRhe_sScivLsniDaZmBkm0ZLvcmzXFKL7QY2Xg,550
 django_bulk_hooks/operations/analyzer.py,sha256=Pz8mc-EL8KDOfLQFYiRuN-r0OmINW3nIBhRJJCma-yo,10360
 django_bulk_hooks/operations/bulk_executor.py,sha256=po8V_2H3ULiE0RYJ-wbaRIz52SKhss81UHwuQjlz3H8,26214
-django_bulk_hooks/operations/coordinator.py,sha256=NHQWg36IvWAsbQnAppsExOhFQsvlk_VD-aMwWsoo1ao,38572
+django_bulk_hooks/operations/coordinator.py,sha256=Gq2vqjlIyyfV8OSoipoED2hC2kb2czaHuy2Cs3gtmGI,39751
 django_bulk_hooks/operations/field_utils.py,sha256=cQ9w4xdk-z3PrMLFvRzVV07Wc0D2qbpSepwoupqwQH8,7888
-django_bulk_hooks/operations/mti_handler.py,sha256=Vmz0C0gtYDvbybmb4cDzIaGglSaQK4DQVkaBK-WuQeE,25855
+django_bulk_hooks/operations/mti_handler.py,sha256=x1uNvP8MkidifPp_AMp4nffsdW3dz3izV6SeaLJ0DaA,26247
 django_bulk_hooks/operations/mti_plans.py,sha256=HIRJgogHPpm6MV7nZZ-sZhMLUnozpZPV2SzwQHLRzYc,3667
 django_bulk_hooks/operations/record_classifier.py,sha256=It85hJC2K-UsEOLbTR-QBdY5UPV-acQIJ91TSGa7pYo,7053
 django_bulk_hooks/queryset.py,sha256=tHt1U2O9Hvozg9sdn5MjzAk_I6wDU-LupuKFTfv1SiQ,7449
 django_bulk_hooks/registry.py,sha256=4HxP1mVK2z4VzvlohbEw2359wM21UJZJYagJJ1komM0,7947
-django_bulk_hooks-0.2.70.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.70.dist-info/METADATA,sha256=cgeAfI0qSgIJJDl7WXpsqErM3YzqmuGnIeqPeSUpVOk,10555
-django_bulk_hooks-0.2.70.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.70.dist-info/RECORD,,
+django_bulk_hooks-0.2.72.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.72.dist-info/METADATA,sha256=QkD3zT88vaJBu79C5vYBSORg0LBh4nCzVpwObeLwpko,10555
+django_bulk_hooks-0.2.72.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.72.dist-info/RECORD,,