django-bulk-hooks 0.2.58__tar.gz → 0.2.59__tar.gz

{django_bulk_hooks-0.2.58 → django_bulk_hooks-0.2.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.58
+Version: 0.2.59
 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 → django_bulk_hooks-0.2.59}/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-0.2.58 → django_bulk_hooks-0.2.59}/pyproject.toml

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