dbos 0.23.0a11__py3-none-any.whl → 0.23.0a13__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/_recovery.py

@@ -14,6 +14,16 @@ if TYPE_CHECKING:
     from ._dbos import DBOS, WorkflowHandle
 
 
+def _recover_workflow(
+    dbos: "DBOS", workflow: GetPendingWorkflowsOutput
+) -> "WorkflowHandle[Any]":
+    if workflow.queue_name and workflow.queue_name != "_dbos_internal_queue":
+        cleared = dbos._sys_db.clear_queue_assignment(workflow.workflow_uuid)
+        if cleared:
+            return dbos.retrieve_workflow(workflow.workflow_uuid)
+    return execute_workflow_by_id(dbos, workflow.workflow_uuid)
+
+
 def startup_recovery_thread(
     dbos: "DBOS", pending_workflows: List[GetPendingWorkflowsOutput]
 ) -> None:
@@ -23,14 +33,7 @@ def startup_recovery_thread(
     while not stop_event.is_set() and len(pending_workflows) > 0:
         try:
             for pending_workflow in list(pending_workflows):
-                if (
-                    pending_workflow.queue_name
-                    and pending_workflow.queue_name != "_dbos_internal_queue"
-                ):
-                    cleared = dbos._sys_db.clear_queue_assignment(pending_workflow.workflow_uuid)
-                    if cleared:
-                        continue
-                execute_workflow_by_id(dbos, pending_workflow.workflow_uuid)
+                _recover_workflow(dbos, pending_workflow)
                 pending_workflows.remove(pending_workflow)
         except DBOSWorkflowFunctionNotFoundError:
             time.sleep(1)
@@ -51,26 +54,14 @@ def recover_pending_workflows(
             executor_id, GlobalParams.app_version
         )
         for pending_workflow in pending_workflows:
-            if (
-                pending_workflow.queue_name
-                and pending_workflow.queue_name != "_dbos_internal_queue"
-            ):
-                try:
-                    cleared = dbos._sys_db.clear_queue_assignment(pending_workflow.workflow_uuid)
-                    if cleared:
-                        workflow_handles.append(
-                            dbos.retrieve_workflow(pending_workflow.workflow_uuid)
-                        )
-                    else:
-                        workflow_handles.append(
-                            execute_workflow_by_id(dbos, pending_workflow.workflow_uuid)
-                        )
-                except Exception as e:
-                    dbos.logger.error(e)
-            else:
-                workflow_handles.append(
-                    execute_workflow_by_id(dbos, pending_workflow.workflow_uuid)
+            try:
+                handle = _recover_workflow(dbos, pending_workflow)
+                workflow_handles.append(handle)
+            except Exception as e:
+                dbos.logger.error(
+                    f"Exception encountered when recovering workflows: {traceback.format_exc()}"
                 )
+                raise e
         dbos.logger.info(
             f"Recovering {len(pending_workflows)} workflows for executor {executor_id} from version {GlobalParams.app_version}"
         )

dbos/_sys_db.py

@@ -1462,7 +1462,6 @@ class SystemDatabase:
                     .values(completed_at_epoch_ms=int(time.time() * 1000))
                 )
 
-
     def clear_queue_assignment(self, workflow_id: str) -> bool:
         if self._debug_mode:
             raise Exception("called clear_queue_assignment in debug mode")
@@ -1483,7 +1482,9 @@ class SystemDatabase:
                 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(
+                        executor_id=None, status=WorkflowStatusString.ENQUEUED.value
+                    )
                 )
                 if res.rowcount == 0:
                     # This should never happen
@@ -1492,6 +1493,7 @@ class SystemDatabase:
                     )
                 return True
 
+
 def reset_system_database(config: ConfigFile) -> None:
     sysdb_name = (
         config["database"]["sys_db_name"]

{dbos-0.23.0a11.dist-info → dbos-0.23.0a13.dist-info}/METADATA

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

{dbos-0.23.0a11.dist-info → dbos-0.23.0a13.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.23.0a11.dist-info/METADATA,sha256=pm213i_FtTxsXr1cfO0_iP5bcU0E60Dzmq9GWXYtFMQ,5556
-dbos-0.23.0a11.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.23.0a11.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.23.0a11.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.23.0a13.dist-info/METADATA,sha256=NGDpQapDUzGaa6Iu-0sMoP32p_Fi_Co7-WFC_kACtIU,5556
+dbos-0.23.0a13.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.23.0a13.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.23.0a13.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
@@ -36,7 +36,7 @@ dbos/_migrations/versions/d76646551a6c_workflow_queue.py,sha256=G942nophZ2uC2vc4
 dbos/_migrations/versions/eab0cc1d9a14_job_queue.py,sha256=uvhFOtqbBreCePhAxZfIT0qCAI7BiZTou9wt6QnbY7c,1412
 dbos/_outcome.py,sha256=FDMgWVjZ06vm9xO-38H17mTqBImUYQxgKs_bDCSIAhE,6648
 dbos/_queue.py,sha256=I2gBc7zQ4G0vyDDBnKwIFzxtqfD7DxHO2IZ41brFSOM,2927
-dbos/_recovery.py,sha256=QIi0xQToYOpUlAzwTsuDonsWbGrI9HZBR2qVyOS2IJU,3077
+dbos/_recovery.py,sha256=4KyZb0XJEUGH7ekYT1kpx38i6y5vygPeH75Ta7RZjYo,2596
 dbos/_registrations.py,sha256=_zy6k944Ll8QwqU12Kr3OP23ukVtm8axPNN1TS_kJRc,6717
 dbos/_request.py,sha256=cX1B3Atlh160phgS35gF1VEEV4pD126c9F3BDgBmxZU,929
 dbos/_roles.py,sha256=iOsgmIAf1XVzxs3gYWdGRe1B880YfOw5fpU7Jwx8_A8,2271
@@ -45,7 +45,7 @@ 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/_serialization.py,sha256=YCYv0qKAwAZ1djZisBC7khvKqG-5OcIv9t9EC5PFIog,1743
-dbos/_sys_db.py,sha256=nJVosEwdc_mkP9cJQb0uFpOOLOX8KxkOs-pij0vu83c,64467
+dbos/_sys_db.py,sha256=05kxY9YY9iUZ1jQmfpymJuZS8Oi69ju_mF_M6lJi8qU,64513
 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.0a11.dist-info/RECORD,,
+dbos-0.23.0a13.dist-info/RECORD,,