dbos 0.26.0a18__py3-none-any.whl → 0.26.0a19__py3-none-any.whl

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/_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/_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/_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.dist-info → dbos-0.26.0a19.dist-info}/METADATA

@@ -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.dist-info → dbos-0.26.0a19.dist-info}/RECORD

@@ -1,19 +1,19 @@
-dbos-0.26.0a18.dist-info/METADATA,sha256=QG3XkqovR0FvEIL1_sHK6K80-comGqhpyC1LCWUDEzA,5554
-dbos-0.26.0a18.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dbos-0.26.0a18.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.26.0a18.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.26.0a19.dist-info/METADATA,sha256=YWeav0kTgNnVV03IK_iG7vuKR04nKeOnIM4M1cmCELw,5554
+dbos-0.26.0a19.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dbos-0.26.0a19.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.26.0a19.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=3NQfGlBiiUSM_v88STdVP3rNZvGkUL_9WbSotKb8Voo,873
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=RrbABfR1D3p9c_QLrCSrgFuYce6FKi0fjMRIYLjO_Y8,9038
-dbos/_app_db.py,sha256=Q9lEyCJFoZMTlnjMO8Pj8bczVmVWyDOP8qPQ6l5PpEU,11241
+dbos/_app_db.py,sha256=obNlgC9IZ20y8tqQeA1q4TjceG3jBFalxz70ieDOWCA,11332
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=QiIR-mwRYb1ffgwGR96ICQgFORki2QpR5najtVJ2WsA,10906
+dbos/_client.py,sha256=PtOZv_4TCd7I0y9kw_0a93Lf_cUkytdDjCdrrHnyTS4,12020
 dbos/_conductor/conductor.py,sha256=HYzVL29IMMrs2Mnms_7cHJynCnmmEN5SDQOMjzn3UoU,16840
 dbos/_conductor/protocol.py,sha256=xN7pmooyF1pqbH1b6WhllU5718P7zSb_b0KCwA6bzcs,6716
 dbos/_context.py,sha256=I8sLkdKTTkZEz7wG-MjynaQB6XEF2bLXuwNksiauP7w,19430
 dbos/_core.py,sha256=uxDIJui4WS_2V1k2np0Ifue_IRzLTyq-c52bgZSQYn4,45118
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
-dbos/_dbos.py,sha256=jtvBQOvwdXFfknx9pDHgKC4DuiH58ICAs_0NoJQMI4w,47526
+dbos/_dbos.py,sha256=Waz_5d9PkDjxD9LUe-nDf4gn5ds2kO0ZyJFQd8Tkz9w,47155
 dbos/_dbos_config.py,sha256=m05IFjM0jSwZBsnFMF_4qP2JkjVFc0gqyM2tnotXq20,20636
 dbos/_debug.py,sha256=MNlQVZ6TscGCRQeEEL0VE8Uignvr6dPeDDDefS3xgIE,1823
 dbos/_docker_pg_helper.py,sha256=NmcgqmR5rQA_4igfeqh8ugNT2z3YmoOvuep_MEtxTiY,5854
@@ -58,11 +58,11 @@ dbos/_templates/dbos-db-starter/migrations/versions/2024_07_31_180642_init.py,sh
 dbos/_templates/dbos-db-starter/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
 dbos/_tracer.py,sha256=dFDSFlta-rfA3-ahIRLYwnnoAOmlavdxAGllqwFgnCA,2440
 dbos/_utils.py,sha256=nFRUHzVjXG5AusF85AlYHikj63Tzi-kQm992ihsrAxA,201
-dbos/_workflow_commands.py,sha256=hHNcW4zopgxVXWfg3flHwqZEFGYpYp8ZAfUXmqiULUk,6261
+dbos/_workflow_commands.py,sha256=BzvWGOQ-4fbHlAoFI5Hdwk1PimUUgBn1kISLnSMt0To,7189
 dbos/cli/_github_init.py,sha256=Y_bDF9gfO2jB1id4FV5h1oIxEJRWyqVjhb7bNEa5nQ0,3224
 dbos/cli/_template_init.py,sha256=-WW3kbq0W_Tq4WbMqb1UGJG3xvJb3woEY5VspG95Srk,2857
 dbos/cli/cli.py,sha256=1qCTs__A9LOEfU44XZ6TufwmRwe68ZEwbWEPli3vnVM,17873
 dbos/dbos-config.schema.json,sha256=i7jcxXqByKq0Jzv3nAUavONtj03vTwj6vWP4ylmBr8o,5694
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.26.0a18.dist-info/RECORD,,
+dbos-0.26.0a19.dist-info/RECORD,,