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

django_bulk_hooks/dispatcher.py

@@ -110,9 +110,9 @@ class HookDispatcher:
         logger.info(f"🔥 HOOKS: Executing {len(hooks)} hooks for {changeset.model_cls.__name__}.{event}")
         for handler_cls, method_name, condition, priority in hooks:
             logger.info(f"  → {handler_cls.__name__}.{method_name} (priority={priority})")
-            self._execute_hook(handler_cls, method_name, condition, changeset)
+            self._execute_hook(handler_cls, method_name, condition, changeset, event)
 
-    def _execute_hook(self, handler_cls, method_name, condition, changeset):
+    def _execute_hook(self, handler_cls, method_name, condition, changeset, event):
         """
         Execute a single hook with condition checking.
 
@@ -121,6 +121,7 @@ class HookDispatcher:
             method_name: Name of the method to call
             condition: Optional condition to filter records
             changeset: ChangeSet with all record changes
+            event: The hook event (e.g., 'before_create')
         """
         # NEW: Preload relationships needed for condition evaluation
         if condition:
@@ -155,7 +156,13 @@ class HookDispatcher:
         handler = create_hook_instance(handler_cls)
         method = getattr(handler, method_name)
 
-        # Check if method has @select_related decorator
+        # 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
@@ -316,6 +323,69 @@ class HookDispatcher:
                             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):
+        """
+        Explicit bulk preloading for @select_related on BEFORE_CREATE hooks.
+
+        This method provides guaranteed N+1 elimination by:
+        1. Collecting all FK IDs from unsaved new_records
+        2. Bulk querying related objects
+        3. Attaching relationships to each record
+
+        Args:
+            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:
+            return
+
+        logger.info(f"🔗 BULK PRELOAD: Preloading {select_related_fields} for {len(changeset.new_records)} unsaved records")
+
+        # Collect FK IDs for each field
+        field_ids_map = {field: set() for field in select_related_fields}
+
+        for record in changeset.new_records:
+            for field in select_related_fields:
+                fk_id = getattr(record, f'{field}_id', None)
+                if fk_id is not None:
+                    field_ids_map[field].add(fk_id)
+
+        # Bulk query related objects for each field
+        field_objects_map = {}
+        for field, ids in field_ids_map.items():
+            if not ids:
+                continue
+
+            try:
+                # Get the related model
+                relation_field = changeset.model_cls._meta.get_field(field)
+                if not relation_field.is_relation:
+                    continue
+
+                related_model = relation_field.remote_field.model
+
+                # Bulk query: related_model.objects.filter(id__in=ids)
+                field_objects_map[field] = related_model.objects.in_bulk(ids)
+                logger.info(f"  ✅ Bulk loaded {len(field_objects_map[field])} {related_model.__name__} objects for field '{field}'")
+
+            except Exception as e:
+                logger.warning(f"  ❌ Failed to bulk load field '{field}': {e}")
+                field_objects_map[field] = {}
+
+        # Attach relationships to each record
+        for record in changeset.new_records:
+            for field in select_related_fields:
+                fk_id = getattr(record, f'{field}_id', None)
+                if fk_id is not None and field in field_objects_map:
+                    related_obj = field_objects_map[field].get(fk_id)
+                    if related_obj is not None:
+                        setattr(record, field, related_obj)
+                        # Also cache in Django's fields_cache for consistency
+                        if hasattr(record, '_state') and hasattr(record._state, 'fields_cache'):
+                            record._state.fields_cache[field] = related_obj
+
+        logger.info(f"🔗 BULK PRELOAD: Completed relationship attachment for {len(changeset.new_records)} records")
+
 
 # Global dispatcher instance
 _dispatcher: HookDispatcher | None = None

django_bulk_hooks/helpers.py

@@ -52,11 +52,18 @@ def build_changeset_for_update(
     if old_records_map is None:
         old_records_map = {}
 
+    # Smart pre-computation logic:
+    # - If update_kwargs non-empty and old_records exist: Don't precompute (QuerySet.update case)
+    # - If update_kwargs empty and old_records exist: Don't precompute (upsert case)
+    # - If update_kwargs empty and no old_records: Precompute as empty (validation case)
+    should_precompute = not bool(update_kwargs) and old_records_map is None
+    changed_fields = list(update_kwargs.keys()) if should_precompute else None
+
     changes = [
         RecordChange(
             new,
             old_records_map.get(new.pk),
-            changed_fields=list(update_kwargs.keys()),
+            changed_fields=changed_fields,
         )
         for new in instances
     ]

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

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

@@ -4,11 +4,11 @@ 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=0mmfzLYP1YY8hMzf1wtI04-A3gz5H35ARt7VDno7OuU,13660
+django_bulk_hooks/dispatcher.py,sha256=AQXryGHVdwjFJnyek2PcjZsQM9I6fVA74WLaPJeFPSw,17157
 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
-django_bulk_hooks/helpers.py,sha256=tMxUI5oWhbtWByzCCR0Qcj1CgZ6iP5Jfx03EqVmEhxU,7597
+django_bulk_hooks/helpers.py,sha256=3rH9TJkdCPF7Vu--0tDaZzJg9Yxcv7yoSF1K1_-0psQ,8048
 django_bulk_hooks/manager.py,sha256=aDuP87DZLWWbDK2qeA7usl3pxoIjHFIWnQNi_jEq6z0,4446
 django_bulk_hooks/models.py,sha256=TWN_F-SsLGPx9jrkNT9pmJFR5VsZ0Z_QaVOZOmt7bpw,2434
 django_bulk_hooks/operations/__init__.py,sha256=BtJYjmRhe_sScivLsniDaZmBkm0ZLvcmzXFKL7QY2Xg,550
@@ -21,7 +21,7 @@ django_bulk_hooks/operations/mti_plans.py,sha256=HIRJgogHPpm6MV7nZZ-sZhMLUnozpZP
 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.64.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.64.dist-info/METADATA,sha256=H1qQ5jw0HZoOXIx1KnTnxHoOBe7E8f08oqpGI-BU_IU,9265
-django_bulk_hooks-0.2.64.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.64.dist-info/RECORD,,
+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,,