dbos 0.24.0a1__py3-none-any.whl → 0.24.0a3__py3-none-any.whl

dbos/_conductor/conductor.py

@@ -3,7 +3,7 @@ import time
 import traceback
 from typing import TYPE_CHECKING, Optional
 
-from websockets import ConnectionClosed, ConnectionClosedOK
+from websockets import ConnectionClosed, ConnectionClosedOK, InvalidStatus
 from websockets.sync.client import connect
 from websockets.sync.connection import Connection
 
@@ -39,12 +39,12 @@ class ConductorWebsocket(threading.Thread):
                         message = websocket.recv()
                         if not isinstance(message, str):
                             self.dbos.logger.warning(
-                                "Receieved unexpected non-str message"
+                                "Received unexpected non-str message"
                             )
                             continue
                         base_message = p.BaseMessage.from_json(message)
-                        type = base_message.type
-                        if type == p.MessageType.EXECUTOR_INFO:
+                        msg_type = base_message.type
+                        if msg_type == p.MessageType.EXECUTOR_INFO:
                             info_response = p.ExecutorInfoResponse(
                                 type=p.MessageType.EXECUTOR_INFO,
                                 request_id=base_message.request_id,
@@ -53,7 +53,7 @@ class ConductorWebsocket(threading.Thread):
                             )
                             websocket.send(info_response.to_json())
                             self.dbos.logger.info("Connected to DBOS conductor")
-                        elif type == p.MessageType.RECOVERY:
+                        elif msg_type == p.MessageType.RECOVERY:
                             recovery_message = p.RecoveryRequest.from_json(message)
                             success = True
                             try:
@@ -71,7 +71,7 @@ class ConductorWebsocket(threading.Thread):
                                 success=success,
                             )
                             websocket.send(recovery_response.to_json())
-                        elif type == p.MessageType.CANCEL:
+                        elif msg_type == p.MessageType.CANCEL:
                             cancel_message = p.CancelRequest.from_json(message)
                             success = True
                             try:
@@ -87,7 +87,7 @@ class ConductorWebsocket(threading.Thread):
                                 success=success,
                             )
                             websocket.send(cancel_response.to_json())
-                        elif type == p.MessageType.RESUME:
+                        elif msg_type == p.MessageType.RESUME:
                             resume_message = p.ResumeRequest.from_json(message)
                             success = True
                             try:
@@ -103,7 +103,7 @@ class ConductorWebsocket(threading.Thread):
                                 success=success,
                             )
                             websocket.send(resume_response.to_json())
-                        elif type == p.MessageType.RESTART:
+                        elif msg_type == p.MessageType.RESTART:
                             restart_message = p.RestartRequest.from_json(message)
                             success = True
                             try:
@@ -119,7 +119,7 @@ class ConductorWebsocket(threading.Thread):
                                 success=success,
                             )
                             websocket.send(restart_response.to_json())
-                        elif type == p.MessageType.LIST_WORKFLOWS:
+                        elif msg_type == p.MessageType.LIST_WORKFLOWS:
                             list_workflows_message = p.ListWorkflowsRequest.from_json(
                                 message
                             )
@@ -147,7 +147,7 @@ class ConductorWebsocket(threading.Thread):
                                 ],
                             )
                             websocket.send(list_workflows_response.to_json())
-                        elif type == p.MessageType.LIST_QUEUED_WORKFLOWS:
+                        elif msg_type == p.MessageType.LIST_QUEUED_WORKFLOWS:
                             list_queued_workflows_message = (
                                 p.ListQueuedWorkflowsRequest.from_json(message)
                             )
@@ -175,7 +175,7 @@ class ConductorWebsocket(threading.Thread):
                                 )
                             )
                             websocket.send(list_queued_workflows_response.to_json())
-                        elif type == p.MessageType.GET_WORKFLOW:
+                        elif msg_type == p.MessageType.GET_WORKFLOW:
                             get_workflow_message = p.GetWorkflowRequest.from_json(
                                 message
                             )
@@ -195,7 +195,9 @@ class ConductorWebsocket(threading.Thread):
                             )
                             websocket.send(get_workflow_response.to_json())
                         else:
-                            self.dbos.logger.warning(f"Unexpected message type: {type}")
+                            self.dbos.logger.warning(
+                                f"Unexpected message type: {msg_type}"
+                            )
             except ConnectionClosedOK:
                 self.dbos.logger.info("Conductor connection terminated")
                 break
@@ -205,6 +207,14 @@ class ConductorWebsocket(threading.Thread):
                 )
                 time.sleep(1)
                 continue
+            except InvalidStatus as e:
+                # This happens when it cannot open a connection to the conductor. E.g., the conductor rejects the request
+                json_data = e.response.body.decode("utf-8")
+                self.dbos.logger.error(
+                    f"Failed to connect to conductor. Retrying: {str(e) }. Details: {json_data}"
+                )
+                time.sleep(1)
+                continue
             except Exception as e:
                 self.dbos.logger.error(
                     f"Unexpected exception in connection to conductor. Reconnecting: {e}"

dbos/_debug.py

@@ -1,8 +1,11 @@
 import re
 import runpy
 import sys
+from pathlib import Path
 from typing import Union
 
+from fastapi_cli.discover import get_module_data_from_path
+
 from dbos import DBOS
 
 
@@ -33,7 +36,10 @@ def debug_workflow(workflow_id: str, entrypoint: Union[str, PythonModule]) -> No
 def parse_start_command(command: str) -> Union[str, PythonModule]:
     match = re.match(r"fastapi\s+run\s+(\.?[\w/]+\.py)", command)
     if match:
-        return match.group(1)
+        # Mirror the logic in fastapi's run command by converting the path argument to a module
+        mod_data = get_module_data_from_path(Path(match.group(1)))
+        sys.path.insert(0, str(mod_data.extra_sys_path))
+        return PythonModule(mod_data.module_import_str)
     match = re.match(r"python3?\s+(\.?[\w/]+\.py)", command)
     if match:
         return match.group(1)

{dbos-0.24.0a1.dist-info → dbos-0.24.0a3.dist-info}/METADATA

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

{dbos-0.24.0a1.dist-info → dbos-0.24.0a3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.24.0a1.dist-info/METADATA,sha256=UuArfBoytGeWjufDI1gg6odzVSbkLTCGu_ZYtZFe_uM,5555
-dbos-0.24.0a1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.24.0a1.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.24.0a1.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.24.0a3.dist-info/METADATA,sha256=U5h4FC8x7Zcr6DG1WCDi-KIbixgUsiMTkL25A81KeV4,5555
+dbos-0.24.0a3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.24.0a3.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.24.0a3.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,7 +10,7 @@ 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=uX6DsAw0vpu4Gf5pxZJL7YrMSfJptCvRCnt14AUURFo,11123
+dbos/_conductor/conductor.py,sha256=Bcq6Y874NyZVPSRlENognkTR9HU6gSkwQr6ubCqu4t8,11670
 dbos/_conductor/protocol.py,sha256=HLHS1bOdFdQhwA05wXDCd3O704ki72ju1UUBXz0UB-0,4841
 dbos/_context.py,sha256=Ue5qu3rzLfRmPkz-UUZi9ZS8iXpapRN0NTM4mbA2QmQ,17738
 dbos/_core.py,sha256=UQb068FT59Op-F5RmtxreSeSQ1_wljOso0dQCUOPrC4,37528
@@ -18,7 +18,7 @@ dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
 dbos/_db_wizard.py,sha256=6tfJaCRa1NtkUdNW75a2yvi_mEgnPJ9C1HP2zPG1hCU,8067
 dbos/_dbos.py,sha256=0kX3fgdTqAn-eMKSbh73LFVR08YPMoB030g4dzvc9Yk,41150
 dbos/_dbos_config.py,sha256=_VETbEsMZ66563A8sX05B_coKz2BrILbIm9H5BmnPmk,9572
-dbos/_debug.py,sha256=wcvjM2k4BrK7mlYjImUZXNBUB00fPGjQrNimZXlj76c,1491
+dbos/_debug.py,sha256=mmgvLkqlrljMBBow9wk01PPur9kUf2rI_11dTJXY4gw,1822
 dbos/_error.py,sha256=xqB7b7g5AF_OwOvqLKLXL1xldn2gAtORix2ZC2B8zK0,5089
 dbos/_fastapi.py,sha256=ke03vqsSYDnO6XeOtOVFXj0-f-v1MGsOxa9McaROvNc,3616
 dbos/_flask.py,sha256=DZKUZR5-xOzPI7tYZ53r2PvvHVoAb8SYwLzMVFsVfjI,2608
@@ -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.24.0a1.dist-info/RECORD,,
+dbos-0.24.0a3.dist-info/RECORD,,