django-bulk-hooks 0.1.98__py3-none-any.whl → 0.1.100__py3-none-any.whl

django_bulk_hooks/models.py

@@ -1,4 +1,8 @@
+import contextlib
+from functools import wraps
+
 from django.db import models, transaction
+from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor
 
 from django_bulk_hooks.constants import (
     AFTER_CREATE,
@@ -14,9 +18,6 @@ from django_bulk_hooks.constants import (
 from django_bulk_hooks.context import HookContext
 from django_bulk_hooks.engine import run
 from django_bulk_hooks.manager import BulkHookManager
-from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor
-from functools import wraps
-import contextlib
 
 
 @contextlib.contextmanager
@@ -26,7 +27,7 @@ def patch_foreign_key_behavior():
     RelatedObjectDoesNotExist when accessing an unset foreign key field.
     """
     original_get = ForwardManyToOneDescriptor.__get__
-    
+
     @wraps(original_get)
     def safe_get(self, instance, cls=None):
         if instance is None:
@@ -35,7 +36,7 @@ def patch_foreign_key_behavior():
             return original_get(self, instance, cls)
         except self.RelatedObjectDoesNotExist:
             return None
-    
+
     # Patch the descriptor
     ForwardManyToOneDescriptor.__get__ = safe_get
     try:
@@ -63,7 +64,7 @@ class HookModelMixin(models.Model):
         # Skip hook validation during admin form validation
         # This prevents RelatedObjectDoesNotExist errors when Django hasn't
         # fully set up the object's relationships yet
-        if hasattr(self, '_state') and getattr(self._state, 'validating', False):
+        if hasattr(self, "_state") and getattr(self._state, "validating", False):
             return
 
         # Determine if this is a create or update operation
@@ -80,7 +81,9 @@ class HookModelMixin(models.Model):
                 old_instance = self.__class__.objects.get(pk=self.pk)
                 ctx = HookContext(self.__class__)
                 with patch_foreign_key_behavior():
-                    run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
+                    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__)
@@ -91,27 +94,40 @@ class HookModelMixin(models.Model):
         is_create = self.pk is None
         ctx = HookContext(self.__class__)
 
-        # Let Django save first to handle form validation
-        super().save(*args, **kwargs)
-
-        # Then run our hooks with the validated data
+        # Run BEFORE hooks before saving to allow field modifications
         with patch_foreign_key_behavior():
             if is_create:
                 # For create operations
                 run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
                 run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
-                run(self.__class__, AFTER_CREATE, [self], ctx=ctx)
             else:
                 # For update operations
                 try:
                     old_instance = self.__class__.objects.get(pk=self.pk)
-                    run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
+                    run(
+                        self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx
+                    )
                     run(self.__class__, BEFORE_UPDATE, [self], [old_instance], ctx=ctx)
-                    run(self.__class__, AFTER_UPDATE, [self], [old_instance], ctx=ctx)
                 except self.__class__.DoesNotExist:
                     # If the old instance doesn't exist, treat as create
                     run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
                     run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
+
+        # Now let Django save with any modifications from BEFORE hooks
+        super().save(*args, **kwargs)
+
+        # Then run AFTER hooks
+        with patch_foreign_key_behavior():
+            if is_create:
+                # For create operations
+                run(self.__class__, AFTER_CREATE, [self], ctx=ctx)
+            else:
+                # For update operations
+                try:
+                    old_instance = self.__class__.objects.get(pk=self.pk)
+                    run(self.__class__, AFTER_UPDATE, [self], [old_instance], ctx=ctx)
+                except self.__class__.DoesNotExist:
+                    # If the old instance doesn't exist, treat as create
                     run(self.__class__, AFTER_CREATE, [self], ctx=ctx)
 
         return self
@@ -125,5 +141,5 @@ class HookModelMixin(models.Model):
             run(self.__class__, BEFORE_DELETE, [self], ctx=ctx)
             result = super().delete(*args, **kwargs)
             run(self.__class__, AFTER_DELETE, [self], ctx=ctx)
-            
+
         return result

{django_bulk_hooks-0.1.98.dist-info → django_bulk_hooks-0.1.100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.98
+Version: 0.1.100
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT

{django_bulk_hooks-0.1.98.dist-info → django_bulk_hooks-0.1.100.dist-info}/RECORD

@@ -7,10 +7,10 @@ django_bulk_hooks/engine.py,sha256=qSBvBel3pBWVE92ZzgKjMn2ceQpA7FMws2uMXes1MkA,3
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/handler.py,sha256=tdDolHAJ_Nd7-RT4s9HRyLtM1UWGjRjP1Y_U6Af32Gg,5325
 django_bulk_hooks/manager.py,sha256=DcVosEA4RS79KSYgw3Z14_a9Sd8CfxNNc5F3eSb8xc0,11459
-django_bulk_hooks/models.py,sha256=a9XoGgIG4Sfi_kvGnPBbG2DlvgZDz6Qck4VG-DGqFT0,4981
+django_bulk_hooks/models.py,sha256=U5nCxingZS2sznDjgW8fWo93SisA03WKcGpxxApqhuM,5519
 django_bulk_hooks/queryset.py,sha256=7lLqhZ-XOYsZ1I3Loxi4Nhz79M8HlTYE413AW8nyeDI,1330
 django_bulk_hooks/registry.py,sha256=Vh78exKYcdZhM27120kQm-iXGOjd_kf9ZUYBZ8eQ2V0,683
-django_bulk_hooks-0.1.98.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.98.dist-info/METADATA,sha256=KLEuzqcEjYRTaH3rhRfoyQIGkbNQwhA0KL1HniVfHzM,15414
-django_bulk_hooks-0.1.98.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.98.dist-info/RECORD,,
+django_bulk_hooks-0.1.100.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.100.dist-info/METADATA,sha256=AH1pPY4iPjCTvBY5Vyj4dWYJeU5CELEkVt0uRdiW2bg,15415
+django_bulk_hooks-0.1.100.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.100.dist-info/RECORD,,