django-bulk-hooks 0.1.231__py3-none-any.whl → 0.1.233__py3-none-any.whl

django_bulk_hooks/models.py

@@ -1,5 +1,6 @@
 import logging
-from django.db import models, transaction
+from django.db import models
+
 from django_bulk_hooks.constants import (
     AFTER_CREATE,
     AFTER_DELETE,
@@ -41,49 +42,32 @@ class HookModelMixin(models.Model):
 
         if is_create:
             # For create operations, run VALIDATE_CREATE hooks for validation
-            ctx = HookContext(self.__class__, bypass_hooks)
+            ctx = HookContext(self.__class__)
             run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
         else:
             # For update operations, run VALIDATE_UPDATE hooks for validation
             try:
                 # Use _base_manager to avoid triggering hooks recursively
                 old_instance = self.__class__._base_manager.get(pk=self.pk)
-                ctx = HookContext(self.__class__, bypass_hooks)
+                ctx = HookContext(self.__class__)
                 run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
             except self.__class__.DoesNotExist:
                 # If the old instance doesn't exist, treat as create
-                ctx = HookContext(self.__class__, bypass_hooks)
+                ctx = HookContext(self.__class__)
                 run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
 
     def save(self, *args, bypass_hooks=False, **kwargs):
-        # If bypass_hooks is True, call the parent save directly within a bypass context
+        # If bypass_hooks is True, use base manager to avoid triggering hooks
         if bypass_hooks:
             logger.debug(f"save() called with bypass_hooks=True for {self.__class__.__name__} pk={self.pk}")
-            with HookContext(self.__class__, bypass_hooks=True):
-                return super().save(*args, **kwargs)
-
-        # Only create a new transaction if we're not already in one
-        # This allows for proper nested transaction handling
-        from django.db import connection
-        if connection.in_atomic_block:
-            # We're already in a transaction, don't create a new one
-            return self._save_with_hooks(*args, **kwargs)
-        else:
-            # We're not in a transaction, so create one
-            with transaction.atomic():
-                return self._save_with_hooks(*args, **kwargs)
+            return self._base_manager.save(self, *args, **kwargs)
 
-    def _save_with_hooks(self, *args, **kwargs):
-        """Internal method to handle save with hooks."""
         is_create = self.pk is None
-        
+
         if is_create:
             logger.debug(f"save() creating new {self.__class__.__name__} instance")
             # For create operations, we don't have old records
-            ctx = HookContext(self.__class__, bypass_hooks=False)
-            
-            # Run hooks - if any fail, the transaction will be rolled back
-            run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
+            ctx = HookContext(self.__class__)
             run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
 
             super().save(*args, **kwargs)
@@ -95,10 +79,7 @@ class HookModelMixin(models.Model):
             try:
                 # Use _base_manager to avoid triggering hooks recursively
                 old_instance = self.__class__._base_manager.get(pk=self.pk)
-                ctx = HookContext(self.__class__, bypass_hooks=False)
-                
-                # Run hooks - if any fail, the transaction will be rolled back
-                run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
+                ctx = HookContext(self.__class__)
                 run(self.__class__, BEFORE_UPDATE, [self], [old_instance], ctx=ctx)
 
                 super().save(*args, **kwargs)
@@ -106,10 +87,7 @@ class HookModelMixin(models.Model):
                 run(self.__class__, AFTER_UPDATE, [self], [old_instance], ctx=ctx)
             except self.__class__.DoesNotExist:
                 # If the old instance doesn't exist, treat as create
-                ctx = HookContext(self.__class__, bypass_hooks=False)
-                
-                # Run hooks - if any fail, the transaction will be rolled back
-                run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
+                ctx = HookContext(self.__class__)
                 run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
 
                 super().save(*args, **kwargs)
@@ -119,27 +97,13 @@ class HookModelMixin(models.Model):
         return self
 
     def delete(self, *args, bypass_hooks=False, **kwargs):
-        # If bypass_hooks is True, call the parent delete directly within a bypass context
+        # If bypass_hooks is True, use base manager to avoid triggering hooks
         if bypass_hooks:
-            with HookContext(self.__class__, bypass_hooks=True):
-                return super().delete(*args, **kwargs)
-
-        # Only create a new transaction if we're not already in one
-        # This allows for proper nested transaction handling
-        from django.db import connection
-        if connection.in_atomic_block:
-            # We're already in a transaction, don't create a new one
-            return self._delete_with_hooks(*args, **kwargs)
-        else:
-            # We're not in a transaction, so create one
-            with transaction.atomic():
-                return self._delete_with_hooks(*args, **kwargs)
+            return self._base_manager.delete(self, *args, **kwargs)
 
-    def _delete_with_hooks(self, *args, **kwargs):
-        """Internal method to handle delete with hooks."""
-        ctx = HookContext(self.__class__, bypass_hooks=False)
+        ctx = HookContext(self.__class__)
 
-        # Run hooks - if any fail, the transaction will be rolled back
+        # Run validation hooks first
         run(self.__class__, VALIDATE_DELETE, [self], ctx=ctx)
 
         # Then run business logic hooks

django_bulk_hooks/priority.py

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