dbos 1.2.0a5__tar.gz → 1.2.0a6__tar.gz

{dbos-1.2.0a5 → dbos-1.2.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 1.2.0a5
+Version: 1.2.0a6
 Summary: Ultra-lightweight durable execution in Python
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-1.2.0a5 → dbos-1.2.0a6}/dbos/_sys_db.py

@@ -425,6 +425,15 @@ class SystemDatabase:
         wf_status: WorkflowStatuses = status["status"]
         workflow_deadline_epoch_ms: Optional[int] = status["workflow_deadline_epoch_ms"]
 
+        # Values to update when a row already exists for this workflow
+        update_values: dict[str, Any] = {
+            "recovery_attempts": SystemSchema.workflow_status.c.recovery_attempts + 1,
+            "updated_at": func.extract("epoch", func.now()) * 1000,
+        }
+        # Don't update an existing executor ID when enqueueing a workflow.
+        if wf_status != WorkflowStatusString.ENQUEUED.value:
+            update_values["executor_id"] = status["executor_id"]
+
         cmd = (
             pg.insert(SystemSchema.workflow_status)
             .values(
@@ -450,13 +459,7 @@ class SystemDatabase:
             )
             .on_conflict_do_update(
                 index_elements=["workflow_uuid"],
-                set_=dict(
-                    executor_id=status["executor_id"],
-                    recovery_attempts=(
-                        SystemSchema.workflow_status.c.recovery_attempts + 1
-                    ),
-                    updated_at=func.extract("epoch", func.now()) * 1000,
-                ),
+                set_=update_values,
             )
         )
 

{dbos-1.2.0a5 → dbos-1.2.0a6}/pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "1.2.0a5"
+version = "1.2.0a6"
 
 [project.license]
 text = "MIT"

{dbos-1.2.0a5 → dbos-1.2.0a6}/tests/test_queue.py

@@ -1446,3 +1446,33 @@ def test_unsetting_timeout(dbos: DBOS) -> None:
     # Verify child two, which doesn't have a timeout, succeeds
     handle = DBOS.retrieve_workflow(child_two)
     assert handle.get_result() == child_two
+
+
+def test_queue_executor_id(dbos: DBOS) -> None:
+
+    queue = Queue("test-queue")
+
+    @DBOS.workflow()
+    def example_workflow() -> str:
+        return DBOS.workflow_id
+
+    # Set an executor ID
+    original_executor_id = str(uuid.uuid4())
+    GlobalParams.executor_id = original_executor_id
+
+    # Enqueue the workflow, validate its executor ID
+    wfid = str(uuid.uuid4())
+    with SetWorkflowID(wfid):
+        handle = queue.enqueue(example_workflow)
+    assert handle.get_result() == wfid
+    assert handle.get_status().executor_id == original_executor_id
+
+    # Set a new executor ID
+    new_executor_id = str(uuid.uuid4())
+    GlobalParams.executor_id = new_executor_id
+
+    # Re-enqueue the workflow, verify its executor ID does not change.
+    with SetWorkflowID(wfid):
+        handle = queue.enqueue(example_workflow)
+        assert handle.get_result() == wfid
+    assert handle.get_status().executor_id == original_executor_id