dbos 0.26.0a18__tar.gz → 0.26.0a19__tar.gz

{dbos-0.26.0a18 → dbos-0.26.0a19}/PKG-INFO

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

{dbos-0.26.0a18 → dbos-0.26.0a19}/dbos/_app_db.py

@@ -74,9 +74,12 @@ class ApplicationDatabase:
                 database["connectionTimeoutMillis"] / 1000
             )
 
+        pool_size = database.get("app_db_pool_size")
+        if pool_size is None:
+            pool_size = 20
         self.engine = sa.create_engine(
             app_db_url,
-            pool_size=database["app_db_pool_size"],
+            pool_size=pool_size,
             max_overflow=0,
             pool_timeout=30,
             connect_args=connect_args,

{dbos-0.26.0a18 → dbos-0.26.0a19}/dbos/_client.py

@@ -3,6 +3,8 @@ import sys
 import uuid
 from typing import Any, Generic, List, Optional, TypedDict, TypeVar
 
+from dbos._app_db import ApplicationDatabase
+
 if sys.version_info < (3, 11):
     from typing_extensions import NotRequired
 else:
@@ -14,11 +16,18 @@ from dbos._dbos_config import parse_database_url_to_dbconfig
 from dbos._error import DBOSNonExistentWorkflowError
 from dbos._registrations import DEFAULT_MAX_RECOVERY_ATTEMPTS
 from dbos._serialization import WorkflowInputs
-from dbos._sys_db import SystemDatabase, WorkflowStatusInternal, WorkflowStatusString
+from dbos._sys_db import (
+    StepInfo,
+    SystemDatabase,
+    WorkflowStatusInternal,
+    WorkflowStatusString,
+)
 from dbos._workflow_commands import (
     WorkflowStatus,
+    fork_workflow,
     get_workflow,
     list_queued_workflows,
+    list_workflow_steps,
     list_workflows,
 )
 
@@ -82,6 +91,7 @@ class DBOSClient:
         if system_database is not None:
             db_config["sys_db_name"] = system_database
         self._sys_db = SystemDatabase(db_config)
+        self._app_db = ApplicationDatabase(db_config)
 
     def destroy(self) -> None:
         self._sys_db.destroy()
@@ -321,3 +331,23 @@ class DBOSClient:
             offset=offset,
             sort_desc=sort_desc,
         )
+
+    def list_workflow_steps(self, workflow_id: str) -> List[StepInfo]:
+        return list_workflow_steps(self._sys_db, self._app_db, workflow_id)
+
+    async def list_workflow_steps_async(self, workflow_id: str) -> List[StepInfo]:
+        return await asyncio.to_thread(self.list_workflow_steps, workflow_id)
+
+    def fork_workflow(self, workflow_id: str, start_step: int) -> WorkflowHandle[R]:
+        forked_workflow_id = fork_workflow(
+            self._sys_db, self._app_db, workflow_id, start_step
+        )
+        return WorkflowHandleClientPolling[R](forked_workflow_id, self._sys_db)
+
+    async def fork_workflow_async(
+        self, workflow_id: str, start_step: int
+    ) -> WorkflowHandleAsync[R]:
+        forked_workflow_id = await asyncio.to_thread(
+            fork_workflow, self._sys_db, self._app_db, workflow_id, start_step
+        )
+        return WorkflowHandleClientAsyncPolling[R](forked_workflow_id, self._sys_db)

{dbos-0.26.0a18 → dbos-0.26.0a19}/dbos/_dbos.py

@@ -34,6 +34,7 @@ from dbos._conductor.conductor import ConductorWebsocket
 from dbos._utils import INTERNAL_QUEUE_NAME, GlobalParams
 from dbos._workflow_commands import (
     WorkflowStatus,
+    fork_workflow,
     list_queued_workflows,
     list_workflows,
 )
@@ -67,7 +68,7 @@ from ._registrations import (
 )
 from ._roles import default_required_roles, required_roles
 from ._scheduler import ScheduledWorkflow, scheduled
-from ._sys_db import reset_system_database
+from ._sys_db import StepInfo, reset_system_database
 from ._tracer import dbos_tracer
 
 if TYPE_CHECKING:
@@ -113,7 +114,7 @@ from ._error import (
 from ._event_loop import BackgroundEventLoop
 from ._logger import add_otlp_to_all_loggers, config_logger, dbos_logger, init_logger
 from ._sys_db import SystemDatabase
-from ._workflow_commands import WorkflowStatus, get_workflow
+from ._workflow_commands import WorkflowStatus, get_workflow, list_workflow_steps
 
 # Most DBOS functions are just any callable F, so decorators / wrappers work on F
 # There are cases where the parameters P and return value R should be separate
@@ -959,40 +960,19 @@ class DBOS:
     @classmethod
     def restart_workflow(cls, workflow_id: str) -> WorkflowHandle[Any]:
         """Restart a workflow with a new workflow ID"""
-
         return cls.fork_workflow(workflow_id, 1)
 
     @classmethod
-    def fork_workflow(
-        cls, workflow_id: str, start_step: int = 1
-    ) -> WorkflowHandle[Any]:
-        """Restart a workflow with a new workflow ID"""
-
-        def get_max_function_id(workflow_uuid: str) -> int:
-            max_transactions = (
-                _get_dbos_instance()._app_db.get_max_function_id(workflow_uuid) or 0
-            )
-            max_operations = (
-                _get_dbos_instance()._sys_db.get_max_function_id(workflow_uuid) or 0
-            )
-            return max(max_transactions, max_operations)
-
-        max_function_id = get_max_function_id(workflow_id)
-        if max_function_id > 0 and start_step > max_function_id:
-            raise DBOSException(
-                f"Cannot fork workflow {workflow_id} at step {start_step}. The workflow has  {max_function_id} steps."
-            )
+    def fork_workflow(cls, workflow_id: str, start_step: int) -> WorkflowHandle[Any]:
+        """Restart a workflow with a new workflow ID from a specific step"""
 
         def fn() -> str:
-            forked_workflow_id = str(uuid.uuid4())
             dbos_logger.info(f"Forking workflow: {workflow_id} from step {start_step}")
-
-            _get_dbos_instance()._app_db.clone_workflow_transactions(
-                workflow_id, forked_workflow_id, start_step
-            )
-
-            return _get_dbos_instance()._sys_db.fork_workflow(
-                workflow_id, forked_workflow_id, start_step
+            return fork_workflow(
+                _get_dbos_instance()._sys_db,
+                _get_dbos_instance()._app_db,
+                workflow_id,
+                start_step,
             )
 
         new_id = _get_dbos_instance()._sys_db.call_function_as_step(
@@ -1066,6 +1046,17 @@ class DBOS:
             fn, "DBOS.listQueuedWorkflows"
         )
 
+    @classmethod
+    def list_workflow_steps(cls, workflow_id: str) -> List[StepInfo]:
+        def fn() -> List[StepInfo]:
+            return list_workflow_steps(
+                _get_dbos_instance()._sys_db, _get_dbos_instance()._app_db, workflow_id
+            )
+
+        return _get_dbos_instance()._sys_db.call_function_as_step(
+            fn, "DBOS.listWorkflowSteps"
+        )
+
     @classproperty
     def logger(cls) -> Logger:
         """Return the DBOS `Logger` for the current context."""

{dbos-0.26.0a18 → dbos-0.26.0a19}/dbos/_workflow_commands.py

@@ -2,6 +2,8 @@ import json
 import uuid
 from typing import Any, List, Optional
 
+from dbos._error import DBOSException
+
 from . import _serialization
 from ._app_db import ApplicationDatabase
 from ._sys_db import (
@@ -185,3 +187,25 @@ def list_workflow_steps(
     merged_steps = steps + transactions
     merged_steps.sort(key=lambda step: step["function_id"])
     return merged_steps
+
+
+def fork_workflow(
+    sys_db: SystemDatabase,
+    app_db: ApplicationDatabase,
+    workflow_id: str,
+    start_step: int,
+) -> str:
+    def get_max_function_id(workflow_uuid: str) -> int:
+        max_transactions = app_db.get_max_function_id(workflow_uuid) or 0
+        max_operations = sys_db.get_max_function_id(workflow_uuid) or 0
+        return max(max_transactions, max_operations)
+
+    max_function_id = get_max_function_id(workflow_id)
+    if max_function_id > 0 and start_step > max_function_id:
+        raise DBOSException(
+            f"Cannot fork workflow {workflow_id} from step {start_step}. The workflow has {max_function_id} steps."
+        )
+    forked_workflow_id = str(uuid.uuid4())
+    app_db.clone_workflow_transactions(workflow_id, forked_workflow_id, start_step)
+    sys_db.fork_workflow(workflow_id, forked_workflow_id, start_step)
+    return forked_workflow_id

{dbos-0.26.0a18 → dbos-0.26.0a19}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.26.0a18"
+version = "0.26.0a19"
 
 [project.license]
 text = "MIT"

{dbos-0.26.0a18 → dbos-0.26.0a19}/tests/client_collateral.py

@@ -36,3 +36,18 @@ def event_test(key: str, value: str, update: Optional[int] = None) -> str:
         DBOS.sleep(update)
         DBOS.set_event(key, f"updated-{value}")
     return f"{key}-{value}"
+
+
+@DBOS.transaction()
+def test_txn(x: int) -> int:
+    return x
+
+
+@DBOS.step()
+def test_step(x: int) -> int:
+    return x
+
+
+@DBOS.workflow()
+def fork_test(x: int) -> int:
+    return test_txn(x) + test_step(x)

{dbos-0.26.0a18 → dbos-0.26.0a19}/tests/test_client.py

@@ -8,10 +8,11 @@ import time
 import uuid
 from typing import Any, Optional, TypedDict, cast
 
+import pytest
 import sqlalchemy as sa
 
 from dbos import DBOS, ConfigFile, DBOSClient, EnqueueOptions, Queue, SetWorkflowID
-from dbos._dbos import WorkflowHandle
+from dbos._dbos import WorkflowHandle, WorkflowHandleAsync
 from dbos._schemas.system_database import SystemSchema
 from dbos._sys_db import SystemDatabase
 from dbos._utils import GlobalParams
@@ -397,3 +398,54 @@ def test_client_retrieve_wf_done(client: DBOSClient, dbos: DBOS) -> None:
     assert handle1.get_workflow_id() == handle2.get_workflow_id()
     result2 = handle2.get_result()
     assert result2 == message
+
+
+def test_client_fork(dbos: DBOS, client: DBOSClient) -> None:
+    run_client_collateral()
+
+    options: EnqueueOptions = {
+        "queue_name": "test_queue",
+        "workflow_name": "fork_test",
+    }
+
+    input = 5
+    handle: WorkflowHandle[int] = client.enqueue(options, input)
+    assert handle.get_result() == input * 2
+    assert len(client.list_workflow_steps(handle.workflow_id)) == 2
+
+    forked_handle: WorkflowHandle[int] = client.fork_workflow(handle.workflow_id, 1)
+    assert forked_handle.workflow_id != handle.workflow_id
+    assert forked_handle.get_result() == input * 2
+
+    forked_handle = client.fork_workflow(handle.workflow_id, 2)
+    assert forked_handle.workflow_id != handle.workflow_id
+    assert forked_handle.get_result() == input * 2
+
+    assert len(client.list_workflows()) == 3
+
+
+@pytest.mark.asyncio
+async def test_client_fork_async(dbos: DBOS, client: DBOSClient) -> None:
+    run_client_collateral()
+
+    options: EnqueueOptions = {
+        "queue_name": "test_queue",
+        "workflow_name": "fork_test",
+    }
+
+    input = 5
+    handle: WorkflowHandleAsync[int] = await client.enqueue_async(options, input)
+    assert await handle.get_result() == input * 2
+    assert len(await client.list_workflow_steps_async(handle.workflow_id)) == 2
+
+    forked_handle: WorkflowHandleAsync[int] = await client.fork_workflow_async(
+        handle.workflow_id, 1
+    )
+    assert forked_handle.workflow_id != handle.workflow_id
+    assert await forked_handle.get_result() == input * 2
+
+    forked_handle = await client.fork_workflow_async(handle.workflow_id, 2)
+    assert forked_handle.workflow_id != handle.workflow_id
+    assert await forked_handle.get_result() == input * 2
+
+    assert len(await client.list_workflows_async()) == 3

{dbos-0.26.0a18 → dbos-0.26.0a19}/tests/test_workflow_introspection.py

@@ -188,9 +188,7 @@ def test_get_workflow(dbos: DBOS, config: ConfigFile, sys_db: SystemDatabase) ->
         assert info.workflow_id == wfUuid, f"Expected workflow_uuid to be {wfUuid}"
 
 
-def test_queued_workflows(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_queued_workflows(dbos: DBOS) -> None:
     queued_steps = 5
     step_events = [threading.Event() for _ in range(queued_steps)]
     event = threading.Event()
@@ -295,7 +293,7 @@ def test_queued_workflows(
     assert len(workflows) == 0
 
     # Test the steps are listed properly
-    steps = _workflow_commands.list_workflow_steps(sys_db, app_db, handle.workflow_id)
+    steps = DBOS.list_workflow_steps(handle.workflow_id)
     assert len(steps) == queued_steps * 2
     for i in range(queued_steps):
         # Check the enqueues
@@ -314,7 +312,7 @@ def test_queued_workflows(
     child_workflows = DBOS.list_workflows(name=f"<temp>.{blocking_step.__qualname__}")
     assert (len(child_workflows)) == queued_steps
     for i, c in enumerate(child_workflows):
-        steps = _workflow_commands.list_workflow_steps(sys_db, app_db, c.workflow_id)
+        steps = DBOS.list_workflow_steps(c.workflow_id)
         assert len(steps) == 1
         assert steps[0]["function_id"] == 1
         assert steps[0]["function_name"] == blocking_step.__qualname__
@@ -323,9 +321,7 @@ def test_queued_workflows(
         assert steps[0]["error"] is None
 
 
-def test_list_2steps_sleep(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_list_2steps_sleep(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def simple_workflow() -> None:
@@ -346,16 +342,14 @@ def test_list_2steps_sleep(
     with SetWorkflowID(wfid):
         simple_workflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 3
     assert wfsteps[0]["function_name"] == stepOne.__qualname__
     assert wfsteps[1]["function_name"] == stepTwo.__qualname__
     assert wfsteps[2]["function_name"] == "DBOS.sleep"
 
 
-def test_send_recv(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_send_recv(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def send_workflow(target: str) -> None:
@@ -374,19 +368,17 @@ def test_send_recv(
     with SetWorkflowID(wfid_s):
         send_workflow(wfid_r)
 
-    wfsteps_send = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid_s)
+    wfsteps_send = DBOS.list_workflow_steps(wfid_s)
     assert len(wfsteps_send) == 1
     assert wfsteps_send[0]["function_name"] == "DBOS.send"
 
-    wfsteps_recv = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid_r)
+    wfsteps_recv = DBOS.list_workflow_steps(wfid_r)
     assert len(wfsteps_recv) == 2
     assert wfsteps_recv[1]["function_name"] == "DBOS.sleep"
     assert wfsteps_recv[0]["function_name"] == "DBOS.recv"
 
 
-def test_set_get_event(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_set_get_event(dbos: DBOS) -> None:
     value = "Hello, World!"
 
     @DBOS.workflow()
@@ -404,7 +396,7 @@ def test_set_get_event(
     with SetWorkflowID(wfid):
         assert set_get_workflow() == value
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 5
     assert wfsteps[0]["function_name"] == "DBOS.setEvent"
     assert wfsteps[1]["function_name"] == stepOne.__qualname__
@@ -419,9 +411,7 @@ def test_set_get_event(
     assert wfsteps[4]["error"] == None
 
 
-def test_callchild_first_sync(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_callchild_first_sync(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def parentWorkflow() -> str:
@@ -446,7 +436,7 @@ def test_callchild_first_sync(
     with SetWorkflowID(wfid):
         child_id = parentWorkflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == child_workflow.__qualname__
     assert wfsteps[0]["child_workflow_id"] == child_id
@@ -461,9 +451,7 @@ def test_callchild_first_sync(
 
 
 @pytest.mark.asyncio
-async def test_callchild_direct_asyncio(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+async def test_callchild_direct_asyncio(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     async def parentWorkflow() -> str:
@@ -488,7 +476,7 @@ async def test_callchild_direct_asyncio(
     with SetWorkflowID(wfid):
         child_id = await parentWorkflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == child_workflow.__qualname__
     assert wfsteps[0]["child_workflow_id"] == child_id
@@ -502,9 +490,7 @@ async def test_callchild_direct_asyncio(
     assert wfsteps[3]["function_name"] == stepTwo.__qualname__
 
 
-def test_callchild_last_sync(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_callchild_last_sync(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def parentWorkflow() -> None:
@@ -529,7 +515,7 @@ def test_callchild_last_sync(
     with SetWorkflowID(wfid):
         parentWorkflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == stepOne.__qualname__
     assert wfsteps[1]["function_name"] == stepTwo.__qualname__
@@ -537,9 +523,7 @@ def test_callchild_last_sync(
     assert wfsteps[3]["function_name"] == "DBOS.getResult"
 
 
-def test_callchild_first_async_thread(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_callchild_first_async_thread(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def parentWorkflow() -> None:
@@ -565,7 +549,7 @@ def test_callchild_first_async_thread(
     with SetWorkflowID(wfid):
         parentWorkflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == child_workflow.__qualname__
     assert wfsteps[1]["function_name"] == "DBOS.getStatus"
@@ -573,9 +557,7 @@ def test_callchild_first_async_thread(
     assert wfsteps[3]["function_name"] == stepTwo.__qualname__
 
 
-def test_list_steps_errors(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_list_steps_errors(dbos: DBOS) -> None:
     queue = Queue("test-queue")
 
     @DBOS.step()
@@ -601,7 +583,7 @@ def test_list_steps_errors(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             call_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 1
     assert wfsteps[0]["function_name"] == failing_step.__qualname__
     assert wfsteps[0]["child_workflow_id"] == None
@@ -613,7 +595,7 @@ def test_list_steps_errors(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             start_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 2
     assert wfsteps[0]["function_name"] == f"<temp>.{failing_step.__qualname__}"
     assert wfsteps[0]["child_workflow_id"] == f"{wfid}-1"
@@ -629,7 +611,7 @@ def test_list_steps_errors(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             enqueue_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 2
     assert wfsteps[0]["function_name"] == f"<temp>.{failing_step.__qualname__}"
     assert wfsteps[0]["child_workflow_id"] == f"{wfid}-1"
@@ -642,9 +624,7 @@ def test_list_steps_errors(
 
 
 @pytest.mark.asyncio
-async def test_list_steps_errors_async(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+async def test_list_steps_errors_async(dbos: DBOS) -> None:
     queue = Queue("test-queue")
 
     @DBOS.step()
@@ -670,7 +650,7 @@ async def test_list_steps_errors_async(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             await call_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 1
     assert wfsteps[0]["function_name"] == failing_step.__qualname__
     assert wfsteps[0]["child_workflow_id"] == None
@@ -682,7 +662,7 @@ async def test_list_steps_errors_async(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             await start_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 2
     assert wfsteps[0]["function_name"] == f"<temp>.{failing_step.__qualname__}"
     assert wfsteps[0]["child_workflow_id"] == f"{wfid}-1"
@@ -698,7 +678,7 @@ async def test_list_steps_errors_async(
     with SetWorkflowID(wfid):
         with pytest.raises(Exception):
             await enqueue_step()
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 2
     assert wfsteps[0]["function_name"] == f"<temp>.{failing_step.__qualname__}"
     assert wfsteps[0]["child_workflow_id"] == f"{wfid}-1"
@@ -710,9 +690,7 @@ async def test_list_steps_errors_async(
     assert isinstance(wfsteps[1]["error"], Exception)
 
 
-def test_callchild_middle_async_thread(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_callchild_middle_async_thread(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def parentWorkflow() -> str:
@@ -739,7 +717,7 @@ def test_callchild_middle_async_thread(
     with SetWorkflowID(wfid):
         child_id = parentWorkflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 5
     assert wfsteps[0]["function_name"] == stepOne.__qualname__
     assert wfsteps[0]["child_workflow_id"] == None
@@ -761,9 +739,7 @@ def test_callchild_middle_async_thread(
 
 
 @pytest.mark.asyncio
-async def test_callchild_first_asyncio(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+async def test_callchild_first_asyncio(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     async def parentWorkflow() -> str:
@@ -790,7 +766,7 @@ async def test_callchild_first_asyncio(
         handle = await dbos.start_workflow_async(parentWorkflow)
         child_id = await handle.get_result()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == child_workflow.__qualname__
     assert wfsteps[0]["child_workflow_id"] == child_id
@@ -883,9 +859,7 @@ async def test_callchild_rerun_asyncio(dbos: DBOS) -> None:
     assert res1 == res2
 
 
-def test_list_transaction(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_list_transaction(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def simple_workflow() -> None:
@@ -906,7 +880,7 @@ def test_list_transaction(
     with SetWorkflowID(wfid):
         simple_workflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 3
     assert wfsteps[0]["function_name"] == transactionOne.__qualname__
     assert wfsteps[0]["output"] == "a test transaction"
@@ -915,9 +889,7 @@ def test_list_transaction(
     assert wfsteps[2]["function_name"] == "DBOS.sleep"
 
 
-def test_list_transaction_error(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_list_transaction_error(dbos: DBOS) -> None:
 
     @DBOS.workflow()
     def simple_workflow() -> None:
@@ -946,7 +918,7 @@ def test_list_transaction_error(
     with SetWorkflowID(wfid):
         simple_workflow()
 
-    wfsteps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    wfsteps = DBOS.list_workflow_steps(wfid)
     assert len(wfsteps) == 4
     assert wfsteps[0]["function_name"] == transactionOne.__qualname__
     assert wfsteps[0]["output"] == "a test transaction"
@@ -992,9 +964,7 @@ def test_list_workflows_as_step(dbos: DBOS) -> None:
     assert handle_two.get_result() == 1
 
 
-def test_call_as_step_within_step(
-    dbos: DBOS, sys_db: SystemDatabase, app_db: ApplicationDatabase
-) -> None:
+def test_call_as_step_within_step(dbos: DBOS) -> None:
     # If we call any util functions within a step, it should be called directly without checkpointing
 
     @DBOS.step()
@@ -1016,7 +986,7 @@ def test_call_as_step_within_step(
         status = getStatusWorkflow()
         assert status == WorkflowStatusString.PENDING.value
 
-    steps = _workflow_commands.list_workflow_steps(sys_db, app_db, wfid)
+    steps = DBOS.list_workflow_steps(wfid)
 
     assert len(steps) == 1
     assert steps[0]["function_name"] == getStatus.__qualname__