dbos 1.8.0a5__tar.gz → 1.8.0a8__tar.gz

{dbos-1.8.0a5 → dbos-1.8.0a8}/PKG-INFO

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

{dbos-1.8.0a5 → dbos-1.8.0a8}/dbos/_dbos.py

@@ -1376,31 +1376,3 @@ class DBOSConfiguredInstance:
     def __init__(self, config_name: str) -> None:
         self.config_name = config_name
         DBOS.register_instance(self)
-
-
-# Apps that import DBOS probably don't exit.  If they do, let's see if
-#   it looks like startup was abandoned or a call was forgotten...
-def _dbos_exit_hook() -> None:
-    if _dbos_global_registry is None:
-        # Probably used as or for a support module
-        return
-    if _dbos_global_instance is None:
-        print("DBOS exiting; functions were registered but DBOS() was not called")
-        dbos_logger.warning(
-            "DBOS exiting; functions were registered but DBOS() was not called"
-        )
-        return
-    if not _dbos_global_instance._launched:
-        if _dbos_global_instance.fastapi is not None:
-            # FastAPI lifespan middleware will call launch/destroy, so we can ignore this.
-            # This is likely to happen during fastapi dev runs, where the reloader loads the module multiple times.
-            return
-        print("DBOS exiting; DBOS exists but launch() was not called")
-        dbos_logger.warning("DBOS exiting; DBOS exists but launch() was not called")
-        return
-    # If we get here, we're exiting normally
-    _dbos_global_instance.destroy()
-
-
-# Register the exit hook
-atexit.register(_dbos_exit_hook)

{dbos-1.8.0a5 → dbos-1.8.0a8}/dbos/_error.py

@@ -55,7 +55,7 @@ class DBOSErrorCode(Enum):
     InitializationError = 3
     WorkflowFunctionNotFound = 4
     NonExistentWorkflowError = 5
-    DeadLetterQueueError = 6
+    MaxRecoveryAttemptsExceeded = 6
     MaxStepRetriesExceeded = 7
     NotAuthorized = 8
     ConflictingWorkflowError = 9
@@ -121,13 +121,13 @@ class DBOSNonExistentWorkflowError(DBOSException):
         )
 
 
-class DBOSDeadLetterQueueError(DBOSException):
-    """Exception raised when a workflow database record does not exist for a given ID."""
+class MaxRecoveryAttemptsExceededError(DBOSException):
+    """Exception raised when a workflow exceeds its max recovery attempts."""
 
     def __init__(self, wf_id: str, max_retries: int):
         super().__init__(
-            f"Workflow {wf_id} has been moved to the dead-letter queue after exceeding the maximum of {max_retries} retries",
-            dbos_error_code=DBOSErrorCode.DeadLetterQueueError.value,
+            f"Workflow {wf_id} has exceeded its maximum of {max_retries} execution or recovery attempts. Further attempts to execute or recover it will fail. See documentation for details: https://docs.dbos.dev/python/reference/decorators",
+            dbos_error_code=DBOSErrorCode.MaxRecoveryAttemptsExceeded.value,
         )
 
 

{dbos-1.8.0a5 → dbos-1.8.0a8}/dbos/_sys_db.py

@@ -37,12 +37,12 @@ from ._context import get_local_dbos_context
 from ._error import (
     DBOSAwaitedWorkflowCancelledError,
     DBOSConflictingWorkflowError,
-    DBOSDeadLetterQueueError,
     DBOSNonExistentWorkflowError,
     DBOSQueueDeduplicatedError,
     DBOSUnexpectedStepError,
     DBOSWorkflowCancelledError,
     DBOSWorkflowConflictIDError,
+    MaxRecoveryAttemptsExceededError,
 )
 from ._logger import dbos_logger
 from ._schemas.system_database import SystemSchema
@@ -57,20 +57,25 @@ class WorkflowStatusString(Enum):
     PENDING = "PENDING"
     SUCCESS = "SUCCESS"
     ERROR = "ERROR"
-    RETRIES_EXCEEDED = "RETRIES_EXCEEDED"
+    MAX_RECOVERY_ATTEMPTS_EXCEEDED = "MAX_RECOVERY_ATTEMPTS_EXCEEDED"
     CANCELLED = "CANCELLED"
     ENQUEUED = "ENQUEUED"
 
 
 WorkflowStatuses = Literal[
-    "PENDING", "SUCCESS", "ERROR", "RETRIES_EXCEEDED", "CANCELLED", "ENQUEUED"
+    "PENDING",
+    "SUCCESS",
+    "ERROR",
+    "MAX_RECOVERY_ATTEMPTS_EXCEEDED",
+    "CANCELLED",
+    "ENQUEUED",
 ]
 
 
 class WorkflowStatus:
     # The workflow ID
     workflow_id: str
-    # The workflow status. Must be one of ENQUEUED, PENDING, SUCCESS, ERROR, CANCELLED, or RETRIES_EXCEEDED
+    # The workflow status. Must be one of ENQUEUED, PENDING, SUCCESS, ERROR, CANCELLED, or MAX_RECOVERY_ATTEMPTS_EXCEEDED
     status: str
     # The name of the workflow function
     name: str
@@ -515,7 +520,7 @@ class SystemDatabase:
                 raise DBOSConflictingWorkflowError(status["workflow_uuid"], err_msg)
 
             # Every time we start executing a workflow (and thus attempt to insert its status), we increment `recovery_attempts` by 1.
-            # When this number becomes equal to `maxRetries + 1`, we mark the workflow as `RETRIES_EXCEEDED`.
+            # When this number becomes equal to `maxRetries + 1`, we mark the workflow as `MAX_RECOVERY_ATTEMPTS_EXCEEDED`.
             if (
                 (wf_status != "SUCCESS" and wf_status != "ERROR")
                 and max_recovery_attempts is not None
@@ -532,7 +537,7 @@ class SystemDatabase:
                         == WorkflowStatusString.PENDING.value
                     )
                     .values(
-                        status=WorkflowStatusString.RETRIES_EXCEEDED.value,
+                        status=WorkflowStatusString.MAX_RECOVERY_ATTEMPTS_EXCEEDED.value,
                         deduplication_id=None,
                         started_at_epoch_ms=None,
                         queue_name=None,
@@ -541,7 +546,7 @@ class SystemDatabase:
                 conn.execute(dlq_cmd)
                 # Need to commit here because we're throwing an exception
                 conn.commit()
-                raise DBOSDeadLetterQueueError(
+                raise MaxRecoveryAttemptsExceededError(
                     status["workflow_uuid"], max_recovery_attempts
                 )
 

{dbos-1.8.0a5 → dbos-1.8.0a8}/dbos/cli/cli.py

@@ -450,7 +450,7 @@ def list(
         typer.Option(
             "--status",
             "-S",
-            help="Retrieve workflows with this status (PENDING, SUCCESS, ERROR, RETRIES_EXCEEDED, ENQUEUED, or CANCELLED)",
+            help="Retrieve workflows with this status (PENDING, SUCCESS, ERROR, ENQUEUED, CANCELLED, or MAX_RECOVERY_ATTEMPTS_EXCEEDED)",
         ),
     ] = None,
     appversion: Annotated[
@@ -657,7 +657,7 @@ def list_queue(
         typer.Option(
             "--status",
             "-S",
-            help="Retrieve functions with this status (PENDING, SUCCESS, ERROR, RETRIES_EXCEEDED, ENQUEUED, or CANCELLED)",
+            help="Retrieve functions with this status (PENDING, SUCCESS, ERROR, ENQUEUED, CANCELLED, or MAX_RECOVERY_ATTEMPTS_EXCEEDED)",
         ),
     ] = None,
     queue_name: Annotated[

{dbos-1.8.0a5 → dbos-1.8.0a8}/pyproject.toml

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

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_admin_server.py

@@ -104,7 +104,7 @@ def test_deactivate(dbos: DBOS, config: DBOSConfig) -> None:
         assert event.is_set()
     # Verify the scheduled workflow does not run anymore
     time.sleep(5)
-    assert wf_counter <= val + 1
+    assert wf_counter <= val + 2
     # Enqueue a workflow, verify it still runs
     assert queue.enqueue(regular_workflow).get_result() == 5
 

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_async.py

@@ -32,12 +32,12 @@ async def test_async_workflow(dbos: DBOS) -> None:
         nonlocal wf_counter
         wf_counter += 1
         res1 = test_transaction(var1)
-        res2 = test_step(var2)
+        res2 = await test_step(var2)
         DBOS.logger.info("I'm test_workflow")
         return res1 + res2
 
     @DBOS.step()
-    def test_step(var: str) -> str:
+    async def test_step(var: str) -> str:
         nonlocal step_counter
         step_counter += 1
         DBOS.logger.info("I'm test_step")
@@ -73,6 +73,10 @@ async def test_async_workflow(dbos: DBOS) -> None:
     sync_handle = DBOS.start_workflow(test_workflow, "alice", "bob")
     assert sync_handle.get_result() == "alicetxn31bobstep3"  # type: ignore
 
+    # Test DBOS.start_workflow_async on steps
+    handle = await DBOS.start_workflow_async(test_step, "alice")
+    assert (await handle.get_result()) == "alicestep4"
+
 
 @pytest.mark.asyncio
 async def test_async_step(dbos: DBOS) -> None:

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_classdecorators.py

@@ -10,6 +10,7 @@ from dbos import DBOS, DBOSConfiguredInstance, Queue, SetWorkflowID
 
 # Private API used because this is a test
 from dbos._context import DBOSContextEnsure, assert_current_dbos_context
+from dbos._dbos_config import DBOSConfig
 from tests.conftest import queue_entries_are_cleaned_up
 
 
@@ -884,3 +885,29 @@ def test_mixed_methods(dbos: DBOS) -> None:
     status = handle.get_status()
     assert status.class_name == None
     assert status.config_name == None
+
+
+def test_class_step_without_dbos(dbos: DBOS, config: DBOSConfig) -> None:
+    DBOS.destroy(destroy_registry=True)
+
+    @DBOS.dbos_class()
+    class TestClass(DBOSConfiguredInstance):
+        def __init__(self, x: int) -> None:
+            self.x = x
+            super().__init__("test")
+
+        @DBOS.step()
+        def step(self, x: int) -> int:
+            return self.x + x
+
+    input = 5
+    inst = TestClass(input)
+    assert inst.step(input) == input + input
+
+    DBOS(config=config)
+
+    assert inst.step(input) == input + input
+
+    DBOS.launch()
+
+    assert inst.step(input) == input + input

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_failures.py

@@ -10,11 +10,11 @@ from sqlalchemy.exc import InvalidRequestError, OperationalError
 from dbos import DBOS, Queue, SetWorkflowID
 from dbos._error import (
     DBOSAwaitedWorkflowCancelledError,
-    DBOSDeadLetterQueueError,
     DBOSMaxStepRetriesExceeded,
     DBOSNotAuthorizedError,
     DBOSQueueDeduplicatedError,
     DBOSUnexpectedStepError,
+    MaxRecoveryAttemptsExceededError,
 )
 from dbos._registrations import DEFAULT_MAX_RECOVERY_ATTEMPTS
 from dbos._serialization import (
@@ -179,12 +179,15 @@ def test_dead_letter_queue(dbos: DBOS) -> None:
     # and puts the workflow in the DLQ status.
     with pytest.raises(Exception) as exc_info:
         DBOS._recover_pending_workflows()
-    assert exc_info.errisinstance(DBOSDeadLetterQueueError)
-    assert handle.get_status().status == WorkflowStatusString.RETRIES_EXCEEDED.value
+    assert exc_info.errisinstance(MaxRecoveryAttemptsExceededError)
+    assert (
+        handle.get_status().status
+        == WorkflowStatusString.MAX_RECOVERY_ATTEMPTS_EXCEEDED.value
+    )
     with pytest.raises(Exception) as exc_info:
         with SetWorkflowID(wfid):
             dead_letter_workflow()
-    assert exc_info.errisinstance(DBOSDeadLetterQueueError)
+    assert exc_info.errisinstance(MaxRecoveryAttemptsExceededError)
 
     # Resume the workflow. Verify it can recover again without error.
     resumed_handle = dbos.resume_workflow(wfid)

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_queue.py

@@ -1041,7 +1041,7 @@ def test_dlq_enqueued_workflows(dbos: DBOS) -> None:
     time.sleep(2)
     assert (
         blocked_handle.get_status().status
-        == WorkflowStatusString.RETRIES_EXCEEDED.value
+        == WorkflowStatusString.MAX_RECOVERY_ATTEMPTS_EXCEEDED.value
     )
     with dbos._sys_db.engine.begin() as c:
         query = sa.select(SystemSchema.workflow_status.c.recovery_attempts).where(

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_scheduler.py

@@ -219,6 +219,9 @@ def test_scheduler_oaoo(dbos: DBOS) -> None:
     for evt in dbos.poller_stop_events:
         evt.set()
 
+    # Wait for workflows to finish
+    time.sleep(2)
+
     dbos._sys_db.update_workflow_outcome(workflow_id, "PENDING")
 
     workflow_handles = DBOS._recover_pending_workflows()

{dbos-1.8.0a5 → dbos-1.8.0a8}/tests/test_singleton.py

@@ -129,27 +129,3 @@ def test_dbos_singleton_negative(cleanup_test_databases: None) -> None:
     assert "launch" in str(exc_info.value)
 
     DBOS.destroy()
-
-
-def test_dbos_atexit_no_dbos(cleanup_test_databases: None) -> None:
-    # Run the .py as a separate process
-    result = subprocess.run(
-        [sys.executable, path.join("tests", "atexit_no_ctor.py")],
-        capture_output=True,
-        text=True,
-    )
-
-    # Assert that the output contains the warning message
-    assert "DBOS exiting; functions were registered" in result.stdout
-
-
-def test_dbos_atexit_no_launch(cleanup_test_databases: None) -> None:
-    # Run the .py as a separate process
-    result = subprocess.run(
-        [sys.executable, path.join("tests", "atexit_no_launch.py")],
-        capture_output=True,
-        text=True,
-    )
-
-    # Assert that the output contains the warning message
-    assert "DBOS exists but launch() was not called" in result.stdout