django-bulk-hooks 0.2.5__tar.gz → 0.2.7__tar.gz

{django_bulk_hooks-0.2.5 → django_bulk_hooks-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.5
+Version: 0.2.7
 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.5 → django_bulk_hooks-0.2.7}/django_bulk_hooks/operations/bulk_executor.py

@@ -386,6 +386,13 @@ class BulkExecutor:
                             continue
                         
                         value = getattr(obj, db_field_name)
+                        
+                        # For FK fields, ensure we get the actual ID value, not the related object
+                        if getattr(field, 'is_relation', False) and hasattr(field, 'attname'):
+                            # If value is a model instance, get its pk
+                            if value is not None and hasattr(value, 'pk'):
+                                value = value.pk
+                        
                         when_statements.append(
                             When(
                                 **{field_group.filter_field: pk},

{django_bulk_hooks-0.2.5 → django_bulk_hooks-0.2.7}/django_bulk_hooks/operations/coordinator.py

@@ -143,7 +143,7 @@ class BulkOperationCoordinator:
                 unique_fields=unique_fields,
             )
 
-        return self.dispatcher.execute_operation_with_hooks(
+        return self._execute_with_mti_hooks(
             changeset=changeset,
             operation=operation,
             event_prefix="create",
@@ -199,7 +199,7 @@ class BulkOperationCoordinator:
         def operation():
             return self.executor.bulk_update(objs, fields, batch_size=batch_size)
 
-        return self.dispatcher.execute_operation_with_hooks(
+        return self._execute_with_mti_hooks(
             changeset=changeset,
             operation=operation,
             event_prefix="update",
@@ -343,7 +343,7 @@ class BulkOperationCoordinator:
             # Call base Django QuerySet.delete() to avoid recursion
             return BaseQuerySet.delete(self.queryset)
 
-        return self.dispatcher.execute_operation_with_hooks(
+        return self._execute_with_mti_hooks(
             changeset=changeset,
             operation=operation,
             event_prefix="delete",
@@ -383,3 +383,90 @@ class BulkOperationCoordinator:
 
         # Dispatch validation event only
         self.dispatcher.dispatch(changeset, event, bypass_hooks=False)
+
+    # ==================== MTI PARENT HOOK SUPPORT ====================
+
+    def _build_changeset_for_model(self, original_changeset, target_model_cls):
+        """
+        Build a changeset for a specific model in the MTI inheritance chain.
+        
+        This allows parent model hooks to receive the same instances but with
+        the correct model_cls for hook registration matching.
+        
+        Args:
+            original_changeset: The original changeset (for child model)
+            target_model_cls: The model class to build changeset for (parent model)
+            
+        Returns:
+            ChangeSet for the target model
+        """
+        from django_bulk_hooks.changeset import ChangeSet
+        
+        # Create new changeset with target model but same record changes
+        return ChangeSet(
+            model_cls=target_model_cls,
+            changes=original_changeset.changes,
+            operation_type=original_changeset.operation_type,
+            operation_meta=original_changeset.operation_meta,
+        )
+
+    def _execute_with_mti_hooks(
+        self, 
+        changeset, 
+        operation, 
+        event_prefix, 
+        bypass_hooks=False, 
+        bypass_validation=False
+    ):
+        """
+        Execute operation with hooks for entire MTI inheritance chain.
+        
+        This method dispatches hooks for both child and parent models when
+        dealing with MTI models, ensuring parent model hooks fire when
+        child instances are created/updated/deleted.
+        
+        Args:
+            changeset: ChangeSet for the child model
+            operation: Callable that performs the actual DB operation
+            event_prefix: 'create', 'update', or 'delete'
+            bypass_hooks: Skip all hooks if True
+            bypass_validation: Skip validation hooks if True
+            
+        Returns:
+            Result of operation
+        """
+        if bypass_hooks:
+            return operation()
+
+        # Get all models in inheritance chain
+        models_in_chain = [changeset.model_cls]
+        if self.mti_handler.is_mti_model():
+            parent_models = self.mti_handler.get_parent_models()
+            models_in_chain.extend(parent_models)
+
+        # VALIDATE phase - for all models in chain
+        if not bypass_validation:
+            for model_cls in models_in_chain:
+                model_changeset = self._build_changeset_for_model(changeset, model_cls)
+                self.dispatcher.dispatch(model_changeset, f"validate_{event_prefix}", bypass_hooks=False)
+
+        # BEFORE phase - for all models in chain
+        for model_cls in models_in_chain:
+            model_changeset = self._build_changeset_for_model(changeset, model_cls)
+            self.dispatcher.dispatch(model_changeset, f"before_{event_prefix}", bypass_hooks=False)
+
+        # Execute the actual operation
+        result = operation()
+
+        # AFTER phase - for all models in chain
+        # Use result if operation returns modified data (for create operations)
+        if result and isinstance(result, list) and event_prefix == "create":
+            # Rebuild changeset with assigned PKs for AFTER hooks
+            from django_bulk_hooks.helpers import build_changeset_for_create
+            changeset = build_changeset_for_create(changeset.model_cls, result)
+
+        for model_cls in models_in_chain:
+            model_changeset = self._build_changeset_for_model(changeset, model_cls)
+            self.dispatcher.dispatch(model_changeset, f"after_{event_prefix}", bypass_hooks=False)
+
+        return result

{django_bulk_hooks-0.2.5 → django_bulk_hooks-0.2.7}/pyproject.toml

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