dbos 0.22.0a5__tar.gz → 0.22.0a7__tar.gz

{dbos-0.22.0a5 → dbos-0.22.0a7}/PKG-INFO

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

{dbos-0.22.0a5 → dbos-0.22.0a7}/dbos/_admin_server.py

@@ -16,6 +16,7 @@ if TYPE_CHECKING:
 _health_check_path = "/dbos-healthz"
 _workflow_recovery_path = "/dbos-workflow-recovery"
 _deactivate_path = "/deactivate"
+_workflow_queues_metadata_path = "/dbos-workflow-queues-metadata"
 # /workflows/:workflow_id/cancel
 # /workflows/:workflow_id/resume
 # /workflows/:workflow_id/restart
@@ -64,6 +65,26 @@ class AdminRequestHandler(BaseHTTPRequestHandler):
             self.send_response(200)
             self._end_headers()
             self.wfile.write("deactivated".encode("utf-8"))
+        elif self.path == _workflow_queues_metadata_path:
+            queue_metadata_array = []
+            from ._dbos import _get_or_create_dbos_registry
+
+            registry = _get_or_create_dbos_registry()
+            for queue in registry.queue_info_map.values():
+                queue_metadata = {
+                    "name": queue.name,
+                    "concurrency": queue.concurrency,
+                    "workerConcurrency": queue.worker_concurrency,
+                    "rateLimit": queue.limiter,
+                }
+                # Remove keys with None values
+                queue_metadata = {
+                    k: v for k, v in queue_metadata.items() if v is not None
+                }
+                queue_metadata_array.append(queue_metadata)
+            self.send_response(200)
+            self._end_headers()
+            self.wfile.write(json.dumps(queue_metadata_array).encode("utf-8"))
         else:
             self.send_response(404)
             self._end_headers()

{dbos-0.22.0a5 → dbos-0.22.0a7}/dbos/_sys_db.py

@@ -22,8 +22,8 @@ import sqlalchemy as sa
 import sqlalchemy.dialects.postgresql as pg
 from alembic import command
 from alembic.config import Config
-from sqlalchemy import or_
 from sqlalchemy.exc import DBAPIError
+from sqlalchemy.sql import func
 
 from . import _serialization
 from ._dbos_config import ConfigFile
@@ -307,6 +307,7 @@ class SystemDatabase:
                     recovery_attempts=(
                         SystemSchema.workflow_status.c.recovery_attempts + 1
                     ),
+                    updated_at=func.extract("epoch", func.now()) * 1000,
                 ),
             )
         )
@@ -404,6 +405,7 @@ class SystemDatabase:
                     status=status["status"],
                     output=status["output"],
                     error=status["error"],
+                    updated_at=func.extract("epoch", func.now()) * 1000,
                 ),
             )
         )

{dbos-0.22.0a5 → dbos-0.22.0a7}/pyproject.toml

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

{dbos-0.22.0a5 → dbos-0.22.0a7}/tests/test_admin_server.py

@@ -5,7 +5,7 @@ import uuid
 import requests
 
 # Public API
-from dbos import DBOS, ConfigFile, SetWorkflowID, _workflow_commands
+from dbos import DBOS, ConfigFile, Queue, SetWorkflowID, _workflow_commands
 
 
 def test_admin_endpoints(dbos: DBOS) -> None:
@@ -23,6 +23,27 @@ def test_admin_endpoints(dbos: DBOS) -> None:
     assert response.status_code == 200
     assert response.json() == []
 
+    # Test GET /dbos-workflow-queues-metadata
+    Queue("q1")
+    Queue("q2", concurrency=1)
+    Queue("q3", concurrency=1, worker_concurrency=1)
+    Queue("q4", concurrency=1, worker_concurrency=1, limiter={"limit": 0, "period": 0})
+    response = requests.get(
+        "http://localhost:3001/dbos-workflow-queues-metadata", timeout=5
+    )
+    assert response.status_code == 200
+    assert response.json() == [
+        {"name": "q1"},
+        {"name": "q2", "concurrency": 1},
+        {"name": "q3", "concurrency": 1, "workerConcurrency": 1},
+        {
+            "name": "q4",
+            "concurrency": 1,
+            "workerConcurrency": 1,
+            "rateLimit": {"limit": 0, "period": 0},
+        },
+    ]
+
     # Test GET not found
     response = requests.get("http://localhost:3001/stuff", timeout=5)
     assert response.status_code == 404

{dbos-0.22.0a5 → dbos-0.22.0a7}/tests/test_dbos.py

@@ -71,14 +71,22 @@ def test_simple_workflow_attempts_counter(dbos: DBOS) -> None:
 
     wfuuid = str(uuid.uuid4())
     with dbos._sys_db.engine.connect() as c:
-        stmt = sa.select(SystemSchema.workflow_status.c.recovery_attempts).where(
-            SystemSchema.workflow_status.c.workflow_uuid == wfuuid
-        )
+        stmt = sa.select(
+            SystemSchema.workflow_status.c.recovery_attempts,
+            SystemSchema.workflow_status.c.created_at,
+            SystemSchema.workflow_status.c.updated_at,
+        ).where(SystemSchema.workflow_status.c.workflow_uuid == wfuuid)
         for i in range(10):
             with SetWorkflowID(wfuuid):
                 noop()
-            result = c.execute(stmt).scalar()
-            assert result == i + 1
+            result = c.execute(stmt).fetchone()
+            assert result is not None
+            recovery_attempts, created_at, updated_at = result
+            assert recovery_attempts == i + 1
+            if i == 0:
+                assert created_at == updated_at
+            else:
+                assert updated_at > created_at
 
 
 def test_child_workflow(dbos: DBOS) -> None: