dbos 0.28.0a12__py3-none-any.whl → 0.28.0a14__py3-none-any.whl

dbos/_conductor/conductor.py

@@ -2,6 +2,7 @@ import socket
 import threading
 import time
 import traceback
+import uuid
 from importlib.metadata import version
 from typing import TYPE_CHECKING, Optional
 
@@ -9,6 +10,7 @@ from websockets import ConnectionClosed, ConnectionClosedOK, InvalidStatus
 from websockets.sync.client import connect
 from websockets.sync.connection import Connection
 
+from dbos._context import SetWorkflowID
 from dbos._utils import GlobalParams
 from dbos._workflow_commands import (
     get_workflow,
@@ -168,10 +170,11 @@ class ConductorWebsocket(threading.Thread):
                             )
                             websocket.send(resume_response.to_json())
                         elif msg_type == p.MessageType.RESTART:
+                            # TODO: deprecate this message type in favor of Fork
                             restart_message = p.RestartRequest.from_json(message)
                             success = True
                             try:
-                                self.dbos.restart_workflow(restart_message.workflow_id)
+                                self.dbos.fork_workflow(restart_message.workflow_id, 1)
                             except Exception as e:
                                 error_message = f"Exception encountered when restarting workflow {restart_message.workflow_id}: {traceback.format_exc()}"
                                 self.dbos.logger.error(error_message)
@@ -183,6 +186,34 @@ class ConductorWebsocket(threading.Thread):
                                 error_message=error_message,
                             )
                             websocket.send(restart_response.to_json())
+                        elif msg_type == p.MessageType.FORK_WORKFLOW:
+                            fork_message = p.ForkWorkflowRequest.from_json(message)
+                            new_workflow_id = fork_message.body["new_workflow_id"]
+                            if new_workflow_id is None:
+                                new_workflow_id = str(uuid.uuid4())
+                            workflow_id = fork_message.body["workflow_id"]
+                            start_step = fork_message.body["start_step"]
+                            app_version = fork_message.body["application_version"]
+                            try:
+                                with SetWorkflowID(new_workflow_id):
+                                    new_handle = self.dbos.fork_workflow(
+                                        workflow_id,
+                                        start_step,
+                                        application_version=app_version,
+                                    )
+                                new_workflow_id = new_handle.workflow_id
+                            except Exception as e:
+                                error_message = f"Exception encountered when forking workflow {workflow_id} to new workflow {new_workflow_id} on step {start_step}, app version {app_version}: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
+                                new_workflow_id = None
+
+                            fork_response = p.ForkWorkflowResponse(
+                                type=p.MessageType.FORK_WORKFLOW,
+                                request_id=base_message.request_id,
+                                new_workflow_id=new_workflow_id,
+                                error_message=error_message,
+                            )
+                            websocket.send(fork_response.to_json())
                         elif msg_type == p.MessageType.LIST_WORKFLOWS:
                             list_workflows_message = p.ListWorkflowsRequest.from_json(
                                 message

dbos/_conductor/protocol.py

@@ -17,6 +17,7 @@ class MessageType(str, Enum):
     GET_WORKFLOW = "get_workflow"
     EXIST_PENDING_WORKFLOWS = "exist_pending_workflows"
     LIST_STEPS = "list_steps"
+    FORK_WORKFLOW = "fork_workflow"
 
 
 T = TypeVar("T", bound="BaseMessage")
@@ -133,7 +134,6 @@ class WorkflowsOutput:
     AuthenticatedRoles: Optional[str]
     Input: Optional[str]
     Output: Optional[str]
-    Request: Optional[str]
     Error: Optional[str]
     CreatedAt: Optional[str]
     UpdatedAt: Optional[str]
@@ -167,7 +167,6 @@ class WorkflowsOutput:
             AuthenticatedRoles=roles_str,
             Input=inputs_str,
             Output=outputs_str,
-            Request=request_str,
             Error=error_str,
             CreatedAt=created_at_str,
             UpdatedAt=updated_at_str,
@@ -263,3 +262,21 @@ class ListStepsRequest(BaseMessage):
 class ListStepsResponse(BaseMessage):
     output: Optional[List[WorkflowSteps]]
     error_message: Optional[str] = None
+
+
+class ForkWorkflowBody(TypedDict):
+    workflow_id: str
+    start_step: int
+    application_version: Optional[str]
+    new_workflow_id: Optional[str]
+
+
+@dataclass
+class ForkWorkflowRequest(BaseMessage):
+    body: ForkWorkflowBody
+
+
+@dataclass
+class ForkWorkflowResponse(BaseMessage):
+    new_workflow_id: Optional[str]
+    error_message: Optional[str] = None

dbos/_dbos_config.py

@@ -436,22 +436,19 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
     # Name
     provided_config["name"] = config_from_file["name"]
 
-    # Database config. Note we disregard a potential database_url in config_from_file because it is not expected from DBOS Cloud
+    # Database config. Expects DBOS_DATABASE_URL to be set
     if "database" not in provided_config:
         provided_config["database"] = {}
-    provided_config["database"]["hostname"] = config_from_file["database"]["hostname"]
-    provided_config["database"]["port"] = config_from_file["database"]["port"]
-    provided_config["database"]["username"] = config_from_file["database"]["username"]
-    provided_config["database"]["password"] = config_from_file["database"]["password"]
-    provided_config["database"]["app_db_name"] = config_from_file["database"][
-        "app_db_name"
-    ]
     provided_config["database"]["sys_db_name"] = config_from_file["database"][
         "sys_db_name"
     ]
-    provided_config["database"]["ssl"] = config_from_file["database"]["ssl"]
-    if "ssl_ca" in config_from_file["database"]:
-        provided_config["database"]["ssl_ca"] = config_from_file["database"]["ssl_ca"]
+
+    db_url = os.environ.get("DBOS_DATABASE_URL")
+    if db_url is None:
+        raise DBOSInitializationError(
+            "DBOS_DATABASE_URL environment variable is not set. This is required to connect to the database."
+        )
+    provided_config["database_url"] = db_url
 
     # Telemetry config
     if "telemetry" not in provided_config or provided_config["telemetry"] is None:

{dbos-0.28.0a12.dist-info → dbos-0.28.0a14.dist-info}/METADATA

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

{dbos-0.28.0a12.dist-info → dbos-0.28.0a14.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dbos-0.28.0a12.dist-info/METADATA,sha256=nxjIfoX9CdMPTCpI-L-iIAHRyTjDDbjJKNbwI6gtiqc,13269
-dbos-0.28.0a12.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dbos-0.28.0a12.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.28.0a12.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.28.0a14.dist-info/METADATA,sha256=MqLv2EJJgoN-0tBxWmqncf_BhF0kxtouqPocYA6OiQA,13269
+dbos-0.28.0a14.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dbos-0.28.0a14.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.28.0a14.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=NssPCubaBxdiKarOWa-wViz1hdJSkmBGcpLX_gQ4NeA,891
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=A_28_nJ1nBBYDmCxtklJR9O2v14JRMtD1rAo_D4y8Kc,9764
 dbos/_app_db.py,sha256=3j8_5-MlSDY0otLRszFE-GfenU6JC20fcfSL-drSNYk,11800
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
 dbos/_client.py,sha256=PPktnvaLfl8Fj27YoOjy_kfgeQm_c3QQZztPyts5GZo,13924
-dbos/_conductor/conductor.py,sha256=qP3fTe74gdaIN9SU9nCn2B5GYMBnhQ6shEhGezEcSPg,19693
-dbos/_conductor/protocol.py,sha256=jwX8ZjmAIlXu1vw9R3b5PfHSNdwofeYOKj8rkfAFVg0,6630
+dbos/_conductor/conductor.py,sha256=o0IaZjwnZ2TOyHeP2H4iSX6UnXLXQ4uODvWAKD9hHMs,21703
+dbos/_conductor/protocol.py,sha256=wgOFZxmS81bv0WCB9dAyg0s6QzldpzVKQDoSPeaX0Ws,6967
 dbos/_context.py,sha256=Ly1CXF1nWxICQgIpDZSaONGlz1yERBs63gqmR-yqCzM,24476
 dbos/_core.py,sha256=UDpSgRA9m_YuViNXR9tVgNFLC-zxKZPxjlkj2a-Kj00,48317
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
 dbos/_dbos.py,sha256=tPpf_X9oLtpPICryXDMc589XuFeJtZ4cIq7vmsNDcls,46220
-dbos/_dbos_config.py,sha256=pgzE5UP3LV_nhwIV4d1-W9q2LumQb1kla75xdx9mBcI,20136
+dbos/_dbos_config.py,sha256=NlVAtoZG5I1e2auez3cGTatC_0HcZSzdZRJAJzUadSc,19683
 dbos/_debug.py,sha256=MNlQVZ6TscGCRQeEEL0VE8Uignvr6dPeDDDefS3xgIE,1823
 dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
 dbos/_error.py,sha256=EN4eVBjMT3k7O7hfqJl6mIf4sxWPsiAOM086yhcGH_g,8012
@@ -67,4 +67,4 @@ dbos/cli/cli.py,sha256=SFmaHlCHtOojETd-P8BpbENQvwQoyq2l2yXZhSVo-50,18892
 dbos/dbos-config.schema.json,sha256=8KcwJb_sQc4-6tQG2TLmjE_nratfrQa0qVLl9XPsvWE,6367
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.28.0a12.dist-info/RECORD,,
+dbos-0.28.0a14.dist-info/RECORD,,