dbos 1.5.0a10__py3-none-any.whl → 1.6.0__py3-none-any.whl

dbos/_client.py

@@ -1,7 +1,7 @@
 import asyncio
 import sys
 import uuid
-from typing import Any, Generic, List, Optional, TypedDict, TypeVar
+from typing import Any, Generic, List, Optional, TypedDict, TypeVar, Union
 
 from dbos._app_db import ApplicationDatabase
 from dbos._context import MaxPriority, MinPriority
@@ -128,7 +128,6 @@ class DBOSClient:
         workflow_name = options["workflow_name"]
         queue_name = options["queue_name"]
 
-        app_version = options.get("app_version")
         max_recovery_attempts = options.get("max_recovery_attempts")
         if max_recovery_attempts is None:
             max_recovery_attempts = DEFAULT_MAX_RECOVERY_ATTEMPTS
@@ -139,6 +138,7 @@ class DBOSClient:
         enqueue_options_internal: EnqueueOptionsInternal = {
             "deduplication_id": options.get("deduplication_id"),
             "priority": options.get("priority"),
+            "app_version": options.get("app_version"),
         }
 
         inputs: WorkflowInputs = {
@@ -152,7 +152,7 @@ class DBOSClient:
             "name": workflow_name,
             "class_name": None,
             "queue_name": queue_name,
-            "app_version": app_version,
+            "app_version": enqueue_options_internal["app_version"],
             "config_name": None,
             "authenticated_user": None,
             "assumed_role": None,
@@ -284,7 +284,7 @@ class DBOSClient:
         self,
         *,
         workflow_ids: Optional[List[str]] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,
@@ -314,7 +314,7 @@ class DBOSClient:
         self,
         *,
         workflow_ids: Optional[List[str]] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,
@@ -344,7 +344,7 @@ class DBOSClient:
         self,
         *,
         queue_name: Optional[str] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,
@@ -368,7 +368,7 @@ class DBOSClient:
         self,
         *,
         queue_name: Optional[str] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,

dbos/_context.py

@@ -93,6 +93,8 @@ class DBOSContext:
         self.assumed_role: Optional[str] = None
         self.step_status: Optional[StepStatus] = None
 
+        self.app_version: Optional[str] = None
+
         # A user-specified workflow timeout. Takes priority over a propagated deadline.
         self.workflow_timeout_ms: Optional[int] = None
         # A propagated workflow deadline.
@@ -138,23 +140,18 @@ class DBOSContext:
         self,
         wfid: Optional[str],
         attributes: TracedAttributes,
-        is_temp_workflow: bool = False,
     ) -> None:
         if wfid is None or len(wfid) == 0:
             wfid = self.assign_workflow_id()
             self.id_assigned_for_next_workflow = ""
         self.workflow_id = wfid
         self.function_id = 0
-        if not is_temp_workflow:
-            self._start_span(attributes)
+        self._start_span(attributes)
 
-    def end_workflow(
-        self, exc_value: Optional[BaseException], is_temp_workflow: bool = False
-    ) -> None:
+    def end_workflow(self, exc_value: Optional[BaseException]) -> None:
         self.workflow_id = ""
         self.function_id = -1
-        if not is_temp_workflow:
-            self._end_span(exc_value)
+        self._end_span(exc_value)
 
     def is_within_workflow(self) -> bool:
         return len(self.workflow_id) > 0
@@ -435,7 +432,11 @@ class SetEnqueueOptions:
     """
 
     def __init__(
-        self, *, deduplication_id: Optional[str] = None, priority: Optional[int] = None
+        self,
+        *,
+        deduplication_id: Optional[str] = None,
+        priority: Optional[int] = None,
+        app_version: Optional[str] = None,
     ) -> None:
         self.created_ctx = False
         self.deduplication_id: Optional[str] = deduplication_id
@@ -446,6 +447,8 @@ class SetEnqueueOptions:
             )
         self.priority: Optional[int] = priority
         self.saved_priority: Optional[int] = None
+        self.app_version: Optional[str] = app_version
+        self.saved_app_version: Optional[str] = None
 
     def __enter__(self) -> SetEnqueueOptions:
         # Code to create a basic context
@@ -458,6 +461,8 @@ class SetEnqueueOptions:
         ctx.deduplication_id = self.deduplication_id
         self.saved_priority = ctx.priority
         ctx.priority = self.priority
+        self.saved_app_version = ctx.app_version
+        ctx.app_version = self.app_version
         return self
 
     def __exit__(
@@ -469,6 +474,7 @@ class SetEnqueueOptions:
         curr_ctx = assert_current_dbos_context()
         curr_ctx.deduplication_id = self.saved_deduplication_id
         curr_ctx.priority = self.saved_priority
+        curr_ctx.app_version = self.saved_app_version
         # Code to clean up the basic context if we created it
         if self.created_ctx:
             _clear_local_dbos_context()
@@ -479,7 +485,6 @@ class EnterDBOSWorkflow(AbstractContextManager[DBOSContext, Literal[False]]):
     def __init__(self, attributes: TracedAttributes) -> None:
         self.created_ctx = False
         self.attributes = attributes
-        self.is_temp_workflow = attributes["name"] == "temp_wf"
         self.saved_workflow_timeout: Optional[int] = None
         self.saved_deduplication_id: Optional[str] = None
         self.saved_priority: Optional[int] = None
@@ -503,7 +508,7 @@ class EnterDBOSWorkflow(AbstractContextManager[DBOSContext, Literal[False]]):
         self.saved_priority = ctx.priority
         ctx.priority = None
         ctx.start_workflow(
-            None, self.attributes, self.is_temp_workflow
+            None, self.attributes
         )  # Will get from the context's next workflow ID
         return ctx
 
@@ -515,7 +520,7 @@ class EnterDBOSWorkflow(AbstractContextManager[DBOSContext, Literal[False]]):
     ) -> Literal[False]:
         ctx = assert_current_dbos_context()
         assert ctx.is_within_workflow()
-        ctx.end_workflow(exc_value, self.is_temp_workflow)
+        ctx.end_workflow(exc_value)
         # Restore the saved workflow timeout
         ctx.workflow_timeout_ms = self.saved_workflow_timeout
         # Clear any propagating timeout

dbos/_core.py

@@ -270,7 +270,12 @@ def _init_workflow(
         "output": None,
         "error": None,
         "app_id": ctx.app_id,
-        "app_version": GlobalParams.app_version,
+        "app_version": (
+            enqueue_options["app_version"]
+            if enqueue_options is not None
+            and enqueue_options["app_version"] is not None
+            else GlobalParams.app_version
+        ),
         "executor_id": ctx.executor_id,
         "recovery_attempts": None,
         "authenticated_user": ctx.authenticated_user,
@@ -387,7 +392,7 @@ def _execute_workflow_wthread(
     **kwargs: Any,
 ) -> R:
     attributes: TracedAttributes = {
-        "name": func.__name__,
+        "name": get_dbos_func_name(func),
         "operationType": OperationType.WORKFLOW.value,
     }
     with DBOSContextSwap(ctx):
@@ -420,7 +425,7 @@ async def _execute_workflow_async(
     **kwargs: Any,
 ) -> R:
     attributes: TracedAttributes = {
-        "name": func.__name__,
+        "name": get_dbos_func_name(func),
         "operationType": OperationType.WORKFLOW.value,
     }
     with DBOSContextSwap(ctx):
@@ -445,7 +450,8 @@ def execute_workflow_by_id(dbos: "DBOS", workflow_id: str) -> "WorkflowHandle[An
     wf_func = dbos._registry.workflow_info_map.get(status["name"], None)
     if not wf_func:
         raise DBOSWorkflowFunctionNotFoundError(
-            workflow_id, "Workflow function not found"
+            workflow_id,
+            f"Cannot execute workflow because {status['name']} is not a registered workflow function",
         )
     with DBOSContextEnsure():
         # If this function belongs to a configured class, add that class instance as its first argument
@@ -526,7 +532,8 @@ def start_workflow(
     fi = get_func_info(func)
     if fi is None:
         raise DBOSWorkflowFunctionNotFoundError(
-            "<NONE>", f"start_workflow: function {func.__name__} is not registered"
+            "<NONE>",
+            f"start_workflow: function {func.__name__} is not registered",
         )
 
     func = cast("Workflow[P, R]", func.__orig_func)  # type: ignore
@@ -546,6 +553,7 @@ def start_workflow(
     enqueue_options = EnqueueOptionsInternal(
         deduplication_id=local_ctx.deduplication_id if local_ctx is not None else None,
         priority=local_ctx.priority if local_ctx is not None else None,
+        app_version=local_ctx.app_version if local_ctx is not None else None,
     )
     new_wf_id, new_wf_ctx = _get_new_wf()
 
@@ -620,7 +628,8 @@ async def start_workflow_async(
     fi = get_func_info(func)
     if fi is None:
         raise DBOSWorkflowFunctionNotFoundError(
-            "<NONE>", f"start_workflow: function {func.__name__} is not registered"
+            "<NONE>",
+            f"start_workflow: function {func.__name__} is not registered",
         )
 
     func = cast("Workflow[P, R]", func.__orig_func)  # type: ignore
@@ -637,6 +646,7 @@ async def start_workflow_async(
     enqueue_options = EnqueueOptionsInternal(
         deduplication_id=local_ctx.deduplication_id if local_ctx is not None else None,
         priority=local_ctx.priority if local_ctx is not None else None,
+        app_version=local_ctx.app_version if local_ctx is not None else None,
     )
     new_wf_id, new_wf_ctx = _get_new_wf()
 
@@ -723,13 +733,13 @@ def workflow_wrapper(
         assert fi is not None
         if dbosreg.dbos is None:
             raise DBOSException(
-                f"Function {func.__name__} invoked before DBOS initialized"
+                f"Function {get_dbos_func_name(func)} invoked before DBOS initialized"
             )
         dbos = dbosreg.dbos
 
         rr: Optional[str] = check_required_roles(func, fi)
         attributes: TracedAttributes = {
-            "name": func.__name__,
+            "name": get_dbos_func_name(func),
             "operationType": OperationType.WORKFLOW.value,
         }
         inputs: WorkflowInputs = {
@@ -829,27 +839,30 @@ def workflow_wrapper(
 
 
 def decorate_workflow(
-    reg: "DBOSRegistry", max_recovery_attempts: Optional[int]
+    reg: "DBOSRegistry", name: Optional[str], max_recovery_attempts: Optional[int]
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
     def _workflow_decorator(func: Callable[P, R]) -> Callable[P, R]:
         wrapped_func = workflow_wrapper(reg, func, max_recovery_attempts)
-        reg.register_wf_function(func.__qualname__, wrapped_func, "workflow")
+        func_name = name if name is not None else func.__qualname__
+        set_dbos_func_name(func, func_name)
+        set_dbos_func_name(wrapped_func, func_name)
+        reg.register_wf_function(func_name, wrapped_func, "workflow")
         return wrapped_func
 
     return _workflow_decorator
 
 
 def decorate_transaction(
-    dbosreg: "DBOSRegistry", isolation_level: "IsolationLevel" = "SERIALIZABLE"
+    dbosreg: "DBOSRegistry", name: Optional[str], isolation_level: "IsolationLevel"
 ) -> Callable[[F], F]:
     def decorator(func: F) -> F:
 
-        transaction_name = func.__qualname__
+        transaction_name = name if name is not None else func.__qualname__
 
         def invoke_tx(*args: Any, **kwargs: Any) -> Any:
             if dbosreg.dbos is None:
                 raise DBOSException(
-                    f"Function {func.__name__} invoked before DBOS initialized"
+                    f"Function {transaction_name} invoked before DBOS initialized"
                 )
 
             dbos = dbosreg.dbos
@@ -857,12 +870,12 @@ def decorate_transaction(
             status = dbos._sys_db.get_workflow_status(ctx.workflow_id)
             if status and status["status"] == WorkflowStatusString.CANCELLED.value:
                 raise DBOSWorkflowCancelledError(
-                    f"Workflow {ctx.workflow_id} is cancelled. Aborting transaction {func.__name__}."
+                    f"Workflow {ctx.workflow_id} is cancelled. Aborting transaction {transaction_name}."
                 )
 
             with dbos._app_db.sessionmaker() as session:
                 attributes: TracedAttributes = {
-                    "name": func.__name__,
+                    "name": transaction_name,
                     "operationType": OperationType.TRANSACTION.value,
                 }
                 with EnterDBOSTransaction(session, attributes=attributes):
@@ -963,7 +976,7 @@ def decorate_transaction(
                             raise
                         except InvalidRequestError as invalid_request_error:
                             dbos.logger.error(
-                                f"InvalidRequestError in transaction {func.__qualname__} \033[1m Hint: Do not call commit() or rollback() within a DBOS transaction.\033[0m"
+                                f"InvalidRequestError in transaction {transaction_name} \033[1m Hint: Do not call commit() or rollback() within a DBOS transaction.\033[0m"
                             )
                             txn_error = invalid_request_error
                             raise
@@ -983,7 +996,7 @@ def decorate_transaction(
 
         if inspect.iscoroutinefunction(func):
             raise DBOSException(
-                f"Function {func.__name__} is a coroutine function, but DBOS.transaction does not support coroutine functions"
+                f"Function {transaction_name} is a coroutine function, but DBOS.transaction does not support coroutine functions"
             )
 
         fi = get_or_create_func_info(func)
@@ -1002,15 +1015,19 @@ def decorate_transaction(
                 with DBOSAssumeRole(rr):
                     return invoke_tx(*args, **kwargs)
             else:
-                tempwf = dbosreg.workflow_info_map.get("<temp>." + func.__qualname__)
+                tempwf = dbosreg.workflow_info_map.get("<temp>." + transaction_name)
                 assert tempwf
                 return tempwf(*args, **kwargs)
 
+        set_dbos_func_name(func, transaction_name)
+        set_dbos_func_name(wrapper, transaction_name)
+
         def temp_wf(*args: Any, **kwargs: Any) -> Any:
             return wrapper(*args, **kwargs)
 
         wrapped_wf = workflow_wrapper(dbosreg, temp_wf)
-        set_dbos_func_name(temp_wf, "<temp>." + func.__qualname__)
+        set_dbos_func_name(temp_wf, "<temp>." + transaction_name)
+        set_dbos_func_name(wrapped_wf, "<temp>." + transaction_name)
         set_temp_workflow_type(temp_wf, "transaction")
         dbosreg.register_wf_function(
             get_dbos_func_name(temp_wf), wrapped_wf, "transaction"
@@ -1027,24 +1044,25 @@ def decorate_transaction(
 def decorate_step(
     dbosreg: "DBOSRegistry",
     *,
-    retries_allowed: bool = False,
-    interval_seconds: float = 1.0,
-    max_attempts: int = 3,
-    backoff_rate: float = 2.0,
+    name: Optional[str],
+    retries_allowed: bool,
+    interval_seconds: float,
+    max_attempts: int,
+    backoff_rate: float,
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
     def decorator(func: Callable[P, R]) -> Callable[P, R]:
 
-        step_name = func.__qualname__
+        step_name = name if name is not None else func.__qualname__
 
         def invoke_step(*args: Any, **kwargs: Any) -> Any:
             if dbosreg.dbos is None:
                 raise DBOSException(
-                    f"Function {func.__name__} invoked before DBOS initialized"
+                    f"Function {step_name} invoked before DBOS initialized"
                 )
             dbos = dbosreg.dbos
 
             attributes: TracedAttributes = {
-                "name": func.__name__,
+                "name": step_name,
                 "operationType": OperationType.STEP.value,
             }
 
@@ -1123,7 +1141,7 @@ def decorate_step(
                 stepOutcome = stepOutcome.retry(
                     max_attempts,
                     on_exception,
-                    lambda i, e: DBOSMaxStepRetriesExceeded(func.__name__, i, e),
+                    lambda i, e: DBOSMaxStepRetriesExceeded(step_name, i, e),
                 )
 
             outcome = (
@@ -1152,7 +1170,7 @@ def decorate_step(
                 with DBOSAssumeRole(rr):
                     return invoke_step(*args, **kwargs)
             else:
-                tempwf = dbosreg.workflow_info_map.get("<temp>." + func.__qualname__)
+                tempwf = dbosreg.workflow_info_map.get("<temp>." + step_name)
                 assert tempwf
                 return tempwf(*args, **kwargs)
 
@@ -1160,20 +1178,19 @@ def decorate_step(
             _mark_coroutine(wrapper) if inspect.iscoroutinefunction(func) else wrapper  # type: ignore
         )
 
+        set_dbos_func_name(func, step_name)
+        set_dbos_func_name(wrapper, step_name)
+
         def temp_wf_sync(*args: Any, **kwargs: Any) -> Any:
             return wrapper(*args, **kwargs)
 
         async def temp_wf_async(*args: Any, **kwargs: Any) -> Any:
             return await wrapper(*args, **kwargs)
 
-        # Other code in transact-py depends on the name of temporary workflow functions to be "temp_wf"
-        # so set the name of both sync and async temporary workflow functions explicitly
-        temp_wf_sync.__name__ = "temp_wf"
-        temp_wf_async.__name__ = "temp_wf"
-
         temp_wf = temp_wf_async if inspect.iscoroutinefunction(func) else temp_wf_sync
         wrapped_wf = workflow_wrapper(dbosreg, temp_wf)
-        set_dbos_func_name(temp_wf, "<temp>." + func.__qualname__)
+        set_dbos_func_name(temp_wf, "<temp>." + step_name)
+        set_dbos_func_name(wrapped_wf, "<temp>." + step_name)
         set_temp_workflow_type(temp_wf, "step")
         dbosreg.register_wf_function(get_dbos_func_name(temp_wf), wrapped_wf, "step")
         wrapper.__orig_func = temp_wf  # type: ignore

dbos/_dbos.py

@@ -24,6 +24,7 @@ from typing import (
     Tuple,
     Type,
     TypeVar,
+    Union,
 )
 
 from opentelemetry.trace import Span
@@ -359,6 +360,7 @@ class DBOS:
 
         temp_send_wf = workflow_wrapper(self._registry, send_temp_workflow)
         set_dbos_func_name(send_temp_workflow, TEMP_SEND_WF_NAME)
+        set_dbos_func_name(temp_send_wf, TEMP_SEND_WF_NAME)
         set_temp_workflow_type(send_temp_workflow, "send")
         self._registry.register_wf_function(TEMP_SEND_WF_NAME, temp_send_wf, "send")
 
@@ -588,14 +590,22 @@ class DBOS:
     # Decorators for DBOS functionality
     @classmethod
     def workflow(
-        cls, *, max_recovery_attempts: Optional[int] = DEFAULT_MAX_RECOVERY_ATTEMPTS
+        cls,
+        *,
+        name: Optional[str] = None,
+        max_recovery_attempts: Optional[int] = DEFAULT_MAX_RECOVERY_ATTEMPTS,
     ) -> Callable[[Callable[P, R]], Callable[P, R]]:
         """Decorate a function for use as a DBOS workflow."""
-        return decorate_workflow(_get_or_create_dbos_registry(), max_recovery_attempts)
+        return decorate_workflow(
+            _get_or_create_dbos_registry(), name, max_recovery_attempts
+        )
 
     @classmethod
     def transaction(
-        cls, isolation_level: IsolationLevel = "SERIALIZABLE"
+        cls,
+        isolation_level: IsolationLevel = "SERIALIZABLE",
+        *,
+        name: Optional[str] = None,
     ) -> Callable[[F], F]:
         """
         Decorate a function for use as a DBOS transaction.
@@ -604,12 +614,15 @@ class DBOS:
             isolation_level(IsolationLevel): Transaction isolation level
 
         """
-        return decorate_transaction(_get_or_create_dbos_registry(), isolation_level)
+        return decorate_transaction(
+            _get_or_create_dbos_registry(), name, isolation_level
+        )
 
     @classmethod
     def step(
         cls,
         *,
+        name: Optional[str] = None,
         retries_allowed: bool = False,
         interval_seconds: float = 1.0,
         max_attempts: int = 3,
@@ -628,6 +641,7 @@ class DBOS:
 
         return decorate_step(
             _get_or_create_dbos_registry(),
+            name=name,
             retries_allowed=retries_allowed,
             interval_seconds=interval_seconds,
             max_attempts=max_attempts,
@@ -998,7 +1012,7 @@ class DBOS:
         cls,
         *,
         workflow_ids: Optional[List[str]] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,
@@ -1034,7 +1048,7 @@ class DBOS:
         cls,
         *,
         queue_name: Optional[str] = None,
-        status: Optional[str] = None,
+        status: Optional[Union[str, List[str]]] = None,
         start_time: Optional[str] = None,
         end_time: Optional[str] = None,
         name: Optional[str] = None,

dbos/_kafka.py

@@ -13,6 +13,7 @@ from ._context import SetWorkflowID
 from ._error import DBOSInitializationError
 from ._kafka_message import KafkaMessage
 from ._logger import dbos_logger
+from ._registrations import get_dbos_func_name
 
 _KafkaConsumerWorkflow = Callable[[KafkaMessage], None]
 
@@ -44,7 +45,7 @@ def _kafka_consumer_loop(
         config["auto.offset.reset"] = "earliest"
 
     if config.get("group.id") is None:
-        config["group.id"] = safe_group_name(func.__qualname__, topics)
+        config["group.id"] = safe_group_name(get_dbos_func_name(func), topics)
         dbos_logger.warning(
             f"Consumer group ID not found. Using generated group.id {config['group.id']}"
         )

dbos/_registrations.py

@@ -4,15 +4,17 @@ from enum import Enum
 from types import FunctionType
 from typing import Any, Callable, List, Literal, Optional, Tuple, Type, cast
 
+from dbos._error import DBOSWorkflowFunctionNotFoundError
+
 DEFAULT_MAX_RECOVERY_ATTEMPTS = 100
 
 
 def get_dbos_func_name(f: Any) -> str:
     if hasattr(f, "dbos_function_name"):
         return str(getattr(f, "dbos_function_name"))
-    if hasattr(f, "__qualname__"):
-        return str(getattr(f, "__qualname__"))
-    return "<unknown>"
+    raise DBOSWorkflowFunctionNotFoundError(
+        "<NONE>", f"function {f.__name__} is not registered"
+    )
 
 
 def set_dbos_func_name(f: Any, name: str) -> None:

dbos/_roles.py

@@ -10,6 +10,7 @@ from ._context import DBOSAssumeRole, get_local_dbos_context
 from ._registrations import (
     DBOSFuncInfo,
     get_class_info_for_func,
+    get_dbos_func_name,
     get_or_create_class_info,
     get_or_create_func_info,
 )
@@ -36,7 +37,7 @@ def check_required_roles(
     ctx = get_local_dbos_context()
     if ctx is None or ctx.authenticated_roles is None:
         raise DBOSNotAuthorizedError(
-            f"Function {func.__name__} requires a role, but was called in a context without authentication information"
+            f"Function {get_dbos_func_name(func)} requires a role, but was called in a context without authentication information"
         )
 
     for r in required_roles:
@@ -44,7 +45,7 @@ def check_required_roles(
             return r
 
     raise DBOSNotAuthorizedError(
-        f"Function {func.__name__} has required roles, but user is not authenticated for any of them"
+        f"Function {get_dbos_func_name(func)} has required roles, but user is not authenticated for any of them"
     )
 
 

dbos/_scheduler.py

@@ -11,6 +11,7 @@ if TYPE_CHECKING:
 
 from ._context import SetWorkflowID
 from ._croniter import croniter  # type: ignore
+from ._registrations import get_dbos_func_name
 
 ScheduledWorkflow = Callable[[datetime, datetime], None]
 
@@ -24,20 +25,22 @@ def scheduler_loop(
         iter = croniter(cron, datetime.now(timezone.utc), second_at_beginning=True)
     except Exception as e:
         dbos_logger.error(
-            f'Cannot run scheduled function {func.__name__}. Invalid crontab "{cron}"'
+            f'Cannot run scheduled function {get_dbos_func_name(func)}. Invalid crontab "{cron}"'
         )
     while not stop_event.is_set():
         nextExecTime = iter.get_next(datetime)
         sleepTime = nextExecTime - datetime.now(timezone.utc)
         if stop_event.wait(timeout=sleepTime.total_seconds()):
             return
-        with SetWorkflowID(f"sched-{func.__qualname__}-{nextExecTime.isoformat()}"):
-            try:
+        try:
+            with SetWorkflowID(
+                f"sched-{get_dbos_func_name(func)}-{nextExecTime.isoformat()}"
+            ):
                 scheduler_queue.enqueue(func, nextExecTime, datetime.now(timezone.utc))
-            except Exception:
-                dbos_logger.warning(
-                    f"Exception encountered in scheduler thread: {traceback.format_exc()})"
-                )
+        except Exception:
+            dbos_logger.warning(
+                f"Exception encountered in scheduler thread: {traceback.format_exc()})"
+            )
 
 
 def scheduled(
@@ -48,7 +51,7 @@ def scheduled(
             croniter(cron, datetime.now(timezone.utc), second_at_beginning=True)
         except Exception as e:
             raise ValueError(
-                f'Invalid crontab "{cron}" for scheduled function function {func.__name__}.'
+                f'Invalid crontab "{cron}" for scheduled function function {get_dbos_func_name(func)}.'
             )
 
         global scheduler_queue

dbos/_sys_db.py

@@ -149,6 +149,8 @@ class EnqueueOptionsInternal(TypedDict):
     deduplication_id: Optional[str]
     # Priority of the workflow on the queue, starting from 1 ~ 2,147,483,647. Default 0 (highest priority).
     priority: Optional[int]
+    # On what version the workflow is enqueued. Current version if not specified.
+    app_version: Optional[str]
 
 
 class RecordedResult(TypedDict):
@@ -185,7 +187,9 @@ class GetWorkflowsInput:
         self.authenticated_user: Optional[str] = None  # The user who ran the workflow.
         self.start_time: Optional[str] = None  # Timestamp in ISO 8601 format
         self.end_time: Optional[str] = None  # Timestamp in ISO 8601 format
-        self.status: Optional[str] = None
+        self.status: Optional[List[str]] = (
+            None  # Get workflows with one of these statuses
+        )
         self.application_version: Optional[str] = (
             None  # The application version that ran this workflow. = None
         )
@@ -205,7 +209,7 @@ class GetWorkflowsInput:
 
 class GetQueuedWorkflowsInput(TypedDict):
     queue_name: Optional[str]  # Get workflows belonging to this queue
-    status: Optional[str]  # Get workflows with this status
+    status: Optional[list[str]]  # Get workflows with one of these statuses
     start_time: Optional[str]  # Timestamp in ISO 8601 format
     end_time: Optional[str]  # Timestamp in ISO 8601 format
     limit: Optional[int]  # Return up to this many workflows IDs.
@@ -832,7 +836,7 @@ class SystemDatabase:
                 <= datetime.datetime.fromisoformat(input.end_time).timestamp() * 1000
             )
         if input.status:
-            query = query.where(SystemSchema.workflow_status.c.status == input.status)
+            query = query.where(SystemSchema.workflow_status.c.status.in_(input.status))
         if input.application_version:
             query = query.where(
                 SystemSchema.workflow_status.c.application_version
@@ -938,10 +942,9 @@ class SystemDatabase:
                 SystemSchema.workflow_status.c.queue_name == input["queue_name"]
             )
 
-        if input.get("status"):
-            query = query.where(
-                SystemSchema.workflow_status.c.status == input["status"]
-            )
+        status = input.get("status", None)
+        if status:
+            query = query.where(SystemSchema.workflow_status.c.status.in_(status))
         if "start_time" in input and input["start_time"] is not None:
             query = query.where(
                 SystemSchema.workflow_status.c.created_at

dbos/_workflow_commands.py

@@ -1,7 +1,7 @@
 import time
 import uuid
 from datetime import datetime
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional, Union
 
 from dbos._context import get_local_dbos_context
 
@@ -23,7 +23,7 @@ def list_workflows(
     sys_db: SystemDatabase,
     *,
     workflow_ids: Optional[List[str]] = None,
-    status: Optional[str] = None,
+    status: Optional[Union[str, List[str]]] = None,
     start_time: Optional[str] = None,
     end_time: Optional[str] = None,
     name: Optional[str] = None,
@@ -39,7 +39,7 @@ def list_workflows(
     input.authenticated_user = user
     input.start_time = start_time
     input.end_time = end_time
-    input.status = status
+    input.status = status if status is None or isinstance(status, list) else [status]
     input.application_version = app_version
     input.limit = limit
     input.name = name
@@ -56,7 +56,7 @@ def list_queued_workflows(
     sys_db: SystemDatabase,
     *,
     queue_name: Optional[str] = None,
-    status: Optional[str] = None,
+    status: Optional[Union[str, List[str]]] = None,
     start_time: Optional[str] = None,
     end_time: Optional[str] = None,
     name: Optional[str] = None,
@@ -68,7 +68,7 @@ def list_queued_workflows(
         "queue_name": queue_name,
         "start_time": start_time,
         "end_time": end_time,
-        "status": status,
+        "status": status if status is None or isinstance(status, list) else [status],
         "limit": limit,
         "name": name,
         "offset": offset,

{dbos-1.5.0a10.dist-info → dbos-1.6.0.dist-info}/METADATA

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

{dbos-1.5.0a10.dist-info → dbos-1.6.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-dbos-1.5.0a10.dist-info/METADATA,sha256=sCKGconTkgDwgAzE6B3g7dXT56-a1rLWVVTdaXtHMIY,13268
-dbos-1.5.0a10.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dbos-1.5.0a10.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-1.5.0a10.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-1.6.0.dist-info/METADATA,sha256=k5u4xGb8zZtCVAbUbOe5LH26_VRO7CgfQ2Fur4zt2wc,13265
+dbos-1.6.0.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dbos-1.6.0.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-1.6.0.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=NssPCubaBxdiKarOWa-wViz1hdJSkmBGcpLX_gQ4NeA,891
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=l46ZX4NpvBP9W8cl9gE7OqMNwUCevLMt2VztM7crBv0,15465
 dbos/_app_db.py,sha256=htblDPfqrpb_uZoFcvaud7cgQ-PDyn6Bn-cBidxdCTA,10603
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=cQxw1Nbh_vKZ03lONt0EmUhwXBk3B3NczZrmfXXeefY,14667
+dbos/_client.py,sha256=DeiJHo5fTedWsipr7qlQQIcDmVAPjzzX94X01121oQM,14780
 dbos/_conductor/conductor.py,sha256=y_T-8kEHwKWt6W8LtcFMctB_6EvYFWsuGLxiFuuKKBU,23702
 dbos/_conductor/protocol.py,sha256=DOTprPSd7oHDcvwWSyZpnlPds_JfILtcKzHZa-qBsF4,7330
-dbos/_context.py,sha256=5ajoWAmToAfzzmMLylnJZoL4Ny9rBwZWuG05sXadMIA,24798
-dbos/_core.py,sha256=eFRhljdi8vjpmBEzu-wt_feC7-uDmKqbiybz92KCRwI,48523
+dbos/_context.py,sha256=zhje6jObpBcRALYfHyyIEumHtk_enl_PxLl01j4oDME,24897
+dbos/_core.py,sha256=m3e1WZ_210p2DT8c1sTh4S_CVM748UjkBdiGO846mVg,49269
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
-dbos/_dbos.py,sha256=HHMo-PLUa6m5jFgdA-YYAwaTx2kyA1Te1VslAyd0hIw,47257
+dbos/_dbos.py,sha256=qzXD55bGJJW2SxI6HESykDRIpBmODNwIUt_jRkcRBVw,47588
 dbos/_dbos_config.py,sha256=JUG4V1rrP0p1AYESgih4ea80qOH_13UsgoIIm8X84pw,20562
 dbos/_debug.py,sha256=99j2SChWmCPAlZoDmjsJGe77tpU2LEa8E2TtLAnnh7o,1831
 dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
@@ -21,7 +21,7 @@ dbos/_error.py,sha256=nS7KuXJHhuNXZRErxdEUGT38Hb0VPyxNwSyADiVpHcE,8581
 dbos/_event_loop.py,sha256=cvaFN9-II3MsHEOq8QoICc_8qSKrjikMlLfuhC3Y8Dk,2923
 dbos/_fastapi.py,sha256=T7YlVY77ASqyTqq0aAPclZ9YzlXdGTT0lEYSwSgt1EE,3151
 dbos/_flask.py,sha256=Npnakt-a3W5OykONFRkDRnumaDhTQmA0NPdUCGRYKXE,1652
-dbos/_kafka.py,sha256=pz0xZ9F3X9Ky1k-VSbeF3tfPhP3UPr3lUUhUfE41__U,4198
+dbos/_kafka.py,sha256=Gm4fHWl7gYb-i5BMvwNwm5Km3z8zQpseqdMgqgFjlGI,4252
 dbos/_kafka_message.py,sha256=NYvOXNG3Qn7bghn1pv3fg4Pbs86ILZGcK4IB-MLUNu0,409
 dbos/_logger.py,sha256=Dp6bHZKUtcm5gWwYHj_HA5Wj5OMuJGUrpl2g2i4xDZg,4620
 dbos/_migrations/env.py,sha256=38SIGVbmn_VV2x2u1aHLcPOoWgZ84eCymf3g_NljmbU,1626
@@ -42,14 +42,14 @@ dbos/_migrations/versions/f4b9b32ba814_functionname_childid_op_outputs.py,sha256
 dbos/_outcome.py,sha256=Kz3aL7517q9UEFTx3Cq9zzztjWyWVOx_08fZyHo9dvg,7035
 dbos/_queue.py,sha256=Kq7aldTDLRF7cZtkXmsCy6wV2PR24enkhghEG25NtaU,4080
 dbos/_recovery.py,sha256=TBNjkmSEqBU-g5YXExsLJ9XoCe4iekqtREsskXZECEg,2507
-dbos/_registrations.py,sha256=CZt1ElqDjCT7hz6iyT-1av76Yu-iuwu_c9lozO87wvM,7303
-dbos/_roles.py,sha256=iOsgmIAf1XVzxs3gYWdGRe1B880YfOw5fpU7Jwx8_A8,2271
-dbos/_scheduler.py,sha256=SR1oRZRcVzYsj-JauV2LA8JtwTkt8mru7qf6H1AzQ1U,2027
+dbos/_registrations.py,sha256=U-PwDZBuyuJjA2LYtud7D3VxDR440mVpMYE-S11BWDo,7369
+dbos/_roles.py,sha256=kCuhhg8XLtrHCgKgm44I0abIRTGHltf88OwjEKAUggk,2317
+dbos/_scheduler.py,sha256=CWeGVfl9h51VXfxt80y5Da_5pE8SPty_AYkfpJkkMxQ,2117
 dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=SypAS9l9EsaBHFn9FR8jmnqt01M74d9AF1AMa4m2hhI,1040
 dbos/_schemas/system_database.py,sha256=rbFKggONdvvbb45InvGz0TM6a7c-Ux9dcaL-h_7Z7pU,4438
 dbos/_serialization.py,sha256=bWuwhXSQcGmiazvhJHA5gwhrRWxtmFmcCFQSDJnqqkU,3666
-dbos/_sys_db.py,sha256=now889o6Mlmcdopp8xF5_0LAE67KeVH9Vm-4svIqo5s,80170
+dbos/_sys_db.py,sha256=yhwhH23QvehbhPW3k6f4TRQ6mDjmvMILqsR8YffFZBg,80368
 dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_templates/dbos-db-starter/__package/main.py.dbos,sha256=aQnBPSSQpkB8ERfhf7gB7P9tsU6OPKhZscfeh0yiaD8,2702
@@ -62,11 +62,11 @@ dbos/_templates/dbos-db-starter/migrations/versions/2024_07_31_180642_init.py,sh
 dbos/_templates/dbos-db-starter/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
 dbos/_tracer.py,sha256=RnlcaOJEx_58hr2J9L9g6E7gjAHAeEtEGugJZmCwNfQ,2963
 dbos/_utils.py,sha256=uywq1QrjMwy17btjxW4bES49povlQwYwYbvKwMT6C2U,1575
-dbos/_workflow_commands.py,sha256=Fi-sQxQvFkDkMlCv7EyRJIWxqk3fG6DGlgvvwkjWbS4,4485
+dbos/_workflow_commands.py,sha256=4QCs7ziQ9T457tqfaNFwiXd6mDisr-ZK__skz1Uteyg,4648
 dbos/cli/_github_init.py,sha256=Y_bDF9gfO2jB1id4FV5h1oIxEJRWyqVjhb7bNEa5nQ0,3224
 dbos/cli/_template_init.py,sha256=7JBcpMqP1r2mfCnvWatu33z8ctEGHJarlZYKgB83cXE,2972
 dbos/cli/cli.py,sha256=IcfaX4rrSrk6f24S2jrlR33snYMyNyEIx_lNQtuVr2E,22081
 dbos/dbos-config.schema.json,sha256=CjaspeYmOkx6Ip_pcxtmfXJTn_YGdSx_0pcPBF7KZmo,6060
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-1.5.0a10.dist-info/RECORD,,
+dbos-1.6.0.dist-info/RECORD,,