dbos 0.7.0a8__tar.gz → 0.7.1__tar.gz

{dbos-0.7.0a8 → dbos-0.7.1}/PKG-INFO

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

{dbos-0.7.0a8 → dbos-0.7.1}/dbos/error.py

@@ -32,7 +32,6 @@ class DBOSErrorCode(Enum):
     InitializationError = 3
     WorkflowFunctionNotFound = 4
     NonExistentWorkflowError = 5
-    DuplicateWorkflowEventError = 6
     MaxStepRetriesExceeded = 7
     NotAuthorized = 8
 
@@ -87,16 +86,6 @@ class DBOSNonExistentWorkflowError(DBOSException):
         )
 
 
-class DBOSDuplicateWorkflowEventError(DBOSException):
-    """Exception raised when a workflow attempts to set an event value more than once per key."""
-
-    def __init__(self, workflow_id: str, key: str):
-        super().__init__(
-            f"Workflow {workflow_id} has already emitted an event with key {key}",
-            dbos_error_code=DBOSErrorCode.DuplicateWorkflowEventError.value,
-        )
-
-
 class DBOSNotAuthorizedError(DBOSException):
     """Exception raised by DBOS role-based security when the user is not authorized to access a function."""
 

dbos-0.7.1/dbos/migrations/versions/50f3227f0b4b_fix_job_queue.py

@@ -0,0 +1,34 @@
+"""fix_job_queue
+
+Revision ID: 50f3227f0b4b
+Revises: eab0cc1d9a14
+Create Date: 2024-09-25 14:03:53.308068
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "50f3227f0b4b"
+down_revision: Union[str, None] = "eab0cc1d9a14"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.drop_constraint("job_queue_pkey", "job_queue", schema="dbos", type_="primary")
+
+    op.create_primary_key(
+        "job_queue_pkey", "job_queue", ["workflow_uuid"], schema="dbos"
+    )
+
+
+def downgrade() -> None:
+    # Reverting the changes
+    op.drop_constraint("job_queue_pkey", "job_queue", schema="dbos", type_="primary")
+
+    op.create_primary_key(
+        "job_queue_pkey", "job_queue", ["created_at_epoch_ms"], schema="dbos"
+    )

{dbos-0.7.0a8 → dbos-0.7.1}/dbos/queue.py

@@ -1,9 +1,9 @@
 import threading
 import time
+import traceback
 from typing import TYPE_CHECKING, Optional
 
 from dbos.core import P, R, _execute_workflow_id, _start_workflow
-from dbos.error import DBOSInitializationError
 
 if TYPE_CHECKING:
     from dbos.dbos import DBOS, Workflow, WorkflowHandle
@@ -31,6 +31,13 @@ def queue_thread(stop_event: threading.Event, dbos: "DBOS") -> None:
     while not stop_event.is_set():
         time.sleep(1)
         for queue_name, queue in dbos._registry.queue_info_map.items():
-            wf_ids = dbos._sys_db.start_queued_workflows(queue_name, queue.concurrency)
-            for id in wf_ids:
-                _execute_workflow_id(dbos, id)
+            try:
+                wf_ids = dbos._sys_db.start_queued_workflows(
+                    queue_name, queue.concurrency
+                )
+                for id in wf_ids:
+                    _execute_workflow_id(dbos, id)
+            except Exception:
+                dbos.logger.warning(
+                    f"Exception encountered in queue thread: {traceback.format_exc()}"
+                )

{dbos-0.7.0a8 → dbos-0.7.1}/dbos/system_database.py

@@ -1,6 +1,5 @@
 import datetime
 import os
-import select
 import threading
 import time
 from enum import Enum
@@ -14,11 +13,7 @@ from alembic.config import Config
 from sqlalchemy.exc import DBAPIError
 
 import dbos.utils as utils
-from dbos.error import (
-    DBOSDuplicateWorkflowEventError,
-    DBOSNonExistentWorkflowError,
-    DBOSWorkflowConflictIDError,
-)
+from dbos.error import DBOSNonExistentWorkflowError, DBOSWorkflowConflictIDError
 
 from .dbos_config import ConfigFile
 from .logger import dbos_logger
@@ -832,18 +827,18 @@ class SystemDatabase:
             if recorded_output is not None:
                 return  # Already sent before
 
-            try:
-                c.execute(
-                    pg.insert(SystemSchema.workflow_events).values(
-                        workflow_uuid=workflow_uuid,
-                        key=key,
-                        value=utils.serialize(message),
-                    )
+            c.execute(
+                pg.insert(SystemSchema.workflow_events)
+                .values(
+                    workflow_uuid=workflow_uuid,
+                    key=key,
+                    value=utils.serialize(message),
                 )
-            except DBAPIError as dbapi_error:
-                if dbapi_error.orig.sqlstate == "23505":  # type: ignore
-                    raise DBOSDuplicateWorkflowEventError(workflow_uuid, key)
-                raise
+                .on_conflict_do_update(
+                    index_elements=["workflow_uuid", "key"],
+                    set_={"value": utils.serialize(message)},
+                )
+            )
             output: OperationResultInternal = {
                 "workflow_uuid": workflow_uuid,
                 "function_id": function_id,

{dbos-0.7.0a8 → dbos-0.7.1}/pyproject.toml

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

{dbos-0.7.0a8 → dbos-0.7.1}/tests/test_dbos.py

@@ -1,7 +1,8 @@
 import datetime
+import threading
 import time
 import uuid
-from typing import Any, Optional
+from typing import Optional
 
 import pytest
 import sqlalchemy as sa
@@ -13,7 +14,6 @@ from dbos import DBOS, ConfigFile, SetWorkflowID, WorkflowHandle, WorkflowStatus
 from dbos.context import assert_current_dbos_context, get_local_dbos_context
 from dbos.error import DBOSMaxStepRetriesExceeded
 from dbos.system_database import GetWorkflowsInput
-from tests.conftest import default_config
 
 
 def test_simple_workflow(dbos: DBOS) -> None:
@@ -882,3 +882,23 @@ def test_set_get_events(dbos: DBOS) -> None:
     with pytest.raises(Exception) as exc_info:
         dbos.set_event("key1", "value1")
     assert "set_event() must be called from within a workflow" in str(exc_info.value)
+
+
+def test_multi_set_event(dbos: DBOS) -> None:
+    event = threading.Event()
+
+    wfid = str(uuid.uuid4())
+
+    @DBOS.workflow()
+    def test_setevent_workflow() -> None:
+        assert DBOS.workflow_id == wfid
+        DBOS.set_event("key", "value1")
+        event.wait()
+        DBOS.set_event("key", "value2")
+
+    with SetWorkflowID(wfid):
+        handle = DBOS.start_workflow(test_setevent_workflow)
+    assert DBOS.get_event(wfid, "key") == "value1"
+    event.set()
+    assert handle.get_result() == None
+    assert DBOS.get_event(wfid, "key") == "value2"

{dbos-0.7.0a8 → dbos-0.7.1}/tests/test_fastapi_roles.py

@@ -18,7 +18,7 @@ from dbos import DBOS, DBOSContextEnsure
 
 # Private API because this is a unit test
 from dbos.context import assert_current_dbos_context
-from dbos.error import DBOSDuplicateWorkflowEventError, DBOSNotAuthorizedError
+from dbos.error import DBOSInitializationError, DBOSNotAuthorizedError
 from dbos.system_database import GetWorkflowsInput
 from dbos.tracer import dbos_tracer
 
@@ -54,7 +54,7 @@ def test_simple_endpoint(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
 
     @app.get("/dbosinternalerror")
     def test_dbos_error_internal() -> None:
-        raise DBOSDuplicateWorkflowEventError("nosuchwf", "test")
+        raise DBOSInitializationError("oh no")
 
     @app.get("/open/{var1}")
     @DBOS.required_roles([])