django-bulk-hooks 0.2.58__py3-none-any.whl → 0.2.60__py3-none-any.whl

django_bulk_hooks/operations/bulk_executor.py

@@ -182,10 +182,35 @@ class BulkExecutor:
         if not objs:
             return 0
 
+        # Ensure auto_now fields are included and pre-saved for all models
+        # This handles both MTI and non-MTI models uniformly (SOC & DRY)
+        fields = list(fields)  # Make a copy so we can modify it
+        
+        # Get models to check - for MTI, check entire inheritance chain
+        if self.mti_handler.is_mti_model():
+            models_to_check = self.mti_handler.get_inheritance_chain()
+        else:
+            models_to_check = [self.model_cls]
+        
+        # Collect all auto_now fields and pre-save them
+        auto_now_fields = set()
+        for model in models_to_check:
+            for field in model._meta.local_fields:
+                if getattr(field, "auto_now", False) and not getattr(field, "auto_now_add", False):
+                    auto_now_fields.add(field.name)
+                    # Pre-save the field to set the value on instances
+                    for obj in objs:
+                        field.pre_save(obj, add=False)
+        
+        # Add auto_now fields to the update list if not already present
+        for auto_now_field in auto_now_fields:
+            if auto_now_field not in fields:
+                fields.append(auto_now_field)
+
         # Check if this is an MTI model and route accordingly
         if self.mti_handler.is_mti_model():
             logger.info(f"Detected MTI model {self.model_cls.__name__}, using MTI bulk update")
-            # Build execution plan
+            # Build execution plan (fields already have auto_now included)
             plan = self.mti_handler.build_update_plan(objs, fields, batch_size=batch_size)
             # Execute the plan
             return self._execute_mti_update_plan(plan)

django_bulk_hooks/operations/coordinator.py

@@ -740,6 +740,8 @@ class BulkOperationCoordinator:
         if not result_objects:
             return
 
+        # First pass: collect objects with metadata and objects needing timestamp check
+        objects_needing_timestamp_check = []
         for obj in result_objects:
             # Check if metadata was set
             if hasattr(obj, "_bulk_hooks_was_created"):
@@ -749,29 +751,52 @@ class BulkOperationCoordinator:
                 else:
                     updated_objects.append(obj)
             else:
-                # Fallback: if no metadata, check timestamps
+                # Need to check timestamps - collect for bulk query
+                objects_needing_timestamp_check.append(obj)
+
+        # Bulk fetch timestamps for objects without metadata (avoids N+1 queries)
+        if objects_needing_timestamp_check:
+            # Group by model class to handle MTI scenarios
+            objects_by_model = {}
+            for obj in objects_needing_timestamp_check:
                 model_cls = obj.__class__
+                if model_cls not in objects_by_model:
+                    objects_by_model[model_cls] = []
+                objects_by_model[model_cls].append(obj)
+
+            # Fetch timestamps in bulk for each model class
+            for model_cls, objs in objects_by_model.items():
                 if hasattr(model_cls, "created_at") and hasattr(model_cls, "updated_at"):
-                    # Reload from DB to get accurate timestamps
-                    db_obj = model_cls.objects.filter(pk=obj.pk).values("created_at", "updated_at").first()
-                    if db_obj:
-                        created_at = db_obj["created_at"]
-                        updated_at = db_obj["updated_at"]
-                        if created_at and updated_at:
-                            time_diff = abs((updated_at - created_at).total_seconds())
-                            if time_diff <= 1.0:  # Within 1 second = just created
-                                created_objects.append(obj)
+                    # Bulk fetch timestamps for all objects of this model
+                    pks = [obj.pk for obj in objs if obj.pk is not None]
+                    if pks:
+                        timestamp_map = {
+                            record["pk"]: (record["created_at"], record["updated_at"])
+                            for record in model_cls.objects.filter(pk__in=pks).values("pk", "created_at", "updated_at")
+                        }
+
+                        # Classify each object based on timestamps
+                        for obj in objs:
+                            if obj.pk in timestamp_map:
+                                created_at, updated_at = timestamp_map[obj.pk]
+                                if created_at and updated_at:
+                                    time_diff = abs((updated_at - created_at).total_seconds())
+                                    if time_diff <= 1.0:  # Within 1 second = just created
+                                        created_objects.append(obj)
+                                    else:
+                                        updated_objects.append(obj)
+                                else:
+                                    # No timestamps, default to created
+                                    created_objects.append(obj)
                             else:
-                                updated_objects.append(obj)
-                        else:
-                            # No timestamps, default to created
-                            created_objects.append(obj)
+                                # Object not found, treat as created
+                                created_objects.append(obj)
                     else:
-                        # Object not found, treat as created
-                        created_objects.append(obj)
+                        # No PKs, default all to created
+                        created_objects.extend(objs)
                 else:
                     # No timestamp fields, default to created
-                    created_objects.append(obj)
+                    created_objects.extend(objs)
 
         logger.info(f"Upsert after hooks: {len(created_objects)} created, {len(updated_objects)} updated")
 

django_bulk_hooks/operations/mti_handler.py

@@ -537,7 +537,7 @@ class MTIHandler:
 
         Args:
             objs: List of model instances to update
-            fields: List of field names to update
+            fields: List of field names to update (auto_now fields already included by executor)
             batch_size: Number of objects per batch
 
         Returns:
@@ -555,28 +555,15 @@ class MTIHandler:
 
         batch_size = batch_size or len(objs)
 
-        # Handle auto_now fields
-        for obj in objs:
-            for model in inheritance_chain:
-                for field in model._meta.local_fields:
-                    if getattr(field, "auto_now", False):
-                        field.pre_save(obj, add=False)
-
-        # Add auto_now fields to update list
-        auto_now_fields = set()
-        for model in inheritance_chain:
-            for field in model._meta.local_fields:
-                if getattr(field, "auto_now", False):
-                    auto_now_fields.add(field.name)
-
-        all_fields = list(fields) + list(auto_now_fields)
+        # Note: auto_now fields are already handled by executor.bulk_update()
+        # which calls pre_save() and includes them in the fields list
 
         # Group fields by model
         field_groups = []
         for model_idx, model in enumerate(inheritance_chain):
             model_fields = []
 
-            for field_name in all_fields:
+            for field_name in fields:
                 try:
                     field = self.model_cls._meta.get_field(field_name)
                     if field in model._meta.local_fields:

{django_bulk_hooks-0.2.58.dist-info → django_bulk_hooks-0.2.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.58
+Version: 0.2.60
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks

{django_bulk_hooks-0.2.58.dist-info → django_bulk_hooks-0.2.60.dist-info}/RECORD

@@ -13,15 +13,15 @@ django_bulk_hooks/manager.py,sha256=3mFzB0ZzHHeXWdKGObZD_H0NlskHJc8uYBF69KKdAXU,
 django_bulk_hooks/models.py,sha256=4Vvi2LiGP0g4j08a5liqBROfsO8Wd_ermBoyjKwfrPU,2512
 django_bulk_hooks/operations/__init__.py,sha256=BtJYjmRhe_sScivLsniDaZmBkm0ZLvcmzXFKL7QY2Xg,550
 django_bulk_hooks/operations/analyzer.py,sha256=wAG8sAG9NwfwNqG9z81VfGR7AANDzRmMGE_o82MWji4,10689
-django_bulk_hooks/operations/bulk_executor.py,sha256=Y-wkvuV_X-SZmI965JVrrtwbzPZVggUfy8mR1pzP9d0,27048
-django_bulk_hooks/operations/coordinator.py,sha256=iGavJLqe3eYRqFay8cMn6muwyRYzQo-HFGphsS5hL6g,30799
+django_bulk_hooks/operations/bulk_executor.py,sha256=0_r9qaOMl9RJpi9eE3GrdUAlXA6ZU016nHYeIZ-yiPE,28279
+django_bulk_hooks/operations/coordinator.py,sha256=1Ka5eZJXTFjx3tr-BD6Tr350Y2T57SUOX3vjagBYBvM,32193
 django_bulk_hooks/operations/field_utils.py,sha256=Tvr5bcZLG8imH-r2S85oui1Cbw6hGv3VtuIMn4OvsU4,2895
-django_bulk_hooks/operations/mti_handler.py,sha256=173jghcxCE5UEZxM1QJRS-lWg0-KJxCQCbWHVKppIEM,26000
+django_bulk_hooks/operations/mti_handler.py,sha256=pguym-6vqaLxu-lY7gnb5laKT9RJQlUciNw1SflZ1Zs,25574
 django_bulk_hooks/operations/mti_plans.py,sha256=7STQ2oA2ZT8cEG3-t-6xciRAdf7OeSf0gRLXR_BRG-Q,3363
 django_bulk_hooks/operations/record_classifier.py,sha256=kqML4aO11X9K3SSJ5DUlUukwI172j_Tk12Kr77ee8q8,7065
 django_bulk_hooks/queryset.py,sha256=aQitlbexcVnmeAdc0jtO3hci39p4QEu4srQPEzozy5s,5546
 django_bulk_hooks/registry.py,sha256=uum5jhGI3TPaoiXuA1MdBdu4gbE3rQGGwQ5YDjiMcjk,7949
-django_bulk_hooks-0.2.58.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.58.dist-info/METADATA,sha256=kVna-_dN9xVNaMMZHZUzm-Ab4IjhVzA1L8XXPms5T7o,9265
-django_bulk_hooks-0.2.58.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.58.dist-info/RECORD,,
+django_bulk_hooks-0.2.60.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.60.dist-info/METADATA,sha256=tYgGJtWSG7Zx360peLawbsJAiIkT-BwF7WuJg4JfkJM,9265
+django_bulk_hooks-0.2.60.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.60.dist-info/RECORD,,