django-bulk-hooks 0.2.59__py3-none-any.whl → 0.2.61__py3-none-any.whl

django_bulk_hooks/operations/field_utils.py

@@ -91,4 +91,144 @@ def normalize_field_name_to_db(field_name, model_cls):
             return field.attname  # Returns 'business_id' for 'business' field
         return field_name
     except Exception:  # noqa: BLE001
-        return field_name
+        return field_name
+
+
+def get_changed_fields(old_obj, new_obj, model_cls, skip_auto_fields=False):
+    """
+    Get field names that have changed between two model instances.
+
+    Uses Django's field.get_prep_value() for proper database-level comparison.
+    This is the canonical implementation used by both RecordChange and ModelAnalyzer.
+
+    Args:
+        old_obj: The old model instance
+        new_obj: The new model instance
+        model_cls: The Django model class
+        skip_auto_fields: Whether to skip auto_created fields (default False)
+
+    Returns:
+        Set of field names that have changed
+    """
+    changed = set()
+
+    for field in model_cls._meta.fields:
+        # Skip primary key fields - they shouldn't change
+        if field.primary_key:
+            continue
+
+        # Optionally skip auto-created fields (for bulk operations)
+        if skip_auto_fields and field.auto_created:
+            continue
+
+        old_val = getattr(old_obj, field.name, None)
+        new_val = getattr(new_obj, field.name, None)
+
+        # Use field's get_prep_value for database-ready comparison
+        # This handles timezone conversions, type coercions, etc.
+        try:
+            old_prep = field.get_prep_value(old_val)
+            new_prep = field.get_prep_value(new_val)
+            if old_prep != new_prep:
+                changed.add(field.name)
+        except (TypeError, ValueError):
+            # Fallback to direct comparison if get_prep_value fails
+            if old_val != new_val:
+                changed.add(field.name)
+
+    return changed
+
+
+def get_auto_fields(model_cls, include_auto_now_add=True):
+    """
+    Get auto fields from a model.
+
+    Args:
+        model_cls: Django model class
+        include_auto_now_add: Whether to include auto_now_add fields
+
+    Returns:
+        List of field names
+    """
+    fields = []
+    for field in model_cls._meta.fields:
+        if getattr(field, "auto_now", False) or (
+            include_auto_now_add and getattr(field, "auto_now_add", False)
+        ):
+            fields.append(field.name)
+    return fields
+
+
+def get_auto_now_only_fields(model_cls):
+    """Get only auto_now fields (excluding auto_now_add)."""
+    return get_auto_fields(model_cls, include_auto_now_add=False)
+
+
+def get_fk_fields(model_cls):
+    """Get foreign key field names for a model."""
+    return [field.name for field in model_cls._meta.concrete_fields
+            if field.is_relation and not field.many_to_many]
+
+
+def collect_auto_now_fields_for_inheritance_chain(inheritance_chain):
+    """Collect auto_now fields across an MTI inheritance chain."""
+    all_auto_now = set()
+    for model_cls in inheritance_chain:
+        all_auto_now.update(get_auto_now_only_fields(model_cls))
+    return all_auto_now
+
+
+def handle_auto_now_fields_for_inheritance_chain(models, instances, for_update=True):
+    """
+    Unified auto-now field handling for any inheritance chain.
+
+    This replaces the separate collect/pre_save logic with a single comprehensive
+    method that handles collection, pre-saving, and field inclusion for updates.
+
+    Args:
+        models: List of model classes in inheritance chain
+        instances: List of model instances to process
+        for_update: Whether this is for an update operation (vs create)
+
+    Returns:
+        Set of auto_now field names that should be included in updates
+    """
+    all_auto_now_fields = set()
+
+    for model_cls in models:
+        for field in model_cls._meta.local_fields:
+            # For updates, only include auto_now (not auto_now_add)
+            # For creates, include both
+            if getattr(field, "auto_now", False) or (
+                not for_update and getattr(field, "auto_now_add", False)
+            ):
+                all_auto_now_fields.add(field.name)
+
+                # Pre-save the field on instances
+                for instance in instances:
+                    if for_update:
+                        # For updates, only pre-save auto_now fields
+                        field.pre_save(instance, add=False)
+                    else:
+                        # For creates, pre-save both auto_now and auto_now_add
+                        field.pre_save(instance, add=True)
+
+    return all_auto_now_fields
+
+
+def pre_save_auto_now_fields(objects, inheritance_chain):
+    """Pre-save auto_now fields across inheritance chain."""
+    # DEPRECATED: Use handle_auto_now_fields_for_inheritance_chain instead
+    auto_now_fields = collect_auto_now_fields_for_inheritance_chain(inheritance_chain)
+
+    for field_name in auto_now_fields:
+        # Find which model has this field
+        for model_cls in inheritance_chain:
+            try:
+                field = model_cls._meta.get_field(field_name)
+                if getattr(field, "auto_now", False):
+                    for obj in objects:
+                        field.pre_save(obj, add=False)
+                    break
+            except Exception:
+                continue

django_bulk_hooks/operations/mti_handler.py

@@ -217,6 +217,11 @@ class MTIHandler:
             child_obj = self._create_child_instance_template(obj, inheritance_chain[-1])
             child_objects.append(child_obj)
 
+        # Pre-compute child-specific fields for execution efficiency
+        from django_bulk_hooks.helpers import get_fields_for_model, filter_field_names_for_model
+        child_unique_fields = get_fields_for_model(inheritance_chain[-1], unique_fields or [])
+        child_update_fields = get_fields_for_model(inheritance_chain[-1], update_fields or [])
+
         return MTICreatePlan(
             inheritance_chain=inheritance_chain,
             parent_levels=parent_levels,
@@ -228,6 +233,8 @@ class MTIHandler:
             update_conflicts=update_conflicts,
             unique_fields=unique_fields or [],
             update_fields=update_fields or [],
+            child_unique_fields=child_unique_fields,
+            child_update_fields=child_update_fields,
         )
 
     def _build_parent_levels(
@@ -458,14 +465,13 @@ class MTIHandler:
             if hasattr(source_obj._state, "db"):
                 parent_obj._state.db = source_obj._state.db
 
-        # Handle auto_now_add and auto_now fields
-        for field in parent_model._meta.local_fields:
-            if getattr(field, "auto_now_add", False):
-                if getattr(parent_obj, field.name) is None:
-                    field.pre_save(parent_obj, add=True)
-                    setattr(parent_obj, field.attname, field.value_from_object(parent_obj))
-            elif getattr(field, "auto_now", False):
-                field.pre_save(parent_obj, add=True)
+        # Use unified auto-now field handling
+        from django_bulk_hooks.operations.field_utils import handle_auto_now_fields_for_inheritance_chain
+
+        # Handle auto fields for this single parent model
+        handle_auto_now_fields_for_inheritance_chain(
+            [parent_model], [parent_obj], for_update=False,  # MTI create is like insert
+        )
 
         return parent_obj
 
@@ -516,14 +522,13 @@ class MTIHandler:
             if hasattr(source_obj._state, "db"):
                 child_obj._state.db = source_obj._state.db
 
-        # Handle auto_now_add and auto_now fields
-        for field in child_model._meta.local_fields:
-            if getattr(field, "auto_now_add", False):
-                if getattr(child_obj, field.name) is None:
-                    field.pre_save(child_obj, add=True)
-                    setattr(child_obj, field.attname, field.value_from_object(child_obj))
-            elif getattr(field, "auto_now", False):
-                field.pre_save(child_obj, add=True)
+        # Use unified auto-now field handling
+        from django_bulk_hooks.operations.field_utils import handle_auto_now_fields_for_inheritance_chain
+
+        # Handle auto fields for this single child model
+        handle_auto_now_fields_for_inheritance_chain(
+            [child_model], [child_obj], for_update=False,  # MTI create is like insert
+        )
 
         return child_obj
 
@@ -537,7 +542,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 +560,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/operations/mti_plans.py

@@ -49,8 +49,10 @@ class MTICreatePlan:
         batch_size: Batch size for operations
         existing_record_ids: Set of id() of original objects that represent existing DB records
         update_conflicts: Whether this is an upsert operation
-        unique_fields: Fields used for conflict detection
-        update_fields: Fields to update on conflict
+        unique_fields: Fields used for conflict detection (original, unfiltered)
+        update_fields: Fields to update on conflict (original, unfiltered)
+        child_unique_fields: Pre-filtered field objects for child table conflict detection
+        child_update_fields: Pre-filtered field objects for child table updates
     """
 
     inheritance_chain: list[Any]
@@ -63,6 +65,8 @@ class MTICreatePlan:
     update_conflicts: bool = False
     unique_fields: list[str] = field(default_factory=list)
     update_fields: list[str] = field(default_factory=list)
+    child_unique_fields: list = field(default_factory=list)  # Field objects for child table
+    child_update_fields: list = field(default_factory=list)  # Field objects for child table
 
 
 @dataclass

django_bulk_hooks/queryset.py

@@ -11,6 +11,8 @@ import logging
 from django.db import models
 from django.db import transaction
 
+from django_bulk_hooks.helpers import extract_pks
+
 logger = logging.getLogger(__name__)
 
 
@@ -148,7 +150,7 @@ class HookQuerySet(models.QuerySet):
             Tuple of (count, details dict)
         """
         # Filter queryset to only these objects
-        pks = [obj.pk for obj in objs if obj.pk is not None]
+        pks = extract_pks(objs)
         if not pks:
             return 0
 

{django_bulk_hooks-0.2.59.dist-info → django_bulk_hooks-0.2.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.59
+Version: 0.2.61
 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.61.dist-info/RECORD

@@ -0,0 +1,27 @@
+django_bulk_hooks/__init__.py,sha256=ujBvX-GY4Pg4ACBh7RXm_MOmi2eAowf5s7pG2SXWdpo,2276
+django_bulk_hooks/changeset.py,sha256=opWqb_x-_9KaMsUJc7lI3wScWLHn2Yhe7hB-ngFCBp0,6731
+django_bulk_hooks/conditions.py,sha256=v2DMFmWI7bppBQw5qdbO5CmQRN_QtUwnBjcyKBJLLbw,8030
+django_bulk_hooks/constants.py,sha256=PxpEETaO6gdENcTPoXS586lerGKVP3nmjpDvOkmhYxI,509
+django_bulk_hooks/context.py,sha256=mqaC5-yESDTA5ruI7fuXlt8qSgKuOFp0mjq7h1-4HdQ,1926
+django_bulk_hooks/decorators.py,sha256=P7cvzFgORJRW-YQHNAxNXqQOP9OywBmA7Rz9kiJoxUk,12237
+django_bulk_hooks/dispatcher.py,sha256=CiKYe5ecUPu5TYUZq8ToaRT40TkLc5l5mczgf5XDzGA,8217
+django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
+django_bulk_hooks/factory.py,sha256=ezrVM5U023KZqOBbJXb6lYUP-pE7WJmi8Olh2Ew-7RA,18085
+django_bulk_hooks/handler.py,sha256=38ejMdQ9reYA07_XQ9tC8xv0lW3amO-m8gPzuRNOyj0,4200
+django_bulk_hooks/helpers.py,sha256=e14aYE1lKaj8-krFclY_WfJF2uWQpblfsl5hqsW-dxY,7800
+django_bulk_hooks/manager.py,sha256=g11g1MZ4DJGIM4prYLpYLejTsz0YkYPWeoxWA4dcgYk,4596
+django_bulk_hooks/models.py,sha256=9uh7leV3EEnTWkNKNqT1xevamPTczRhW7KbnIHraBlk,2969
+django_bulk_hooks/operations/__init__.py,sha256=BtJYjmRhe_sScivLsniDaZmBkm0ZLvcmzXFKL7QY2Xg,550
+django_bulk_hooks/operations/analyzer.py,sha256=wO-LUgGExE8y3fb25kdfpbj_KdSIW8fd4QFp0Os8Muk,10679
+django_bulk_hooks/operations/bulk_executor.py,sha256=byo09_65qQI_Z-7HvIoeWh-fRAFnI6qrWFjDr2Ar8LA,26275
+django_bulk_hooks/operations/coordinator.py,sha256=d7DD_CMUA4yeUJeJueBOQ9LrJFFj3emVx56hG1Ju5Xg,33787
+django_bulk_hooks/operations/field_utils.py,sha256=M1HfBj5EK5c6SbOmkVT9s6u_SEOh_N4bheytm5jBD4o,7980
+django_bulk_hooks/operations/mti_handler.py,sha256=LbmbAzowfaQePWjjryHJxogvyDZ4GTL176gc6ezKVYA,25829
+django_bulk_hooks/operations/mti_plans.py,sha256=Vl0lV7AuhmovI0_qcD73KairyPy73l36fJYk8wRBh2g,3770
+django_bulk_hooks/operations/record_classifier.py,sha256=kqML4aO11X9K3SSJ5DUlUukwI172j_Tk12Kr77ee8q8,7065
+django_bulk_hooks/queryset.py,sha256=8xdA3jV6SeEGzW-av346I85Kq1N1uqt178aEh8vm8v8,5568
+django_bulk_hooks/registry.py,sha256=uum5jhGI3TPaoiXuA1MdBdu4gbE3rQGGwQ5YDjiMcjk,7949
+django_bulk_hooks-0.2.61.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.61.dist-info/METADATA,sha256=UxXjcApyuPWulCJWCm9LJGeI6Krh7bwb8mdOsVMfmc0,9265
+django_bulk_hooks-0.2.61.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.61.dist-info/RECORD,,

django_bulk_hooks-0.2.59.dist-info/RECORD

@@ -1,27 +0,0 @@
-django_bulk_hooks/__init__.py,sha256=ujBvX-GY4Pg4ACBh7RXm_MOmi2eAowf5s7pG2SXWdpo,2276
-django_bulk_hooks/changeset.py,sha256=wU6wckJEQ_hG5UZq_9g_kWODoKwEj99JrtacVUQ9BxA,7445
-django_bulk_hooks/conditions.py,sha256=v2DMFmWI7bppBQw5qdbO5CmQRN_QtUwnBjcyKBJLLbw,8030
-django_bulk_hooks/constants.py,sha256=PxpEETaO6gdENcTPoXS586lerGKVP3nmjpDvOkmhYxI,509
-django_bulk_hooks/context.py,sha256=mqaC5-yESDTA5ruI7fuXlt8qSgKuOFp0mjq7h1-4HdQ,1926
-django_bulk_hooks/decorators.py,sha256=P7cvzFgORJRW-YQHNAxNXqQOP9OywBmA7Rz9kiJoxUk,12237
-django_bulk_hooks/dispatcher.py,sha256=CiKYe5ecUPu5TYUZq8ToaRT40TkLc5l5mczgf5XDzGA,8217
-django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
-django_bulk_hooks/factory.py,sha256=ezrVM5U023KZqOBbJXb6lYUP-pE7WJmi8Olh2Ew-7RA,18085
-django_bulk_hooks/handler.py,sha256=38ejMdQ9reYA07_XQ9tC8xv0lW3amO-m8gPzuRNOyj0,4200
-django_bulk_hooks/helpers.py,sha256=Nw8eXryLUUquW7AgiuKp0PQT3Pq6HAHsdP-xAtqhmjA,3216
-django_bulk_hooks/manager.py,sha256=3mFzB0ZzHHeXWdKGObZD_H0NlskHJc8uYBF69KKdAXU,4068
-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=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_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.59.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.59.dist-info/METADATA,sha256=Zqy1xIlJ4pSLl-rxnjA96tNhdgomhT21cnHI7Z9ZbE8,9265
-django_bulk_hooks-0.2.59.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.59.dist-info/RECORD,,