dbos 0.23.0a14__tar.gz → 0.24.0a3__tar.gz

{dbos-0.23.0a14 → dbos-0.24.0a3}/PKG-INFO

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

{dbos-0.23.0a14 → dbos-0.24.0a3}/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-0.23.0a14 → dbos-0.24.0a3}/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.23.0a14 → dbos-0.24.0a3}/dbos/_scheduler.py

@@ -1,4 +1,5 @@
 import threading
+import traceback
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Callable
 
@@ -33,8 +34,10 @@ def scheduler_loop(
         with SetWorkflowID(f"sched-{func.__qualname__}-{nextExecTime.isoformat()}"):
             try:
                 scheduler_queue.enqueue(func, nextExecTime, datetime.now(timezone.utc))
-            except Exception as e:
-                dbos_logger.warning(f"Error scheduling workflow: ", e)
+            except Exception:
+                dbos_logger.warning(
+                    f"Exception encountered in scheduler thread: {traceback.format_exc()})"
+                )
 
 
 def scheduled(

{dbos-0.23.0a14 → dbos-0.24.0a3}/dbos/_sys_db.py

@@ -202,7 +202,11 @@ class SystemDatabase:
 
         # Create a connection pool for the system database
         self.engine = sa.create_engine(
-            system_db_url, pool_size=20, max_overflow=5, pool_timeout=30
+            system_db_url,
+            pool_size=20,
+            max_overflow=5,
+            pool_timeout=30,
+            connect_args={"connect_timeout": 10},
         )
 
         # Run a schema migration for the system database

{dbos-0.23.0a14 → dbos-0.24.0a3}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.23.0a14"
+version = "0.24.0a3"
 
 [project.license]
 text = "MIT"

{dbos-0.23.0a14 → dbos-0.24.0a3}/tests/test_debug.py

@@ -11,9 +11,9 @@ from dbos._schemas.system_database import SystemSchema
 
 def test_parse_fast_api_command() -> None:
     command = "fastapi run app/main.py"
-    expected = "app/main.py"
     actual = parse_start_command(command)
-    assert actual == expected
+    assert isinstance(actual, PythonModule)
+    assert actual.module_name == "main"
 
 
 def test_parse_python_command() -> None: