django-bulk-hooks 0.1.235__py3-none-any.whl → 0.1.237__py3-none-any.whl

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/queryset.py

@@ -1,4 +1,5 @@
 import logging
+
 from django.db import models, transaction
 from django.db.models import AutoField, Case, Field, Value, When
 
@@ -16,7 +17,11 @@ from django_bulk_hooks.constants import (
     VALIDATE_DELETE,
     VALIDATE_UPDATE,
 )
-from django_bulk_hooks.context import HookContext
+from django_bulk_hooks.context import (
+    HookContext,
+    get_bulk_update_value_map,
+    set_bulk_update_value_map,
+)
 
 
 class HookQuerySetMixin:
@@ -71,14 +76,21 @@ 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
+
         current_bypass_hooks = get_bypass_hooks()
-        
+
         # If we're in a bulk operation context, skip hooks to prevent double execution
         if current_bypass_hooks:
             logger.debug("update: skipping hooks (bulk context)")
@@ -91,6 +103,44 @@ class HookQuerySetMixin:
             # Then run BEFORE_UPDATE hooks
             engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
+            # Persist any additional field mutations made by BEFORE_UPDATE hooks.
+            # Build CASE statements per modified field not already present in kwargs.
+            modified_fields = self._detect_modified_fields(instances, originals)
+            extra_fields = [f for f in modified_fields if f not in kwargs]
+            if extra_fields:
+                case_statements = {}
+                for field_name in extra_fields:
+                    try:
+                        field_obj = model_cls._meta.get_field(field_name)
+                    except Exception:
+                        # Skip unknown fields
+                        continue
+
+                    when_statements = []
+                    for obj in instances:
+                        obj_pk = getattr(obj, "pk", None)
+                        if obj_pk is None:
+                            continue
+                        value = getattr(obj, field_name)
+                        # Normalize relation values to instance or pk consistently
+                        if getattr(field_obj, "is_relation", False):
+                            # If a model instance is provided, use it; else use as-is
+                            # Value() with output_field handles conversion
+                            pass
+
+                        when_statements.append(
+                            When(pk=obj_pk, then=Value(value, output_field=field_obj))
+                        )
+
+                    if when_statements:
+                        case_statements[field_name] = Case(
+                            *when_statements, output_field=field_obj
+                        )
+
+                # Merge extra CASE updates into kwargs for DB update
+                if case_statements:
+                    kwargs = {**kwargs, **case_statements}
+
         # Use Django's built-in update logic directly
         # Call the base QuerySet implementation to avoid recursion
         update_count = super().update(**kwargs)
@@ -180,12 +230,12 @@ class HookQuerySetMixin:
 
         # Fire hooks before DB ops
         if not bypass_hooks:
-            ctx = HookContext(model_cls, bypass_hooks=False) # Pass bypass_hooks
+            ctx = HookContext(model_cls, bypass_hooks=False)  # Pass bypass_hooks
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
             engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
         else:
-            ctx = HookContext(model_cls, bypass_hooks=True) # Pass bypass_hooks
+            ctx = HookContext(model_cls, bypass_hooks=True)  # Pass bypass_hooks
             logger.debug("bulk_create bypassed hooks")
 
         # For MTI models, we need to handle them specially
@@ -241,7 +291,9 @@ class HookQuerySetMixin:
                 f"bulk_update expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
             )
 
-        logger.debug(f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)}")
+        logger.debug(
+            f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)}"
+        )
 
         # Check for MTI
         is_mti = False
@@ -257,7 +309,9 @@ class HookQuerySetMixin:
         else:
             logger.debug("bulk_update: hooks bypassed")
             ctx = HookContext(model_cls, bypass_hooks=True)
-            originals = [None] * len(objs)  # Ensure originals is defined for after_update call
+            originals = [None] * len(
+                objs
+            )  # Ensure originals is defined for after_update call
 
         # Handle auto_now fields like Django's update_or_create does
         fields_set = set(fields)
@@ -283,7 +337,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
@@ -315,18 +389,16 @@ class HookQuerySetMixin:
                 if field.name == "id":
                     continue
 
-                new_value = getattr(new_instance, field.name)
-                original_value = getattr(original, field.name)
-
                 # Handle different field types appropriately
                 if field.is_relation:
-                    # For foreign keys, compare the pk values
-                    new_pk = new_value.pk if new_value else None
-                    original_pk = original_value.pk if original_value else None
+                    # Compare by raw id values to catch cases where only <fk>_id was set
+                    new_pk = getattr(new_instance, field.attname, None)
+                    original_pk = getattr(original, field.attname, None)
                     if new_pk != original_pk:
                         modified_fields.add(field.name)
                 else:
-                    # For regular fields, use direct comparison
+                    new_value = getattr(new_instance, field.name)
+                    original_value = getattr(original, field.name)
                     if new_value != original_value:
                         modified_fields.add(field.name)
 

{django_bulk_hooks-0.1.235.dist-info → django_bulk_hooks-0.1.237.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 django_bulk_hooks/__init__.py,sha256=uUgpnb9AWjIAcWNpCMqBcOewSnpJjJYH6cjPbQkzoNU,140
 django_bulk_hooks/conditions.py,sha256=V_f3Di2uCVUjoyfiU4BQCHmI4uUIRSRroApDcXlvnso,6349
 django_bulk_hooks/constants.py,sha256=3x1H1fSUUNo0DZONN7GUVDuySZctTR-jtByBHmAIX5w,303
-django_bulk_hooks/context.py,sha256=_NbGWTq9s66g0vbFIaqN4GlIHWQmFg3EQ44qY8YvvEg,1537
+django_bulk_hooks/context.py,sha256=jlLsqGZbj__J0-iBUp1D6jTrlDEiX3qIo0XlywW4D9I,2244
 django_bulk_hooks/decorators.py,sha256=WD7Jn7QAvY8F4wOsYlIpjoM9-FdHXSKB7hH9ot-lkYQ,4896
 django_bulk_hooks/engine.py,sha256=t_kvgex6_iZEFc5LK-srBTZPe-1bdlYdip5LfWOc6lc,2411
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
 django_bulk_hooks/models.py,sha256=exnXYVKEVbYAXhChCP8VdWTnKCnm9DiTcokEIBee1I0,4350
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=YSDCMAf24YLeLJrRKCDYwbZInP2mK_Tcuw3EHLDkv_w,32605
+django_bulk_hooks/queryset.py,sha256=5utEjCnrmJ7tbE2OrDgWf0LU6SCGYoJ1OecmaQW9HVM,35767
 django_bulk_hooks/registry.py,sha256=8UuhniiH5ChSeOKV1UUbqTEiIu25bZXvcHmkaRbxmME,1131
-django_bulk_hooks-0.1.235.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.235.dist-info/METADATA,sha256=_AvaKqJPklOzTxh8VnSpQCG8z8B2sPoltcq3phrz56A,9049
-django_bulk_hooks-0.1.235.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.235.dist-info/RECORD,,
+django_bulk_hooks-0.1.237.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.237.dist-info/METADATA,sha256=_jfrUKLLRuYMbka2ojsBYkINVC4kg8jbb5zVvwOhS8M,9049
+django_bulk_hooks-0.1.237.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.237.dist-info/RECORD,,