dbos 0.24.0a7__py3-none-any.whl → 0.24.0a8__py3-none-any.whl

dbos/_conductor/conductor.py

@@ -33,7 +33,7 @@ class ConductorWebsocket(threading.Thread):
     def run(self) -> None:
         while not self.evt.is_set():
             try:
-                with connect(self.url) as websocket:
+                with connect(self.url, open_timeout=5) as websocket:
                     self.websocket = websocket
                     while not self.evt.is_set():
                         message = websocket.recv()
@@ -44,6 +44,7 @@ class ConductorWebsocket(threading.Thread):
                             continue
                         base_message = p.BaseMessage.from_json(message)
                         msg_type = base_message.type
+                        error_message = None
                         if msg_type == p.MessageType.EXECUTOR_INFO:
                             info_response = p.ExecutorInfoResponse(
                                 type=p.MessageType.EXECUTOR_INFO,
@@ -61,14 +62,14 @@ class ConductorWebsocket(threading.Thread):
                                     recovery_message.executor_ids
                                 )
                             except Exception as e:
-                                self.dbos.logger.error(
-                                    f"Exception encountered when recovering workflows: {traceback.format_exc()}"
-                                )
+                                error_message = f"Exception encountered when recovering workflows: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
                                 success = False
                             recovery_response = p.RecoveryResponse(
                                 type=p.MessageType.RECOVERY,
                                 request_id=base_message.request_id,
                                 success=success,
+                                error_message=error_message,
                             )
                             websocket.send(recovery_response.to_json())
                         elif msg_type == p.MessageType.CANCEL:
@@ -77,14 +78,14 @@ class ConductorWebsocket(threading.Thread):
                             try:
                                 self.dbos.cancel_workflow(cancel_message.workflow_id)
                             except Exception as e:
-                                self.dbos.logger.error(
-                                    f"Exception encountered when cancelling workflow {cancel_message.workflow_id}: {traceback.format_exc()}"
-                                )
+                                error_message = f"Exception encountered when cancelling workflow {cancel_message.workflow_id}: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
                                 success = False
                             cancel_response = p.CancelResponse(
                                 type=p.MessageType.CANCEL,
                                 request_id=base_message.request_id,
                                 success=success,
+                                error_message=error_message,
                             )
                             websocket.send(cancel_response.to_json())
                         elif msg_type == p.MessageType.RESUME:
@@ -93,14 +94,14 @@ class ConductorWebsocket(threading.Thread):
                             try:
                                 self.dbos.resume_workflow(resume_message.workflow_id)
                             except Exception as e:
-                                self.dbos.logger.error(
-                                    f"Exception encountered when resuming workflow {resume_message.workflow_id}: {traceback.format_exc()}"
-                                )
+                                error_message = f"Exception encountered when resuming workflow {resume_message.workflow_id}: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
                                 success = False
                             resume_response = p.ResumeResponse(
                                 type=p.MessageType.RESUME,
                                 request_id=base_message.request_id,
                                 success=success,
+                                error_message=error_message,
                             )
                             websocket.send(resume_response.to_json())
                         elif msg_type == p.MessageType.RESTART:
@@ -109,14 +110,14 @@ class ConductorWebsocket(threading.Thread):
                             try:
                                 self.dbos.restart_workflow(restart_message.workflow_id)
                             except Exception as e:
-                                self.dbos.logger.error(
-                                    f"Exception encountered when restarting workflow {restart_message.workflow_id}: {traceback.format_exc()}"
-                                )
+                                error_message = f"Exception encountered when restarting workflow {restart_message.workflow_id}: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
                                 success = False
                             restart_response = p.RestartResponse(
                                 type=p.MessageType.RESTART,
                                 request_id=base_message.request_id,
                                 success=success,
+                                error_message=error_message,
                             )
                             websocket.send(restart_response.to_json())
                         elif msg_type == p.MessageType.LIST_WORKFLOWS:
@@ -124,20 +125,26 @@ class ConductorWebsocket(threading.Thread):
                                 message
                             )
                             body = list_workflows_message.body
-                            infos = list_workflows(
-                                self.dbos._sys_db,
-                                workflow_ids=body["workflow_uuids"],
-                                user=body["authenticated_user"],
-                                start_time=body["start_time"],
-                                end_time=body["end_time"],
-                                status=body["status"],
-                                request=False,
-                                app_version=body["application_version"],
-                                name=body["workflow_name"],
-                                limit=body["limit"],
-                                offset=body["offset"],
-                                sort_desc=body["sort_desc"],
-                            )
+                            infos = []
+                            try:
+                                infos = list_workflows(
+                                    self.dbos._sys_db,
+                                    workflow_ids=body["workflow_uuids"],
+                                    user=body["authenticated_user"],
+                                    start_time=body["start_time"],
+                                    end_time=body["end_time"],
+                                    status=body["status"],
+                                    request=False,
+                                    app_version=body["application_version"],
+                                    name=body["workflow_name"],
+                                    limit=body["limit"],
+                                    offset=body["offset"],
+                                    sort_desc=body["sort_desc"],
+                                )
+                            except Exception as e:
+                                error_message = f"Exception encountered when listing workflows: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
+
                             list_workflows_response = p.ListWorkflowsResponse(
                                 type=p.MessageType.LIST_WORKFLOWS,
                                 request_id=base_message.request_id,
@@ -145,6 +152,7 @@ class ConductorWebsocket(threading.Thread):
                                     p.WorkflowsOutput.from_workflow_information(i)
                                     for i in infos
                                 ],
+                                error_message=error_message,
                             )
                             websocket.send(list_workflows_response.to_json())
                         elif msg_type == p.MessageType.LIST_QUEUED_WORKFLOWS:
@@ -152,18 +160,24 @@ class ConductorWebsocket(threading.Thread):
                                 p.ListQueuedWorkflowsRequest.from_json(message)
                             )
                             q_body = list_queued_workflows_message.body
-                            infos = list_queued_workflows(
-                                self.dbos._sys_db,
-                                start_time=q_body["start_time"],
-                                end_time=q_body["end_time"],
-                                status=q_body["status"],
-                                request=False,
-                                name=q_body["workflow_name"],
-                                limit=q_body["limit"],
-                                offset=q_body["offset"],
-                                queue_name=q_body["queue_name"],
-                                sort_desc=q_body["sort_desc"],
-                            )
+                            infos = []
+                            try:
+                                infos = list_queued_workflows(
+                                    self.dbos._sys_db,
+                                    start_time=q_body["start_time"],
+                                    end_time=q_body["end_time"],
+                                    status=q_body["status"],
+                                    request=False,
+                                    name=q_body["workflow_name"],
+                                    limit=q_body["limit"],
+                                    offset=q_body["offset"],
+                                    queue_name=q_body["queue_name"],
+                                    sort_desc=q_body["sort_desc"],
+                                )
+                            except Exception as e:
+                                error_message = f"Exception encountered when listing queued workflows: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
+
                             list_queued_workflows_response = (
                                 p.ListQueuedWorkflowsResponse(
                                     type=p.MessageType.LIST_QUEUED_WORKFLOWS,
@@ -172,6 +186,7 @@ class ConductorWebsocket(threading.Thread):
                                         p.WorkflowsOutput.from_workflow_information(i)
                                         for i in infos
                                     ],
+                                    error_message=error_message,
                                 )
                             )
                             websocket.send(list_queued_workflows_response.to_json())
@@ -179,11 +194,17 @@ class ConductorWebsocket(threading.Thread):
                             get_workflow_message = p.GetWorkflowRequest.from_json(
                                 message
                             )
-                            info = get_workflow(
-                                self.dbos._sys_db,
-                                get_workflow_message.workflow_id,
-                                getRequest=False,
-                            )
+                            info = None
+                            try:
+                                info = get_workflow(
+                                    self.dbos._sys_db,
+                                    get_workflow_message.workflow_id,
+                                    getRequest=False,
+                                )
+                            except Exception as e:
+                                error_message = f"Exception encountered when getting workflow {get_workflow_message.workflow_id}: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
+
                             get_workflow_response = p.GetWorkflowResponse(
                                 type=p.MessageType.GET_WORKFLOW,
                                 request_id=base_message.request_id,
@@ -192,21 +213,29 @@ class ConductorWebsocket(threading.Thread):
                                     if info is not None
                                     else None
                                 ),
+                                error_message=error_message,
                             )
                             websocket.send(get_workflow_response.to_json())
                         elif msg_type == p.MessageType.EXIST_PENDING_WORKFLOWS:
                             exist_pending_workflows_message = (
                                 p.ExistPendingWorkflowsRequest.from_json(message)
                             )
-                            pending_wfs = self.dbos._sys_db.get_pending_workflows(
-                                exist_pending_workflows_message.executor_id,
-                                exist_pending_workflows_message.application_version,
-                            )
+                            pending_wfs = []
+                            try:
+                                pending_wfs = self.dbos._sys_db.get_pending_workflows(
+                                    exist_pending_workflows_message.executor_id,
+                                    exist_pending_workflows_message.application_version,
+                                )
+                            except Exception as e:
+                                error_message = f"Exception encountered when checking for pending workflows: {traceback.format_exc()}"
+                                self.dbos.logger.error(error_message)
+
                             exist_pending_workflows_response = (
                                 p.ExistPendingWorkflowsResponse(
                                     type=p.MessageType.EXIST_PENDING_WORKFLOWS,
                                     request_id=base_message.request_id,
                                     exist=len(pending_wfs) > 0,
+                                    error_message=error_message,
                                 )
                             )
                             websocket.send(exist_pending_workflows_response.to_json())
@@ -214,6 +243,13 @@ class ConductorWebsocket(threading.Thread):
                             self.dbos.logger.warning(
                                 f"Unexpected message type: {msg_type}"
                             )
+                            unknown_message = p.BaseResponse(
+                                request_id=base_message.request_id,
+                                type=msg_type,
+                                error_message="Unknown message type",
+                            )
+                            # Still need to send a response to the conductor
+                            websocket.send(unknown_message.to_json())
             except ConnectionClosedOK:
                 self.dbos.logger.info("Conductor connection terminated")
                 break

dbos/_conductor/protocol.py

@@ -45,6 +45,11 @@ class BaseMessage:
         return json.dumps(dict_data)
 
 
+@dataclass
+class BaseResponse(BaseMessage):
+    error_message: Optional[str] = None
+
+
 @dataclass
 class ExecutorInfoRequest(BaseMessage):
     pass
@@ -54,6 +59,7 @@ class ExecutorInfoRequest(BaseMessage):
 class ExecutorInfoResponse(BaseMessage):
     executor_id: str
     application_version: str
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -64,6 +70,7 @@ class RecoveryRequest(BaseMessage):
 @dataclass
 class RecoveryResponse(BaseMessage):
     success: bool
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -74,6 +81,7 @@ class CancelRequest(BaseMessage):
 @dataclass
 class CancelResponse(BaseMessage):
     success: bool
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -84,6 +92,7 @@ class ResumeRequest(BaseMessage):
 @dataclass
 class ResumeResponse(BaseMessage):
     success: bool
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -94,6 +103,7 @@ class RestartRequest(BaseMessage):
 @dataclass
 class RestartResponse(BaseMessage):
     success: bool
+    error_message: Optional[str] = None
 
 
 class ListWorkflowsBody(TypedDict):
@@ -165,6 +175,7 @@ class ListWorkflowsRequest(BaseMessage):
 @dataclass
 class ListWorkflowsResponse(BaseMessage):
     output: List[WorkflowsOutput]
+    error_message: Optional[str] = None
 
 
 class ListQueuedWorkflowsBody(TypedDict):
@@ -186,6 +197,7 @@ class ListQueuedWorkflowsRequest(BaseMessage):
 @dataclass
 class ListQueuedWorkflowsResponse(BaseMessage):
     output: List[WorkflowsOutput]
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -196,6 +208,7 @@ class GetWorkflowRequest(BaseMessage):
 @dataclass
 class GetWorkflowResponse(BaseMessage):
     output: Optional[WorkflowsOutput]
+    error_message: Optional[str] = None
 
 
 @dataclass
@@ -207,3 +220,4 @@ class ExistPendingWorkflowsRequest(BaseMessage):
 @dataclass
 class ExistPendingWorkflowsResponse(BaseMessage):
     exist: bool
+    error_message: Optional[str] = None

{dbos-0.24.0a7.dist-info → dbos-0.24.0a8.dist-info}/METADATA

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

{dbos-0.24.0a7.dist-info → dbos-0.24.0a8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.24.0a7.dist-info/METADATA,sha256=wvDZ3P2eE7j7S3YM33RoAxO3Sp0R9woyTrAC1wCEvdE,5555
-dbos-0.24.0a7.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.24.0a7.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.24.0a7.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.24.0a8.dist-info/METADATA,sha256=XsFBfl6GM7-vBod-qlcQ0QphxHaMNGPaeYloFB02pLE,5555
+dbos-0.24.0a8.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.24.0a8.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.24.0a8.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=uq9LP5uY96kIS9N0yKqlvDwADmtg_Hl30uSUhyuUr-4,754
 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=tvB1k8V3ZsI3MBEcG9sIkfbsHHx_Cvh0FZAi9vSPrXU,12698
-dbos/_conductor/protocol.py,sha256=Lo-DjvKevTS2uKyITLjjVp56rBRzaQfKkKpieZz3VAs,5088
+dbos/_conductor/conductor.py,sha256=5mFrE6yEAHWcFjkYr5p2AoPkV6iwYHxsB3K06yaOmqM,15112
+dbos/_conductor/protocol.py,sha256=W-BnX-bD5folo96NGrUytuCHW72H-OQwPrkJ9q5Au5c,5534
 dbos/_context.py,sha256=Ue5qu3rzLfRmPkz-UUZi9ZS8iXpapRN0NTM4mbA2QmQ,17738
 dbos/_core.py,sha256=8TTIj5shcm5hpKjouMA4VzMWl7R7MJlU-mAHB6xQBxE,37585
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
@@ -65,4 +65,4 @@ dbos/cli/cli.py,sha256=ThomRytw7EP5iOcrjEgwnpaWgXNTLfnFEBBvCGHxtJs,15590
 dbos/dbos-config.schema.json,sha256=HtF_njVTGHLdzBGZ4OrGQz3qbPPT0Go-iwd1PgFVTNg,5847
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.24.0a7.dist-info/RECORD,,
+dbos-0.24.0a8.dist-info/RECORD,,