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

django_bulk_hooks/manager.py

@@ -5,41 +5,8 @@ from django_bulk_hooks.queryset import HookQuerySet
 
 class BulkHookManager(models.Manager):
     def get_queryset(self):
-        qs = HookQuerySet(self.model, using=self._db)
-        return qs
-
-    def bulk_update(
-        self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
-    ):
-        """
-        Delegate to QuerySet's bulk_update implementation.
-        This follows Django's pattern where Manager methods call QuerySet methods.
-        """
-        import inspect
-
-        qs = self.get_queryset()
-
-        # Check if this is our HookQuerySet or a different QuerySet
-        if (
-            hasattr(qs, "bulk_update")
-            and "bypass_hooks" in inspect.signature(qs.bulk_update).parameters
-        ):
-            # Our HookQuerySet - pass all parameters
-            return qs.bulk_update(
-                objs,
-                fields,
-                bypass_hooks=bypass_hooks,
-                bypass_validation=bypass_validation,
-                **kwargs,
-            )
-        else:
-            # Different QuerySet (like queryable_properties) - only pass standard parameters
-            django_kwargs = {
-                k: v
-                for k, v in kwargs.items()
-                if k not in ["bypass_hooks", "bypass_validation"]
-            }
-            return qs.bulk_update(objs, fields, **django_kwargs)
+        queryset = HookQuerySet(self.model, using=self._db)
+        return queryset
 
     def bulk_create(
         self,
@@ -51,84 +18,58 @@ class BulkHookManager(models.Manager):
         unique_fields=None,
         bypass_hooks=False,
         bypass_validation=False,
+        **kwargs,
     ):
         """
         Delegate to QuerySet's bulk_create implementation.
         This follows Django's pattern where Manager methods call QuerySet methods.
         """
-        import inspect
-
-        qs = 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
-        ):
-            # Our HookQuerySet - pass all parameters
-            kwargs = {
-                "batch_size": batch_size,
-                "ignore_conflicts": ignore_conflicts,
-                "update_conflicts": update_conflicts,
-                "update_fields": update_fields,
-                "unique_fields": unique_fields,
-            }
-            return qs.bulk_create(
-                objs,
-                bypass_hooks=bypass_hooks,
-                bypass_validation=bypass_validation,
-                **kwargs,
-            )
-        else:
-            # Different QuerySet - only pass standard parameters
-            kwargs = {
-                "batch_size": batch_size,
-                "ignore_conflicts": ignore_conflicts,
-                "update_conflicts": update_conflicts,
-                "update_fields": update_fields,
-                "unique_fields": unique_fields,
-            }
-            return qs.bulk_create(objs, **kwargs)
+        return self.get_queryset().bulk_create(
+            objs,
+            bypass_hooks=bypass_hooks,
+            bypass_validation=bypass_validation,
+            batch_size=batch_size,
+            ignore_conflicts=ignore_conflicts,
+            update_conflicts=update_conflicts,
+            update_fields=update_fields,
+            unique_fields=unique_fields,
+            **kwargs,
+        )
 
-    def bulk_delete(
-        self, objs, batch_size=None, bypass_hooks=False, bypass_validation=False
+    def bulk_update(
+        self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
     ):
         """
-        Delegate to QuerySet's bulk_delete implementation.
+        Delegate to QuerySet's bulk_update implementation.
         This follows Django's pattern where Manager methods call QuerySet methods.
         """
-        import inspect
-
-        qs = self.get_queryset()
+        return self.get_queryset().bulk_update(
+            objs,
+            fields,
+            bypass_hooks=bypass_hooks,
+            bypass_validation=bypass_validation,
+            **kwargs,
+        )
 
-        # Check if this is our HookQuerySet or a different QuerySet
-        if (
-            hasattr(qs, "bulk_delete")
-            and "bypass_hooks" in inspect.signature(qs.bulk_delete).parameters
-        ):
-            # Our HookQuerySet - pass all parameters
-            kwargs = {
-                "batch_size": batch_size,
-            }
-            return qs.bulk_delete(
-                objs,
-                bypass_hooks=bypass_hooks,
-                bypass_validation=bypass_validation,
-                **kwargs,
-            )
-        else:
-            # Different QuerySet - only pass standard parameters
-            kwargs = {
-                "batch_size": batch_size,
-            }
-            return qs.bulk_delete(objs, **kwargs)
-
-    def update(self, **kwargs):
+    def bulk_delete(
+        self,
+        objs,
+        batch_size=None,
+        bypass_hooks=False,
+        bypass_validation=False,
+        **kwargs,
+    ):
         """
-        Delegate to QuerySet's update implementation.
+        Delegate to QuerySet's bulk_delete implementation.
         This follows Django's pattern where Manager methods call QuerySet methods.
         """
-        return self.get_queryset().update(**kwargs)
+        return self.get_queryset().bulk_delete(
+            objs,
+            bypass_hooks=bypass_hooks,
+            bypass_validation=bypass_validation,
+            batch_size=batch_size,
+            **kwargs,
+        )
 
     def delete(self):
         """
@@ -137,6 +78,13 @@ class BulkHookManager(models.Manager):
         """
         return self.get_queryset().delete()
 
+    def update(self, **kwargs):
+        """
+        Delegate to QuerySet's update implementation.
+        This follows Django's pattern where Manager methods call QuerySet methods.
+        """
+        return self.get_queryset().update(**kwargs)
+
     def save(self, obj):
         """
         Save a single object using the appropriate bulk operation.

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)
@@ -315,6 +302,10 @@ class HookQuerySet(models.QuerySet):
         if inheritance_chain is None:
             inheritance_chain = self._get_inheritance_chain()
 
+        for inheritance in inheritance_chain:
+            print(inheritance)
+        
+
         # Safety check to prevent infinite recursion
         if len(inheritance_chain) > 10:  # Arbitrary limit to prevent infinite loops
             raise ValueError(

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

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

@@ -6,12 +6,12 @@ django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lk
 django_bulk_hooks/engine.py,sha256=nA5PU9msk_Ju5Gf_sTd7GqPscuTxEW5itCDAoSScYGI,1645
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,4854
-django_bulk_hooks/manager.py,sha256=OSzW8eVzknLV1WCvZcBkWMz9x_Vjq4bJM8raVXKiZvI,5085
+django_bulk_hooks/manager.py,sha256=KLEjpQRt4WlzgBAf_X3XOAPUQM8Jmc1fIt8yr62FPQc,3044
 django_bulk_hooks/models.py,sha256=7fnx5xd4HWXfLVlFhhiRzR92JRWFEuxgk6aSWLEsyJg,3996
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=wP1PHzDJ-n_F6RtPzQUdB2j16aALabDl0gbaMJAE2eI,22812
+django_bulk_hooks/queryset.py,sha256=unW-YBkiS5NbuPwOdbRK05ZOKRi7KjSxevyKX22NxmU,22270
 django_bulk_hooks/registry.py,sha256=-mQBizJ06nz_tajZBinViKx_uP2Tbc1tIpTEMv7lwKA,705
-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,,
+django_bulk_hooks-0.1.177.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.177.dist-info/METADATA,sha256=99nhQDIQt5uMqZedTPGw7wB1VLpkE0VacnVeyk2koiM,6951
+django_bulk_hooks-0.1.177.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.177.dist-info/RECORD,,

{django_bulk_hooks-0.1.175.dist-info → django_bulk_hooks-0.1.177.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any