django-bulk-hooks 0.1.235__tar.gz → 0.1.236__tar.gz

{django_bulk_hooks-0.1.235 → django_bulk_hooks-0.1.236}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.235
+Version: 0.1.236
 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.235 → django_bulk_hooks-0.1.236}/django_bulk_hooks/context.py

@@ -22,6 +22,22 @@ def get_bypass_hooks():
     return getattr(_hook_context, 'bypass_hooks', False)
 
 
+# Thread-local storage for passing per-object field values from bulk_update -> update
+def set_bulk_update_value_map(value_map):
+    """Store a mapping of {pk: {field_name: value}} for the current thread.
+
+    This allows the internal update() call (triggered by Django's bulk_update)
+    to populate in-memory instances with the concrete values that will be
+    written to the database, instead of Django expression objects like Case/Cast.
+    """
+    _hook_context.bulk_update_value_map = value_map
+
+
+def get_bulk_update_value_map():
+    """Retrieve the mapping {pk: {field_name: value}} for the current thread, if any."""
+    return getattr(_hook_context, 'bulk_update_value_map', None)
+
+
 class HookContext:
     def __init__(self, model, bypass_hooks=False):
         self.model = model

{django_bulk_hooks-0.1.235 → django_bulk_hooks-0.1.236}/django_bulk_hooks/queryset.py

@@ -17,6 +17,10 @@ from django_bulk_hooks.constants import (
     VALIDATE_UPDATE,
 )
 from django_bulk_hooks.context import HookContext
+from django_bulk_hooks.context import (
+    get_bulk_update_value_map,
+    set_bulk_update_value_map,
+)
 
 
 class HookQuerySetMixin:
@@ -71,9 +75,15 @@ class HookQuerySetMixin:
         )
 
         # Apply field updates to instances
+        # If a per-object value map exists (from bulk_update), prefer it over kwargs
+        per_object_values = get_bulk_update_value_map()
         for obj in instances:
-            for field, value in kwargs.items():
-                setattr(obj, field, value)
+            if per_object_values and obj.pk in per_object_values:
+                for field, value in per_object_values[obj.pk].items():
+                    setattr(obj, field, value)
+            else:
+                for field, value in kwargs.items():
+                    setattr(obj, field, value)
 
         # Check if we're in a bulk operation context to prevent double hook execution
         from django_bulk_hooks.context import get_bypass_hooks
@@ -283,7 +293,27 @@ class HookQuerySetMixin:
                 if k not in ["bypass_hooks", "bypass_validation"]
             }
             logger.debug("Calling Django bulk_update")
-            result = super().bulk_update(objs, fields, **django_kwargs)
+            # Build a per-object concrete value map to avoid leaking expressions into hooks
+            value_map = {}
+            for obj in objs:
+                if obj.pk is None:
+                    continue
+                field_values = {}
+                for field_name in fields:
+                    # Capture raw values assigned on the object (not expressions)
+                    field_values[field_name] = getattr(obj, field_name)
+                if field_values:
+                    value_map[obj.pk] = field_values
+
+            # Make the value map available to the subsequent update() call
+            if value_map:
+                set_bulk_update_value_map(value_map)
+
+            try:
+                result = super().bulk_update(objs, fields, **django_kwargs)
+            finally:
+                # Always clear after the internal update() path finishes
+                set_bulk_update_value_map(None)
             logger.debug(f"Django bulk_update done: {result}")
 
         # Note: We don't run AFTER_UPDATE hooks here to prevent double execution

{django_bulk_hooks-0.1.235 → django_bulk_hooks-0.1.236}/pyproject.toml

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