dbos 1.13.0a7__tar.gz → 1.14.0a2__tar.gz

{dbos-1.13.0a7 → dbos-1.14.0a2}/PKG-INFO

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

{dbos-1.13.0a7 → dbos-1.14.0a2}/dbos/_client.py

@@ -241,7 +241,7 @@ class DBOSClient:
         return WorkflowHandleClientPolling[R](workflow_id, self._sys_db)
 
     async def retrieve_workflow_async(self, workflow_id: str) -> WorkflowHandleAsync[R]:
-        status = asyncio.to_thread(get_workflow, self._sys_db, workflow_id)
+        status = await asyncio.to_thread(get_workflow, self._sys_db, workflow_id)
         if status is None:
             raise DBOSNonExistentWorkflowError(workflow_id)
         return WorkflowHandleClientAsyncPolling[R](workflow_id, self._sys_db)

dbos-1.14.0a2/dbos/_templates/dbos-db-starter/start_postgres_docker.py

@@ -0,0 +1,67 @@
+import os
+import subprocess
+import sys
+import time
+
+# Default PostgreSQL port
+port = "5432"
+
+# Set the host PostgreSQL port with the -p/--port flag
+for i, arg in enumerate(sys.argv):
+    if arg in ["-p", "--port"]:
+        if i + 1 < len(sys.argv):
+            port = sys.argv[i + 1]
+
+if "PGPASSWORD" not in os.environ:
+    print("Error: PGPASSWORD is not set.")
+    sys.exit(1)
+
+try:
+    subprocess.run(
+        [
+            "docker",
+            "run",
+            "--rm",
+            "--name=dbos-db",
+            f'--env=POSTGRES_PASSWORD={os.environ["PGPASSWORD"]}',
+            "--env=PGDATA=/var/lib/postgresql/data",
+            "--volume=/var/lib/postgresql/data",
+            "-p",
+            f"{port}:5432",
+            "-d",
+            "pgvector/pgvector:pg16",
+        ],
+        check=True,
+    )
+
+    print("Waiting for PostgreSQL to start...")
+    attempts = 30
+
+    while attempts > 0:
+        try:
+            subprocess.run(
+                [
+                    "docker",
+                    "exec",
+                    "dbos-db",
+                    "psql",
+                    "-U",
+                    "postgres",
+                    "-c",
+                    "SELECT 1;",
+                ],
+                check=True,
+                capture_output=True,
+            )
+            print("PostgreSQL started!")
+            print("Database started successfully!")
+            break
+        except subprocess.CalledProcessError:
+            attempts -= 1
+            time.sleep(1)
+
+    if attempts == 0:
+        print("Failed to start PostgreSQL.")
+
+except subprocess.CalledProcessError as error:
+    print(f"Error starting PostgreSQL in Docker: {error}")

{dbos-1.13.0a7 → dbos-1.14.0a2}/pyproject.toml

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

{dbos-1.13.0a7 → dbos-1.14.0a2}/tests/test_config.py

@@ -939,6 +939,7 @@ def test_overwrite_config(mocker):
     assert "env" not in config
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 def test_overwrite_config_minimal(mocker):
@@ -985,6 +986,7 @@ def test_overwrite_config_minimal(mocker):
     assert "env" not in config
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 def test_overwrite_config_has_telemetry(mocker):
@@ -1033,6 +1035,7 @@ def test_overwrite_config_has_telemetry(mocker):
     assert "env" not in config
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 # Not expected in practice, but exercise the code path
@@ -1068,6 +1071,7 @@ def test_overwrite_config_no_telemetry_in_file(mocker):
     }
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 # Not expected in practice, but exercise the code path
@@ -1109,6 +1113,7 @@ def test_overwrite_config_no_otlp_in_file(mocker):
     assert "logs" not in config["telemetry"]
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 def test_overwrite_config_with_provided_database_url(mocker):
@@ -1156,6 +1161,7 @@ def test_overwrite_config_with_provided_database_url(mocker):
     assert "env" not in config
 
     del os.environ["DBOS_DATABASE_URL"]
+    del os.environ["DBOS_SYSTEM_DATABASE_URL"]
 
 
 def test_overwrite_config_missing_dbos_database_url(mocker):

{dbos-1.13.0a7 → dbos-1.14.0a2}/tests/test_package.py

@@ -175,22 +175,24 @@ def test_workflow_commands(config: DBOSConfig) -> None:
         db_url = config["system_database_url"]
     else:
         db_url = (
-            sa.make_url(config["application_database_url"])
+            sa.make_url(config["system_database_url"])
             .set(database="dbos_toolbox")
             .render_as_string(hide_password=False)
         )
     with tempfile.TemporaryDirectory() as temp_path:
         env = os.environ.copy()
-        env["DBOS_DATABASE_URL"] = db_url
+        env["DBOS_SYSTEM_DATABASE_URL"] = db_url
         subprocess.check_call(
             ["dbos", "init", "--template", "dbos-toolbox"],
             cwd=temp_path,
             env=env,
         )
-        subprocess.check_call(["dbos", "reset", "-y", "-D", db_url], cwd=temp_path)
+        subprocess.check_call(
+            ["dbos", "reset", "-y", "--sys-db-url", db_url], cwd=temp_path
+        )
 
         # Get some workflows enqueued on the toolbox, then kill the toolbox
-        process = subprocess.Popen(["dbos", "start"], cwd=temp_path, env=env)
+        process = subprocess.Popen(["python3", "main.py"], cwd=temp_path, env=env)
         try:
             session = requests.Session()
             for i in range(10):
@@ -209,25 +211,25 @@ def test_workflow_commands(config: DBOSConfig) -> None:
             time.sleep(1)  # So the queued workflows can start
         finally:
             # Because the toolbox steps sleep for 5 seconds, all the steps should be PENDING
-            os.kill(process.pid, signal.SIGINT)
+            os.kill(process.pid, signal.SIGKILL)
             process.wait()
 
         # Verify the output is valid JSON
         output = subprocess.check_output(
-            ["dbos", "workflow", "list", "--db-url", db_url], cwd=temp_path
+            ["dbos", "workflow", "list", "--sys-db-url", db_url], cwd=temp_path
         )
         data = json.loads(output)
         assert isinstance(data, list) and len(data) == 10
 
         # Verify the output is valid JSON
         output = subprocess.check_output(
-            ["dbos", "workflow", "queue", "list", "--db-url", db_url], cwd=temp_path
+            ["dbos", "workflow", "queue", "list", "--sys-db-url", db_url], cwd=temp_path
         )
         workflows = json.loads(output)
         assert isinstance(workflows, list) and len(workflows) == 10
         for wf in workflows:
             output = subprocess.check_output(
-                ["dbos", "workflow", "get", wf["workflow_id"], "--db-url", db_url],
+                ["dbos", "workflow", "get", wf["workflow_id"], "--sys-db-url", db_url],
                 cwd=temp_path,
             )
             get_wf_data = json.loads(output)
@@ -237,7 +239,7 @@ def test_workflow_commands(config: DBOSConfig) -> None:
         # workflow ID is a preffix to each step ID
         wf_id = "-".join(workflows[0]["workflow_id"].split("-")[:-1])
         get_steps_output = subprocess.check_output(
-            ["dbos", "workflow", "steps", wf_id, "--db-url", db_url], cwd=temp_path
+            ["dbos", "workflow", "steps", wf_id, "--sys-db-url", db_url], cwd=temp_path
         )
         get_steps_data = json.loads(get_steps_output)
         assert isinstance(get_steps_data, list)
@@ -310,8 +312,7 @@ def test_workflow_commands(config: DBOSConfig) -> None:
 
         # verify the forked workflow data with get command
         output = subprocess.check_output(
-            ["dbos", "workflow", "get", custom_fork_id, "--db-url", db_url],
-            cwd=temp_path,
+            ["dbos", "workflow", "get", custom_fork_id], cwd=temp_path, env=env
         )
         custom_fork_get_data = json.loads(output)
         assert isinstance(custom_fork_get_data, dict)
@@ -339,15 +340,9 @@ def test_workflow_commands(config: DBOSConfig) -> None:
 
         # verify the forked workflow data with get command and check application version
         output = subprocess.check_output(
-            [
-                "dbos",
-                "workflow",
-                "get",
-                version_fork_data["workflow_id"],
-                "--db-url",
-                db_url,
-            ],
+            ["dbos", "workflow", "get", version_fork_data["workflow_id"]],
             cwd=temp_path,
+            env=env,
         )
         version_fork_get_data = json.loads(output)
         assert isinstance(version_fork_get_data, dict)
@@ -379,8 +374,7 @@ def test_workflow_commands(config: DBOSConfig) -> None:
 
         # verify the forked workflow data with get command and check both ID and application version
         output = subprocess.check_output(
-            ["dbos", "workflow", "get", custom_fork_id2, "--db-url", db_url],
-            cwd=temp_path,
+            ["dbos", "workflow", "get", custom_fork_id2], cwd=temp_path, env=env
         )
         combined_fork_get_data = json.loads(output)
         assert isinstance(combined_fork_get_data, dict)

{dbos-1.13.0a7 → dbos-1.14.0a2}/tests/test_workflow_management.py

@@ -738,8 +738,8 @@ def test_global_timeout(dbos: DBOS) -> None:
     num_workflows = 10
     handles = [DBOS.start_workflow(blocked_workflow) for _ in range(num_workflows)]
 
-    # Wait one second, start one final workflow, then timeout all workflows started more than one second ago
-    time.sleep(1)
+    # Wait two seconds, start one final workflow, then timeout all workflows started more than one second ago
+    time.sleep(2)
     final_handle = DBOS.start_workflow(blocked_workflow)
     cutoff_epoch_timestamp_ms = int(time.time() * 1000) - 1000
     global_timeout(dbos, cutoff_epoch_timestamp_ms)