dbos 1.3.0a2__tar.gz → 1.3.0a3__tar.gz

{dbos-1.3.0a2 → dbos-1.3.0a3}/PKG-INFO

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

{dbos-1.3.0a2 → dbos-1.3.0a3}/dbos/_client.py

@@ -163,6 +163,12 @@ class DBOSClient:
                 int(workflow_timeout * 1000) if workflow_timeout is not None else None
             ),
             "workflow_deadline_epoch_ms": None,
+            "deduplication_id": enqueue_options_internal["deduplication_id"],
+            "priority": (
+                enqueue_options_internal["priority"]
+                if enqueue_options_internal["priority"] is not None
+                else 0
+            ),
         }
 
         inputs: WorkflowInputs = {
@@ -174,7 +180,6 @@ class DBOSClient:
             status,
             _serialization.serialize_args(inputs),
             max_recovery_attempts=None,
-            enqueue_options=enqueue_options_internal,
         )
         return workflow_id
 
@@ -230,6 +235,8 @@ class DBOSClient:
             "app_version": None,
             "workflow_timeout_ms": None,
             "workflow_deadline_epoch_ms": None,
+            "deduplication_id": None,
+            "priority": 0,
         }
         with self._sys_db.engine.begin() as conn:
             self._sys_db._insert_workflow_status(

{dbos-1.3.0a2 → dbos-1.3.0a3}/dbos/_core.py

@@ -279,6 +279,18 @@ def _init_workflow(
         "updated_at": None,
         "workflow_timeout_ms": workflow_timeout_ms,
         "workflow_deadline_epoch_ms": workflow_deadline_epoch_ms,
+        "deduplication_id": (
+            enqueue_options["deduplication_id"] if enqueue_options is not None else None
+        ),
+        "priority": (
+            (
+                enqueue_options["priority"]
+                if enqueue_options["priority"] is not None
+                else 0
+            )
+            if enqueue_options is not None
+            else 0
+        ),
     }
 
     # If we have a class name, the first arg is the instance and do not serialize
@@ -290,7 +302,6 @@ def _init_workflow(
         status,
         _serialization.serialize_args(inputs),
         max_recovery_attempts=max_recovery_attempts,
-        enqueue_options=enqueue_options,
     )
 
     if workflow_deadline_epoch_ms is not None:
@@ -342,13 +353,12 @@ def _get_wf_invoke_func(
             return recorded_result
         try:
             output = func()
-            status["status"] = "SUCCESS"
-            status["output"] = _serialization.serialize(output)
             if not dbos.debug_mode:
-                if status["queue_name"] is not None:
-                    queue = dbos._registry.queue_info_map[status["queue_name"]]
-                    dbos._sys_db.remove_from_queue(status["workflow_uuid"], queue)
-                dbos._sys_db.update_workflow_status(status)
+                dbos._sys_db.update_workflow_outcome(
+                    status["workflow_uuid"],
+                    "SUCCESS",
+                    output=_serialization.serialize(output),
+                )
             return output
         except DBOSWorkflowConflictIDError:
             # Await the workflow result
@@ -357,13 +367,12 @@ def _get_wf_invoke_func(
         except DBOSWorkflowCancelledError as error:
             raise
         except Exception as error:
-            status["status"] = "ERROR"
-            status["error"] = _serialization.serialize_exception(error)
             if not dbos.debug_mode:
-                if status["queue_name"] is not None:
-                    queue = dbos._registry.queue_info_map[status["queue_name"]]
-                    dbos._sys_db.remove_from_queue(status["workflow_uuid"], queue)
-                dbos._sys_db.update_workflow_status(status)
+                dbos._sys_db.update_workflow_outcome(
+                    status["workflow_uuid"],
+                    "ERROR",
+                    error=_serialization.serialize_exception(error),
+                )
             raise
 
     return persist

{dbos-1.3.0a2 → dbos-1.3.0a3}/dbos/_dbos.py

@@ -215,6 +215,8 @@ class DBOSRegistry:
         sources = sorted(
             [inspect.getsource(wf) for wf in self.workflow_info_map.values()]
         )
+        # Different DBOS versions should produce different app versions
+        sources.append(GlobalParams.dbos_version)
         for source in sources:
             hasher.update(source.encode("utf-8"))
         return hasher.hexdigest()

dbos-1.3.0a3/dbos/_migrations/versions/66478e1b95e5_consolidate_queues.py

@@ -0,0 +1,71 @@
+"""consolidate_queues
+
+Revision ID: 66478e1b95e5
+Revises: 933e86bdac6a
+Create Date: 2025-05-21 10:14:25.674613
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "66478e1b95e5"
+down_revision: Union[str, None] = "933e86bdac6a"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Add new columns to workflow_status table
+    op.add_column(
+        "workflow_status",
+        sa.Column("started_at_epoch_ms", sa.BigInteger(), nullable=True),
+        schema="dbos",
+    )
+
+    op.add_column(
+        "workflow_status",
+        sa.Column("deduplication_id", sa.Text(), nullable=True),
+        schema="dbos",
+    )
+
+    op.add_column(
+        "workflow_status",
+        sa.Column(
+            "priority", sa.Integer(), nullable=False, server_default=sa.text("'0'::int")
+        ),
+        schema="dbos",
+    )
+
+    # Add unique constraint for deduplication_id
+    op.create_unique_constraint(
+        "uq_workflow_status_queue_name_dedup_id",
+        "workflow_status",
+        ["queue_name", "deduplication_id"],
+        schema="dbos",
+    )
+
+    # Add index on status field
+    op.create_index(
+        "workflow_status_status_index", "workflow_status", ["status"], schema="dbos"
+    )
+
+
+def downgrade() -> None:
+    # Drop indexes
+    op.drop_index(
+        "workflow_status_status_index", table_name="workflow_status", schema="dbos"
+    )
+
+    # Drop unique constraint
+    op.drop_constraint(
+        "uq_workflow_status_queue_name_dedup_id", "workflow_status", schema="dbos"
+    )
+
+    # Drop columns
+    op.drop_column("workflow_status", "priority", schema="dbos")
+    op.drop_column("workflow_status", "deduplication_id", schema="dbos")
+    op.drop_column("workflow_status", "started_at_epoch_ms", schema="dbos")

{dbos-1.3.0a2 → dbos-1.3.0a3}/dbos/_queue.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING, Any, Callable, Coroutine, Optional, TypedDict
 from psycopg import errors
 from sqlalchemy.exc import OperationalError
 
+from dbos._context import get_local_dbos_context
 from dbos._logger import dbos_logger
 from dbos._utils import GlobalParams
 
@@ -41,6 +42,7 @@ class Queue:
         limiter: Optional[QueueRateLimit] = None,
         *,  # Disable positional arguments from here on
         worker_concurrency: Optional[int] = None,
+        priority_enabled: bool = False,
     ) -> None:
         if (
             worker_concurrency is not None
@@ -54,6 +56,7 @@ class Queue:
         self.concurrency = concurrency
         self.worker_concurrency = worker_concurrency
         self.limiter = limiter
+        self.priority_enabled = priority_enabled
         from ._dbos import _get_or_create_dbos_registry
 
         registry = _get_or_create_dbos_registry()
@@ -66,6 +69,14 @@ class Queue:
     ) -> "WorkflowHandle[R]":
         from ._dbos import _get_dbos_instance
 
+        context = get_local_dbos_context()
+        if (
+            context is not None
+            and context.priority is not None
+            and not self.priority_enabled
+        ):
+            dbos_logger.warning(f"Priority is not enabled for queue {self.name}. Setting priority will not have any effect.")
+
         dbos = _get_dbos_instance()
         return start_workflow(dbos, func, self.name, False, *args, **kwargs)
 

{dbos-1.3.0a2 → dbos-1.3.0a3}/dbos/_schemas/system_database.py

@@ -1,6 +1,5 @@
 from sqlalchemy import (
     BigInteger,
-    Boolean,
     Column,
     ForeignKey,
     Index,
@@ -57,8 +56,17 @@ class SystemSchema:
         Column("queue_name", Text, nullable=True),
         Column("workflow_timeout_ms", BigInteger, nullable=True),
         Column("workflow_deadline_epoch_ms", BigInteger, nullable=True),
+        Column("started_at_epoch_ms", BigInteger(), nullable=True),
+        Column("deduplication_id", Text(), nullable=True),
+        Column("priority", Integer(), nullable=False, server_default=text("'0'::int")),
         Index("workflow_status_created_at_index", "created_at"),
         Index("workflow_status_executor_id_index", "executor_id"),
+        Index("workflow_status_status_index", "status"),
+        UniqueConstraint(
+            "queue_name",
+            "deduplication_id",
+            name="uq_workflow_status_queue_name_dedup_id",
+        ),
     )
 
     operation_outputs = Table(
@@ -138,54 +146,3 @@ class SystemSchema:
         Column("value", Text, nullable=False),
         PrimaryKeyConstraint("workflow_uuid", "key"),
     )
-
-    scheduler_state = Table(
-        "scheduler_state",
-        metadata_obj,
-        Column("workflow_fn_name", Text, primary_key=True, nullable=False),
-        Column("last_run_time", BigInteger, nullable=False),
-    )
-
-    workflow_queue = Table(
-        "workflow_queue",
-        metadata_obj,
-        Column(
-            "workflow_uuid",
-            Text,
-            ForeignKey(
-                "workflow_status.workflow_uuid", onupdate="CASCADE", ondelete="CASCADE"
-            ),
-            nullable=False,
-            primary_key=True,
-        ),
-        # Column("executor_id", Text), # This column is deprecated. Do *not* use it.
-        Column("queue_name", Text, nullable=False),
-        Column(
-            "created_at_epoch_ms",
-            BigInteger,
-            nullable=False,
-            server_default=text("(EXTRACT(epoch FROM now()) * 1000::numeric)::bigint"),
-        ),
-        Column(
-            "started_at_epoch_ms",
-            BigInteger(),
-        ),
-        Column(
-            "completed_at_epoch_ms",
-            BigInteger(),
-        ),
-        Column(
-            "deduplication_id",
-            Text,
-            nullable=True,
-        ),
-        Column(
-            "priority",
-            Integer,
-            nullable=False,
-            server_default=text("'0'::int"),
-        ),
-        UniqueConstraint(
-            "queue_name", "deduplication_id", name="uq_workflow_queue_name_dedup_id"
-        ),
-    )