dbos 0.23.0a12__py3-none-any.whl → 0.23.0a14__py3-none-any.whl

dbos/_conductor/conductor.py

@@ -8,7 +8,7 @@ from websockets.sync.client import connect
 from websockets.sync.connection import Connection
 
 from dbos._utils import GlobalParams
-from dbos._workflow_commands import list_queued_workflows, list_workflows
+from dbos._workflow_commands import get_workflow, list_queued_workflows, list_workflows
 
 from . import protocol as p
 
@@ -175,6 +175,25 @@ class ConductorWebsocket(threading.Thread):
                                 )
                             )
                             websocket.send(list_queued_workflows_response.to_json())
+                        elif type == p.MessageType.GET_WORKFLOW:
+                            get_workflow_message = p.GetWorkflowRequest.from_json(
+                                message
+                            )
+                            info = get_workflow(
+                                self.dbos._sys_db,
+                                get_workflow_message.workflow_id,
+                                getRequest=False,
+                            )
+                            get_workflow_response = p.GetWorkflowResponse(
+                                type=p.MessageType.GET_WORKFLOW,
+                                request_id=base_message.request_id,
+                                output=(
+                                    p.WorkflowsOutput.from_workflow_information(info)
+                                    if info is not None
+                                    else None
+                                ),
+                            )
+                            websocket.send(get_workflow_response.to_json())
                         else:
                             self.dbos.logger.warning(f"Unexpected message type: {type}")
             except ConnectionClosedOK:

dbos/_conductor/protocol.py

@@ -14,6 +14,7 @@ class MessageType(str, Enum):
     LIST_QUEUED_WORKFLOWS = "list_queued_workflows"
     RESUME = "resume"
     RESTART = "restart"
+    GET_WORKFLOW = "get_workflow"
 
 
 T = TypeVar("T", bound="BaseMessage")
@@ -184,3 +185,13 @@ class ListQueuedWorkflowsRequest(BaseMessage):
 @dataclass
 class ListQueuedWorkflowsResponse(BaseMessage):
     output: List[WorkflowsOutput]
+
+
+@dataclass
+class GetWorkflowRequest(BaseMessage):
+    workflow_id: str
+
+
+@dataclass
+class GetWorkflowResponse(BaseMessage):
+    output: Optional[WorkflowsOutput]

dbos/_schemas/system_database.py

@@ -154,7 +154,7 @@ class SystemSchema:
             nullable=False,
             primary_key=True,
         ),
-        Column("executor_id", Text),
+        # Column("executor_id", Text), # This column is deprecated. Do *not* use it.
         Column("queue_name", Text, nullable=False),
         Column(
             "created_at_epoch_ms",

dbos/_sys_db.py

@@ -1324,24 +1324,32 @@ class SystemDatabase:
             # If there is a global or local concurrency limit N, select only the N oldest enqueued
             # functions, else select all of them.
 
-            # First lets figure out how many tasks the worker can dequeue
+            # First lets figure out how many tasks are eligible for dequeue.
+            # This means figuring out how many unstarted tasks are within the local and global concurrency limits
             running_tasks_query = (
                 sa.select(
-                    SystemSchema.workflow_queue.c.executor_id,
+                    SystemSchema.workflow_status.c.executor_id,
                     sa.func.count().label("task_count"),
                 )
+                .select_from(
+                    SystemSchema.workflow_queue.join(
+                        SystemSchema.workflow_status,
+                        SystemSchema.workflow_queue.c.workflow_uuid
+                        == SystemSchema.workflow_status.c.workflow_uuid,
+                    )
+                )
                 .where(SystemSchema.workflow_queue.c.queue_name == queue.name)
                 .where(
-                    SystemSchema.workflow_queue.c.executor_id.isnot(
+                    SystemSchema.workflow_queue.c.started_at_epoch_ms.isnot(
                         None
-                    )  # Task is dequeued
+                    )  # Task is started
                 )
                 .where(
                     SystemSchema.workflow_queue.c.completed_at_epoch_ms.is_(
                         None
-                    )  # Task is not completed
+                    )  # Task is not completed.
                 )
-                .group_by(SystemSchema.workflow_queue.c.executor_id)
+                .group_by(SystemSchema.workflow_status.c.executor_id)
             )
             running_tasks_result = c.execute(running_tasks_query).fetchall()
             running_tasks_result_dict = {row[0]: row[1] for row in running_tasks_result}
@@ -1351,12 +1359,6 @@ class SystemDatabase:
 
             max_tasks = float("inf")
             if queue.worker_concurrency is not None:
-                # Worker local concurrency limit should always be >= running_tasks_for_this_worker
-                # This should never happen but a check + warning doesn't hurt
-                if running_tasks_for_this_worker > queue.worker_concurrency:
-                    dbos_logger.warning(
-                        f"Number of tasks on this worker ({running_tasks_for_this_worker}) exceeds the worker concurrency limit ({queue.worker_concurrency})"
-                    )
                 max_tasks = max(
                     0, queue.worker_concurrency - running_tasks_for_this_worker
                 )
@@ -1371,16 +1373,14 @@ class SystemDatabase:
                 available_tasks = max(0, queue.concurrency - total_running_tasks)
                 max_tasks = min(max_tasks, available_tasks)
 
-            # Lookup tasks
+            # Lookup unstarted/uncompleted tasks (not running)
             query = (
                 sa.select(
                     SystemSchema.workflow_queue.c.workflow_uuid,
-                    SystemSchema.workflow_queue.c.started_at_epoch_ms,
-                    SystemSchema.workflow_queue.c.executor_id,
                 )
                 .where(SystemSchema.workflow_queue.c.queue_name == queue.name)
+                .where(SystemSchema.workflow_queue.c.started_at_epoch_ms == None)
                 .where(SystemSchema.workflow_queue.c.completed_at_epoch_ms == None)
-                .where(SystemSchema.workflow_queue.c.executor_id == None)
                 .order_by(SystemSchema.workflow_queue.c.created_at_epoch_ms.asc())
                 .with_for_update(nowait=True)  # Error out early
             )
@@ -1423,7 +1423,7 @@ class SystemDatabase:
                 c.execute(
                     SystemSchema.workflow_queue.update()
                     .where(SystemSchema.workflow_queue.c.workflow_uuid == id)
-                    .values(started_at_epoch_ms=start_time_ms, executor_id=executor_id)
+                    .values(started_at_epoch_ms=start_time_ms)
                 )
                 ret_ids.append(id)
 
@@ -1468,23 +1468,26 @@ class SystemDatabase:
 
         with self.engine.connect() as conn:
             with conn.begin() as transaction:
+                # Reset the start time in the queue to mark it as not started
                 res = conn.execute(
                     sa.update(SystemSchema.workflow_queue)
                     .where(SystemSchema.workflow_queue.c.workflow_uuid == workflow_id)
-                    .values(executor_id=None, started_at_epoch_ms=None)
+                    .where(
+                        SystemSchema.workflow_queue.c.completed_at_epoch_ms.is_(None)
+                    )
+                    .values(started_at_epoch_ms=None)
                 )
 
-                # If no rows were affected, the workflow is not anymore in the queue
+                # If no rows were affected, the workflow is not anymore in the queue or was already completed
                 if res.rowcount == 0:
                     transaction.rollback()
                     return False
 
+                # Reset the status of the task to "ENQUEUED"
                 res = conn.execute(
                     sa.update(SystemSchema.workflow_status)
                     .where(SystemSchema.workflow_status.c.workflow_uuid == workflow_id)
-                    .values(
-                        executor_id=None, status=WorkflowStatusString.ENQUEUED.value
-                    )
+                    .values(status=WorkflowStatusString.ENQUEUED.value)
                 )
                 if res.rowcount == 0:
                     # This should never happen

{dbos-0.23.0a12.dist-info → dbos-0.23.0a14.dist-info}/METADATA

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

{dbos-0.23.0a12.dist-info → dbos-0.23.0a14.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.23.0a12.dist-info/METADATA,sha256=vaytGbqIq4czcptlNoggkKmYz6LWFxDuysPkAZ0o4M0,5556
-dbos-0.23.0a12.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.23.0a12.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.23.0a12.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.23.0a14.dist-info/METADATA,sha256=z88O0QiIfVU-VrNs6Udtgiw5G0asAkl6x6ugTrG7wHk,5556
+dbos-0.23.0a14.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.23.0a14.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.23.0a14.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=CxRHBHEthPL4PZoLbZhp3rdm44-KkRTT2-7DkK9d4QQ,724
 dbos/__main__.py,sha256=P7jAr-7L9XE5mrsQ7i4b-bLr2ap1tCQfhMByLCRWDj0,568
 dbos/_admin_server.py,sha256=YiVn5lywz2Vg8_juyNHOYl0HVEy48--7b4phwK7r92o,5732
@@ -10,8 +10,8 @@ dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
 dbos/_cloudutils/authentication.py,sha256=V0fCWQN9stCkhbuuxgPTGpvuQcDqfU3KAxPAh01vKW4,5007
 dbos/_cloudutils/cloudutils.py,sha256=YC7jGsIopT0KveLsqbRpQk2KlRBk-nIRC_UCgep4f3o,7797
 dbos/_cloudutils/databases.py,sha256=_shqaqSvhY4n2ScgQ8IP5PDZvzvcx3YBKV8fj-cxhSY,8543
-dbos/_conductor/conductor.py,sha256=SkTQDMBabzgrgJDDDwJSkF0eLIFzBe-_DIPL8OrNjA4,10067
-dbos/_conductor/protocol.py,sha256=mlAtcE2aT_egBiof_oyVVZPHTvWvU_U7-yu0fuNGKV0,4643
+dbos/_conductor/conductor.py,sha256=uX6DsAw0vpu4Gf5pxZJL7YrMSfJptCvRCnt14AUURFo,11123
+dbos/_conductor/protocol.py,sha256=HLHS1bOdFdQhwA05wXDCd3O704ki72ju1UUBXz0UB-0,4841
 dbos/_context.py,sha256=Ue5qu3rzLfRmPkz-UUZi9ZS8iXpapRN0NTM4mbA2QmQ,17738
 dbos/_core.py,sha256=UQb068FT59Op-F5RmtxreSeSQ1_wljOso0dQCUOPrC4,37528
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
@@ -43,9 +43,9 @@ dbos/_roles.py,sha256=iOsgmIAf1XVzxs3gYWdGRe1B880YfOw5fpU7Jwx8_A8,2271
 dbos/_scheduler.py,sha256=0I3e8Y-OIBG3wiUCIskShd-Sk_eUFCFyRB5u4L7IHXI,1940
 dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=KeyoPrF7hy_ODXV7QNike_VFSD74QBRfQ76D7QyE9HI,966
-dbos/_schemas/system_database.py,sha256=rwp4EvCSaXcUoMaRczZCvETCxGp72k3-hvLyGUDkih0,5163
+dbos/_schemas/system_database.py,sha256=16146P4TLjAGjTYykOs_KUd2c_geJ5fuhk0ko85C65M,5211
 dbos/_serialization.py,sha256=YCYv0qKAwAZ1djZisBC7khvKqG-5OcIv9t9EC5PFIog,1743
-dbos/_sys_db.py,sha256=05kxY9YY9iUZ1jQmfpymJuZS8Oi69ju_mF_M6lJi8qU,64513
+dbos/_sys_db.py,sha256=ul17Pe_qmslBMU1UZpY_UpCGnvUhcAxLAbSBps0YB20,64587
 dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_templates/dbos-db-starter/__package/main.py,sha256=eI0SS9Nwj-fldtiuSzIlIG6dC91GXXwdRsoHxv6S_WI,2719
@@ -65,4 +65,4 @@ dbos/cli/cli.py,sha256=ThomRytw7EP5iOcrjEgwnpaWgXNTLfnFEBBvCGHxtJs,15590
 dbos/dbos-config.schema.json,sha256=X5TpXNcARGceX0zQs0fVgtZW_Xj9uBbY5afPt9Rz9yk,5741
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.23.0a12.dist-info/RECORD,,
+dbos-0.23.0a14.dist-info/RECORD,,