django-bulk-hooks 0.2.44__py3-none-any.whl → 0.2.50__py3-none-any.whl

django_bulk_hooks/operations/mti_plans.py

@@ -14,7 +14,7 @@ from typing import Any
 class ParentLevel:
     """
     Represents one level in the parent hierarchy for MTI bulk create.
-    
+
     Attributes:
         model_class: The parent model class for this level
         objects: List of parent instances to create
@@ -23,6 +23,7 @@ class ParentLevel:
         unique_fields: Fields for conflict detection (if update_conflicts=True)
         update_fields: Fields to update on conflict (if update_conflicts=True)
     """
+
     model_class: Any
     objects: list[Any]
     original_object_map: dict[int, int] = field(default_factory=dict)
@@ -35,10 +36,10 @@ class ParentLevel:
 class MTICreatePlan:
     """
     Plan for executing bulk_create on an MTI model.
-    
+
     This plan describes WHAT to create, not HOW to create it.
     The executor is responsible for executing this plan.
-    
+
     Attributes:
         inheritance_chain: List of model classes from root to child
         parent_levels: List of ParentLevel objects, one per parent model
@@ -51,6 +52,7 @@ class MTICreatePlan:
         unique_fields: Fields used for conflict detection
         update_fields: Fields to update on conflict
     """
+
     inheritance_chain: list[Any]
     parent_levels: list[ParentLevel]
     child_objects: list[Any]
@@ -67,12 +69,13 @@ class MTICreatePlan:
 class ModelFieldGroup:
     """
     Represents fields to update for one model in the inheritance chain.
-    
+
     Attributes:
         model_class: The model class
         fields: List of field names to update on this model
         filter_field: Field to use for filtering (e.g., 'pk' or parent link attname)
     """
+
     model_class: Any
     fields: list[str]
     filter_field: str = "pk"
@@ -82,15 +85,15 @@ class ModelFieldGroup:
 class MTIUpdatePlan:
     """
     Plan for executing bulk_update on an MTI model.
-    
+
     Attributes:
         inheritance_chain: List of model classes from root to child
         field_groups: List of ModelFieldGroup objects
         objects: Objects to update
         batch_size: Batch size for operations
     """
+
     inheritance_chain: list[Any]
     field_groups: list[ModelFieldGroup]
     objects: list[Any]
     batch_size: int = None
-

django_bulk_hooks/operations/record_classifier.py

@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)
 class RecordClassifier:
     """
     Service for classifying and fetching records via database queries.
-    
+
     This is the SINGLE point of truth for record classification queries.
     Keeps database access logic separate from business/planning logic.
     """
@@ -31,17 +31,18 @@ class RecordClassifier:
         """
         self.model_cls = model_cls
 
-    def classify_for_upsert(self, objs, unique_fields):
+    def classify_for_upsert(self, objs, unique_fields, query_model=None):
         """
         Classify records as new or existing based on unique_fields.
-        
+
         Queries the database to check which records already exist based on the
         unique_fields constraint.
-        
+
         Args:
             objs: List of model instances
             unique_fields: List of field names that form the unique constraint
-            
+            query_model: Optional model class to query (for MTI, may be different from self.model_cls)
+
         Returns:
             Tuple of (existing_record_ids, existing_pks_map)
             - existing_record_ids: Set of id() for objects that exist in DB
@@ -50,6 +51,9 @@ class RecordClassifier:
         if not unique_fields or not objs:
             return set(), {}
 
+        # Use query_model if provided (for MTI scenarios), otherwise use self.model_cls
+        query_model = query_model or self.model_cls
+
         # Build a query to find existing records
         queries = []
         obj_to_unique_values = {}
@@ -77,9 +81,12 @@ class RecordClassifier:
         for q in queries[1:]:
             combined_query |= q
 
-        existing_records = list(
-            self.model_cls.objects.filter(combined_query).values("pk", *unique_fields),
-        )
+        logger.info(f"Classifying for upsert: model={query_model.__name__}, query={combined_query}, unique_fields={unique_fields}")
+        queryset = query_model.objects.filter(combined_query)
+        logger.info(f"Queryset SQL: {queryset.query}")
+        logger.info(f"All records in table: {query_model.objects.all().count()}")
+        existing_records = list(queryset.values("pk", *unique_fields))
+        logger.info(f"Found {len(existing_records)} existing records: {existing_records}")
 
         # Map existing records back to original objects
         existing_record_ids = set()
@@ -94,8 +101,7 @@ class RecordClassifier:
                     existing_pks_map[obj_id] = record["pk"]
 
         logger.info(
-            f"Classified {len(existing_record_ids)} existing and "
-            f"{len(objs) - len(existing_record_ids)} new records for upsert",
+            f"Classified {len(existing_record_ids)} existing and {len(objs) - len(existing_record_ids)} new records for upsert",
         )
 
         return existing_record_ids, existing_pks_map
@@ -103,12 +109,12 @@ class RecordClassifier:
     def fetch_by_pks(self, pks, select_related=None, prefetch_related=None):
         """
         Fetch records by primary keys with optional relationship loading.
-        
+
         Args:
             pks: List of primary key values
             select_related: Optional list of fields to select_related
             prefetch_related: Optional list of fields to prefetch_related
-            
+
         Returns:
             Dict[pk, instance] for O(1) lookups
         """
@@ -128,10 +134,10 @@ class RecordClassifier:
     def fetch_by_unique_constraint(self, field_values_map):
         """
         Fetch records matching a unique constraint.
-        
+
         Args:
             field_values_map: Dict of {field_name: value} for unique constraint
-            
+
         Returns:
             Model instance if found, None otherwise
         """
@@ -141,18 +147,17 @@ class RecordClassifier:
             return None
         except self.model_cls.MultipleObjectsReturned:
             logger.warning(
-                f"Multiple {self.model_cls.__name__} records found for "
-                f"unique constraint {field_values_map}",
+                f"Multiple {self.model_cls.__name__} records found for unique constraint {field_values_map}",
             )
             return self.model_cls.objects.filter(**field_values_map).first()
 
     def exists_by_pks(self, pks):
         """
         Check if records exist by primary keys without fetching them.
-        
+
         Args:
             pks: List of primary key values
-            
+
         Returns:
             Set of PKs that exist in the database
         """
@@ -168,13 +173,13 @@ class RecordClassifier:
     def count_by_unique_fields(self, objs, unique_fields):
         """
         Count how many objects already exist based on unique fields.
-        
+
         Useful for validation or reporting before upsert operations.
-        
+
         Args:
             objs: List of model instances
             unique_fields: List of field names that form the unique constraint
-            
+
         Returns:
             Tuple of (existing_count, new_count)
         """

{django_bulk_hooks-0.2.44.dist-info → django_bulk_hooks-0.2.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.44
+Version: 0.2.50
 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.44.dist-info → django_bulk_hooks-0.2.50.dist-info}/RECORD

@@ -12,15 +12,15 @@ django_bulk_hooks/helpers.py,sha256=Nw8eXryLUUquW7AgiuKp0PQT3Pq6HAHsdP-xAtqhmjA,
 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=dXcgk99Q9Zv7r2PMNIQE9f-hkPW3rGKXnDw28r3C7IE,10782
-django_bulk_hooks/operations/bulk_executor.py,sha256=Biyt8RxbBsxC5u4GDwHq2BSGQTrF646mRKYAjxR-WC0,23259
-django_bulk_hooks/operations/coordinator.py,sha256=qH4AAx1fZ-h_Q6w5qa2Vqbq98nx5ezAwCPpbj2oKccA,29076
-django_bulk_hooks/operations/mti_handler.py,sha256=xKEz9hgdFnA6mX5RQ8Pa1MJFluzeJBJ6EqFJxXTyedM,19664
-django_bulk_hooks/operations/mti_plans.py,sha256=YP7LcV9Z8UqNS_x74OswF9_5swqruRTdAu6z-J_R6C0,3377
-django_bulk_hooks/operations/record_classifier.py,sha256=KzUoAhfoqzFVrOabNZAby9Akb54h-fAQZmb8O-fIx_0,6221
+django_bulk_hooks/operations/analyzer.py,sha256=wAG8sAG9NwfwNqG9z81VfGR7AANDzRmMGE_o82MWji4,10689
+django_bulk_hooks/operations/bulk_executor.py,sha256=kqRGSdqKHc1WoG8yEhn82gKZ9KelV3GGTU7YccUdFG0,24737
+django_bulk_hooks/operations/coordinator.py,sha256=iGavJLqe3eYRqFay8cMn6muwyRYzQo-HFGphsS5hL6g,30799
+django_bulk_hooks/operations/mti_handler.py,sha256=uDrfE29e80v4YjPF4fPw2x0bntRnFGyfEh-grMQUGu0,20907
+django_bulk_hooks/operations/mti_plans.py,sha256=7STQ2oA2ZT8cEG3-t-6xciRAdf7OeSf0gRLXR_BRG-Q,3363
+django_bulk_hooks/operations/record_classifier.py,sha256=vNi0WSNiPAVb8pTZZJ26b81oX59snk7LIxWMzyenDCk,6694
 django_bulk_hooks/queryset.py,sha256=aQitlbexcVnmeAdc0jtO3hci39p4QEu4srQPEzozy5s,5546
 django_bulk_hooks/registry.py,sha256=uum5jhGI3TPaoiXuA1MdBdu4gbE3rQGGwQ5YDjiMcjk,7949
-django_bulk_hooks-0.2.44.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.44.dist-info/METADATA,sha256=uyhU1_WPDEgljEWHdoWHa0KtfTAkMkY8MRpuKDSUpYU,9265
-django_bulk_hooks-0.2.44.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.44.dist-info/RECORD,,
+django_bulk_hooks-0.2.50.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.50.dist-info/METADATA,sha256=oVFxbFoCH691HY57pcgVa9em9_M0IAg1L0VECri_l_Q,9265
+django_bulk_hooks-0.2.50.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.50.dist-info/RECORD,,