django-bulk-hooks 0.1.262__tar.gz → 0.1.264__tar.gz

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.262
+Version: 0.1.264
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: Django (>=4.0)
+Requires-Dist: django (>=5.2.0,<6.0.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
@@ -114,7 +114,7 @@ Account.objects.bulk_create(accounts)
 # Bulk update - triggers BEFORE_UPDATE and AFTER_UPDATE hooks
 for account in accounts:
     account.balance *= 1.1
-Account.objects.bulk_update(accounts, ['balance'])
+Account.objects.bulk_update(accounts)  # fields are auto-detected
 
 # Bulk delete - triggers BEFORE_DELETE and AFTER_DELETE hooks
 Account.objects.bulk_delete(accounts)
@@ -200,7 +200,7 @@ account.delete()
 ```python
 # These also trigger hooks
 Account.objects.bulk_create(accounts)
-Account.objects.bulk_update(accounts, ['balance'])
+Account.objects.bulk_update(accounts)  # fields are auto-detected
 Account.objects.bulk_delete(accounts)
 ```
 
@@ -239,7 +239,7 @@ accounts = [account1, account2, account3]  # IDs: 1, 2, 3
 reordered = [account3, account1, account2]  # IDs: 3, 1, 2
 
 # The hook will still receive properly paired old/new records
-LoanAccount.objects.bulk_update(reordered, ['balance'])
+LoanAccount.objects.bulk_update(reordered)  # fields are auto-detected
 ```
 
 ## 🧩 Integration with Other Managers

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/README.md

@@ -95,7 +95,7 @@ Account.objects.bulk_create(accounts)
 # Bulk update - triggers BEFORE_UPDATE and AFTER_UPDATE hooks
 for account in accounts:
     account.balance *= 1.1
-Account.objects.bulk_update(accounts, ['balance'])
+Account.objects.bulk_update(accounts)  # fields are auto-detected
 
 # Bulk delete - triggers BEFORE_DELETE and AFTER_DELETE hooks
 Account.objects.bulk_delete(accounts)
@@ -181,7 +181,7 @@ account.delete()
 ```python
 # These also trigger hooks
 Account.objects.bulk_create(accounts)
-Account.objects.bulk_update(accounts, ['balance'])
+Account.objects.bulk_update(accounts)  # fields are auto-detected
 Account.objects.bulk_delete(accounts)
 ```
 
@@ -220,7 +220,7 @@ accounts = [account1, account2, account3]  # IDs: 1, 2, 3
 reordered = [account3, account1, account2]  # IDs: 3, 1, 2
 
 # The hook will still receive properly paired old/new records
-LoanAccount.objects.bulk_update(reordered, ['balance'])
+LoanAccount.objects.bulk_update(reordered)  # fields are auto-detected
 ```
 
 ## 🧩 Integration with Other Managers

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/django_bulk_hooks/decorators.py

@@ -82,17 +82,18 @@ def select_related(*related_fields):
                     ids_to_fetch.append(obj.pk)
 
             # Always validate fields for nested field errors, regardless of whether we need to fetch
-            for field in related_fields:
-                if "." in field or "__" in field:
-                    raise ValueError(
-                        f"@select_related does not support nested fields like '{field}'"
-                    )
+            # Note: We allow nested fields as Django's select_related supports them
 
             fetched = {}
             if ids_to_fetch:
                 # Validate fields before passing to select_related
                 validated_fields = []
                 for field in related_fields:
+                    # For nested fields (containing __), let Django's select_related handle validation
+                    if "__" in field:
+                        validated_fields.append(field)
+                        continue
+
                     try:
                         # Handle Mock objects that don't have _meta
                         if hasattr(model_cls, "_meta"):
@@ -112,9 +113,13 @@ def select_related(*related_fields):
 
                 if validated_fields:
                     # Use the base manager to avoid recursion
-                    fetched = model_cls._base_manager.select_related(
-                        *validated_fields
-                    ).in_bulk(ids_to_fetch)
+                    try:
+                        fetched = model_cls._base_manager.select_related(
+                            *validated_fields
+                        ).in_bulk(ids_to_fetch)
+                    except Exception:
+                        # If select_related fails (e.g., invalid nested fields), skip preloading
+                        fetched = {}
 
             for obj in new_records:
                 preloaded = fetched.get(obj.pk)
@@ -126,8 +131,8 @@ def select_related(*related_fields):
                         if field in obj._state.fields_cache:
                             # don't override values that were explicitly set or already loaded
                             continue
-                    if "." in field or "__" in field:
-                        # This should have been caught earlier, but just in case
+                    if "." in field:
+                        # Skip fields with dots (legacy format, not supported)
                         continue
 
                     try:
@@ -181,8 +186,8 @@ def bulk_hook(model_cls, event, when=None, priority=None):
             def __init__(self):
                 self.func = func
 
-            def handle(self, new_instances, original_instances):
-                return self.func(new_instances, original_instances)
+            def handle(self, new_records=None, old_records=None, **kwargs):
+                return self.func(new_records, old_records)
 
         # Register the hook using the registry
         register_hook(

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/django_bulk_hooks/manager.py

@@ -51,7 +51,7 @@ class BulkHookManager(models.Manager):
         )
 
     def bulk_update(
-        self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
+        self, objs, bypass_hooks=False, bypass_validation=False, **kwargs
     ):
         """
         Delegate to QuerySet's bulk_update implementation.
@@ -59,7 +59,6 @@ class BulkHookManager(models.Manager):
         """
         return self.get_queryset().bulk_update(
             objs,
-            fields,
             bypass_hooks=bypass_hooks,
             bypass_validation=bypass_validation,
             **kwargs,
@@ -104,10 +103,8 @@ class BulkHookManager(models.Manager):
         Save a single object using the appropriate bulk operation.
         """
         if obj.pk:
-            self.bulk_update(
-                [obj],
-                fields=[field.name for field in obj._meta.fields if field.name != "id"],
-            )
+            # bulk_update now auto-detects changed fields
+            self.bulk_update([obj])
         else:
             self.bulk_create([obj])
         return obj

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/django_bulk_hooks/queryset.py

@@ -846,12 +846,70 @@ class HookQuerySetMixin:
 
         return result
 
+    def _detect_changed_fields(self, objs):
+        """
+        Auto-detect which fields have changed by comparing objects with database values.
+        Returns a set of field names that have changed across all objects.
+        """
+        if not objs:
+            return set()
+
+        model_cls = self.model
+        changed_fields = set()
+
+        # Get primary key field names
+        pk_fields = [f.name for f in model_cls._meta.pk_fields]
+        if not pk_fields:
+            pk_fields = ['pk']
+
+        # Get all object PKs
+        obj_pks = []
+        for obj in objs:
+            if hasattr(obj, 'pk') and obj.pk is not None:
+                obj_pks.append(obj.pk)
+            else:
+                # Skip objects without PKs
+                continue
+
+        if not obj_pks:
+            return set()
+
+        # Fetch current database values for all objects
+        existing_objs = {obj.pk: obj for obj in model_cls.objects.filter(pk__in=obj_pks)}
+
+        # Compare each object's current values with database values
+        for obj in objs:
+            if obj.pk not in existing_objs:
+                continue
+
+            db_obj = existing_objs[obj.pk]
+
+            # Check all concrete fields for changes
+            for field in model_cls._meta.concrete_fields:
+                field_name = field.name
+
+                # Skip primary key fields
+                if field_name in pk_fields:
+                    continue
+
+                # Get current value from object
+                current_value = getattr(obj, field_name, None)
+                # Get database value
+                db_value = getattr(db_obj, field_name, None)
+
+                # Compare values (handle None cases)
+                if current_value != db_value:
+                    changed_fields.add(field_name)
+
+        return changed_fields
+
     @transaction.atomic
     def bulk_update(
-        self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
+        self, objs, bypass_hooks=False, bypass_validation=False, **kwargs
     ):
         """
         Bulk update objects in the database with MTI support.
+        Automatically detects which fields have changed by comparing with database values.
         """
         model_cls = self.model
 
@@ -863,10 +921,14 @@ class HookQuerySetMixin:
                 f"bulk_update expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
             )
 
+        # Auto-detect changed fields by comparing with database values
+        changed_fields = self._detect_changed_fields(objs)
+        logger.debug(f"Auto-detected changed fields: {changed_fields}")
+
         logger.debug(
-            f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)} fields={fields}"
+            f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)} changed_fields={changed_fields}"
         )
-        print(f"DEBUG: bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)} fields={fields}")
+        print(f"DEBUG: bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)} changed_fields={changed_fields}")
 
         # Check for MTI
         is_mti = False
@@ -887,7 +949,7 @@ class HookQuerySetMixin:
             )  # Ensure originals is defined for after_update call
 
         # Handle auto_now fields like Django's update_or_create does
-        fields_set = set(fields)
+        fields_set = set(changed_fields)
         pk_fields = model_cls._meta.pk_fields
         pk_field_names = [f.name for f in pk_fields]
         auto_now_fields = []
@@ -921,7 +983,6 @@ class HookQuerySetMixin:
         
         logger.debug(f"Auto_now fields detected: {auto_now_fields}")
         print(f"DEBUG: Auto_now fields detected: {auto_now_fields}")
-        fields = list(fields_set)
         
         # Set auto_now field values to current timestamp
         if auto_now_fields:
@@ -949,7 +1010,6 @@ class HookQuerySetMixin:
                             # Add this field to the update fields if it's not already there and not a primary key
                             if field.name not in fields_set and field.name not in pk_field_names:
                                 fields_set.add(field.name)
-                                fields.append(field.name)
                             logger.debug(f"Custom field {field.name} updated via pre_save() for object {obj.pk}")
                             print(f"DEBUG: Custom field {field.name} updated via pre_save() for object {obj.pk}")
                     except Exception as e:
@@ -958,7 +1018,7 @@ class HookQuerySetMixin:
 
         # Handle MTI models differently
         if is_mti:
-            result = self._mti_bulk_update(objs, fields, **kwargs)
+            result = self._mti_bulk_update(objs, list(fields_set), **kwargs)
         else:
             # For single-table models, use Django's built-in bulk_update
             django_kwargs = {
@@ -970,12 +1030,12 @@ class HookQuerySetMixin:
             print("DEBUG: Calling Django bulk_update")
             # Build a per-object concrete value map to avoid leaking expressions into hooks
             value_map = {}
-            logger.debug(f"Building value map for {len(objs)} objects with fields: {fields}")
+            logger.debug(f"Building value map for {len(objs)} objects with fields: {list(fields_set)}")
             for obj in objs:
                 if obj.pk is None:
                     continue
                 field_values = {}
-                for field_name in fields:
+                for field_name in fields_set:
                     # Capture raw values assigned on the object (not expressions)
                     field_values[field_name] = getattr(obj, field_name)
                     if field_name in auto_now_fields:
@@ -988,7 +1048,7 @@ class HookQuerySetMixin:
                 set_bulk_update_value_map(value_map)
 
             try:
-                result = super().bulk_update(objs, fields, **django_kwargs)
+                result = super().bulk_update(objs, list(fields_set), **django_kwargs)
             finally:
                 # Always clear after the internal update() path finishes
                 set_bulk_update_value_map(None)

{django_bulk_hooks-0.1.262 → django_bulk_hooks-0.1.264}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.262"
+version = "0.1.264"
 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"
@@ -14,7 +14,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.11"
-Django = ">=4.0"
+django = "^5.2.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"