pydocket 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

docket/docket.py

@@ -428,6 +428,9 @@ class Docket:
     def parked_task_key(self, key: str) -> str:
         return f"{self.name}:{key}"
 
+    def stream_id_key(self, key: str) -> str:
+        return f"{self.name}:stream-id:{key}"
+
     async def _schedule(
         self,
         redis: Redis,
@@ -472,13 +475,14 @@ class Docket:
                 self._schedule_task_script = cast(
                     _schedule_task,
                     redis.register_script(
-                        # KEYS: stream_key, known_key, parked_key, queue_key
+                        # KEYS: stream_key, known_key, parked_key, queue_key, stream_id_key
                         # ARGV: task_key, when_timestamp, is_immediate, replace, ...message_fields
                         """
                         local stream_key = KEYS[1]
                         local known_key = KEYS[2]
                         local parked_key = KEYS[3]
                         local queue_key = KEYS[4]
+                        local stream_id_key = KEYS[5]
 
                         local task_key = ARGV[1]
                         local when_timestamp = ARGV[2]
@@ -494,11 +498,11 @@ class Docket:
 
                         -- Handle replacement: cancel existing task if needed
                         if replace then
-                            local existing_message_id = redis.call('HGET', known_key, 'stream_message_id')
+                            local existing_message_id = redis.call('GET', stream_id_key)
                             if existing_message_id then
                                 redis.call('XDEL', stream_key, existing_message_id)
                             end
-                            redis.call('DEL', known_key, parked_key)
+                            redis.call('DEL', known_key, parked_key, stream_id_key)
                             redis.call('ZREM', queue_key, task_key)
                         else
                             -- Check if task already exists
@@ -510,11 +514,12 @@ class Docket:
                         if is_immediate then
                             -- Add to stream and store message ID for later cancellation
                             local message_id = redis.call('XADD', stream_key, '*', unpack(message))
-                            redis.call('HSET', known_key, 'when', when_timestamp, 'stream_message_id', message_id)
+                            redis.call('SET', known_key, when_timestamp)
+                            redis.call('SET', stream_id_key, message_id)
                             return message_id
                         else
                             -- Add to queue with task data in parked hash
-                            redis.call('HSET', known_key, 'when', when_timestamp)
+                            redis.call('SET', known_key, when_timestamp)
                             redis.call('HSET', parked_key, unpack(message))
                             redis.call('ZADD', queue_key, when_timestamp, task_key)
                             return 'QUEUED'
@@ -530,6 +535,7 @@ class Docket:
                     known_task_key,
                     self.parked_task_key(key),
                     self.queue_key,
+                    self.stream_id_key(key),
                 ],
                 args=[
                     key,
@@ -556,23 +562,24 @@ class Docket:
             self._cancel_task_script = cast(
                 _cancel_task,
                 redis.register_script(
-                    # KEYS: stream_key, known_key, parked_key, queue_key
+                    # KEYS: stream_key, known_key, parked_key, queue_key, stream_id_key
                     # ARGV: task_key
                     """
                     local stream_key = KEYS[1]
                     local known_key = KEYS[2]
                     local parked_key = KEYS[3]
                     local queue_key = KEYS[4]
+                    local stream_id_key = KEYS[5]
                     local task_key = ARGV[1]
 
                     -- Delete from stream if message ID exists
-                    local message_id = redis.call('HGET', known_key, 'stream_message_id')
+                    local message_id = redis.call('GET', stream_id_key)
                     if message_id then
                         redis.call('XDEL', stream_key, message_id)
                     end
 
                     -- Clean up all task-related keys
-                    redis.call('DEL', known_key, parked_key)
+                    redis.call('DEL', known_key, parked_key, stream_id_key)
                     redis.call('ZREM', queue_key, task_key)
 
                     return 'OK'
@@ -588,6 +595,7 @@ class Docket:
                 self.known_task_key(key),
                 self.parked_task_key(key),
                 self.queue_key,
+                self.stream_id_key(key),
             ],
             args=[key],
         )
@@ -897,6 +905,7 @@ class Docket:
                         key = key_bytes.decode()
                         pipeline.delete(self.parked_task_key(key))
                         pipeline.delete(self.known_task_key(key))
+                        pipeline.delete(self.stream_id_key(key))
 
                     await pipeline.execute()
 

docket/worker.py

@@ -406,7 +406,7 @@ class Worker:
                             task[task_data[j]] = task_data[j+1]
                         end
 
-                        local message_id = redis.call('XADD', KEYS[2], '*',
+                        redis.call('XADD', KEYS[2], '*',
                             'key', task['key'],
                             'when', task['when'],
                             'function', task['function'],
@@ -414,9 +414,6 @@ class Worker:
                             'kwargs', task['kwargs'],
                             'attempt', task['attempt']
                         )
-                        -- Store the message ID in the known task key
-                        local known_key = ARGV[2] .. ":known:" .. key
-                        redis.call('HSET', known_key, 'stream_message_id', message_id)
                         redis.call('DEL', hash_key)
                         due_work = due_work + 1
                     end
@@ -498,7 +495,8 @@ class Worker:
 
         logger.debug("Deleting known task", extra=self._log_context())
         known_task_key = self.docket.known_task_key(key)
-        await redis.delete(known_task_key)
+        stream_id_key = self.docket.stream_id_key(key)
+        await redis.delete(known_task_key, stream_id_key)
 
     async def _execute(self, execution: Execution) -> None:
         log_context = {**self._log_context(), **execution.specific_labels()}

{pydocket-0.9.0.dist-info → pydocket-0.9.2.dist-info}/METADATA

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

@@ -3,14 +3,14 @@ docket/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 docket/annotations.py,sha256=wttix9UOeMFMAWXAIJUfUw5GjESJZsACb4YXJCozP7Q,2348
 docket/cli.py,sha256=rTfri2--u4Q5PlXyh7Ub_F5uh3-TtZOWLUp9WY_TvAE,25750
 docket/dependencies.py,sha256=BC0bnt10cr9_S1p5JAP_bnC9RwZkTr9ulPBrxC7eZnA,20247
-docket/docket.py,sha256=0nQCHDDHy7trv2a0eYygGgIKiA7fWq5GcOXye3_CPWM,30847
+docket/docket.py,sha256=jP5uI02in5chQvovRsnPaMhgLff3uiK42A-l3eBh2sE,31241
 docket/execution.py,sha256=r_2RGC1qhtAcBUg7E6wewLEgftrf3hIxNbH0HnYPbek,14961
 docket/instrumentation.py,sha256=ogvzrfKbWsdPGfdg4hByH3_r5d3b5AwwQkSrmXw0hRg,5492
 docket/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docket/tasks.py,sha256=RIlSM2omh-YDwVnCz6M5MtmK8T_m_s1w2OlRRxDUs6A,1437
-docket/worker.py,sha256=jqVYqtQyxbk-BIy3shY8haX-amVT9Np97VhJuaQTfpM,35174
-pydocket-0.9.0.dist-info/METADATA,sha256=kymp9PKG7UwMj0i0qGSSCHKu-g-tS__qydr6mYuMLtg,5418
-pydocket-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydocket-0.9.0.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
-pydocket-0.9.0.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
-pydocket-0.9.0.dist-info/RECORD,,
+docket/worker.py,sha256=S5HG87vHa_r1JKApHpEtNkVdUhkdi802zUw3h_zIHt0,34998
+pydocket-0.9.2.dist-info/METADATA,sha256=gWX-2gIAQ5pn3fQ1XwFweQYnbXwsgIpGVahW7KJJNtU,5418
+pydocket-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydocket-0.9.2.dist-info/entry_points.txt,sha256=4WOk1nUlBsUT5O3RyMci2ImuC5XFswuopElYcLHtD5k,47
+pydocket-0.9.2.dist-info/licenses/LICENSE,sha256=YuVWU_ZXO0K_k2FG8xWKe5RGxV24AhJKTvQmKfqXuyk,1087
+pydocket-0.9.2.dist-info/RECORD,,