pydocket 0.9.1__tar.gz → 0.9.2__tar.gz

{pydocket-0.9.1 → pydocket-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydocket
-Version: 0.9.1
+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.1 → pydocket-0.9.2}/src/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()
 

{pydocket-0.9.1 → pydocket-0.9.2}/src/docket/worker.py

@@ -495,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.1 → pydocket-0.9.2}/tests/test_worker.py

@@ -1731,3 +1731,28 @@ async def test_redis_key_cleanup_cancelled_task(docket: Docket, worker: Worker)
 
         # Verify cleanup after cancellation
         await checker.verify_keys_returned_to_baseline("task cancellation")
+
+
+async def test_replace_task_with_legacy_known_key(
+    docket: Docket, worker: Worker, the_task: AsyncMock, now: Callable[[], datetime]
+):
+    """Test that replace() works with legacy string known_keys.
+
+    This reproduces the exact production scenario where replace() would get
+    WRONGTYPE errors when trying to HGET on legacy string known_keys.
+    The main goal is to verify no WRONGTYPE error occurs.
+    """
+    key = f"legacy-replace-task:{uuid4()}"
+
+    # Simulate legacy state: create known_key as string (old format)
+    async with docket.redis() as redis:
+        known_task_key = docket.known_task_key(key)
+        when = now()
+
+        # Create legacy known_key as STRING (what old code did)
+        await redis.set(known_task_key, str(when.timestamp()))
+
+    # Now try to replace - this should work without WRONGTYPE error
+    # The key point is that this call succeeds without throwing WRONGTYPE
+    replacement_time = now() + timedelta(seconds=1)
+    await docket.replace("trace", replacement_time, key=key)("replacement message")