django-bulk-hooks 0.1.110__py3-none-any.whl → 0.1.111__py3-none-any.whl

django_bulk_hooks/manager.py

@@ -22,185 +22,6 @@ class BulkHookManager(models.Manager):
     def get_queryset(self):
         return HookQuerySet(self.model, using=self._db)
 
-    def _has_multi_table_inheritance(self, model_cls):
-        """
-        Check if this model uses multi-table inheritance.
-        """
-        if not model_cls._meta.parents:
-            return False
-        
-        # Check if any parent is not abstract
-        for parent_model in model_cls._meta.parents.keys():
-            if not parent_model._meta.abstract:
-                return True
-        
-        return False
-    
-    def _get_base_model(self, model_cls):
-        """
-        Get the base model (first non-abstract parent or self).
-        """
-        base_model = model_cls
-        while base_model._meta.parents:
-            # Get the first non-abstract parent model
-            for parent_model in base_model._meta.parents.keys():
-                if not parent_model._meta.abstract:
-                    base_model = parent_model
-                    break
-            else:
-                # No non-abstract parents found, break the loop
-                break
-        return base_model
-    
-    def _extract_base_objects(self, objs, model_cls):
-        """
-        Extract base model objects from inherited objects.
-        """
-        base_model = self._get_base_model(model_cls)
-        base_objects = []
-        
-        for obj in objs:
-            base_obj = base_model()
-            for field in base_model._meta.fields:
-                # Skip ID field
-                if field.name == 'id':
-                    continue
-                
-                # Safely copy field values
-                try:
-                    if hasattr(obj, field.name):
-                        setattr(base_obj, field.name, getattr(obj, field.name))
-                except (AttributeError, ValueError):
-                    # Skip fields that can't be copied
-                    continue
-            
-            base_objects.append(base_obj)
-        
-        return base_objects
-    
-    def _extract_child_objects(self, objs, model_cls):
-        """
-        Extract child model objects from inherited objects.
-        """
-        child_objects = []
-        
-        for obj in objs:
-            child_obj = model_cls()
-            child_obj.pk = obj.pk  # Set the same PK as base
-            
-            # Copy only fields specific to this model
-            for field in model_cls._meta.fields:
-                # Skip ID field and fields that don't belong to this model
-                if field.name == 'id':
-                    continue
-                
-                # Check if this field belongs to the current model
-                # Use a safer way to check field ownership
-                try:
-                    if hasattr(field, 'model') and field.model == model_cls:
-                        # This field belongs to the current model
-                        if hasattr(obj, field.name):
-                            setattr(child_obj, field.name, getattr(obj, field.name))
-                except AttributeError:
-                    # Skip fields that don't have proper model reference
-                    continue
-            
-            child_objects.append(child_obj)
-        
-        return child_objects
-    
-    def _bulk_create_inherited(self, objs, **kwargs):
-        """
-        Handle bulk create for inherited models by handling each table separately.
-        """
-        if not objs:
-            return []
-        
-        model_cls = self.model
-        result = []
-        
-        # Group objects by their actual class
-        objects_by_class = {}
-        for obj in objs:
-            obj_class = obj.__class__
-            if obj_class not in objects_by_class:
-                objects_by_class[obj_class] = []
-            objects_by_class[obj_class].append(obj)
-        
-        for obj_class, class_objects in objects_by_class.items():
-            try:
-                # Check if this class has multi-table inheritance
-                parent_models = [p for p in obj_class._meta.get_parent_list() 
-                               if not p._meta.abstract]
-                
-                if not parent_models:
-                    # No inheritance, use standard bulk_create
-                    chunk_result = super(models.Manager, self).bulk_create(class_objects, **kwargs)
-                    result.extend(chunk_result)
-                    continue
-                
-                # Handle multi-table inheritance
-                # Step 1: Bulk create base objects with hooks
-                base_objects = self._extract_base_objects(class_objects, obj_class)
-                
-                # Use the model's manager with hooks
-                base_model = self._get_base_model(obj_class)
-                
-                # Try to avoid recursion by using raw SQL or _base_manager
-                try:
-                    if hasattr(base_model.objects, 'bulk_create'):
-                        # Use the base model's manager with hooks
-                        created_base = base_model.objects.bulk_create(base_objects, **kwargs)
-                    else:
-                        # Fallback to _base_manager
-                        created_base = base_model._base_manager.bulk_create(base_objects, **kwargs)
-                except RecursionError:
-                    # If recursion error, use _base_manager directly
-                    created_base = base_model._base_manager.bulk_create(base_objects, **kwargs)
-                
-                # Step 2: Update original objects with base IDs
-                for obj, base_obj in zip(class_objects, created_base):
-                    obj.pk = base_obj.pk
-                    obj._state.adding = False
-                
-                # Step 3: Bulk create child objects with hooks
-                child_objects = self._extract_child_objects(class_objects, obj_class)
-                if child_objects:
-                    # Use _base_manager to avoid recursion with custom managers
-                    try:
-                        obj_class._base_manager.bulk_create(child_objects, **kwargs)
-                    except RecursionError:
-                        # If recursion error, use individual saves
-                        for obj in child_objects:
-                            obj.save()
-                
-                result.extend(class_objects)
-                
-            except Exception as e:
-                # Add debugging information
-                import logging
-                logger = logging.getLogger(__name__)
-                logger.error(f"Error in _bulk_create_inherited for {obj_class}: {e}")
-                logger.error(f"Model fields: {[f.name for f in obj_class._meta.fields]}")
-                logger.error(f"Base model: {self._get_base_model(obj_class)}")
-                logger.error(f"Base model manager: {self._get_base_model(obj_class).objects}")
-                
-                # If it's a recursion error, try a simpler approach
-                if isinstance(e, RecursionError):
-                    logger.error("Recursion error detected, trying fallback approach")
-                    try:
-                        # Fallback: use individual saves
-                        for obj in class_objects:
-                            obj.save()
-                        result.extend(class_objects)
-                        continue
-                    except Exception as fallback_error:
-                        logger.error(f"Fallback approach also failed: {fallback_error}")
-                
-                raise
-        
-        return result
-
     @transaction.atomic
     def bulk_update(
         self, objs, fields, bypass_hooks=False, bypass_validation=False, **kwargs
@@ -295,9 +116,6 @@ class BulkHookManager(models.Manager):
                 f"bulk_create expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
             )
 
-        # Check if this model uses multi-table inheritance
-        has_multi_table_inheritance = self._has_multi_table_inheritance(model_cls)
-
         result = []
 
         if not bypass_hooks:
@@ -310,18 +128,9 @@ class BulkHookManager(models.Manager):
             # Then run business logic hooks
             engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
 
-        # Perform bulk create in chunks
         for i in range(0, len(objs), self.CHUNK_SIZE):
             chunk = objs[i : i + self.CHUNK_SIZE]
-            
-            if has_multi_table_inheritance:
-                # Use our multi-table bulk create
-                created_chunk = self._bulk_create_inherited(chunk, **kwargs)
-            else:
-                # Use Django's standard bulk create
-                created_chunk = super(models.Manager, self).bulk_create(chunk, **kwargs)
-            
-            result.extend(created_chunk)
+            result.extend(super(models.Manager, self).bulk_create(chunk, **kwargs))
 
         if not bypass_hooks:
             engine.run(model_cls, AFTER_CREATE, result, ctx=ctx)

{django_bulk_hooks-0.1.110.dist-info → django_bulk_hooks-0.1.111.dist-info}/METADATA

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

{django_bulk_hooks-0.1.110.dist-info → django_bulk_hooks-0.1.111.dist-info}/RECORD

@@ -6,12 +6,12 @@ django_bulk_hooks/decorators.py,sha256=tckDcxtOzKCbgvS9QydgeIAWTFDEl-ch3_Q--ruEG
 django_bulk_hooks/engine.py,sha256=3HbgV12JRYIy9IlygHPxZiHnFXj7EwzLyTuJNQeVIoI,1402
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,4854
-django_bulk_hooks/manager.py,sha256=MzX9mMLbxAKMqYiKwFkieYn9EtxpLOUfA-S57co2q8I,15295
+django_bulk_hooks/manager.py,sha256=JkhOw9XbEUt8VpunhUSP0z-NlazIFUWmAesj7H4ge8w,7148
 django_bulk_hooks/models.py,sha256=7RG7GrOdHXFjGVPV4FPRZVNMIHHW-hMCi6hn9LH_hVI,3331
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
 django_bulk_hooks/queryset.py,sha256=iet4z-9SKhnresA4FBQbxx9rdYnoaOWbw9LUlGftlP0,1466
 django_bulk_hooks/registry.py,sha256=-mQBizJ06nz_tajZBinViKx_uP2Tbc1tIpTEMv7lwKA,705
-django_bulk_hooks-0.1.110.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.110.dist-info/METADATA,sha256=P2a5pByPA96kdKHrURz7Rp1AGUHfV_c0JdbVo7Ost90,6951
-django_bulk_hooks-0.1.110.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.1.110.dist-info/RECORD,,
+django_bulk_hooks-0.1.111.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.111.dist-info/METADATA,sha256=eljgMdpOu6xv8oWYbEMeP0GM7oXy4NrVDHDlrAfpHP0,6951
+django_bulk_hooks-0.1.111.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.111.dist-info/RECORD,,