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

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

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

@@ -1,7 +1,6 @@
 import logging
-
 from django.db import models, transaction
-from django.db.models import AutoField, Case, Value, When
+from django.db.models import AutoField, Case, Field, Value, When
 
 from django_bulk_hooks import engine
 
@@ -65,19 +64,21 @@ class HookQuerySetMixin:
         }
         originals = [original_map.get(obj.pk) for obj in instances]
 
-        # Resolve subqueries to actual values before applying to instances
-        resolved_kwargs = self._resolve_subquery_values(kwargs)
+        # Check if any of the update values are Subquery objects
+        has_subquery = any(
+            hasattr(value, "query") and hasattr(value, "resolve_expression")
+            for value in kwargs.values()
+        )
 
-        # Apply resolved field updates to instances
+        # Apply field updates to instances
         for obj in instances:
-            for field, value in resolved_kwargs.items():
+            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)")
@@ -92,10 +93,28 @@ class HookQuerySetMixin:
 
         # Use Django's built-in update logic directly
         # Call the base QuerySet implementation to avoid recursion
-        # Use original kwargs so Django can handle subqueries at database level
         update_count = super().update(**kwargs)
 
-        # Since we resolved subqueries upfront, we don't need the post-refresh logic
+        # If we used Subquery objects, refresh the instances to get computed values
+        if has_subquery and instances:
+            # Simple refresh of model fields without fetching related objects
+            # Subquery updates only affect the model's own fields, not relationships
+            refreshed_instances = {
+                obj.pk: obj for obj in model_cls._base_manager.filter(pk__in=pks)
+            }
+
+            # Bulk update all instances in memory
+            for instance in instances:
+                if instance.pk in refreshed_instances:
+                    refreshed_instance = refreshed_instances[instance.pk]
+                    # Update all fields except primary key
+                    for field in model_cls._meta.fields:
+                        if field.name != "id":
+                            setattr(
+                                instance,
+                                field.name,
+                                getattr(refreshed_instance, field.name),
+                            )
 
         # Run AFTER_UPDATE hooks only for standalone updates
         if not current_bypass_hooks:
@@ -106,38 +125,6 @@ class HookQuerySetMixin:
 
         return update_count
 
-    def _resolve_subquery_values(self, kwargs):
-        """
-        Resolve Subquery objects to their actual values by evaluating them
-        against the database. This ensures hooks receive resolved values
-        instead of raw Subquery objects.
-        """
-        resolved_kwargs = {}
-        for field, value in kwargs.items():
-            if hasattr(value, "query") and hasattr(value, "resolve_expression"):
-                # This is a subquery - we need to resolve it
-                try:
-                    # Create a temporary queryset to evaluate the subquery
-                    temp_qs = self.model._default_manager.all()
-                    temp_qs = temp_qs.annotate(_temp_field=value)
-                    temp_qs = temp_qs.values("_temp_field")
-
-                    # Get the resolved value (assuming single result for update context)
-                    resolved_value = temp_qs.first()["_temp_field"]
-                    resolved_kwargs[field] = resolved_value
-                except Exception:
-                    # If resolution fails, use the original subquery
-                    # Django's update() will handle it at the database level
-                    logger.warning(
-                        f"Failed to resolve subquery for field {field}, using original"
-                    )
-                    resolved_kwargs[field] = value
-            else:
-                # Not a subquery, use as-is
-                resolved_kwargs[field] = value
-
-        return resolved_kwargs
-
     @transaction.atomic
     def bulk_create(
         self,
@@ -193,12 +180,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
@@ -254,9 +241,7 @@ 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
@@ -272,9 +257,7 @@ 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)

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

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