dbos 1.7.0a3__tar.gz → 1.7.0a5__tar.gz

{dbos-1.7.0a3 → dbos-1.7.0a5}/PKG-INFO

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

{dbos-1.7.0a3 → dbos-1.7.0a5}/dbos/_admin_server.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import json
 import re
 import threading
-from dataclasses import asdict
 from functools import partial
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, TypedDict
@@ -120,7 +119,12 @@ class AdminRequestHandler(BaseHTTPRequestHandler):
                     self.send_response(404)
                     self._end_headers()
                     return
-                response_body = json.dumps(workflows[0].__dict__).encode("utf-8")
+                workflow_output = (
+                    conductor_protocol.WorkflowsOutput.from_workflow_information(
+                        workflows[0]
+                    )
+                )
+                response_body = json.dumps(workflow_output.__dict__).encode("utf-8")
                 self.send_response(200)
                 self.send_header("Content-Type", "application/json")
                 self.send_header("Content-Length", str(len(response_body)))

{dbos-1.7.0a3 → dbos-1.7.0a5}/dbos/_core.py

@@ -1157,13 +1157,16 @@ def decorate_step(
         def wrapper(*args: Any, **kwargs: Any) -> Any:
             rr: Optional[str] = check_required_roles(func, fi)
             # Entering step is allowed:
+            #  No DBOS, just call the original function directly
             #  In a step already, just call the original function directly.
             #  In a workflow (that is not in a step already)
             #  Not in a workflow (we will start the single op workflow)
+            if not dbosreg.dbos or not dbosreg.dbos._launched:
+                # Call the original function directly
+                return func(*args, **kwargs)
             ctx = get_local_dbos_context()
             if ctx and ctx.is_step():
                 # Call the original function directly
-
                 return func(*args, **kwargs)
             if ctx and ctx.is_within_workflow():
                 assert ctx.is_workflow(), "Steps must be called from within workflows"

{dbos-1.7.0a3 → dbos-1.7.0a5}/pyproject.toml

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

{dbos-1.7.0a3 → dbos-1.7.0a5}/tests/test_admin_server.py

@@ -639,16 +639,16 @@ def test_get_workflow_by_id(dbos: DBOS) -> None:
         pass
 
     @DBOS.workflow()
-    def test_workflow_2() -> None:
-        pass
+    def test_workflow_2(my_time: datetime) -> str:
+        return DBOS.workflow_id + " completed at " + my_time.isoformat()
 
     # Start workflows
     handle_1 = DBOS.start_workflow(test_workflow_1)
-    handle_2 = DBOS.start_workflow(test_workflow_2)
+    handle_2 = DBOS.start_workflow(test_workflow_2, datetime.now())
 
     # Wait for workflows to complete
     handle_1.get_result()
-    handle_2.get_result()
+    assert handle_2.get_result() is not None
 
     # Get the workflow ID of the second workflow
     workflow_id = handle_2.workflow_id
@@ -660,10 +660,28 @@ def test_get_workflow_by_id(dbos: DBOS) -> None:
     ), f"Expected status code 200, but got {response.status_code}"
 
     workflow_data = response.json()
-    assert workflow_data["workflow_id"] == workflow_id, "Workflow ID mismatch"
+    assert workflow_data["WorkflowUUID"] == workflow_id, "Workflow ID mismatch"
     assert (
-        workflow_data["status"] == "SUCCESS"
+        workflow_data["Status"] == "SUCCESS"
     ), "Expected workflow status to be SUCCESS"
+    assert workflow_data["WorkflowName"] == test_workflow_2.__qualname__
+    assert workflow_data["WorkflowClassName"] is None
+    assert workflow_data["WorkflowConfigName"] is None
+    assert workflow_data["AuthenticatedUser"] is None
+    assert workflow_data["AssumedRole"] is None
+    assert workflow_data["AuthenticatedRoles"] is None
+    assert workflow_data["Input"] is not None and len(workflow_data["Input"]) > 0
+    assert workflow_data["Output"] is not None and len(workflow_data["Output"]) > 0
+    assert workflow_data["Error"] is None
+    assert (
+        workflow_data["CreatedAt"] is not None and len(workflow_data["CreatedAt"]) > 0
+    )
+    assert (
+        workflow_data["UpdatedAt"] is not None and len(workflow_data["UpdatedAt"]) > 0
+    )
+    assert workflow_data["QueueName"] is None
+    assert workflow_data["ApplicationVersion"] == GlobalParams.app_version
+    assert workflow_data["ExecutorID"] == GlobalParams.executor_id
 
     # Test GET /workflows/:workflow_id for a non-existing workflow
     non_existing_workflow_id = "non-existing-id"

{dbos-1.7.0a3 → dbos-1.7.0a5}/tests/test_dbos.py

@@ -1608,3 +1608,29 @@ def test_custom_names(dbos: DBOS) -> None:
     handle = DBOS.start_workflow(workflow, value)  # type: ignore
     assert handle.get_status().name == another_workflow
     assert handle.get_result() == value  # type: ignore
+
+
+@pytest.mark.asyncio
+async def test_step_without_dbos(dbos: DBOS, config: DBOSConfig) -> None:
+    DBOS.destroy(destroy_registry=True)
+
+    @DBOS.step()
+    def step(x: int) -> int:
+        return x
+
+    @DBOS.step()
+    async def async_step(x: int) -> int:
+        return x
+
+    assert step(5) == 5
+    assert await async_step(5) == 5
+
+    DBOS(config=config)
+
+    assert step(5) == 5
+    assert await async_step(5) == 5
+
+    DBOS.launch()
+
+    assert step(5) == 5
+    assert await async_step(5) == 5