pydocket 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

docket/execution.py

@@ -183,18 +183,33 @@ TaskStrikes = dict[str, ParameterStrikes]
 class StrikeList:
     task_strikes: TaskStrikes
     parameter_strikes: ParameterStrikes
+    _conditions: list[Callable[[Execution], bool]]
 
     def __init__(self) -> None:
         self.task_strikes = {}
         self.parameter_strikes = {}
+        self._conditions = [self._matches_task_or_parameter_strike]
+
+    def add_condition(self, condition: Callable[[Execution], bool]) -> None:
+        """Adds a temporary condition that indicates an execution is stricken."""
+        self._conditions.insert(0, condition)
+
+    def remove_condition(self, condition: Callable[[Execution], bool]) -> None:
+        """Adds a temporary condition that indicates an execution is stricken."""
+        assert condition is not self._matches_task_or_parameter_strike
+        self._conditions.remove(condition)
 
     def is_stricken(self, execution: Execution) -> bool:
         """
-        Checks if an execution is stricken based on task name or parameter values.
+        Checks if an execution is stricken based on task, parameter, or temporary
+        conditions.
 
         Returns:
             bool: True if the execution is stricken, False otherwise.
         """
+        return any(condition(execution) for condition in self._conditions)
+
+    def _matches_task_or_parameter_strike(self, execution: Execution) -> bool:
         function_name = execution.function.__name__
 
         # Check if the entire task is stricken (without parameter conditions)

docket/worker.py

@@ -7,7 +7,6 @@ from types import TracebackType
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Mapping,
     Protocol,
     Self,
@@ -69,7 +68,6 @@ class Worker:
     redelivery_timeout: timedelta
     reconnection_delay: timedelta
     minimum_check_interval: timedelta
-    _strike_conditions: list[Callable[[Execution], bool]] = []
 
     def __init__(
         self,
@@ -87,13 +85,9 @@ class Worker:
         self.reconnection_delay = reconnection_delay
         self.minimum_check_interval = minimum_check_interval
 
-        self._strike_conditions = [
-            docket.strike_list.is_stricken,
-        ]
-
     async def __aenter__(self) -> Self:
         self._heartbeat_task = asyncio.create_task(self._heartbeat())
-
+        self._execution_counts = {}
         return self
 
     async def __aexit__(
@@ -102,6 +96,8 @@ class Worker:
         exc_value: BaseException | None,
         traceback: TracebackType | None,
     ) -> None:
+        del self._execution_counts
+
         self._heartbeat_task.cancel()
         try:
             await self._heartbeat_task
@@ -162,6 +158,8 @@ class Worker:
         """Run the worker indefinitely."""
         return await self._run(forever=True)  # pragma: no cover
 
+    _execution_counts: dict[str, int]
+
     async def run_at_most(self, iterations_by_key: Mapping[str, int]) -> None:
         """
         Run the worker until there are no more tasks to process, but limit specified
@@ -173,23 +171,25 @@ class Worker:
         Args:
             iterations_by_key: Maps task keys to their maximum allowed executions
         """
-        execution_counts: dict[str, int] = {key: 0 for key in iterations_by_key}
+        self._execution_counts = {key: 0 for key in iterations_by_key}
 
         def has_reached_max_iterations(execution: Execution) -> bool:
-            if execution.key not in iterations_by_key:
+            key = execution.key
+
+            if key not in iterations_by_key:
                 return False
 
-            if execution_counts[execution.key] >= iterations_by_key[execution.key]:
+            if self._execution_counts[key] >= iterations_by_key[key]:
                 return True
 
-            execution_counts[execution.key] += 1
             return False
 
-        self._strike_conditions.insert(0, has_reached_max_iterations)
+        self.docket.strike_list.add_condition(has_reached_max_iterations)
         try:
             await self.run_until_finished()
         finally:
-            self._strike_conditions.remove(has_reached_max_iterations)
+            self.docket.strike_list.remove_condition(has_reached_max_iterations)
+            self._execution_counts = {}
 
     async def _run(self, forever: bool = False) -> None:
         logger.info("Starting worker %r with the following tasks:", self.name)
@@ -291,6 +291,9 @@ class Worker:
                     def start_task(
                         message_id: RedisMessageID, message: RedisMessage
                     ) -> None:
+                        if not message:  # pragma: no cover
+                            return
+
                         task = asyncio.create_task(self._execute(message))
                         active_tasks[task] = message_id
 
@@ -380,12 +383,15 @@ class Worker:
         arrow = "↬" if execution.attempt > 1 else "↪"
         call = execution.call_repr()
 
-        if any(condition(execution) for condition in self._strike_conditions):
+        if self.docket.strike_list.is_stricken(execution):
             arrow = "🗙"
             logger.warning("%s %s", arrow, call, extra=log_context)
             TASKS_STRICKEN.add(1, counter_labels | {"docket.where": "worker"})
             return
 
+        if execution.key in self._execution_counts:
+            self._execution_counts[execution.key] += 1
+
         dependencies = self._get_dependencies(execution)
 
         context = propagate.extract(message, getter=message_getter)

{pydocket-0.3.0.dist-info → pydocket-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydocket
-Version: 0.3.0
+Version: 0.3.2
 Summary: A distributed background task system for Python functions
 Project-URL: Homepage, https://github.com/chrisguidry/docket
 Project-URL: Bug Tracker, https://github.com/chrisguidry/docket/issues

{pydocket-0.3.0.dist-info → pydocket-0.3.2.dist-info}/RECORD

@@ -4,13 +4,13 @@ docket/annotations.py,sha256=GZwOPtPXyeIhnsLh3TQMBnXrjtTtSmF4Ratv4vjPx8U,950
 docket/cli.py,sha256=EseF0Sj7IEgd9QDC-FSbHSffvF7DNsrmDGYGgZBdJc8,19413
 docket/dependencies.py,sha256=S3KqXxEF0Q2t_jO3R-kI5IIA3M-tqybtiSod2xnRO4o,4991
 docket/docket.py,sha256=zva6ofTm7i5hRwAaAnNtlgIqoMPaNLqCTs2PXGka_8s,19723
-docket/execution.py,sha256=ShP8MoLmxEslk2pAuhKi6KEEKbHdneyQukR9oQwXdjQ,11732
+docket/execution.py,sha256=PDrlAr8VzmB6JvqKO71YhXUcTcGQW7eyXrSKiTcAexE,12508
 docket/instrumentation.py,sha256=bZlGA02JoJcY0J1WGm5_qXDfY0AXKr0ZLAYu67wkeKY,4611
 docket/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docket/tasks.py,sha256=RIlSM2omh-YDwVnCz6M5MtmK8T_m_s1w2OlRRxDUs6A,1437
-docket/worker.py,sha256=A0jfi6f2QZ2OA5z9rVvEcstSiIAQPrxaJmKkFBHH48g,21752
-pydocket-0.3.0.dist-info/METADATA,sha256=O6NoNE03rUVEMokkKArLaH6_sXhnrx-kWTnVBN8h5Ak,13092
-pydocket-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydocket-0.3.0.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
-pydocket-0.3.0.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
-pydocket-0.3.0.dist-info/RECORD,,
+docket/worker.py,sha256=MO-j5NQWvhlZh0vCVeUCwLas3i6AVsY672MYgyoU620,21882
+pydocket-0.3.2.dist-info/METADATA,sha256=F0cKpadZ6gQ-mJYXde7XTogoy_uaaTpprpJ5uum9z-w,13092
+pydocket-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydocket-0.3.2.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
+pydocket-0.3.2.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
+pydocket-0.3.2.dist-info/RECORD,,