dbos 1.12.0a1__tar.gz → 1.12.0a3__tar.gz

{dbos-1.12.0a1 → dbos-1.12.0a3}/PKG-INFO

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

{dbos-1.12.0a1 → dbos-1.12.0a3}/dbos/_core.py

@@ -1156,27 +1156,15 @@ def decorate_step(
 
         @wraps(func)
         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)
+            # If the step is called from a workflow, run it as a step.
+            # Otherwise, run it as a normal function.
             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"
+            if ctx and ctx.is_workflow():
+                rr: Optional[str] = check_required_roles(func, fi)
                 with DBOSAssumeRole(rr):
                     return invoke_step(*args, **kwargs)
             else:
-                tempwf = dbosreg.workflow_info_map.get("<temp>." + step_name)
-                assert tempwf
-                return tempwf(*args, **kwargs)
+                return func(*args, **kwargs)
 
         wrapper = (
             _mark_coroutine(wrapper) if inspect.iscoroutinefunction(func) else wrapper  # type: ignore

{dbos-1.12.0a1 → dbos-1.12.0a3}/dbos/_fastapi.py

@@ -83,4 +83,6 @@ def setup_fastapi_middleware(app: FastAPI, dbos: DBOS) -> None:
                     response = await call_next(request)
             else:
                 response = await call_next(request)
+            if hasattr(response, "status_code"):
+                DBOS.span.set_attribute("responseCode", response.status_code)
         return response

{dbos-1.12.0a1 → dbos-1.12.0a3}/dbos/cli/cli.py

@@ -14,6 +14,7 @@ from rich import print as richprint
 from rich.prompt import IntPrompt
 from typing_extensions import Annotated, List
 
+from dbos._context import SetWorkflowID
 from dbos._debug import debug_workflow, parse_start_command
 from dbos.cli.migration import grant_dbos_schema_permissions, migrate_dbos_databases
 
@@ -567,7 +568,9 @@ def resume(
     start_client(db_url=db_url).resume_workflow(workflow_id=workflow_id)
 
 
-@workflow.command(help="Restart a workflow from the beginning with a new id")
+@workflow.command(
+    help="[DEPRECATED - Use fork instead] Restart a workflow from the beginning with a new id"
+)
 def restart(
     workflow_id: Annotated[str, typer.Argument()],
     db_url: Annotated[
@@ -600,6 +603,22 @@ def fork(
             help="Restart from this step",
         ),
     ] = 1,
+    forked_workflow_id: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--forked-workflow-id",
+            "-f",
+            help="Custom ID for the forked workflow",
+        ),
+    ] = None,
+    application_version: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--application-version",
+            "-v",
+            help="Custom application version for the forked workflow",
+        ),
+    ] = None,
     db_url: Annotated[
         typing.Optional[str],
         typer.Option(
@@ -609,11 +628,21 @@ def fork(
         ),
     ] = None,
 ) -> None:
-    status = (
-        start_client(db_url=db_url)
-        .fork_workflow(workflow_id=workflow_id, start_step=step)
-        .get_status()
-    )
+    client = start_client(db_url=db_url)
+
+    if forked_workflow_id is not None:
+        with SetWorkflowID(forked_workflow_id):
+            status = client.fork_workflow(
+                workflow_id=workflow_id,
+                start_step=step,
+                application_version=application_version,
+            ).get_status()
+    else:
+        status = client.fork_workflow(
+            workflow_id=workflow_id,
+            start_step=step,
+            application_version=application_version,
+        ).get_status()
     print(jsonpickle.encode(status, unpicklable=False))
 
 

{dbos-1.12.0a1 → dbos-1.12.0a3}/pyproject.toml

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

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_async.py

@@ -329,30 +329,6 @@ def test_async_tx_raises(config: ConfigFile) -> None:
     DBOS.destroy(destroy_registry=True)
 
 
-@pytest.mark.asyncio
-async def test_async_step_temp(dbos: DBOS) -> None:
-    step_counter: int = 0
-
-    @DBOS.step()
-    async def test_step(var: str) -> str:
-        await asyncio.sleep(0.1)
-        nonlocal step_counter
-        step_counter += 1
-        DBOS.logger.info("I'm test_step")
-        return var + f"step{step_counter}"
-
-    wfuuid = f"test_async_step_temp-{time.time_ns()}"
-    with SetWorkflowID(wfuuid):
-        result = await test_step("alice")
-        assert result == "alicestep1"
-
-    with SetWorkflowID(wfuuid):
-        result = await test_step("alice")
-        assert result == "alicestep1"
-
-    assert step_counter == 1
-
-
 @pytest.mark.asyncio
 async def test_start_workflow_async(dbos: DBOS) -> None:
     wf_counter: int = 0

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_classdecorators.py

@@ -574,7 +574,7 @@ def test_step_recovery(dbos: DBOS) -> None:
     def call_step() -> None:
         with SetWorkflowID(wfid):
             nonlocal return_value
-            return_value = inst.step(input)
+            return_value = DBOS.start_workflow(inst.step, input).get_result()
 
     thread = threading.Thread(target=call_step)
     thread.start()

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_concurrency.py

@@ -59,10 +59,6 @@ def test_concurrent_conflict_uuid(dbos: DBOS) -> None:
         res = test_step()
         return res
 
-    def test_comm_thread(id: str) -> str:
-        with SetWorkflowID(id):
-            return test_step()
-
     # Need to set isolation level to a lower one, otherwise it gets serialization error instead (we already handle it correctly by automatic retries).
     @DBOS.transaction(isolation_level="REPEATABLE READ")
     def test_transaction() -> str:
@@ -97,15 +93,6 @@ def test_concurrent_conflict_uuid(dbos: DBOS) -> None:
     assert wf_handle1.get_result() == wfuuid
     assert wf_handle2.get_result() == wfuuid
 
-    # Make sure temp workflows can handle conflicts as well.
-    wfuuid = str(uuid.uuid4())
-    with ThreadPoolExecutor(max_workers=2) as executor:
-        future1 = executor.submit(test_comm_thread, wfuuid)
-        future2 = executor.submit(test_comm_thread, wfuuid)
-
-    assert future1.result() == wfuuid
-    assert future2.result() == wfuuid
-
     # Make sure temp transactions can handle conflicts as well.
     wfuuid = str(uuid.uuid4())
     with ThreadPoolExecutor(max_workers=2) as executor:

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_dbos.py

@@ -307,16 +307,12 @@ def test_temp_workflow(dbos: DBOS) -> None:
     assert res == "var"
 
     wfs = dbos._sys_db.get_workflows(gwi)
-    assert len(wfs) == 2
+    assert len(wfs) == 1
 
     wfi1 = dbos._sys_db.get_workflow_status(wfs[0].workflow_id)
     assert wfi1
     assert wfi1["name"].startswith("<temp>")
 
-    wfi2 = dbos._sys_db.get_workflow_status(wfs[1].workflow_id)
-    assert wfi2
-    assert wfi2["name"].startswith("<temp>")
-
     assert txn_counter == 1
     assert step_counter == 1
 
@@ -350,7 +346,7 @@ def test_temp_workflow_errors(dbos: DBOS) -> None:
     def test_retried_step(var: str) -> str:
         nonlocal retried_step_counter
         retried_step_counter += 1
-        raise Exception(var)
+        raise ValueError(var)
 
     with pytest.raises(Exception) as exc_info:
         test_transaction("tval")
@@ -360,12 +356,12 @@ def test_temp_workflow_errors(dbos: DBOS) -> None:
         test_step("cval")
     assert "cval" == str(exc_info.value)
 
-    with pytest.raises(DBOSMaxStepRetriesExceeded) as exc_info:
+    with pytest.raises(ValueError) as exc_info:
         test_retried_step("rval")
 
     assert txn_counter == 1
     assert step_counter == 1
-    assert retried_step_counter == 3
+    assert retried_step_counter == 1
 
 
 def test_recovery_workflow(dbos: DBOS) -> None:
@@ -1102,9 +1098,6 @@ def test_nonserializable_values(dbos: DBOS) -> None:
     with pytest.raises(Exception) as exc_info:
         test_ns_transaction("h")
     assert "data item should not be a function" in str(exc_info.value)
-    with pytest.raises(Exception) as exc_info:
-        test_ns_step("f")
-    assert "data item should not be a function" in str(exc_info.value)
     with pytest.raises(Exception) as exc_info:
         test_ns_wf("g")
     assert "data item should not be a function" in str(exc_info.value)
@@ -1645,22 +1638,14 @@ def test_custom_names(dbos: DBOS) -> None:
 async def test_step_without_dbos(dbos: DBOS, config: DBOSConfig) -> None:
     DBOS.destroy(destroy_registry=True)
 
-    is_dbos_active = False
-
     @DBOS.step()
     def step(x: int) -> int:
-        if is_dbos_active:
-            assert DBOS.workflow_id is not None
-        else:
-            assert DBOS.workflow_id is None
+        assert DBOS.workflow_id is None
         return x
 
     @DBOS.step()
     async def async_step(x: int) -> int:
-        if is_dbos_active:
-            assert DBOS.workflow_id is not None
-        else:
-            assert DBOS.workflow_id is None
+        assert DBOS.workflow_id is None
         return x
 
     assert step(5) == 5
@@ -1672,7 +1657,30 @@ async def test_step_without_dbos(dbos: DBOS, config: DBOSConfig) -> None:
     assert await async_step(5) == 5
 
     DBOS.launch()
-    is_dbos_active = True
 
     assert step(5) == 5
     assert await async_step(5) == 5
+
+    assert len(DBOS.list_workflows()) == 0
+
+
+def test_nested_steps(dbos: DBOS) -> None:
+
+    @DBOS.step()
+    def outer_step() -> str:
+        return inner_step()
+
+    @DBOS.step()
+    def inner_step() -> str:
+        id = DBOS.workflow_id
+        assert id is not None
+        return id
+
+    @DBOS.workflow()
+    def workflow() -> str:
+        return outer_step()
+
+    id = workflow()
+    steps = DBOS.list_workflow_steps(id)
+    assert len(steps) == 1
+    assert steps[0]["function_name"] == outer_step.__qualname__

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_failures.py

@@ -333,15 +333,8 @@ def test_step_retries(dbos: DBOS) -> None:
     error_message = f"Step {failing_step.__qualname__} has exceeded its maximum of {max_attempts} retries"
 
     # Test calling the step directly
-    with pytest.raises(DBOSMaxStepRetriesExceeded) as excinfo:
+    with pytest.raises(Exception) as excinfo:
         failing_step()
-    assert error_message in str(excinfo.value)
-    assert step_counter == max_attempts
-    assert len(excinfo.value.errors) == max_attempts
-    for error in excinfo.value.errors:
-        assert isinstance(error, Exception)
-        assert error
-        assert "fail" in str(error)
 
     # Test calling the workflow
     step_counter = 0
@@ -349,6 +342,11 @@ def test_step_retries(dbos: DBOS) -> None:
         failing_workflow()
     assert error_message in str(excinfo.value)
     assert step_counter == max_attempts
+    assert len(excinfo.value.errors) == max_attempts
+    for error in excinfo.value.errors:
+        assert isinstance(error, Exception)
+        assert error
+        assert "fail" in str(error)
 
     # Test enqueueing the step
     step_counter = 0
@@ -399,7 +397,6 @@ def test_step_status(dbos: DBOS) -> None:
 
     assert failing_workflow() == None
     step_counter = 0
-    assert failing_step() == None
 
 
 def test_recovery_during_retries(dbos: DBOS) -> None:

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_package.py

@@ -275,3 +275,103 @@ def test_workflow_commands(postgres_db_engine: sa.Engine) -> None:
         assert isinstance(fork_wf_data, dict)
         assert fork_wf_data["workflow_id"] != wf_id
         assert fork_wf_data["status"] == "ENQUEUED"
+
+        # fork the workflow with custom forked workflow ID
+        custom_fork_id = "custom-fork-id-12345"
+        output = subprocess.check_output(
+            [
+                "dbos",
+                "workflow",
+                "fork",
+                wf_id,
+                "--step",
+                "3",
+                "--forked-workflow-id",
+                custom_fork_id,
+            ],
+            cwd=temp_path,
+            env=env,
+        )
+        custom_fork_data = json.loads(output)
+        assert isinstance(custom_fork_data, dict)
+        assert custom_fork_data["workflow_id"] == custom_fork_id
+        assert custom_fork_data["status"] == "ENQUEUED"
+
+        # 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,
+        )
+        custom_fork_get_data = json.loads(output)
+        assert isinstance(custom_fork_get_data, dict)
+        assert custom_fork_get_data["workflow_id"] == custom_fork_id
+
+        # fork the workflow with custom application version
+        output = subprocess.check_output(
+            [
+                "dbos",
+                "workflow",
+                "fork",
+                wf_id,
+                "--step",
+                "2",
+                "--application-version",
+                "test-version",
+            ],
+            cwd=temp_path,
+            env=env,
+        )
+        version_fork_data = json.loads(output)
+        assert isinstance(version_fork_data, dict)
+        assert version_fork_data["workflow_id"] != wf_id
+        assert version_fork_data["status"] == "ENQUEUED"
+
+        # 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,
+            ],
+            cwd=temp_path,
+        )
+        version_fork_get_data = json.loads(output)
+        assert isinstance(version_fork_get_data, dict)
+        assert version_fork_get_data["workflow_id"] == version_fork_data["workflow_id"]
+        assert version_fork_get_data["app_version"] == "test-version"
+
+        # fork the workflow with both custom ID and application version
+        custom_fork_id2 = "custom-fork-with-version-67890"
+        output = subprocess.check_output(
+            [
+                "dbos",
+                "workflow",
+                "fork",
+                wf_id,
+                "--step",
+                "4",
+                "--forked-workflow-id",
+                custom_fork_id2,
+                "--application-version",
+                "v2.0.0",
+            ],
+            cwd=temp_path,
+            env=env,
+        )
+        combined_fork_data = json.loads(output)
+        assert isinstance(combined_fork_data, dict)
+        assert combined_fork_data["workflow_id"] == custom_fork_id2
+        assert combined_fork_data["status"] == "ENQUEUED"
+
+        # 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,
+        )
+        combined_fork_get_data = json.loads(output)
+        assert isinstance(combined_fork_get_data, dict)
+        assert combined_fork_get_data["workflow_id"] == custom_fork_id2
+        assert combined_fork_get_data["app_version"] == "v2.0.0"

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_queue.py

@@ -181,7 +181,8 @@ def test_queue_step(dbos: DBOS) -> None:
         handle = queue.enqueue(test_step, "abc")
     assert handle.get_result() == "abc1"
     with SetWorkflowID(wfid):
-        assert test_step("abc") == "abc1"
+        handle = queue.enqueue(test_step, "abc")
+    assert handle.get_result() == "abc1"
     assert step_counter == 1
 
 

{dbos-1.12.0a1 → dbos-1.12.0a3}/tests/test_spans.py

@@ -53,11 +53,10 @@ def test_spans(config: DBOSConfig) -> None:
     dbos_logger.addHandler(LoggingHandler(logger_provider=log_provider))
 
     test_workflow()
-    test_step()
 
     log_processor.force_flush(timeout_millis=5000)
     logs = log_exporter.get_finished_logs()
-    assert len(logs) == 3
+    assert len(logs) == 2
     for log in logs:
         assert log.log_record.attributes is not None
         assert (
@@ -78,7 +77,7 @@ def test_spans(config: DBOSConfig) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 5
+    assert len(spans) == 3
 
     for span in spans:
         assert span.attributes is not None
@@ -92,26 +91,19 @@ def test_spans(config: DBOSConfig) -> None:
     assert spans[0].name == test_step.__qualname__
     assert spans[1].name == "a new span"
     assert spans[2].name == test_workflow.__qualname__
-    assert spans[3].name == test_step.__qualname__
-    assert spans[4].name == f"<temp>.{test_step.__qualname__}"
 
     assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
-    assert spans[3].parent.span_id == spans[4].context.span_id  # type: ignore
-    assert spans[4].parent == None
 
     # Span ID and trace ID should match the log record
     # For pyright
     assert spans[0].context is not None
     assert spans[2].context is not None
-    assert spans[3].context is not None
     assert logs[0].log_record.span_id == spans[0].context.span_id
     assert logs[0].log_record.trace_id == spans[0].context.trace_id
     assert logs[1].log_record.span_id == spans[2].context.span_id
     assert logs[1].log_record.trace_id == spans[2].context.trace_id
-    assert logs[2].log_record.span_id == spans[3].context.span_id
-    assert logs[2].log_record.trace_id == spans[3].context.trace_id
 
 
 @pytest.mark.asyncio
@@ -147,11 +139,10 @@ async def test_spans_async(dbos: DBOS) -> None:
     dbos_logger.addHandler(LoggingHandler(logger_provider=log_provider))
 
     await test_workflow()
-    await test_step()
 
     log_processor.force_flush(timeout_millis=5000)
     logs = log_exporter.get_finished_logs()
-    assert len(logs) == 3
+    assert len(logs) == 2
     for log in logs:
         assert log.log_record.attributes is not None
         assert (
@@ -171,7 +162,7 @@ async def test_spans_async(dbos: DBOS) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 5
+    assert len(spans) == 3
 
     for span in spans:
         assert span.attributes is not None
@@ -184,34 +175,27 @@ async def test_spans_async(dbos: DBOS) -> None:
     assert spans[0].name == test_step.__qualname__
     assert spans[1].name == "a new span"
     assert spans[2].name == test_workflow.__qualname__
-    assert spans[3].name == test_step.__qualname__
-    assert spans[4].name == f"<temp>.{test_step.__qualname__}"
 
     assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
-    assert spans[3].parent.span_id == spans[4].context.span_id  # type: ignore
-    assert spans[4].parent == None
 
     # Span ID and trace ID should match the log record
     assert spans[0].context is not None
     assert spans[2].context is not None
-    assert spans[3].context is not None
     assert logs[0].log_record.span_id == spans[0].context.span_id
     assert logs[0].log_record.trace_id == spans[0].context.trace_id
     assert logs[1].log_record.span_id == spans[2].context.span_id
     assert logs[1].log_record.trace_id == spans[2].context.trace_id
-    assert logs[2].log_record.span_id == spans[3].context.span_id
-    assert logs[2].log_record.trace_id == spans[3].context.trace_id
 
 
-def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
+def test_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
     dbos, app = dbos_fastapi
 
-    @app.get("/step")
-    @DBOS.step()
-    def test_step_endpoint() -> str:
-        dbos.logger.info("This is a test_step_endpoint")
+    @app.get("/wf")
+    @DBOS.workflow()
+    def test_workflow_endpoint() -> str:
+        dbos.logger.info("This is a test_workflow_endpoint")
         return "test"
 
     exporter = InMemorySpanExporter()
@@ -229,7 +213,7 @@ def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
     dbos_logger.addHandler(LoggingHandler(logger_provider=log_provider))
 
     client = TestClient(app)
-    response = client.get("/step")
+    response = client.get("/wf")
     assert response.status_code == 200
     assert response.text == '"test"'
 
@@ -242,14 +226,14 @@ def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
     )
     assert logs[0].log_record.span_id is not None and logs[0].log_record.span_id > 0
     assert logs[0].log_record.trace_id is not None and logs[0].log_record.trace_id > 0
-    assert logs[0].log_record.body == "This is a test_step_endpoint"
+    assert logs[0].log_record.body == "This is a test_workflow_endpoint"
     assert logs[0].log_record.attributes["traceId"] == format_trace_id(
         logs[0].log_record.trace_id
     )
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 3
+    assert len(spans) == 2
 
     for span in spans:
         assert span.attributes is not None
@@ -258,13 +242,13 @@ def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
         assert span.context.span_id > 0
         assert span.context.trace_id > 0
 
-    assert spans[0].name == test_step_endpoint.__qualname__
-    assert spans[1].name == f"<temp>.{test_step_endpoint.__qualname__}"
-    assert spans[2].name == "/step"
+    assert spans[0].name == test_workflow_endpoint.__qualname__
+    assert spans[1].name == "/wf"
+    assert spans[1].attributes is not None
+    assert spans[1].attributes["responseCode"] == 200
 
     assert spans[0].parent.span_id == spans[1].context.span_id  # type: ignore
-    assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
-    assert spans[2].parent == None
+    assert spans[1].parent == None
 
     # Span ID and trace ID should match the log record
     assert spans[0].context is not None