django-bulk-hooks 0.2.66__py3-none-any.whl → 0.2.68__py3-none-any.whl

django_bulk_hooks/dispatcher.py

@@ -126,12 +126,16 @@ class HookDispatcher:
         # NEW: Preload relationships needed for condition evaluation
         if condition:
             condition_relationships = self._extract_condition_relationships(condition, changeset.model_cls)
+            logger.info(f"🔍 CONDITION: {handler_cls.__name__}.{method_name} has condition, extracted relationships: {condition_relationships}")
             if condition_relationships:
+                logger.info(f"🔗 PRELOADING: Preloading condition relationships for {len(changeset.changes)} records")
                 self._preload_condition_relationships(changeset, condition_relationships)
 
         # Filter records based on condition (now safe - relationships are preloaded)
         if condition:
+            logger.info(f"⚡ EVALUATING: Checking condition for {handler_cls.__name__}.{method_name} on {len(changeset.changes)} records")
             filtered_changes = [change for change in changeset.changes if condition.check(change.new_record, change.old_record)]
+            logger.info(f"✅ CONDITION: {len(filtered_changes)}/{len(changeset.changes)} records passed condition filter")
 
             if not filtered_changes:
                 # No records match condition, skip this hook
@@ -287,23 +291,36 @@ class HookDispatcher:
         """
         Preload relationships needed for condition evaluation.
 
+        This prevents N+1 queries when conditions access relationships on both
+        old_records and new_records (e.g., HasChanged conditions).
+
         Args:
             changeset: ChangeSet with records
             relationships: Set of relationship field names to preload
         """
-        if not relationships or not changeset.new_records:
+        if not relationships:
             return
 
         # Use Django's select_related to preload relationships
         relationship_list = list(relationships)
 
-        # Preload for new_records
+        # Collect all unique PKs from both new_records and old_records
+        all_ids = set()
+
+        # Add PKs from new_records
         if changeset.new_records:
-            # Use select_related on the queryset
-            ids = [obj.pk for obj in changeset.new_records if obj.pk is not None]
-            if ids:
-                preloaded = changeset.model_cls.objects.filter(pk__in=ids).select_related(*relationship_list).in_bulk()
-                # Update the objects in changeset with preloaded relationships
+            all_ids.update(obj.pk for obj in changeset.new_records if obj.pk is not None)
+
+        # Add PKs from old_records
+        if changeset.old_records:
+            all_ids.update(obj.pk for obj in changeset.old_records if obj.pk is not None)
+
+        # Bulk preload relationships for all records that have PKs
+        if all_ids:
+            preloaded = changeset.model_cls.objects.filter(pk__in=list(all_ids)).select_related(*relationship_list).in_bulk()
+
+            # Update new_records with preloaded relationships
+            if changeset.new_records:
                 for obj in changeset.new_records:
                     if obj.pk and obj.pk in preloaded:
                         preloaded_obj = preloaded[obj.pk]
@@ -311,17 +328,27 @@ class HookDispatcher:
                             if hasattr(preloaded_obj, rel):
                                 setattr(obj, rel, getattr(preloaded_obj, rel))
 
-        # Also handle unsaved objects by preloading their FK targets
-        for obj in changeset.new_records:
-            if obj.pk is None:  # Unsaved object
-                for rel in relationship_list:
-                    if hasattr(obj, f'{rel}_id'):
-                        rel_id = getattr(obj, f'{rel}_id')
-                        if rel_id:
-                            # Load the related object
-                            rel_model = getattr(changeset.model_cls._meta.get_field(rel).remote_field, 'model')
-                            rel_obj = rel_model.objects.get(pk=rel_id)
-                            setattr(obj, rel, rel_obj)
+            # Update old_records with preloaded relationships
+            if changeset.old_records:
+                for obj in changeset.old_records:
+                    if obj.pk and obj.pk in preloaded:
+                        preloaded_obj = preloaded[obj.pk]
+                        for rel in relationship_list:
+                            if hasattr(preloaded_obj, rel):
+                                setattr(obj, rel, getattr(preloaded_obj, rel))
+
+        # Handle unsaved new_records by preloading their FK targets
+        if changeset.new_records:
+            for obj in changeset.new_records:
+                if obj.pk is None:  # Unsaved object
+                    for rel in relationship_list:
+                        if hasattr(obj, f'{rel}_id'):
+                            rel_id = getattr(obj, f'{rel}_id')
+                            if rel_id:
+                                # Load the related object
+                                rel_model = getattr(changeset.model_cls._meta.get_field(rel).remote_field, 'model')
+                                rel_obj = rel_model.objects.get(pk=rel_id)
+                                setattr(obj, rel, rel_obj)
 
     def _preload_select_related_for_before_create(self, changeset, select_related_fields):
         """
@@ -336,7 +363,8 @@ class HookDispatcher:
             changeset: ChangeSet with new_records (unsaved objects)
             select_related_fields: List of field names to preload (e.g., ['financial_account'])
         """
-        if not select_related_fields or not changeset.new_records:
+        # Ensure select_related_fields is actually iterable (not a Mock in tests)
+        if not select_related_fields or not changeset.new_records or not hasattr(select_related_fields, '__iter__'):
             return
 
         logger.info(f"🔗 BULK PRELOAD: Preloading {select_related_fields} for {len(changeset.new_records)} unsaved records")

django_bulk_hooks/operations/coordinator.py

@@ -366,8 +366,19 @@ class BulkOperationCoordinator:
         Returns:
             Number of rows updated
         """
-        # Step 1: Fetch old state (before database update)
-        old_instances = list(self.queryset)
+        # Step 0: Extract relationships that hooks might access to avoid N+1 queries
+        hook_relationships = self._extract_hook_relationships()
+
+        # Step 1: Fetch old state (before database update) with relationships preloaded
+        if hook_relationships:
+            logger.info(f"🔗 BULK PRELOAD: Fetching {self.queryset.count()} old instances with select_related({list(hook_relationships)})")
+            old_queryset = self.queryset.select_related(*hook_relationships)
+        else:
+            logger.info(f"🔗 BULK PRELOAD: Fetching {self.queryset.count()} old instances without select_related")
+            old_queryset = self.queryset
+
+        old_instances = list(old_queryset)
+        logger.info(f"✅ Fetched {len(old_instances)} old instances")
         if not old_instances:
             return 0
 
@@ -380,11 +391,20 @@ class BulkOperationCoordinator:
         if update_count == 0:
             return 0
 
-        # Step 3: Fetch new state (after database update)
+        # Step 3: Fetch new state (after database update) with relationships preloaded
         # This captures any Subquery/F() computed values
         # Use primary keys to fetch updated instances since queryset filters may no longer match
         pks = [inst.pk for inst in old_instances]
-        new_instances = list(self.model_cls.objects.filter(pk__in=pks))
+
+        if hook_relationships:
+            logger.info(f"🔗 BULK PRELOAD: Fetching {len(pks)} new instances with select_related({list(hook_relationships)})")
+            new_queryset = self.model_cls.objects.filter(pk__in=pks).select_related(*hook_relationships)
+        else:
+            logger.info(f"🔗 BULK PRELOAD: Fetching {len(pks)} new instances without select_related")
+            new_queryset = self.model_cls.objects.filter(pk__in=pks)
+
+        new_instances = list(new_queryset)
+        logger.info(f"✅ Fetched {len(new_instances)} new instances")
 
         # Step 4: Build changeset
         changeset = build_changeset_for_update(
@@ -870,6 +890,57 @@ class BulkOperationCoordinator:
         # Clean up temporary metadata
         self._cleanup_upsert_metadata(result_objects)
 
+    def _extract_hook_relationships(self):
+        """
+        Extract all relationship paths that hooks might access for this model and its MTI parents.
+
+        This prevents N+1 queries by preloading all relationships that any hook
+        (condition or @select_related) might access during bulk operations.
+
+        Returns:
+            set: Set of relationship field names to preload with select_related
+        """
+        relationships = set()
+
+        # Get the dispatcher to access hook registry
+        dispatcher = self.dispatcher
+
+        # Get all models in the inheritance chain (including parents for MTI)
+        models_to_check = self._get_models_in_chain(self.model_cls)
+
+        # Check hooks for all relevant events that might run during bulk operations
+        events_to_check = ['before_update', 'after_update', 'validate_update']
+
+        for model_cls in models_to_check:
+            logger.info(f"🔍 BULK PRELOAD: Checking hooks for model {model_cls.__name__}")
+            for event in events_to_check:
+                hooks = dispatcher.registry.get_hooks(model_cls, event)
+                logger.info(f"  🔍 Found {len(hooks)} hooks for {model_cls.__name__}.{event}")
+
+                for handler_cls, method_name, condition, priority in hooks:
+                    logger.info(f"    → Checking {handler_cls.__name__}.{method_name}")
+
+                    # Extract relationships from conditions
+                    if condition:
+                        condition_relationships = dispatcher._extract_condition_relationships(condition, model_cls)
+                        if condition_relationships:
+                            logger.info(f"      📋 Condition relationships for {model_cls.__name__}: {condition_relationships}")
+                            relationships.update(condition_relationships)
+
+                    # Extract relationships from @select_related decorators
+                    try:
+                        method = getattr(handler_cls, method_name, None)
+                        if method:
+                            select_related_fields = getattr(method, "_select_related_fields", None)
+                            if select_related_fields and hasattr(select_related_fields, '__iter__'):
+                                logger.info(f"      🔗 @select_related fields on {handler_cls.__name__}.{method_name}: {list(select_related_fields)}")
+                                relationships.update(select_related_fields)
+                    except Exception as e:
+                        logger.warning(f"      ❌ Failed to extract @select_related from {handler_cls.__name__}.{method_name}: {e}")
+
+        logger.info(f"🔗 BULK PRELOAD: Total extracted relationships for {self.model_cls.__name__}: {list(relationships)}")
+        return relationships
+
     def _cleanup_upsert_metadata(self, result_objects):
         """
         Clean up temporary metadata added during upsert operations.

{django_bulk_hooks-0.2.66.dist-info → django_bulk_hooks-0.2.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.66
+Version: 0.2.68
 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.66.dist-info → django_bulk_hooks-0.2.68.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=AQXryGHVdwjFJnyek2PcjZsQM9I6fVA74WLaPJeFPSw,17157
+django_bulk_hooks/dispatcher.py,sha256=mNRiv9SEf9PwRskGA1GxTIl0kp-CozAcScICqpPHxzM,18809
 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=NPPkiEIMgbJXEIOtBqvy3OH4l0pOK_NL5jwT7Og9I4o,33765
+django_bulk_hooks/operations/coordinator.py,sha256=GJKP60To6A7_E3Ge_F-cGSPTx2-BHMBBtE8GK6rO-Pc,37842
 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_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=g_9OtOTC8FXY0hBwYr2FCqQ3mYXbfJTFPLlFV3SHmWQ,5600
 django_bulk_hooks/registry.py,sha256=4HxP1mVK2z4VzvlohbEw2359wM21UJZJYagJJ1komM0,7947
-django_bulk_hooks-0.2.66.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.66.dist-info/METADATA,sha256=SUi-L6kewPDyuGtGMW1PMJoV_DUxHlYAMv_x0kHNT9o,9265
-django_bulk_hooks-0.2.66.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.66.dist-info/RECORD,,
+django_bulk_hooks-0.2.68.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.68.dist-info/METADATA,sha256=ny5caEpFwD2Dw2sJtJHVHBL-I1pTBTdU5YDNOysuNRM,9265
+django_bulk_hooks-0.2.68.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.68.dist-info/RECORD,,