dbos 1.3.0a3__tar.gz → 1.3.0a5__tar.gz

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

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

{dbos-1.3.0a3 → dbos-1.3.0a5}/dbos/_sys_db.py

@@ -483,6 +483,8 @@ class SystemDatabase:
                     status["queue_name"],
                     status["deduplication_id"],
                 )
+            else:
+                raise
         row = results.fetchone()
         if row is not None:
             # Check the started workflow matches the expected name, class_name, config_name, and queue_name
@@ -1707,43 +1709,48 @@ class SystemDatabase:
                 if num_recent_queries >= queue.limiter["limit"]:
                     return []
 
-            # Count how many workflows on this queue are currently PENDING both locally and globally.
-            pending_tasks_query = (
-                sa.select(
-                    SystemSchema.workflow_status.c.executor_id,
-                    sa.func.count().label("task_count"),
-                )
-                .select_from(SystemSchema.workflow_status)
-                .where(SystemSchema.workflow_status.c.queue_name == queue.name)
-                .where(
-                    SystemSchema.workflow_status.c.status
-                    == WorkflowStatusString.PENDING.value
-                )
-                .group_by(SystemSchema.workflow_status.c.executor_id)
-            )
-            pending_workflows = c.execute(pending_tasks_query).fetchall()
-            pending_workflows_dict = {row[0]: row[1] for row in pending_workflows}
-            local_pending_workflows = pending_workflows_dict.get(executor_id, 0)
-
             # Compute max_tasks, the number of workflows that can be dequeued given local and global concurrency limits,
             max_tasks = float("inf")
-            if queue.worker_concurrency is not None:
-                # Print a warning if the local concurrency limit is violated
-                if local_pending_workflows > queue.worker_concurrency:
-                    dbos_logger.warning(
-                        f"The number of local pending workflows ({local_pending_workflows}) on queue {queue.name} exceeds the local concurrency limit ({queue.worker_concurrency})"
+            if queue.worker_concurrency is not None or queue.concurrency is not None:
+                # Count how many workflows on this queue are currently PENDING both locally and globally.
+                pending_tasks_query = (
+                    sa.select(
+                        SystemSchema.workflow_status.c.executor_id,
+                        sa.func.count().label("task_count"),
+                    )
+                    .select_from(SystemSchema.workflow_status)
+                    .where(SystemSchema.workflow_status.c.queue_name == queue.name)
+                    .where(
+                        SystemSchema.workflow_status.c.status
+                        == WorkflowStatusString.PENDING.value
+                    )
+                    .group_by(SystemSchema.workflow_status.c.executor_id)
+                )
+                pending_workflows = c.execute(pending_tasks_query).fetchall()
+                pending_workflows_dict = {row[0]: row[1] for row in pending_workflows}
+                local_pending_workflows = pending_workflows_dict.get(executor_id, 0)
+
+                if queue.worker_concurrency is not None:
+                    # Print a warning if the local concurrency limit is violated
+                    if local_pending_workflows > queue.worker_concurrency:
+                        dbos_logger.warning(
+                            f"The number of local pending workflows ({local_pending_workflows}) on queue {queue.name} exceeds the local concurrency limit ({queue.worker_concurrency})"
+                        )
+                    max_tasks = max(
+                        0, queue.worker_concurrency - local_pending_workflows
                     )
-                max_tasks = max(0, queue.worker_concurrency - local_pending_workflows)
 
-            if queue.concurrency is not None:
-                global_pending_workflows = sum(pending_workflows_dict.values())
-                # Print a warning if the global concurrency limit is violated
-                if global_pending_workflows > queue.concurrency:
-                    dbos_logger.warning(
-                        f"The total number of pending workflows ({global_pending_workflows}) on queue {queue.name} exceeds the global concurrency limit ({queue.concurrency})"
+                if queue.concurrency is not None:
+                    global_pending_workflows = sum(pending_workflows_dict.values())
+                    # Print a warning if the global concurrency limit is violated
+                    if global_pending_workflows > queue.concurrency:
+                        dbos_logger.warning(
+                            f"The total number of pending workflows ({global_pending_workflows}) on queue {queue.name} exceeds the global concurrency limit ({queue.concurrency})"
+                        )
+                    available_tasks = max(
+                        0, queue.concurrency - global_pending_workflows
                     )
-                available_tasks = max(0, queue.concurrency - global_pending_workflows)
-                max_tasks = min(max_tasks, available_tasks)
+                    max_tasks = min(max_tasks, available_tasks)
 
             # Retrieve the first max_tasks workflows in the queue.
             # Only retrieve workflows of the local version (or without version set)

{dbos-1.3.0a3 → dbos-1.3.0a5}/pyproject.toml

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