django-bulk-hooks 0.1.227__py3-none-any.whl → 0.1.228__py3-none-any.whl

django_bulk_hooks/engine.py

@@ -43,7 +43,8 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
                 logger.error("Validation failed for %s: %s", instance, e)
                 raise
 
-    # Process hooks in priority order
+    # Process hooks in priority order (highest priority first)
+    # Registry now sorts by priority (highest first)
     for handler_cls, method_name, condition, priority in hooks:
         logger.debug(f"Processing {handler_cls.__name__}.{method_name} (priority: {priority})")
         
@@ -80,8 +81,9 @@ def run(model_cls, event, new_records, old_records=None, ctx=None):
             try:
                 func(
                     new_records=to_process_new,
-                    old_records=to_process_old if any(to_process_old) else None,
+                    old_records=to_process_old if any(x is not None for x in to_process_old) else None,
                 )
             except Exception as e:
                 logger.error(f"Hook execution failed in {handler_cls.__name__}.{method_name}: {e}")
+                # Re-raise the exception to ensure proper error handling
                 raise

django_bulk_hooks/enums.py

@@ -1,17 +1,3 @@
-from enum import IntEnum
-
-
-class Priority(IntEnum):
-    """
-    Named priorities for django-bulk-hooks hooks.
-    Replaces module-level constants with a clean IntEnum.
-    """
-
-    HIGHEST = 0  # runs first
-    HIGH = 25  # runs early
-    NORMAL = 50  # default ordering
-    LOW = 75  # runs late
-    LOWEST = 100  # runs last
-
+from django_bulk_hooks.priority import Priority
 
 DEFAULT_PRIORITY = Priority.NORMAL

django_bulk_hooks/handler.py

@@ -61,36 +61,43 @@ class HookContextState:
         return hook_vars.model
 
 
-Hook = HookContextState()
-
-
 class HookMeta(type):
     """Metaclass that automatically registers hooks when Hook classes are defined."""
     
     def __new__(mcs, name, bases, namespace):
         cls = super().__new__(mcs, name, bases, namespace)
         
-        # Register hooks for this class
-        for method_name, method in namespace.items():
-            if hasattr(method, "hooks_hooks"):
-                for model_cls, event, condition, priority in method.hooks_hooks:
-                    # Create a unique key for this hook registration
-                    key = (model_cls, event, cls, method_name)
-                    
-                    # Register the hook
-                    register_hook(
-                        model=model_cls,
-                        event=event,
-                        handler_cls=cls,
-                        method_name=method_name,
-                        condition=condition,
-                        priority=priority,
-                    )
-                    
-                    logger.debug(
-                        f"Registered hook {cls.__name__}.{method_name} "
-                        f"for {model_cls.__name__}.{event} with priority {priority}"
-                    )
+        # Register hooks for this class, including inherited methods
+        # We need to check all methods in the MRO to handle inheritance
+        for attr_name in dir(cls):
+            if attr_name.startswith('_'):
+                continue
+                
+            try:
+                attr = getattr(cls, attr_name)
+                if callable(attr) and hasattr(attr, "hooks_hooks"):
+                    for model_cls, event, condition, priority in attr.hooks_hooks:
+                        # Create a unique key for this hook registration
+                        key = (model_cls, event, cls, attr_name)
+                        
+                        # Register the hook
+                        register_hook(
+                            model=model_cls,
+                            event=event,
+                            handler_cls=cls,
+                            method_name=attr_name,
+                            condition=condition,
+                            priority=priority,
+                        )
+                        
+                        logger.debug(
+                            f"Registered hook {cls.__name__}.{attr_name} "
+                            f"for {model_cls.__name__}.{event} with priority {priority}"
+                        )
+            except Exception as e:
+                # Skip attributes that can't be accessed
+                logger.debug(f"Skipping attribute {attr_name}: {e}")
+                continue
         
         return cls
 
@@ -132,7 +139,7 @@ class Hook(metaclass=HookMeta):
         hook_vars.event = event
         hook_vars.model = model
 
-        hooks = sorted(get_hooks(model, event), key=lambda x: x[3])
+        hooks = get_hooks(model, event)
 
         def _execute():
             new_local = new_records or []
@@ -161,6 +168,8 @@ class Hook(metaclass=HookMeta):
                     logger.exception(
                         "Error in hook %s.%s", handler_cls.__name__, method_name
                     )
+                    # Re-raise the exception to ensure proper error handling
+                    raise
 
         conn = transaction.get_connection()
         try:
@@ -174,3 +183,7 @@ class Hook(metaclass=HookMeta):
             hook_vars.event = None
             hook_vars.model = None
             hook_vars.depth -= 1
+
+
+# Create a global Hook instance for context access
+HookContext = HookContextState()

django_bulk_hooks/priority.py

@@ -5,12 +5,12 @@ class Priority(IntEnum):
     """
     Named priorities for django-bulk-hooks hooks.
 
-    Lower values run earlier (higher priority).
-    Hooks are sorted in ascending order.
+    Higher values run earlier (higher priority).
+    Hooks are sorted in descending order.
     """
 
-    HIGHEST = 0  # runs first
-    HIGH = 25  # runs early
+    LOWEST = 0  # runs last
+    LOW = 25  # runs later
     NORMAL = 50  # default ordering
-    LOW = 75  # runs later
-    LOWEST = 100  # runs last
+    HIGH = 75  # runs early
+    HIGHEST = 100  # runs first

django_bulk_hooks/queryset.py

@@ -95,22 +95,49 @@ class HookQuerySetMixin:
 
         # Run hooks only if not bypassed
         if not bypass_hooks:
+            ctx = HookContext(model_cls)
             # Run VALIDATE_UPDATE hooks
-            engine.run(model_cls, VALIDATE_UPDATE, instances, originals, HookContext(model_cls))
+            engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
             
-            # Run BEFORE_UPDATE hooks
-            engine.run(model_cls, BEFORE_UPDATE, instances, originals, HookContext(model_cls))
+            # For subqueries, we need to compute the values and apply them to instances
+            # before running BEFORE_UPDATE hooks
+            if has_subquery:
+                # Create a temporary update to compute the values
+                # We'll use a subquery to compute values without actually updating
+                for field_name, value in kwargs.items():
+                    if (hasattr(value, "query") and hasattr(value.query, "model")) or \
+                       (hasattr(value, "get_source_expressions") and value.get_source_expressions()):
+                        # This is a complex expression - compute it for each instance
+                        for instance in instances:
+                            # Create a single-instance queryset to compute the value
+                            single_qs = model_cls._base_manager.filter(pk=instance.pk)
+                            computed_values = single_qs.annotate(computed_field=value).values_list('computed_field', flat=True)
+                            if computed_values:
+                                setattr(instance, field_name, computed_values[0])
+            else:
+                # For simple updates, apply the values directly
+                for obj in instances:
+                    for field, value in kwargs.items():
+                        setattr(obj, field, value)
+            
+            # Run BEFORE_UPDATE hooks with updated instances
+            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
         if has_subquery:
             # For complex expressions, use Django's native update
             # This handles Subquery, Case, F expressions, etc. correctly
             result = super().update(**kwargs)
+            
+            # After updating with complex expressions, we need to reload the instances
+            # to get the computed values for the AFTER_UPDATE hooks
+            if not bypass_hooks:
+                # Reload instances to get computed values
+                updated_instances = list(model_cls._base_manager.filter(pk__in=pks))
+                # Maintain the original order
+                updated_map = {obj.pk: obj for obj in updated_instances}
+                instances = [updated_map.get(obj.pk, obj) for obj in instances]
         else:
-            # For simple field updates, apply changes to instances first
-            for obj in instances:
-                for field, value in kwargs.items():
-                    setattr(obj, field, value)
-
+            # For simple field updates, instances have already been updated in the hook section
             # Perform database update using Django's native bulk_update
             # We use the base manager to avoid recursion
             base_manager = model_cls._base_manager
@@ -120,7 +147,8 @@ class HookQuerySetMixin:
 
         # Run AFTER_UPDATE hooks only if not bypassed
         if not bypass_hooks:
-            engine.run(model_cls, AFTER_UPDATE, instances, originals, HookContext(model_cls))
+            ctx = HookContext(model_cls)
+            engine.run(model_cls, AFTER_UPDATE, instances, originals, ctx=ctx)
         
         return result
 
@@ -273,14 +301,16 @@ class HookQuerySetMixin:
 
         # Run VALIDATE_UPDATE hooks
         if not bypass_validation:
+            ctx = HookContext(model_cls)
             engine.run(
-                model_cls, VALIDATE_UPDATE, objs, originals, HookContext(model_cls)
+                model_cls, VALIDATE_UPDATE, objs, originals, ctx=ctx
             )
 
         # Run BEFORE_UPDATE hooks
         if not bypass_hooks:
+            ctx = HookContext(model_cls)
             engine.run(
-                model_cls, BEFORE_UPDATE, objs, originals, HookContext(model_cls)
+                model_cls, BEFORE_UPDATE, objs, originals, ctx=ctx
             )
 
         # Perform database update using Django's native bulk_update
@@ -290,7 +320,8 @@ class HookQuerySetMixin:
 
         # Run AFTER_UPDATE hooks
         if not bypass_hooks:
-            engine.run(model_cls, AFTER_UPDATE, objs, originals, HookContext(model_cls))
+            ctx = HookContext(model_cls)
+            engine.run(model_cls, AFTER_UPDATE, objs, originals, ctx=ctx)
 
         return result
 

django_bulk_hooks/registry.py

@@ -42,8 +42,8 @@ def register_hook(
     # Add the hook
     hooks.append((handler_cls, method_name, condition, priority))
     
-    # Sort by priority (lowest numbers execute first, matching engine expectation)
-    hooks.sort(key=lambda x: x[3])
+    # Sort by priority (highest numbers execute first)
+    hooks.sort(key=lambda x: x[3], reverse=True)
     
     logger.debug(
         f"Registered {handler_cls.__name__}.{method_name} "
@@ -71,6 +71,10 @@ def get_hooks(model, event):
     # Log hook discovery for debugging
     if hooks:
         logger.debug(f"Found {len(hooks)} hooks for {model.__name__}.{event}")
+        for handler_cls, method_name, condition, priority in hooks:
+            logger.debug(f"  - {handler_cls.__name__}.{method_name} (priority: {priority})")
+    else:
+        logger.debug(f"No hooks found for {model.__name__}.{event}")
     
     return hooks
 

{django_bulk_hooks-0.1.227.dist-info → django_bulk_hooks-0.1.228.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.227
+Version: 0.1.228
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks

django_bulk_hooks-0.1.228.dist-info/RECORD

@@ -0,0 +1,17 @@
+django_bulk_hooks/__init__.py,sha256=uUgpnb9AWjIAcWNpCMqBcOewSnpJjJYH6cjPbQkzoNU,140
+django_bulk_hooks/conditions.py,sha256=V_f3Di2uCVUjoyfiU4BQCHmI4uUIRSRroApDcXlvnso,6349
+django_bulk_hooks/constants.py,sha256=3x1H1fSUUNo0DZONN7GUVDuySZctTR-jtByBHmAIX5w,303
+django_bulk_hooks/context.py,sha256=_NbGWTq9s66g0vbFIaqN4GlIHWQmFg3EQ44qY8YvvEg,1537
+django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lkYQ,4896
+django_bulk_hooks/engine.py,sha256=81NUQAppn2eCsY1Ao6SgvyXsowmxUnabYgY0GHWoo-o,3294
+django_bulk_hooks/enums.py,sha256=1pKFHXq1iCceAUitCj9v6WM3PVJpYJx5ZNZD1RzCJUU,87
+django_bulk_hooks/handler.py,sha256=sd5kPOZKwKQnxmQGir5u10ZkTHRdN4Hynl_oIWEIYzQ,5857
+django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
+django_bulk_hooks/models.py,sha256=mj4f93L64CN1XBS29RlS02WnZjCNoUkai97vKqjgZQ8,4575
+django_bulk_hooks/priority.py,sha256=EGFBbRmX_LhwRYFCKzM8I5m8NGCsUEVJp2pfNTcoHe4,378
+django_bulk_hooks/queryset.py,sha256=L_C0ICEnD2TxOljn0RckX0W8xB-jLa_2995ZuKDRVJY,34448
+django_bulk_hooks/registry.py,sha256=EJBNVDo6VOz2s5zsJbpppiM6JwRmmXLyfwSKXYaT4Fs,2802
+django_bulk_hooks-0.1.228.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.228.dist-info/METADATA,sha256=FFM1S50BoNZtBfQyDGhJ4dtvQTsFY1OvNUmrbmHFk0Q,9743
+django_bulk_hooks-0.1.228.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.228.dist-info/RECORD,,

django_bulk_hooks-0.1.227.dist-info/RECORD

@@ -1,17 +0,0 @@
-django_bulk_hooks/__init__.py,sha256=uUgpnb9AWjIAcWNpCMqBcOewSnpJjJYH6cjPbQkzoNU,140
-django_bulk_hooks/conditions.py,sha256=V_f3Di2uCVUjoyfiU4BQCHmI4uUIRSRroApDcXlvnso,6349
-django_bulk_hooks/constants.py,sha256=3x1H1fSUUNo0DZONN7GUVDuySZctTR-jtByBHmAIX5w,303
-django_bulk_hooks/context.py,sha256=_NbGWTq9s66g0vbFIaqN4GlIHWQmFg3EQ44qY8YvvEg,1537
-django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lkYQ,4896
-django_bulk_hooks/engine.py,sha256=wiO6HvZkBSHzt1Q3IpXmVppJl30zlsoTheuPPCrGqdU,3118
-django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
-django_bulk_hooks/handler.py,sha256=IRgJ6uoyD1NifqzZpL2YxOqInJ4MFlS3vZkAa5ZTIVo,5210
-django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
-django_bulk_hooks/models.py,sha256=mj4f93L64CN1XBS29RlS02WnZjCNoUkai97vKqjgZQ8,4575
-django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=xgnuwl8Ha9IhVzKEvjvCX5jUuRZgc0tWYwaKreuDvpw,32478
-django_bulk_hooks/registry.py,sha256=h59veo8Qh4Afj8ZP_4Jqr-2S6ebXjUJ7pJTdfqzfXkE,2572
-django_bulk_hooks-0.1.227.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.227.dist-info/METADATA,sha256=rY5wk0lHKwxaqEdbVz3BLw3DnRBjMhXSN4syZLuWGX4,9743
-django_bulk_hooks-0.1.227.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.1.227.dist-info/RECORD,,