django-bulk-hooks 0.1.261__tar.gz → 0.1.263__tar.gz

{django_bulk_hooks-0.1.261 → django_bulk_hooks-0.1.263}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.261
+Version: 0.1.263
 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

{django_bulk_hooks-0.1.261 → django_bulk_hooks-0.1.263}/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.261 → django_bulk_hooks-0.1.263}/django_bulk_hooks/queryset.py

@@ -889,6 +889,7 @@ class HookQuerySetMixin:
         # Handle auto_now fields like Django's update_or_create does
         fields_set = set(fields)
         pk_fields = model_cls._meta.pk_fields
+        pk_field_names = [f.name for f in pk_fields]
         auto_now_fields = []
         custom_update_fields = []  # Fields that need pre_save() called on update
         logger.debug(f"Checking for auto_now and custom update fields in {model_cls.__name__}")
@@ -898,7 +899,7 @@ class HookQuerySetMixin:
             if hasattr(field, "auto_now") and field.auto_now:
                 logger.debug(f"Found auto_now field: {field.name}")
                 print(f"DEBUG: Found auto_now field: {field.name}")
-                if field.name not in fields_set and field.name not in pk_fields:
+                if field.name not in fields_set and field.name not in pk_field_names:
                     fields_set.add(field.name)
                     if field.name != field.attname:
                         fields_set.add(field.attname)
@@ -913,7 +914,7 @@ class HookQuerySetMixin:
             # Check for custom fields that might need pre_save() on update (like CurrentUserField)
             elif hasattr(field, 'pre_save'):
                 # Only call pre_save on fields that aren't already being updated
-                if field.name not in fields_set and field.name not in pk_fields:
+                if field.name not in fields_set and field.name not in pk_field_names:
                     custom_update_fields.append(field)
                     logger.debug(f"Found custom field with pre_save: {field.name}")
                     print(f"DEBUG: Found custom field with pre_save: {field.name}")
@@ -945,8 +946,8 @@ class HookQuerySetMixin:
                         # Only update the field if pre_save returned a new value
                         if new_value is not None:
                             setattr(obj, field.name, new_value)
-                            # Add this field to the update fields if it's not already there
-                            if field.name not in fields_set:
+                            # 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}")

{django_bulk_hooks-0.1.261 → django_bulk_hooks-0.1.263}/pyproject.toml

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