dbos 0.28.0a12__tar.gz → 0.28.0a14__tar.gz

{dbos-0.28.0a12 → dbos-0.28.0a14}/PKG-INFO

@@ -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 → dbos-0.28.0a14}/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-0.28.0a12 → dbos-0.28.0a14}/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-0.28.0a12 → dbos-0.28.0a14}/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 → dbos-0.28.0a14}/pyproject.toml

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

{dbos-0.28.0a12 → dbos-0.28.0a14}/tests/test_config.py

@@ -865,18 +865,14 @@ def test_overwrite_config(mocker):
             "FOO": "BAR",
         },
     }
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
 
     assert config["name"] == "stock-prices"
-    assert config["database"]["hostname"] == "hostname"
-    assert config["database"]["port"] == 1234
-    assert config["database"]["username"] == "dbosadmin"
-    assert config["database"]["password"] == "pwd"
-    assert config["database"]["app_db_name"] == "appdbname"
+    assert config["database_url"] == exported_db_url
     assert config["database"]["sys_db_name"] == "sysdbname"
-    assert config["database"]["ssl"] == True
-    assert config["database"]["ssl_ca"] == "cert.pem"
-    assert config["database"]["connectionTimeoutMillis"] == 10000
     assert config["database"]["app_db_pool_size"] == 10
     assert "sys_db_pool_size" not in config["database"]
     assert config["telemetry"]["logs"]["logLevel"] == "DEBUG"
@@ -892,6 +888,8 @@ def test_overwrite_config(mocker):
     assert "run_admin_server" not in config["runtimeConfig"]
     assert "env" not in config
 
+    del os.environ["DBOS_DATABASE_URL"]
+
 
 def test_overwrite_config_minimal(mocker):
     mock_config = """
@@ -924,17 +922,15 @@ def test_overwrite_config_minimal(mocker):
     provided_config: ConfigFile = {
         "name": "test-app",
     }
+
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
 
     assert config["name"] == "stock-prices"
-    assert config["database"]["hostname"] == "hostname"
-    assert config["database"]["port"] == 1234
-    assert config["database"]["username"] == "dbosadmin"
-    assert config["database"]["password"] == "pwd"
-    assert config["database"]["app_db_name"] == "appdbname"
+    assert config["database_url"] == exported_db_url
     assert config["database"]["sys_db_name"] == "sysdbname"
-    assert config["database"]["ssl"] == True
-    assert "ssl_ca" not in config["database"]
     assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == [
         "thetracesendpoint"
     ]
@@ -942,6 +938,8 @@ def test_overwrite_config_minimal(mocker):
     assert "runtimeConfig" not in config
     assert "env" not in config
 
+    del os.environ["DBOS_DATABASE_URL"]
+
 
 def test_overwrite_config_has_telemetry(mocker):
     mock_config = """
@@ -983,17 +981,15 @@ def test_overwrite_config_has_telemetry(mocker):
         },
         "telemetry": {"logs": {"logLevel": "DEBUG"}},
     }
+
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
 
     assert config["name"] == "stock-prices"
-    assert config["database"]["hostname"] == "hostname"
-    assert config["database"]["port"] == 1234
-    assert config["database"]["username"] == "dbosadmin"
-    assert config["database"]["password"] == "pwd"
-    assert config["database"]["app_db_name"] == "appdbname"
+    assert config["database_url"] == exported_db_url
     assert config["database"]["sys_db_name"] == "sysdbname"
-    assert config["database"]["ssl"] == True
-    assert config["database"]["ssl_ca"] == "cert.pem"
     assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == [
         "thetracesendpoint"
     ]
@@ -1002,6 +998,8 @@ def test_overwrite_config_has_telemetry(mocker):
     assert "runtimeConfig" not in config
     assert "env" not in config
 
+    del os.environ["DBOS_DATABASE_URL"]
+
 
 # Not expected in practice, but exercise the code path
 def test_overwrite_config_no_telemetry_in_file(mocker):
@@ -1034,14 +1032,20 @@ def test_overwrite_config_no_telemetry_in_file(mocker):
         "telemetry": {"logs": {"logLevel": "DEBUG"}},
     }
 
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
     # Test that telemetry from provided_config is preserved
+    assert config["database_url"] == exported_db_url
     assert config["telemetry"]["logs"]["logLevel"] == "DEBUG"
     assert config["telemetry"]["OTLPExporter"] == {
         "tracesEndpoint": [],
         "logsEndpoint": [],
     }
 
+    del os.environ["DBOS_DATABASE_URL"]
+
 
 # Not expected in practice, but exercise the code path
 def test_overwrite_config_no_otlp_in_file(mocker):
@@ -1082,12 +1086,18 @@ def test_overwrite_config_no_otlp_in_file(mocker):
         },
     }
 
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
+    assert config["database_url"] == exported_db_url
     # Test that OTLPExporter from provided_config is preserved
     assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == ["original-trace"]
     assert config["telemetry"]["OTLPExporter"]["logsEndpoint"] == ["original-log"]
     assert "logs" not in config["telemetry"]
 
+    del os.environ["DBOS_DATABASE_URL"]
+
 
 # Not expected in practice, but exercise the code path
 def test_overwrite_config_with_provided_database_url(mocker):
@@ -1123,17 +1133,15 @@ def test_overwrite_config_with_provided_database_url(mocker):
         "name": "test-app",
         "database_url": "ignored",
     }
+
+    exported_db_url = "postgres://dbosadmin:pwd@hostname:1234/appdbname?connect_timeout=10000&sslmode=require&sslrootcert=cert.pem"
+    os.environ["DBOS_DATABASE_URL"] = exported_db_url
+
     config = overwrite_config(provided_config)
 
     assert config["name"] == "stock-prices"
-    assert config["database"]["hostname"] == "hostname"
-    assert config["database"]["port"] == 1234
-    assert config["database"]["username"] == "dbosadmin"
-    assert config["database"]["password"] == "pwd"
-    assert config["database"]["app_db_name"] == "appdbname"
+    assert config["database_url"] == exported_db_url
     assert config["database"]["sys_db_name"] == "sysdbname"
-    assert config["database"]["ssl"] == True
-    assert config["database"]["ssl_ca"] == "cert.pem"
     assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == [
         "thetracesendpoint"
     ]
@@ -1141,6 +1149,30 @@ def test_overwrite_config_with_provided_database_url(mocker):
     assert "runtimeConfig" not in config
     assert "env" not in config
 
+    del os.environ["DBOS_DATABASE_URL"]
+
+
+def test_overwrite_config_missing_dbos_database_url(mocker):
+    mock_config = """
+    name: "stock-prices"
+    database:
+        sys_db_name: "sysdbname"
+    """
+
+    mocker.patch(
+        "builtins.open", side_effect=generate_mock_open("dbos-config.yaml", mock_config)
+    )
+
+    provided_config: ConfigFile = {
+        "name": "test-app",
+    }
+    with pytest.raises(DBOSInitializationError) as exc_info:
+        overwrite_config(provided_config)
+    assert (
+        "DBOS_DATABASE_URL environment variable is not set. This is required to connect to the database."
+        in str(exc_info.value)
+    )
+
 
 ####################
 # PROVIDED CONFIGS vs CONFIG FILE