dbos 1.15.0a4__tar.gz → 1.15.0a5__tar.gz

{dbos-1.15.0a4 → dbos-1.15.0a5}/PKG-INFO

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

{dbos-1.15.0a4 → dbos-1.15.0a5}/dbos/_dbos.py

@@ -1222,6 +1222,10 @@ class DBOS:
     async def list_workflow_steps_async(cls, workflow_id: str) -> List[StepInfo]:
         await cls._configure_asyncio_thread_pool()
         return await asyncio.to_thread(cls.list_workflow_steps, workflow_id)
+    
+    @classproperty
+    def application_version(cls) -> str:
+        return GlobalParams.app_version
 
     @classproperty
     def logger(cls) -> Logger:

{dbos-1.15.0a4 → dbos-1.15.0a5}/dbos/_debouncer.py

@@ -89,11 +89,13 @@ def debouncer_workflow(
     # Every time the debounced workflow is called, a message is sent to this workflow.
     # It waits until debounce_period_sec have passed since the last message or until
     # debounce_timeout_sec has elapsed.
-    debounce_deadline_epoch_sec = (
-        time.time() + options["debounce_timeout_sec"]
-        if options["debounce_timeout_sec"]
-        else math.inf
-    )
+    def get_debounce_deadline_epoch_sec() -> float:
+        return (
+            time.time() + options["debounce_timeout_sec"]
+            if options["debounce_timeout_sec"]
+            else math.inf
+        )
+    debounce_deadline_epoch_sec = dbos._sys_db.call_function_as_step(get_debounce_deadline_epoch_sec, "get_debounce_deadline_epoch_sec")
     debounce_period_sec = initial_debounce_period_sec
     while time.time() < debounce_deadline_epoch_sec:
         time_until_deadline = max(debounce_deadline_epoch_sec - time.time(), 0)

{dbos-1.15.0a4 → dbos-1.15.0a5}/dbos/_queue.py

@@ -61,7 +61,7 @@ class Queue:
 
         registry = _get_or_create_dbos_registry()
         if self.name in registry.queue_info_map and self.name != INTERNAL_QUEUE_NAME:
-            dbos_logger.warning(f"Queue {name} has already been declared")
+            raise Exception(f"Queue {name} has already been declared")
         registry.queue_info_map[self.name] = self
 
     def enqueue(
@@ -75,7 +75,7 @@ class Queue:
             and context.priority is not None
             and not self.priority_enabled
         ):
-            dbos_logger.warning(
+            raise Exception(
                 f"Priority is not enabled for queue {self.name}. Setting priority will not have any effect."
             )
 

{dbos-1.15.0a4 → dbos-1.15.0a5}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 readme = "README.md"
-version = "1.15.0a4"
+version = "1.15.0a5"
 
 [project.license]
 text = "MIT"

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_admin_server.py

@@ -520,7 +520,7 @@ def test_list_workflows(dbos: DBOS, skip_with_sqlite_imprecise_time: None) -> No
     assert workflows[0]["CreatedAt"] is not None and len(workflows[0]["CreatedAt"]) > 0
     assert workflows[0]["UpdatedAt"] is not None and len(workflows[0]["UpdatedAt"]) > 0
     assert workflows[0]["QueueName"] is None
-    assert workflows[0]["ApplicationVersion"] == GlobalParams.app_version
+    assert workflows[0]["ApplicationVersion"] == DBOS.application_version
     assert workflows[0]["ExecutorID"] == GlobalParams.executor_id
 
     # Only load input and output as requested
@@ -620,7 +620,7 @@ def test_list_workflows(dbos: DBOS, skip_with_sqlite_imprecise_time: None) -> No
     assert len(workflows) == 2
 
     filters = {
-        "application_version": GlobalParams.app_version,
+        "application_version": DBOS.application_version,
     }
     response = requests.post("http://localhost:3001/workflows", json=filters, timeout=5)
     assert response.status_code == 200
@@ -699,7 +699,7 @@ def test_get_workflow_by_id(dbos: DBOS) -> None:
         workflow_data["UpdatedAt"] is not None and len(workflow_data["UpdatedAt"]) > 0
     )
     assert workflow_data["QueueName"] is None
-    assert workflow_data["ApplicationVersion"] == GlobalParams.app_version
+    assert workflow_data["ApplicationVersion"] == DBOS.application_version
     assert workflow_data["ExecutorID"] == GlobalParams.executor_id
 
     # Test GET /workflows/:workflow_id for a non-existing workflow
@@ -812,7 +812,7 @@ def test_queued_workflows_endpoint(
         and len(queued_workflows[0]["UpdatedAt"]) > 0
     )
     assert queued_workflows[0]["QueueName"] == test_queue1.name
-    assert queued_workflows[0]["ApplicationVersion"] == GlobalParams.app_version
+    assert queued_workflows[0]["ApplicationVersion"] == DBOS.application_version
     assert queued_workflows[0]["ExecutorID"] == GlobalParams.executor_id
 
     # Verify sort_desc inverts the order

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_client.py

@@ -14,8 +14,6 @@ from sqlalchemy.exc import DBAPIError
 
 from dbos import DBOS, DBOSClient, DBOSConfig, EnqueueOptions, SetWorkflowID
 from dbos._dbos import WorkflowHandle, WorkflowHandleAsync
-from dbos._sys_db import SystemDatabase
-from dbos._utils import GlobalParams
 from tests import client_collateral
 from tests.client_collateral import event_test, retrieve_test, send_test
 
@@ -125,7 +123,7 @@ def test_client_enqueue_appver_not_set(dbos: DBOS, client: DBOSClient) -> None:
     assert wf_status is not None
     assert wf_status.status == "SUCCESS"
     assert wf_status.name == "enqueue_test"
-    assert wf_status.app_version == GlobalParams.app_version
+    assert wf_status.app_version == DBOS.application_version
 
 
 def test_client_enqueue_appver_set(dbos: DBOS, client: DBOSClient) -> None:
@@ -138,7 +136,7 @@ def test_client_enqueue_appver_set(dbos: DBOS, client: DBOSClient) -> None:
         "queue_name": "test_queue",
         "workflow_name": "enqueue_test",
         "workflow_id": wfid,
-        "app_version": GlobalParams.app_version,
+        "app_version": DBOS.application_version,
     }
 
     client.enqueue(options, 42, "test", johnDoe)
@@ -151,7 +149,7 @@ def test_client_enqueue_appver_set(dbos: DBOS, client: DBOSClient) -> None:
     assert wf_status is not None
     assert wf_status.status == "SUCCESS"
     assert wf_status.name == "enqueue_test"
-    assert wf_status.app_version == GlobalParams.app_version
+    assert wf_status.app_version == DBOS.application_version
 
 
 def test_client_enqueue_wrong_appver(dbos: DBOS, client: DBOSClient) -> None:
@@ -205,7 +203,7 @@ def test_client_enqueue_idempotent(config: DBOSConfig, client: DBOSClient) -> No
     assert wf_status is not None
     assert wf_status.status == "SUCCESS"
     assert wf_status.name == "enqueue_test"
-    assert wf_status.app_version == GlobalParams.app_version
+    assert wf_status.app_version == DBOS.application_version
 
     DBOS.destroy(destroy_registry=True)
 
@@ -272,7 +270,7 @@ def test_client_send_idempotent(
     idempotency_key = f"test-idempotency-{now}"
     sendWFID = f"{wfid}-{idempotency_key}"
 
-    run_send_worker(wfid, topic, GlobalParams.app_version)
+    run_send_worker(wfid, topic, DBOS.application_version)
 
     client.send(wfid, message, topic, idempotency_key)
     client.send(wfid, message, topic, idempotency_key)
@@ -315,7 +313,7 @@ def test_client_send_failure(
     idempotency_key = f"test-idempotency-{now}"
     sendWFID = f"{wfid}-{idempotency_key}"
 
-    run_send_worker(wfid, topic, GlobalParams.app_version)
+    run_send_worker(wfid, topic, DBOS.application_version)
 
     client.send(wfid, message, topic, idempotency_key)
 

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_dbos.py

@@ -1371,12 +1371,12 @@ def test_app_version(config: DBOSConfig) -> None:
     DBOS.launch()
 
     # Verify that app version is correctly set to a hex string
-    app_version = GlobalParams.app_version
+    app_version = DBOS.application_version
     assert len(app_version) > 0
     assert is_hex(app_version)
 
     DBOS.destroy(destroy_registry=True)
-    assert GlobalParams.app_version == ""
+    assert DBOS.application_version == ""
     dbos = DBOS(config=config)
 
     @DBOS.workflow()
@@ -1390,7 +1390,7 @@ def test_app_version(config: DBOSConfig) -> None:
     DBOS.launch()
 
     # Verify stability--the same workflow source produces the same app version.
-    assert GlobalParams.app_version == app_version
+    assert DBOS.application_version == app_version
 
     DBOS.destroy(destroy_registry=True)
     dbos = DBOS(config=config)
@@ -1401,7 +1401,7 @@ def test_app_version(config: DBOSConfig) -> None:
 
     # Verify that changing the workflow source changes the workflow version
     DBOS.launch()
-    assert GlobalParams.app_version != app_version
+    assert DBOS.application_version != app_version
 
     # Verify that version can be overriden with an environment variable
     app_version = str(uuid.uuid4())
@@ -1415,7 +1415,7 @@ def test_app_version(config: DBOSConfig) -> None:
         return x
 
     DBOS.launch()
-    assert GlobalParams.app_version == app_version
+    assert DBOS.application_version == app_version
 
     del os.environ["DBOS__APPVERSION"]
 
@@ -1434,7 +1434,7 @@ def test_app_version(config: DBOSConfig) -> None:
         return DBOS.workflow_id
 
     DBOS.launch()
-    assert GlobalParams.app_version == app_version
+    assert DBOS.application_version == app_version
     assert GlobalParams.executor_id == executor_id
     wfid = test_workflow()
     handle: WorkflowHandle[str] = DBOS.retrieve_workflow(wfid)

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_debouncer.py

@@ -147,7 +147,7 @@ def test_debouncer_queue(dbos: DBOS) -> None:
         return x
 
     first_value, second_value, third_value, fourth_value = 0, 1, 2, 3
-    queue = Queue("test-queue")
+    queue = Queue("test-queue", priority_enabled=True)
 
     debouncer = Debouncer.create(workflow, queue=queue)
     debounce_period_sec = 2

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_queue.py

@@ -55,6 +55,10 @@ def test_simple_queue(dbos: DBOS) -> None:
 
     queue = Queue("test_queue")
 
+    # Test that redeclaring a queue is an exception
+    with pytest.raises(Exception):
+        Queue(queue.name)
+
     with SetWorkflowID(wfid):
         handle = queue.enqueue(test_workflow, "abc", "123")
     assert handle.get_result() == "abcd123"
@@ -908,7 +912,6 @@ def test_timeout_queue(dbos: DBOS) -> None:
 
     # Verify if a parent called with a timeout enqueues a blocked child
     # then exits the deadline propagates and the child is cancelled.
-    queue = Queue("regular_queue")
 
     @DBOS.workflow()
     def exiting_parent_workflow() -> str:

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_spans.py

@@ -76,7 +76,7 @@ def test_spans(config: DBOSConfig) -> None:
     for log in logs:
         assert log.log_record.attributes is not None
         assert (
-            log.log_record.attributes["applicationVersion"] == GlobalParams.app_version
+            log.log_record.attributes["applicationVersion"] == DBOS.application_version
         )
         assert log.log_record.attributes["executorID"] == GlobalParams.executor_id
         assert log.log_record.attributes["foo"] == "bar"
@@ -98,7 +98,7 @@ def test_spans(config: DBOSConfig) -> None:
             # Skip the manual span because it was not created by DBOS.tracer
             continue
         assert span.attributes is not None
-        assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["applicationVersion"] == DBOS.application_version
         assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
         assert span.attributes["foo"] == "bar"
@@ -203,7 +203,7 @@ async def test_spans_async(dbos: DBOS) -> None:
     for log in logs:
         assert log.log_record.attributes is not None
         assert (
-            log.log_record.attributes["applicationVersion"] == GlobalParams.app_version
+            log.log_record.attributes["applicationVersion"] == DBOS.application_version
         )
         assert log.log_record.attributes["executorID"] == GlobalParams.executor_id
         # Make sure the log record has a span_id and trace_id
@@ -226,7 +226,7 @@ async def test_spans_async(dbos: DBOS) -> None:
             # Skip the manual span because it was not created by DBOS.tracer
             continue
         assert span.attributes is not None
-        assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["applicationVersion"] == DBOS.application_version
         assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
         assert span.context.span_id > 0
@@ -316,7 +316,7 @@ def test_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
     assert len(logs) == 1
     assert logs[0].log_record.attributes is not None
     assert (
-        logs[0].log_record.attributes["applicationVersion"] == GlobalParams.app_version
+        logs[0].log_record.attributes["applicationVersion"] == DBOS.application_version
     )
     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
@@ -331,7 +331,7 @@ def test_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None:
 
     for span in spans:
         assert span.attributes is not None
-        assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["applicationVersion"] == DBOS.application_version
         assert span.context is not None
         assert span.context.span_id > 0
         assert span.context.trace_id > 0
@@ -389,7 +389,7 @@ def test_disable_otlp_no_spans(config: DBOSConfig) -> None:
     for log in logs:
         assert log.log_record.attributes is not None
         assert (
-            log.log_record.attributes["applicationVersion"] == GlobalParams.app_version
+            log.log_record.attributes["applicationVersion"] == DBOS.application_version
         )
         assert log.log_record.attributes["executorID"] == GlobalParams.executor_id
         assert log.log_record.attributes["foo"] == "bar"

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_workflow_introspection.py

@@ -39,7 +39,7 @@ def test_list_workflow(dbos: DBOS) -> None:
     assert output.updated_at is not None and output.updated_at > 0
     assert output.queue_name == None
     assert output.executor_id == GlobalParams.executor_id
-    assert output.app_version == GlobalParams.app_version
+    assert output.app_version == DBOS.application_version
     assert output.app_id == ""
     assert output.recovery_attempts == 1
     assert output.workflow_timeout_ms is None
@@ -77,7 +77,7 @@ def test_list_workflow(dbos: DBOS) -> None:
     # Test searching by application version
     outputs = DBOS.list_workflows(app_version="no")
     assert len(outputs) == 0
-    outputs = DBOS.list_workflows(app_version=GlobalParams.app_version)
+    outputs = DBOS.list_workflows(app_version=DBOS.application_version)
     assert len(outputs) == 1
 
 
@@ -109,7 +109,7 @@ def test_list_workflow_error(dbos: DBOS) -> None:
     assert output.updated_at is not None and output.updated_at > 0
     assert output.queue_name == None
     assert output.executor_id == GlobalParams.executor_id
-    assert output.app_version == GlobalParams.app_version
+    assert output.app_version == DBOS.application_version
     assert output.app_id == ""
     assert output.recovery_attempts == 1
     assert output.workflow_timeout_ms is None
@@ -289,7 +289,7 @@ def test_queued_workflows(dbos: DBOS, skip_with_sqlite_imprecise_time: None) ->
         assert workflow.error is None
         assert "blocking_step" in workflow.name
         assert workflow.executor_id == GlobalParams.executor_id
-        assert workflow.app_version == GlobalParams.app_version
+        assert workflow.app_version == DBOS.application_version
         assert workflow.created_at is not None and workflow.created_at > 0
         assert workflow.updated_at is not None and workflow.updated_at > 0
         assert workflow.recovery_attempts == 1
@@ -323,7 +323,7 @@ def test_queued_workflows(dbos: DBOS, skip_with_sqlite_imprecise_time: None) ->
         assert workflow.error is None
         assert "blocking_step" in workflow.name
         assert workflow.executor_id == GlobalParams.executor_id
-        assert workflow.app_version == GlobalParams.app_version
+        assert workflow.app_version == DBOS.application_version
         assert workflow.created_at is not None and workflow.created_at > 0
         assert workflow.updated_at is not None and workflow.updated_at > 0
         assert workflow.recovery_attempts == 1

{dbos-1.15.0a4 → dbos-1.15.0a5}/tests/test_workflow_management.py

@@ -1,14 +1,11 @@
 import threading
 import time
 import uuid
-from typing import Callable
 
 import pytest
 import sqlalchemy as sa
 
-# Public API
 from dbos import DBOS, Queue, SetWorkflowID
-from dbos._dbos import DBOSConfiguredInstance
 from dbos._error import DBOSAwaitedWorkflowCancelledError
 from dbos._schemas.application_database import ApplicationSchema
 from dbos._utils import INTERNAL_QUEUE_NAME, GlobalParams
@@ -58,7 +55,7 @@ def test_cancel_resume(dbos: DBOS) -> None:
 
     # Resume the workflow. Verify it completes successfully.
     handle = DBOS.resume_workflow(wfid)
-    assert handle.get_status().app_version == GlobalParams.app_version
+    assert handle.get_status().app_version == DBOS.application_version
     assert handle.get_status().queue_name == INTERNAL_QUEUE_NAME
     assert handle.get_result() == input
     assert steps_completed == 2
@@ -231,7 +228,7 @@ def test_fork_steps(
     with SetWorkflowID(fork_id):
         forked_handle = DBOS.fork_workflow(wfid, 3)
     assert forked_handle.workflow_id == fork_id
-    assert forked_handle.get_status().app_version == GlobalParams.app_version
+    assert forked_handle.get_status().app_version == DBOS.application_version
     assert forked_handle.get_result() == output
 
     assert stepOneCount == 1