django-bulk-hooks 0.2.73__tar.gz → 0.2.75__tar.gz

{django_bulk_hooks-0.2.73 → django_bulk_hooks-0.2.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.73
+Version: 0.2.75
 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.73 → django_bulk_hooks-0.2.75}/django_bulk_hooks/dispatcher.py

@@ -191,7 +191,55 @@ class HookDispatcher:
             changeset: ChangeSet with all record changes
             event: The hook event (e.g., 'before_create')
         """
-        # Preload relationships needed for condition evaluation (skip if already done upfront)
+        # Use DI factory to create handler instance EARLY to access method decorators
+        from django_bulk_hooks.factory import create_hook_instance
+
+        handler = create_hook_instance(handler_cls)
+        method = getattr(handler, method_name)
+
+        # PRELOAD @select_related RELATIONSHIPS BEFORE CONDITION EVALUATION
+        # This ensures both conditions and hook methods have access to preloaded relationships
+
+        # Check if method has @select_related decorator
+        preload_func = getattr(method, "_select_related_preload", None)
+        if preload_func:
+            # Preload relationships to prevent N+1 queries in both conditions and hook methods
+            try:
+                model_cls_override = getattr(handler, "model_cls", None)
+
+                # Get FK fields being updated to avoid preloading conflicting relationships
+                skip_fields = changeset.operation_meta.get("fk_fields_being_updated", set())
+
+                # Preload for new_records (needed for condition evaluation and hook execution)
+                if changeset.new_records:
+                    preload_func(
+                        changeset.new_records,
+                        model_cls=model_cls_override,
+                        skip_fields=skip_fields,
+                    )
+
+                # Also preload for old_records (for conditions that check previous values)
+                if changeset.old_records:
+                    preload_func(
+                        changeset.old_records,
+                        model_cls=model_cls_override,
+                        skip_fields=skip_fields,
+                    )
+
+                # Mark that relationships have been preloaded to avoid duplicate condition preloading
+                changeset.operation_meta['relationships_preloaded'] = True
+                logger.debug(f"🔗 @select_related: Preloaded relationships for {handler_cls.__name__}.{method_name}")
+
+            except Exception as e:
+                logger.warning(f"Failed to preload relationships for {handler_cls.__name__}.{method_name}: {e}")
+
+        # SPECIAL HANDLING: Explicit @select_related support for BEFORE_CREATE hooks
+        # (This can stay for additional BEFORE_CREATE-specific logic if needed)
+        select_related_fields = getattr(method, "_select_related_fields", None)
+        if select_related_fields and event == "before_create" and changeset.new_records:
+            self._preload_select_related_for_before_create(changeset, select_related_fields)
+
+        # NOW condition evaluation is safe - relationships are preloaded
         if condition:
             # Skip per-hook preloading if relationships were already preloaded upfront
             if not changeset.operation_meta.get('relationships_preloaded', False):
@@ -226,46 +274,6 @@ class HookDispatcher:
             # No condition, use full changeset
             filtered_changeset = changeset
 
-        # Use DI factory to create handler instance
-        from django_bulk_hooks.factory import create_hook_instance
-
-        handler = create_hook_instance(handler_cls)
-        method = getattr(handler, method_name)
-
-        # SPECIAL HANDLING: Explicit @select_related support for BEFORE_CREATE hooks
-        # This provides guaranteed bulk preloading to eliminate N+1 queries
-        select_related_fields = getattr(method, "_select_related_fields", None)
-        if select_related_fields and event == "before_create" and filtered_changeset.new_records:
-            self._preload_select_related_for_before_create(filtered_changeset, select_related_fields)
-
-        # Check if method has @select_related decorator (fallback for other cases)
-        preload_func = getattr(method, "_select_related_preload", None)
-        if preload_func:
-            # Preload relationships to prevent N+1 queries
-            try:
-                model_cls_override = getattr(handler, "model_cls", None)
-
-                # Get FK fields being updated to avoid preloading conflicting relationships
-                skip_fields = changeset.operation_meta.get("fk_fields_being_updated", set())
-
-                # Preload for new_records
-                if filtered_changeset.new_records:
-                    preload_func(
-                        filtered_changeset.new_records,
-                        model_cls=model_cls_override,
-                        skip_fields=skip_fields,
-                    )
-
-                # Also preload for old_records (for conditions that check previous values)
-                if filtered_changeset.old_records:
-                    preload_func(
-                        filtered_changeset.old_records,
-                        model_cls=model_cls_override,
-                        skip_fields=skip_fields,
-                    )
-            except Exception:
-                pass  # Preload failed, continue without it
-
         # Execute hook with ChangeSet
         #
         # ARCHITECTURE NOTE: Hook Contract
@@ -409,17 +417,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-0.2.73 → django_bulk_hooks-0.2.75}/pyproject.toml

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