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

django_bulk_hooks/dispatcher.py

@@ -191,13 +191,17 @@ class HookDispatcher:
             changeset: ChangeSet with all record changes
             event: The hook event (e.g., 'before_create')
         """
-        # NEW: Preload relationships needed for condition evaluation
+        # Preload relationships needed for condition evaluation (skip if already done upfront)
         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)
+            # Skip per-hook preloading if relationships were already preloaded upfront
+            if not changeset.operation_meta.get('relationships_preloaded', False):
+                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)
+            else:
+                logger.debug(f"🔍 CONDITION: {handler_cls.__name__}.{method_name} has condition (relationships already preloaded)")
 
         # Filter records based on condition (now safe - relationships are preloaded)
         if condition:
@@ -405,17 +409,38 @@ class HookDispatcher:
                             if hasattr(preloaded_obj, rel):
                                 setattr(obj, rel, getattr(preloaded_obj, rel))
 
-        # Handle unsaved new_records by preloading their FK targets
+        # Handle unsaved new_records by preloading their FK targets (bulk query to avoid N+1)
         if changeset.new_records:
+            # Collect FK IDs for each relationship from unsaved records
+            field_ids_map = {rel: set() for rel in relationship_list}
+
             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)
+                                field_ids_map[rel].add(rel_id)
+
+            # Bulk load relationships for unsaved records
+            field_objects_map = {}
+            for rel, ids in field_ids_map.items():
+                if not ids:
+                    continue
+                try:
+                    rel_model = getattr(changeset.model_cls._meta.get_field(rel).remote_field, 'model')
+                    field_objects_map[rel] = rel_model.objects.in_bulk(ids)
+                except Exception:
+                    field_objects_map[rel] = {}
+
+            # Attach relationships to unsaved records
+            for obj in changeset.new_records:
+                if obj.pk is None:  # Unsaved object
+                    for rel in relationship_list:
+                        rel_id = getattr(obj, f'{rel}_id', None)
+                        if rel_id and rel in field_objects_map:
+                            rel_obj = field_objects_map[rel].get(rel_id)
+                            if rel_obj:
                                 setattr(obj, rel, rel_obj)
 
     def _preload_select_related_for_before_create(self, changeset, select_related_fields):

django_bulk_hooks/operations/coordinator.py

@@ -711,6 +711,17 @@ class BulkOperationCoordinator:
         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__}")
 
+        # Extract and preload relationships needed by hook conditions upfront
+        # This prevents duplicate queries by avoiding per-hook preloading
+        condition_relationships = self._extract_condition_relationships_for_operation(changeset, models_in_chain)
+        if condition_relationships:
+            logger.info(f"🔗 BULK PRELOAD: Preloading {len(condition_relationships)} condition relationships for {changeset.model_cls.__name__} hooks")
+            self.dispatcher._preload_condition_relationships(changeset, condition_relationships)
+            # Mark that relationships have been preloaded to avoid per-hook duplication
+            changeset.operation_meta['relationships_preloaded'] = True
+        else:
+            logger.info(f"🔗 BULK PRELOAD: No condition relationships to preload for {changeset.model_cls.__name__} hooks")
+
         # VALIDATE phase - for all models in chain
         if not bypass_validation:
             self._dispatch_hooks_for_models(models_in_chain, changeset, f"validate_{event_prefix}")
@@ -878,6 +889,8 @@ class BulkOperationCoordinator:
             from django_bulk_hooks.helpers import build_changeset_for_create
 
             create_changeset = build_changeset_for_create(self.model_cls, created_objects)
+            # Mark that relationships have been preloaded to avoid per-hook duplication
+            create_changeset.operation_meta['relationships_preloaded'] = True
 
             self._dispatch_hooks_for_models(models_in_chain, create_changeset, "after_create", bypass_hooks=False)
 
@@ -895,12 +908,48 @@ class BulkOperationCoordinator:
                 update_kwargs={},  # Empty since we don't know specific fields
                 old_records_map=old_records_map,
             )
+            # Mark that relationships have been preloaded to avoid per-hook duplication
+            update_changeset.operation_meta['relationships_preloaded'] = True
 
             self._dispatch_hooks_for_models(models_in_chain, update_changeset, "after_update", bypass_hooks=False)
 
         # Clean up temporary metadata
         self._cleanup_upsert_metadata(result_objects)
 
+    def _extract_condition_relationships_for_operation(self, changeset, models_in_chain):
+        """
+        Extract relationships needed by hook conditions for this specific operation.
+
+        This is different from _extract_hook_relationships which gets ALL possible relationships
+        for queryset operations. This method only gets relationships needed by hooks that will
+        actually run in this operation.
+
+        Args:
+            changeset: The changeset for this operation
+            models_in_chain: List of model classes in inheritance chain
+
+        Returns:
+            set: Set of relationship field names to preload
+        """
+        relationships = set()
+        dispatcher = self.dispatcher
+
+        # Get the events that will run in this operation
+        event_prefix = changeset.operation_type
+        events_to_check = [f"validate_{event_prefix}", f"before_{event_prefix}", f"after_{event_prefix}"]
+
+        for model_cls in models_in_chain:
+            for event in events_to_check:
+                hooks = dispatcher.registry.get_hooks(model_cls, event)
+
+                for handler_cls, method_name, condition, priority in hooks:
+                    # Only extract relationships from conditions (not @select_related)
+                    if condition:
+                        condition_relationships = dispatcher._extract_condition_relationships(condition, model_cls)
+                        relationships.update(condition_relationships)
+
+        return relationships
+
     def _extract_hook_relationships(self):
         """
         Extract all relationship paths that hooks might access for this model and its MTI parents.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.72
+Version: 0.2.74
 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.72.dist-info → django_bulk_hooks-0.2.74.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=AJJFpP5zvstF1VfKyduetDlor9Dskk-7VbwHkGHRMYM,22352
+django_bulk_hooks/dispatcher.py,sha256=LfqSDE1NK-cgAUDwaN542_d4ohSxBeiOAhbOqklZfPo,23659
 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=Gq2vqjlIyyfV8OSoipoED2hC2kb2czaHuy2Cs3gtmGI,39751
+django_bulk_hooks/operations/coordinator.py,sha256=J3lsxsN7lgBkeiSmu1Kw0tvU_M9sBTozdLZ7HO7Nb-w,42489
 django_bulk_hooks/operations/field_utils.py,sha256=cQ9w4xdk-z3PrMLFvRzVV07Wc0D2qbpSepwoupqwQH8,7888
 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.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,,
+django_bulk_hooks-0.2.74.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.74.dist-info/METADATA,sha256=TKjaRj-VJoMK_WiZVl7TNPf9yay5he233hmsMAFmYJI,10555
+django_bulk_hooks-0.2.74.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.74.dist-info/RECORD,,