django-bulk-hooks 0.1.53__py3-none-any.whl → 0.1.55__py3-none-any.whl

django_bulk_hooks/context.py

@@ -1,3 +1,15 @@
+import threading
+from collections import deque
+
+_hook_context = threading.local()
+
+
+def get_hook_queue():
+    if not hasattr(_hook_context, "queue"):
+        _hook_context.queue = deque()
+    return _hook_context.queue
+
+
 class TriggerContext:
     def __init__(self, model_cls, metadata=None):
         self.model_cls = model_cls

django_bulk_hooks/handler.py

@@ -1,11 +1,61 @@
 import logging
+import threading
+from collections import deque
 
 from django.db import transaction
-from django_bulk_hooks.conditions import HookCondition
 from django_bulk_hooks.registry import get_hooks, register_hook
 
 logger = logging.getLogger(__name__)
 
+# Thread-local hook context and trigger state
+class TriggerVars(threading.local):
+    def __init__(self):
+        self.new = None
+        self.old = None
+        self.event = None
+        self.model = None
+        self.depth = 0
+
+trigger = TriggerVars()
+
+# Hook queue per thread
+_hook_context = threading.local()
+
+def get_hook_queue():
+    if not hasattr(_hook_context, "queue"):
+        _hook_context.queue = deque()
+    return _hook_context.queue
+
+class TriggerContextState:
+    @property
+    def is_before(self):
+        return trigger.event.startswith("before_") if trigger.event else False
+
+    @property
+    def is_after(self):
+        return trigger.event.startswith("after_") if trigger.event else False
+
+    @property
+    def is_create(self):
+        return "create" in trigger.event if trigger.event else False
+
+    @property
+    def is_update(self):
+        return "update" in trigger.event if trigger.event else False
+
+    @property
+    def new(self):
+        return trigger.new
+
+    @property
+    def old(self):
+        return trigger.old
+
+    @property
+    def model(self):
+        return trigger.model
+
+Trigger = TriggerContextState()
 
 class TriggerHandlerMeta(type):
     _registered = set()
@@ -16,15 +66,7 @@ class TriggerHandlerMeta(type):
             if hasattr(method, "hooks_hooks"):
                 for model_cls, event, condition, priority in method.hooks_hooks:
                     key = (model_cls, event, cls, method_name)
-                    if key in TriggerHandlerMeta._registered:
-                        logger.debug(
-                            "Skipping duplicate registration for %s.%s on %s.%s",
-                            cls.__name__,
-                            method_name,
-                            model_cls.__name__,
-                            event,
-                        )
-                    else:
+                    if key not in TriggerHandlerMeta._registered:
                         register_hook(
                             model=model_cls,
                             event=event,
@@ -34,18 +76,8 @@ class TriggerHandlerMeta(type):
                             priority=priority,
                         )
                         TriggerHandlerMeta._registered.add(key)
-                        logger.debug(
-                            "Registered hook %s.%s → %s.%s (cond=%r, prio=%s)",
-                            model_cls.__name__,
-                            event,
-                            cls.__name__,
-                            method_name,
-                            condition,
-                            priority,
-                        )
         return cls
 
-
 class TriggerHandler(metaclass=TriggerHandlerMeta):
     @classmethod
     def handle(
@@ -57,152 +89,69 @@ class TriggerHandler(metaclass=TriggerHandlerMeta):
         old_records: list = None,
         **kwargs,
     ) -> None:
-        # Prepare hook list and log names
-        hooks = get_hooks(model, event)
-
-        # Sort hooks by priority (ascending: lower number = higher priority)
-        hooks = sorted(hooks, key=lambda x: x[3])
-
-        hook_names = [f"{h.__name__}.{m}" for h, m, _, _ in hooks]
-        logger.debug(
-            "Found %d hooks for %s.%s: %s",
-            len(hooks),
-            model.__name__,
-            event,
-            hook_names,
-        )
-
-        def _process():
-            # Ensure new_records is a list
-            new_records_local = new_records or []
-
-            # Normalize old_records: ensure list and pad with None
-            old_records_local = list(old_records) if old_records else []
-            if len(old_records_local) < len(new_records_local):
-                old_records_local += [None] * (
-                    len(new_records_local) - len(old_records_local)
-                )
-
-            logger.debug(
-                "ℹ️  bulk_hooks.handle() start: model=%s event=%s new_count=%d old_count=%d",
-                model.__name__,
-                event,
-                len(new_records_local),
-                len(old_records_local),
-            )
+        queue = get_hook_queue()
+        queue.append((cls, event, model, new_records, old_records, kwargs))
 
-            for handler_cls, method_name, condition, priority in hooks:
-                logger.debug(
-                    "→ evaluating hook %s.%s (cond=%r, prio=%s)",
-                    handler_cls.__name__,
-                    method_name,
-                    condition,
-                    priority,
-                )
-
-                # Evaluate condition
-                passed = True
-                if condition is not None:
-                    if isinstance(condition, HookCondition):
-                        cond_info = getattr(condition, "__dict__", str(condition))
-                        logger.debug(
-                            "   [cond-info] %s.%s → %r",
-                            handler_cls.__name__,
-                            method_name,
-                            cond_info,
-                        )
+        if len(queue) > 1:
+            return  # nested call, will be processed by outermost
 
-                        checks = []
-                        for new, old in zip(new_records_local, old_records_local):
-                            field_name = getattr(condition, "field", None) or getattr(
-                                condition, "field_name", None
-                            )
-                            if field_name:
-                                actual_val = getattr(new, field_name, None)
-                                expected = getattr(condition, "value", None) or getattr(
-                                    condition, "value", None
-                                )
-                                logger.debug(
-                                    "   [field-lookup] %s.%s → field=%r actual=%r expected=%r",
-                                    handler_cls.__name__,
-                                    method_name,
-                                    field_name,
-                                    actual_val,
-                                    expected,
-                                )
-                            result = condition.check(new, old)
-                            checks.append(result)
-                            logger.debug(
-                                "   [cond-check] %s.%s → new=%r old=%r => %s",
-                                handler_cls.__name__,
-                                method_name,
-                                new,
-                                old,
-                                result,
-                            )
-                        passed = any(checks)
-                        logger.debug(
-                            "   [cond-summary] %s.%s any-passed=%s",
-                            handler_cls.__name__,
-                            method_name,
-                            passed,
-                        )
-                    else:
-                        # Legacy callable conditions
-                        passed = condition(
-                            new_records=new_records_local,
-                            old_records=old_records_local,
-                        )
-                        logger.debug(
-                            "   [legacy-cond] %s.%s → full-list => %s",
-                            handler_cls.__name__,
-                            method_name,
-                            passed,
-                        )
+        # only outermost handle will process the queue
+        while queue:
+            cls_, event_, model_, new_, old_, kw_ = queue.popleft()
+            cls_._process(event_, model_, new_, old_, **kw_)
 
-                if not passed:
-                    logger.debug(
-                        "↳ skipping %s.%s (condition not met)",
-                        handler_cls.__name__,
-                        method_name,
-                    )
-                    continue
+    @classmethod
+    def _process(
+        cls,
+        event,
+        model,
+        new_records,
+        old_records,
+        **kwargs,
+    ):
+        trigger.depth += 1
+        trigger.new = new_records
+        trigger.old = old_records
+        trigger.event = event
+        trigger.model = model
+
+        hooks = sorted(get_hooks(model, event), key=lambda x: x[3])
+        logger.debug("Processing %d hooks for %s.%s", len(hooks), model.__name__, event)
+
+        def _execute():
+            new_local = new_records or []
+            old_local = old_records or []
+            if len(old_local) < len(new_local):
+                old_local += [None] * (len(new_local) - len(old_local))
+
+            for handler_cls, method_name, condition, priority in hooks:
+                if condition is not None:
+                    checks = [condition.check(n, o) for n, o in zip(new_local, old_local)]
+                    if not any(checks):
+                        continue
 
-                # Instantiate & invoke handler method
                 handler = handler_cls()
                 method = getattr(handler, method_name)
-                logger.info(
-                    "✨ invoking %s.%s on %d record(s)",
-                    handler_cls.__name__,
-                    method_name,
-                    len(new_records_local),
-                )
+
+                logger.info("Running hook %s.%s on %d items", handler_cls.__name__, method_name, len(new_local))
                 try:
                     method(
-                        new_records=new_records_local,
-                        old_records=old_records_local,
+                        new_records=new_local,
+                        old_records=old_local,
                         **kwargs,
                     )
                 except Exception:
-                    logger.exception(
-                        "❌ exception in %s.%s",
-                        handler_cls.__name__,
-                        method_name,
-                    )
-
-            logger.debug(
-                "✔️  bulk_hooks.handle() complete for %s.%s",
-                model.__name__,
-                event,
-            )
+                    logger.exception("Error in hook %s.%s", handler_cls.__name__, method_name)
 
-        # Defer if in atomic block and event is after_*
         conn = transaction.get_connection()
-        if conn.in_atomic_block and event.startswith("after_"):
-            logger.debug(
-                "Deferring hook execution until after transaction commit for event '%s'",
-                event,
-            )
-            transaction.on_commit(_process)
-        else:
-            _process()
+        try:
+            if conn.in_atomic_block and event.startswith("after_"):
+                transaction.on_commit(_execute)
+            else:
+                _execute()
+        finally:
+            trigger.new = None
+            trigger.old = None
+            trigger.event = None
+            trigger.model = None
+            trigger.depth -= 1

django_bulk_hooks/queryset.py

@@ -1,5 +1,4 @@
 from django.db import models, transaction
-from django.db.models.manager import BaseManager
 
 
 class LifecycleQuerySet(models.QuerySet):

{django_bulk_hooks-0.1.53.dist-info → django_bulk_hooks-0.1.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.53
+Version: 0.1.55
 Summary: Lifecycle-style hooks for Django bulk operations like bulk_create and bulk_update.
 Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT

{django_bulk_hooks-0.1.53.dist-info → django_bulk_hooks-0.1.55.dist-info}/RECORD

@@ -1,17 +1,17 @@
 django_bulk_hooks/__init__.py,sha256=6VFU52Kz5Yjhjr_RhID41nMaXUMZ4na_MVDXEhIMXc4,98
 django_bulk_hooks/conditions.py,sha256=UQP5Y7yyJXqDdUcUukRPxCbvrsV6HqNmIxERFZqBh58,5317
 django_bulk_hooks/constants.py,sha256=Jks1BIADYbap2fpq3Ry0e7w-CiXBCsR9b5h1yan1qoc,192
-django_bulk_hooks/context.py,sha256=csjBwbB6asGHeeyzD5WWhFqrAox_DIIBvKQFUs9ENpk,150
+django_bulk_hooks/context.py,sha256=VyjgaubjJTTXQHgyoGY4OLBbdCpBwo-RX4bvxRfZ1c4,383
 django_bulk_hooks/decorators.py,sha256=wbT9lbpKZqDbG5vPvtTC6MHYWvjLaVccCwFM9U2nHkA,3159
 django_bulk_hooks/engine.py,sha256=l7BzU3lfYhZHZazks8FgHhZB4iLVKuzmcnVcyEQkGpQ,1978
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
-django_bulk_hooks/handler.py,sha256=X6VIBvW84Ni7Y2MWAN1l7lcomSmS7pQ3W9HF_Y0k9ZA,8294
+django_bulk_hooks/handler.py,sha256=qUulFSPhi__gWHISC4GogeVQ9aDo45bz0Dj421Y6skE,4968
 django_bulk_hooks/manager.py,sha256=jsTgbjmRe5SeakVJxV8wYxqH6f3fRX5zm3q0Wy-M9Nc,4271
 django_bulk_hooks/models.py,sha256=_cqIVHKhXb1EOnXxhsuJUlLnPjTRM_sCP5OKbq4q-I8,542
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=IKTrvTzL76jJ-5RrC_BsEF8JUg_VbnR_-yjMj-DPa7M,731
+django_bulk_hooks/queryset.py,sha256=wrK--iZBsBNuf25HpaaZE9__EN9y6KlVmfXqioS8SmY,681
 django_bulk_hooks/registry.py,sha256=yeTi0IhodL61J86ohb5OyITufE28T3ecMbt6RWvkzTs,585
-django_bulk_hooks-0.1.53.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.53.dist-info/METADATA,sha256=h_Ybr3zAAxbowClo2mDzasYkC_S3NJuAlkKEu4DHEmo,3101
-django_bulk_hooks-0.1.53.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.53.dist-info/RECORD,,
+django_bulk_hooks-0.1.55.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.55.dist-info/METADATA,sha256=jge-9Tq4hx6ISQV49qKbu6kUrl1DrQfHxZ8-7PwKT5g,3101
+django_bulk_hooks-0.1.55.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.55.dist-info/RECORD,,