pydocket 0.3.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

docket/docket.py

@@ -132,6 +132,9 @@ class Docket:
                 - "redis://user:password@localhost:6379/0?ssl=true"
                 - "rediss://localhost:6379/0"
                 - "unix:///path/to/redis.sock"
+            heartbeat_interval: How often workers send heartbeat messages to the docket.
+            missed_heartbeats: How many heartbeats a worker can miss before it is
+                considered dead.
         """
         self.name = name
         self.url = url
@@ -305,6 +308,9 @@ class Docket:
     def stream_key(self) -> str:
         return f"{self.name}:stream"
 
+    def known_task_key(self, key: str) -> str:
+        return f"{self.name}:known:{key}"
+
     def parked_task_key(self, key: str) -> str:
         return f"{self.name}:{key}"
 
@@ -340,30 +346,36 @@ class Docket:
             when = execution.when
 
             async with self.redis() as redis:
-                # if the task is already in the queue, retain it
-                if await redis.zscore(self.queue_key, key) is not None:
+                # if the task is already in the queue or stream, retain it
+                if await redis.exists(self.known_task_key(key)):
+                    logger.debug(
+                        "Task %r is already in the queue or stream, skipping schedule",
+                        key,
+                        extra=self.labels(),
+                    )
                     return
 
-                if when <= datetime.now(timezone.utc):
-                    await redis.xadd(self.stream_key, message)  # type: ignore[arg-type]
-                else:
-                    async with redis.pipeline() as pipe:
+                async with redis.pipeline() as pipe:
+                    pipe.set(self.known_task_key(key), when.timestamp())
+
+                    if when <= datetime.now(timezone.utc):
+                        pipe.xadd(self.stream_key, message)  # type: ignore[arg-type]
+                    else:
                         pipe.hset(self.parked_task_key(key), mapping=message)  # type: ignore[arg-type]
                         pipe.zadd(self.queue_key, {key: when.timestamp()})
-                        await pipe.execute()
+
+                    await pipe.execute()
 
         TASKS_SCHEDULED.add(1, {**self.labels(), **execution.general_labels()})
 
     async def cancel(self, key: str) -> None:
         with tracer.start_as_current_span(
             "docket.cancel",
-            attributes={
-                **self.labels(),
-                "docket.key": key,
-            },
+            attributes={**self.labels(), "docket.key": key},
         ):
             async with self.redis() as redis:
                 async with redis.pipeline() as pipe:
+                    pipe.delete(self.known_task_key(key))
                     pipe.delete(self.parked_task_key(key))
                     pipe.zrem(self.queue_key, key)
                     await pipe.execute()

docket/worker.py

@@ -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
 
@@ -374,6 +377,9 @@ class Worker:
 
         execution = Execution.from_message(function, message)
 
+        async with self.docket.redis() as redis:
+            await redis.delete(self.docket.known_task_key(execution.key))
+
         log_context = {**log_context, **execution.specific_labels()}
         counter_labels = {**self.labels(), **execution.general_labels()}
 

{pydocket-0.3.1.dist-info → pydocket-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydocket
-Version: 0.3.1
+Version: 0.4.0
 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.1.dist-info → pydocket-0.4.0.dist-info}/RECORD

@@ -3,14 +3,14 @@ docket/__main__.py,sha256=Vkuh7aJ-Bl7QVpVbbkUksAd_hn05FiLmWbc-8kbhZQ4,34
 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/docket.py,sha256=xjmXZtE2QY6Pet5Gv5hEJNr8d5wp3zL1GJqRbJYwnKs,20321
 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=AO5k7rn5xHLGN0L6vckQuMyt_LSHh01me_LqNtsobtc,21786
-pydocket-0.3.1.dist-info/METADATA,sha256=tIHiKQjQ-to6bp437vH3-2LsUPnfUP-iG61FAcQa2GE,13092
-pydocket-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydocket-0.3.1.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
-pydocket-0.3.1.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
-pydocket-0.3.1.dist-info/RECORD,,
+docket/worker.py,sha256=3gyXOMaXTBAqEMJqTbItssWtil4ZtVT32UZZoaqWxK0,22006
+pydocket-0.4.0.dist-info/METADATA,sha256=eZAK9MrnZBJhgH8Nc_JDWykcETUU5wszL0KbAPq8ha0,13092
+pydocket-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydocket-0.4.0.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
+pydocket-0.4.0.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
+pydocket-0.4.0.dist-info/RECORD,,