django-bulk-hooks 0.1.170__tar.gz → 0.1.172__tar.gz

{django_bulk_hooks-0.1.170 → django_bulk_hooks-0.1.172}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.170
+Version: 0.1.172
 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.170 → django_bulk_hooks-0.1.172}/django_bulk_hooks/models.py

@@ -44,7 +44,8 @@ class HookModelMixin(models.Model):
         else:
             # For update operations, run VALIDATE_UPDATE hooks for validation
             try:
-                old_instance = self.__class__.objects.get(pk=self.pk)
+                # Use _base_manager to avoid triggering hooks recursively
+                old_instance = self.__class__._base_manager.get(pk=self.pk)
                 ctx = HookContext(self.__class__)
                 run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
             except self.__class__.DoesNotExist:
@@ -56,7 +57,7 @@ class HookModelMixin(models.Model):
         # If bypass_hooks is True, use base manager to avoid triggering hooks
         if bypass_hooks:
             return self._base_manager.save(self, *args, **kwargs)
-        
+
         is_create = self.pk is None
 
         if is_create:
@@ -70,7 +71,8 @@ class HookModelMixin(models.Model):
         else:
             # For update operations, we need to get the old record
             try:
-                old_instance = self.__class__.objects.get(pk=self.pk)
+                # Use _base_manager to avoid triggering hooks recursively
+                old_instance = self.__class__._base_manager.get(pk=self.pk)
                 ctx = HookContext(self.__class__)
                 run(self.__class__, BEFORE_UPDATE, [self], [old_instance], ctx=ctx)
 
@@ -92,7 +94,7 @@ class HookModelMixin(models.Model):
         # If bypass_hooks is True, use base manager to avoid triggering hooks
         if bypass_hooks:
             return self._base_manager.delete(self, *args, **kwargs)
-        
+
         ctx = HookContext(self.__class__)
 
         # Run validation hooks first

{django_bulk_hooks-0.1.170 → django_bulk_hooks-0.1.172}/django_bulk_hooks/queryset.py

@@ -139,21 +139,17 @@ 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
-
-            # 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,
-            )
+            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)
 
         # Fire AFTER_CREATE hooks
         if not bypass_hooks:
@@ -250,23 +246,9 @@ class HookQuerySet(models.QuerySet):
 
         pks = [obj.pk for obj in objs if obj.pk is not None]
 
-        # Use Django's base manager to perform the actual deletion
-        # This avoids recursion and uses Django's built-in delete logic
-        from django.db.models import QuerySet
-
-        base_qs = QuerySet(model_cls, using=self.db)
-
-        # Delete in batches if batch_size is specified
-        if batch_size:
-            for i in range(0, len(objs), batch_size):
-                batch = objs[i : i + batch_size]
-                batch_pks = [obj.pk for obj in batch if obj.pk is not None]
-                if batch_pks:
-                    base_qs.filter(pk__in=batch_pks).delete()
-        else:
-            # Delete all at once
-            if pks:
-                base_qs.filter(pk__in=pks).delete()
+        # 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)

{django_bulk_hooks-0.1.170 → django_bulk_hooks-0.1.172}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.170"
+version = "0.1.172"
 description = "Hook-style hooks for Django bulk operations like bulk_create and bulk_update."
 authors = ["Konrad Beck <konrad.beck@merchantcapital.co.za>"]
 readme = "README.md"