django-bulk-hooks 0.1.189__tar.gz → 0.1.190__tar.gz

{django_bulk_hooks-0.1.189 → django_bulk_hooks-0.1.190}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.189
+Version: 0.1.190
 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.189 → django_bulk_hooks-0.1.190}/django_bulk_hooks/manager.py

@@ -12,18 +12,36 @@ def inject_bulk_hook_behavior(queryset):
         queryset: Any Django QuerySet instance
         
     Returns:
-        The same queryset instance with bulk hook functionality added
+        A new queryset instance with bulk hook functionality added
     """
-    if not isinstance(queryset, HookQuerySetMixin):
-        # Create a new class that inherits from both HookQuerySetMixin and the queryset's class
-        HookedQuerySetClass = type(
-            "HookedQuerySet",
-            (HookQuerySetMixin, queryset.__class__),
-            {}
-        )
-        # Change the instance's class to the new hybrid class
-        queryset.__class__ = HookedQuerySetClass
-    return queryset
+    if isinstance(queryset, HookQuerySetMixin):
+        # Already has hook functionality, return as-is
+        return queryset
+    
+    # Create a new class that inherits from both HookQuerySetMixin and the queryset's class
+    HookedQuerySetClass = type(
+        "HookedQuerySet",
+        (HookQuerySetMixin, queryset.__class__),
+        {
+            '__module__': 'django_bulk_hooks.queryset',
+            '__doc__': f'Dynamically created queryset with bulk hook functionality for {queryset.__class__.__name__}'
+        }
+    )
+    
+    # Create a new instance with the same parameters
+    new_queryset = HookedQuerySetClass(
+        model=queryset.model,
+        query=queryset.query,
+        using=queryset._db,
+        hints=queryset._hints
+    )
+    
+    # Copy any additional attributes that might be important
+    for attr, value in queryset.__dict__.items():
+        if not hasattr(new_queryset, attr):
+            setattr(new_queryset, attr, value)
+    
+    return new_queryset
 
 
 class BulkHookManager(models.Manager):

{django_bulk_hooks-0.1.189 → django_bulk_hooks-0.1.190}/django_bulk_hooks/queryset.py

@@ -642,10 +642,16 @@ class HookQuerySetMixin:
         # If objects have pk set but are not loaded from DB, use those PKs
         root_pks = []
         for obj in batch:
-            if obj.pk is not None:
-                root_pks.append(obj.pk)
+            # Check both pk and id attributes
+            pk_value = getattr(obj, 'pk', None)
+            if pk_value is None:
+                pk_value = getattr(obj, 'id', None)
+            
+            if pk_value is not None:
+                root_pks.append(pk_value)
+                print(f"Found PK {pk_value} for object {obj}")
             else:
-                print(f"WARNING: Object {obj} has no primary key")
+                print(f"WARNING: Object {obj} has no primary key (pk={getattr(obj, 'pk', None)}, id={getattr(obj, 'id', None)})")
                 continue
         
         print(f"Root PKs to update: {root_pks}")
@@ -708,7 +714,12 @@ class HookQuerySetMixin:
                     
                     print(f"Building CASE statement for field: {field_name}")
                     for pk, obj in zip(pks, batch):
-                        if obj.pk is None:
+                        # Check both pk and id attributes for the object
+                        obj_pk = getattr(obj, 'pk', None)
+                        if obj_pk is None:
+                            obj_pk = getattr(obj, 'id', None)
+                        
+                        if obj_pk is None:
                             continue
                         value = getattr(obj, field_name)
                         print(f"  PK {pk}: {field_name} = {value}")

{django_bulk_hooks-0.1.189 → django_bulk_hooks-0.1.190}/pyproject.toml

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