django-bulk-hooks 0.1.172__py3-none-any.whl → 0.1.175__py3-none-any.whl

django_bulk_hooks/queryset.py

@@ -24,9 +24,23 @@ class HookQuerySet(models.QuerySet):
         objs = list(self)
         if not objs:
             return 0
-        # Use our bulk_delete method to handle hooks properly
-        self.bulk_delete(objs)
-        return len(objs)
+        
+        model_cls = self.model
+        ctx = HookContext(model_cls)
+        
+        # Run validation hooks first
+        engine.run(model_cls, VALIDATE_DELETE, objs, ctx=ctx)
+        
+        # Then run business logic hooks
+        engine.run(model_cls, BEFORE_DELETE, objs, ctx=ctx)
+        
+        # Use Django's standard delete() method
+        result = super().delete()
+        
+        # Run AFTER_DELETE hooks
+        engine.run(model_cls, AFTER_DELETE, objs, ctx=ctx)
+        
+        return result
 
     @transaction.atomic
     def update(self, **kwargs):
@@ -34,28 +48,33 @@ class HookQuerySet(models.QuerySet):
         if not instances:
             return 0
 
+        model_cls = self.model
+        pks = [obj.pk for obj in instances]
+
+        # Load originals for hook comparison and ensure they match the order of instances
+        # Use the base manager to avoid recursion
+        original_map = {
+            obj.pk: obj for obj in model_cls._base_manager.filter(pk__in=pks)
+        }
+        originals = [original_map.get(obj.pk) for obj in instances]
+
         # Apply field updates to instances
         for obj in instances:
             for field, value in kwargs.items():
                 setattr(obj, field, value)
 
-        # Use our bulk_update method to handle hooks properly
-        self.bulk_update(instances, list(kwargs.keys()))
-        return len(instances)
+        # Run BEFORE_UPDATE hooks
+        ctx = HookContext(model_cls)
+        engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
-    def save(self, obj):
-        """
-        Save a single object using the appropriate bulk operation.
-        """
-        if obj.pk:
-            # Use bulk_update for existing objects
-            self.bulk_update(
-                [obj], [field.name for field in obj._meta.fields if field.name != "id"]
-            )
-        else:
-            # Use bulk_create for new objects
-            self.bulk_create([obj])
-        return obj
+        # Use Django's built-in update logic directly
+        # Call the base QuerySet implementation to avoid recursion
+        update_count = super().update(**kwargs)
+
+        # Run AFTER_UPDATE hooks
+        engine.run(model_cls, AFTER_UPDATE, instances, originals, ctx=ctx)
+
+        return update_count
 
     @transaction.atomic
     def bulk_create(
@@ -139,17 +158,21 @@ class HookQuerySet(models.QuerySet):
             )
         else:
             # For single-table models, use Django's built-in bulk_create
+            # but we need to call it on the base manager to avoid recursion
             # Filter out custom parameters that Django's bulk_create doesn't accept
-            django_kwargs = {
-                "batch_size": batch_size,
-                "ignore_conflicts": ignore_conflicts,
-                "update_conflicts": update_conflicts,
-                "update_fields": update_fields,
-                "unique_fields": unique_fields,
-            }
-            # Remove custom hook kwargs if present
-            django_kwargs = {k: v for k, v in django_kwargs.items() if v is not None}
-            result = super().bulk_create(objs, **django_kwargs)
+
+            # Use Django's original QuerySet to avoid recursive calls
+            from django.db.models import QuerySet
+
+            original_qs = QuerySet(model_cls, using=self.db)
+            result = original_qs.bulk_create(
+                objs,
+                batch_size=batch_size,
+                ignore_conflicts=ignore_conflicts,
+                update_conflicts=update_conflicts,
+                update_fields=update_fields,
+                unique_fields=unique_fields,
+            )
 
         # Fire AFTER_CREATE hooks
         if not bypass_hooks:
@@ -220,41 +243,6 @@ class HookQuerySet(models.QuerySet):
 
         return objs
 
-    @transaction.atomic
-    def bulk_delete(
-        self, objs, batch_size=None, bypass_hooks=False, bypass_validation=False
-    ):
-        if not objs:
-            return []
-
-        model_cls = self.model
-
-        if any(not isinstance(obj, model_cls) for obj in objs):
-            raise TypeError(
-                f"bulk_delete expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
-            )
-
-        ctx = HookContext(model_cls)
-
-        if not bypass_hooks:
-            # Run validation hooks first
-            if not bypass_validation:
-                engine.run(model_cls, VALIDATE_DELETE, objs, ctx=ctx)
-
-            # Then run business logic hooks
-            engine.run(model_cls, BEFORE_DELETE, objs, ctx=ctx)
-
-        pks = [obj.pk for obj in objs if obj.pk is not None]
-
-        # Call the base QuerySet implementation to avoid recursion
-        # The hooks have already been fired above, so we don't need them again
-        super().bulk_delete(objs, batch_size=batch_size)
-
-        if not bypass_hooks:
-            engine.run(model_cls, AFTER_DELETE, objs, ctx=ctx)
-
-        return objs
-
     def _detect_modified_fields(self, new_instances, original_instances):
         """
         Detect fields that were modified during BEFORE_UPDATE hooks by comparing

{django_bulk_hooks-0.1.172.dist-info → django_bulk_hooks-0.1.175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.172
+Version: 0.1.175
 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.172.dist-info → django_bulk_hooks-0.1.175.dist-info}/RECORD

@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,
 django_bulk_hooks/manager.py,sha256=OSzW8eVzknLV1WCvZcBkWMz9x_Vjq4bJM8raVXKiZvI,5085
 django_bulk_hooks/models.py,sha256=7fnx5xd4HWXfLVlFhhiRzR92JRWFEuxgk6aSWLEsyJg,3996
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=yGzVFWWbg7mjJxH9Gx1hXw9Mf82H0XmMlfKZn47WMJw,23222
+django_bulk_hooks/queryset.py,sha256=wP1PHzDJ-n_F6RtPzQUdB2j16aALabDl0gbaMJAE2eI,22812
 django_bulk_hooks/registry.py,sha256=-mQBizJ06nz_tajZBinViKx_uP2Tbc1tIpTEMv7lwKA,705
-django_bulk_hooks-0.1.172.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.172.dist-info/METADATA,sha256=JQDexi4jxTyskLLwCDmRemDvHPeihDdkNZOJSohsLjk,6939
-django_bulk_hooks-0.1.172.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.172.dist-info/RECORD,,
+django_bulk_hooks-0.1.175.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.175.dist-info/METADATA,sha256=HmgU2xtMNjhwLejwg5ehchMkJPSYn6B_JRcRmn3EoXs,6939
+django_bulk_hooks-0.1.175.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.175.dist-info/RECORD,,