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

django_bulk_hooks/__init__.py

@@ -25,9 +25,6 @@ from django_bulk_hooks.operations import BulkOperationCoordinator
 from django_bulk_hooks.operations import ModelAnalyzer
 from django_bulk_hooks.operations import MTIHandler
 
-# Add NullHandler to prevent logging messages if the application doesn't configure logging
-logging.getLogger(__name__).addHandler(logging.NullHandler())
-
 __all__ = [
     "BulkHookManager",
     "HookClass",

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

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

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

@@ -1,10 +1,10 @@
-django_bulk_hooks/__init__.py,sha256=ujBvX-GY4Pg4ACBh7RXm_MOmi2eAowf5s7pG2SXWdpo,2276
+django_bulk_hooks/__init__.py,sha256=ZKjEi9Sj3lRr3hcEfknXAr1UXXwERzUCNgMkNXhW0mk,2119
 django_bulk_hooks/changeset.py,sha256=qnMD3bR2cNh8ZM8J6ASR5ly5Rjx-tPzXBYkqIjKGW98,6568
 django_bulk_hooks/conditions.py,sha256=ar4pGjtxLKmgSIlO4S6aZFKmaBNchLtxMmWpkn4g9RU,8114
 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=LfqSDE1NK-cgAUDwaN542_d4ohSxBeiOAhbOqklZfPo,23659
+django_bulk_hooks/dispatcher.py,sha256=mW5gkHFmkw_IdLb3j4QgKfZ9ia4MivuSbxNgp3B_O68,24220
 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
@@ -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=tHt1U2O9Hvozg9sdn5MjzAk_I6wDU-LupuKFTfv1SiQ,7449
 django_bulk_hooks/registry.py,sha256=4HxP1mVK2z4VzvlohbEw2359wM21UJZJYagJJ1komM0,7947
-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,,
+django_bulk_hooks-0.2.76.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.76.dist-info/METADATA,sha256=j4nb5519S7OtuxUQ2jbrCPMJMVWVJ2Cdvkgrq3tT9zo,10555
+django_bulk_hooks-0.2.76.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.76.dist-info/RECORD,,