django-bulk-hooks 0.1.175__tar.gz → 0.1.176__tar.gz

{django_bulk_hooks-0.1.175 → django_bulk_hooks-0.1.176}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.175
+Version: 0.1.176
 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
 Keywords: django,bulk,hooks
 Author: Konrad Beck
@@ -14,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: Django (>=4.0)
+Project-URL: Homepage, https://github.com/AugendLimited/django-bulk-hooks
 Project-URL: Repository, https://github.com/AugendLimited/django-bulk-hooks
 Description-Content-Type: text/markdown
 

{django_bulk_hooks-0.1.175 → django_bulk_hooks-0.1.176}/django_bulk_hooks/manager.py

@@ -58,12 +58,12 @@ class BulkHookManager(models.Manager):
         """
         import inspect
 
-        qs = self.get_queryset()
+        queryset = self.get_queryset()
 
         # Check if this is our HookQuerySet or a different QuerySet
         if (
-            hasattr(qs, "bulk_create")
-            and "bypass_hooks" in inspect.signature(qs.bulk_create).parameters
+            hasattr(queryset, "bulk_create")
+            and "bypass_hooks" in inspect.signature(queryset.bulk_create).parameters
         ):
             # Our HookQuerySet - pass all parameters
             kwargs = {
@@ -73,13 +73,15 @@ class BulkHookManager(models.Manager):
                 "update_fields": update_fields,
                 "unique_fields": unique_fields,
             }
-            return qs.bulk_create(
+            return queryset.bulk_create(
                 objs,
                 bypass_hooks=bypass_hooks,
                 bypass_validation=bypass_validation,
                 **kwargs,
             )
         else:
+            print("Different QuerySet")
+
             # Different QuerySet - only pass standard parameters
             kwargs = {
                 "batch_size": batch_size,
@@ -88,7 +90,7 @@ class BulkHookManager(models.Manager):
                 "update_fields": update_fields,
                 "unique_fields": unique_fields,
             }
-            return qs.bulk_create(objs, **kwargs)
+            return queryset.bulk_create(objs, **kwargs)
 
     def bulk_delete(
         self, objs, batch_size=None, bypass_hooks=False, bypass_validation=False

{django_bulk_hooks-0.1.175 → django_bulk_hooks-0.1.176}/django_bulk_hooks/queryset.py

@@ -109,6 +109,14 @@ class HookQuerySet(models.QuerySet):
         # trickier so it's not done yet.
         if batch_size is not None and batch_size <= 0:
             raise ValueError("Batch size must be a positive integer.")
+        
+        if not objs:
+            return objs
+        
+        if any(not isinstance(obj, model_cls) for obj in objs):
+            raise TypeError(
+                f"bulk_create expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
+            )
 
         # Check for MTI - if we detect multi-table inheritance, we need special handling
         # This follows Django's approach: check that the parents share the same concrete model
@@ -121,14 +129,6 @@ class HookQuerySet(models.QuerySet):
                 is_mti = True
                 break
 
-        if not objs:
-            return objs
-
-        if any(not isinstance(obj, model_cls) for obj in objs):
-            raise TypeError(
-                f"bulk_create expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
-            )
-
         # Fire hooks before DB ops
         if not bypass_hooks:
             ctx = HookContext(model_cls)
@@ -150,22 +150,14 @@ class HookQuerySet(models.QuerySet):
             # Remove custom hook kwargs if present in self.bulk_create signature
             result = self._mti_bulk_create(
                 objs,
-                **{
-                    k: v
-                    for k, v in mti_kwargs.items()
-                    if k not in ["bypass_hooks", "bypass_validation"]
-                },
+                mti_kwargs,
             )
         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(
+            result = super().bulk_create(
                 objs,
                 batch_size=batch_size,
                 ignore_conflicts=ignore_conflicts,
@@ -226,17 +218,12 @@ class HookQuerySet(models.QuerySet):
                 fields_set.update(modified_fields)
                 fields = list(fields_set)
 
-        for i in range(0, len(objs), self.CHUNK_SIZE):
-            chunk = objs[i : i + self.CHUNK_SIZE]
-
-            # Call the base implementation to avoid re-triggering this method
-            # Filter out custom parameters that Django's bulk_update doesn't accept
-            django_kwargs = {
-                k: v
-                for k, v in kwargs.items()
-                if k not in ["bypass_hooks", "bypass_validation"]
-            }
-            super().bulk_update(chunk, fields, **django_kwargs)
+        django_kwargs = {
+            k: v
+            for k, v in kwargs.items()
+            if k not in ["bypass_hooks", "bypass_validation"]
+        }
+        super().bulk_update(objs, fields, **django_kwargs)
 
         if not bypass_hooks:
             engine.run(model_cls, AFTER_UPDATE, objs, originals, ctx=ctx)

{django_bulk_hooks-0.1.175 → django_bulk_hooks-0.1.176}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.175"
+version = "0.1.176"
 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"