dbos 0.23.0a2__tar.gz → 0.23.0a3__tar.gz

{dbos-0.23.0a2 → dbos-0.23.0a3}/PKG-INFO

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

{dbos-0.23.0a2 → dbos-0.23.0a3}/dbos/_recovery.py

@@ -43,6 +43,7 @@ def startup_recovery_thread(
 def recover_pending_workflows(
     dbos: "DBOS", executor_ids: List[str] = ["local"]
 ) -> List["WorkflowHandle[Any]"]:
+    """Attempt to recover pending workflows for a list of specific executors and return workflow handles for them."""
     workflow_handles: List["WorkflowHandle[Any]"] = []
     for executor_id in executor_ids:
         dbos.logger.debug(f"Recovering pending workflows for executor: {executor_id}")

{dbos-0.23.0a2 → dbos-0.23.0a3}/dbos/_sys_db.py

@@ -305,6 +305,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
                     ),

{dbos-0.23.0a2 → dbos-0.23.0a3}/pyproject.toml

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

{dbos-0.23.0a2 → dbos-0.23.0a3}/tests/test_admin_server.py

@@ -3,9 +3,12 @@ import time
 import uuid
 
 import requests
+import sqlalchemy as sa
 
 # Public API
 from dbos import DBOS, ConfigFile, Queue, SetWorkflowID, _workflow_commands
+from dbos._schemas.system_database import SystemSchema
+from dbos._sys_db import WorkflowStatusString
 from dbos._utils import GlobalParams
 
 
@@ -91,34 +94,25 @@ def test_admin_recovery(config: ConfigFile) -> None:
         assert test_workflow("bob", "bob") == "bob1bob"
 
     dbos._sys_db.wait_for_buffer_flush()
-    # Change the workflow status to pending
-    dbos._sys_db.update_workflow_status(
-        {
-            "workflow_uuid": wfuuid,
-            "status": "PENDING",
-            "name": test_workflow.__qualname__,
-            "class_name": None,
-            "config_name": None,
-            "output": None,
-            "error": None,
-            "executor_id": None,
-            "app_id": None,
-            "app_version": None,
-            "request": None,
-            "recovery_attempts": None,
-            "authenticated_user": None,
-            "authenticated_roles": None,
-            "assumed_role": None,
-            "queue_name": None,
-        }
-    )
+
+    # Manually update the database to pretend the workflow comes from another executor and is pending
+    with dbos._sys_db.engine.begin() as c:
+        query = (
+            sa.update(SystemSchema.workflow_status)
+            .values(
+                status=WorkflowStatusString.PENDING.value, executor_id="other-executor"
+            )
+            .where(SystemSchema.workflow_status.c.workflow_uuid == wfuuid)
+        )
+        c.execute(query)
+
     status = dbos.get_workflow_status(wfuuid)
     assert (
         status is not None and status.status == "PENDING"
     ), "Workflow status not updated"
 
     # Test POST /dbos-workflow-recovery
-    data = ["testexecutor"]
+    data = ["other-executor"]
     response = requests.post(
         "http://localhost:3001/dbos-workflow-recovery", json=data, timeout=5
     )
@@ -131,6 +125,8 @@ def test_admin_recovery(config: ConfigFile) -> None:
     for attempt in range(max_retries):
         status = dbos.get_workflow_status(wfuuid)
         if status is not None and status.status == "SUCCESS":
+            assert status.status == "SUCCESS"
+            assert status.executor_id == "testexecutor"
             succeeded = True
             break
         else:
@@ -208,6 +204,17 @@ def test_admin_workflow_resume(dbos: DBOS, config: ConfigFile) -> None:
     assert info is not None
     assert info.status == "CANCELLED", f"Expected status to be CANCELLED"
 
+    # Manually update the database to pretend the workflow comes from another executor and is pending
+    with dbos._sys_db.engine.begin() as c:
+        query = (
+            sa.update(SystemSchema.workflow_status)
+            .values(
+                status=WorkflowStatusString.PENDING.value, executor_id="other-executor"
+            )
+            .where(SystemSchema.workflow_status.c.workflow_uuid == wfUuid)
+        )
+        c.execute(query)
+
     # Resume the workflow. Verify that it succeeds again.
     response = requests.post(
         f"http://localhost:3001/workflows/{wfUuid}/resume", json=[], timeout=5
@@ -218,6 +225,7 @@ def test_admin_workflow_resume(dbos: DBOS, config: ConfigFile) -> None:
     info = _workflow_commands.get_workflow(config, wfUuid, True)
     assert info is not None
     assert info.status == "SUCCESS", f"Expected status to be SUCCESS"
+    assert info.executor_id == GlobalParams.executor_id
 
     # Resume the workflow. Verify it does not run and status remains SUCCESS
     response = requests.post(