dbos 0.26.0a25__tar.gz → 0.27.0a2__tar.gz

{dbos-0.26.0a25 → dbos-0.27.0a2}/PKG-INFO

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

{dbos-0.26.0a25 → dbos-0.27.0a2}/dbos/_app_db.py

@@ -77,12 +77,24 @@ class ApplicationDatabase:
         pool_size = database.get("app_db_pool_size")
         if pool_size is None:
             pool_size = 20
+
+        engine_kwargs = database.get("db_engine_kwargs")
+        if engine_kwargs is None:
+            engine_kwargs = {}
+
+        # Respect user-provided values. Otherwise, set defaults.
+        if "pool_size" not in engine_kwargs:
+            engine_kwargs["pool_size"] = pool_size
+        if "max_overflow" not in engine_kwargs:
+            engine_kwargs["max_overflow"] = 0
+        if "pool_timeout" not in engine_kwargs:
+            engine_kwargs["pool_timeout"] = 30
+        if "connect_args" not in engine_kwargs:
+            engine_kwargs["connect_args"] = connect_args
+
         self.engine = sa.create_engine(
             app_db_url,
-            pool_size=pool_size,
-            max_overflow=0,
-            pool_timeout=30,
-            connect_args=connect_args,
+            **engine_kwargs,
         )
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.debug_mode = debug_mode

{dbos-0.26.0a25 → dbos-0.27.0a2}/dbos/_dbos.py

@@ -65,7 +65,7 @@ from ._registrations import (
 from ._roles import default_required_roles, required_roles
 from ._scheduler import ScheduledWorkflow, scheduled
 from ._sys_db import StepInfo, WorkflowStatus, reset_system_database
-from ._tracer import dbos_tracer
+from ._tracer import DBOSTracer, dbos_tracer
 
 if TYPE_CHECKING:
     from fastapi import FastAPI
@@ -1166,6 +1166,11 @@ class DBOS:
         ctx.authenticated_user = authenticated_user
         ctx.authenticated_roles = authenticated_roles
 
+    @classproperty
+    def tracer(self) -> DBOSTracer:
+        """Return the DBOS OpenTelemetry tracer."""
+        return dbos_tracer
+
 
 class WorkflowHandle(Generic[R], Protocol):
     """

{dbos-0.26.0a25 → dbos-0.27.0a2}/dbos/_dbos_config.py

@@ -31,6 +31,7 @@ class DBOSConfig(TypedDict, total=False):
         app_db_pool_size (int): Application database pool size
         sys_db_name (str): System database name
         sys_db_pool_size (int): System database pool size
+        db_engine_kwargs (Dict[str, Any]): SQLAlchemy engine kwargs (See https://docs.sqlalchemy.org/en/20/core/engines.html#sqlalchemy.create_engine)
         log_level (str): Log level
         otlp_traces_endpoints: List[str]: OTLP traces endpoints
         otlp_logs_endpoints: List[str]: OTLP logs endpoints
@@ -43,6 +44,7 @@ class DBOSConfig(TypedDict, total=False):
     app_db_pool_size: Optional[int]
     sys_db_name: Optional[str]
     sys_db_pool_size: Optional[int]
+    db_engine_kwargs: Optional[Dict[str, Any]]
     log_level: Optional[str]
     otlp_traces_endpoints: Optional[List[str]]
     otlp_logs_endpoints: Optional[List[str]]
@@ -64,6 +66,7 @@ class DatabaseConfig(TypedDict, total=False):
         app_db_pool_size (int): Application database pool size
         sys_db_name (str): System database name
         sys_db_pool_size (int): System database pool size
+        db_engine_kwargs (Dict[str, Any]): SQLAlchemy engine kwargs
         migrate (List[str]): Migration commands to run on startup
     """
 
@@ -76,6 +79,7 @@ class DatabaseConfig(TypedDict, total=False):
     app_db_pool_size: Optional[int]
     sys_db_name: Optional[str]
     sys_db_pool_size: Optional[int]
+    db_engine_kwargs: Optional[Dict[str, Any]]
     ssl: Optional[bool]  # Will be removed in a future version
     ssl_ca: Optional[str]  # Will be removed in a future version
     migrate: Optional[List[str]]
@@ -183,6 +187,8 @@ def translate_dbos_config_to_config_file(config: DBOSConfig) -> ConfigFile:
         db_config["app_db_pool_size"] = config.get("app_db_pool_size")
     if "sys_db_pool_size" in config:
         db_config["sys_db_pool_size"] = config.get("sys_db_pool_size")
+    if "db_engine_kwargs" in config:
+        db_config["db_engine_kwargs"] = config.get("db_engine_kwargs")
     if db_config:
         translated_config["database"] = db_config
 

{dbos-0.26.0a25 → dbos-0.27.0a2}/dbos/_sys_db.py

@@ -267,12 +267,23 @@ class SystemDatabase:
         if pool_size is None:
             pool_size = 20
 
+        engine_kwargs = database.get("db_engine_kwargs")
+        if engine_kwargs is None:
+            engine_kwargs = {}
+
+        # Respect user-provided values. Otherwise, set defaults.
+        if "pool_size" not in engine_kwargs:
+            engine_kwargs["pool_size"] = pool_size
+        if "max_overflow" not in engine_kwargs:
+            engine_kwargs["max_overflow"] = 0
+        if "pool_timeout" not in engine_kwargs:
+            engine_kwargs["pool_timeout"] = 30
+        if "connect_args" not in engine_kwargs:
+            engine_kwargs["connect_args"] = {"connect_timeout": 10}
+
         self.engine = sa.create_engine(
             system_db_url,
-            pool_size=pool_size,
-            max_overflow=0,
-            pool_timeout=30,
-            connect_args={"connect_timeout": 10},
+            **engine_kwargs,
         )
 
         # Run a schema migration for the system database
@@ -378,7 +389,6 @@ class SystemDatabase:
         cmd = cmd.returning(SystemSchema.workflow_status.c.recovery_attempts, SystemSchema.workflow_status.c.status, SystemSchema.workflow_status.c.workflow_deadline_epoch_ms, SystemSchema.workflow_status.c.name, SystemSchema.workflow_status.c.class_name, SystemSchema.workflow_status.c.config_name, SystemSchema.workflow_status.c.queue_name)  # type: ignore
 
         results = conn.execute(cmd)
-
         row = results.fetchone()
         if row is not None:
             # Check the started workflow matches the expected name, class_name, config_name, and queue_name

{dbos-0.26.0a25 → dbos-0.27.0a2}/dbos/_tracer.py

@@ -3,8 +3,10 @@ from typing import TYPE_CHECKING, Optional
 
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
+from opentelemetry.semconv.resource import ResourceAttributes
 from opentelemetry.trace import Span
 
 from dbos._utils import GlobalParams
@@ -23,7 +25,13 @@ class DBOSTracer:
 
     def config(self, config: ConfigFile) -> None:
         if not isinstance(trace.get_tracer_provider(), TracerProvider):
-            provider = TracerProvider()
+            resource = Resource(
+                attributes={
+                    ResourceAttributes.SERVICE_NAME: config["name"],
+                }
+            )
+
+            provider = TracerProvider(resource=resource)
             if os.environ.get("DBOS__CONSOLE_TRACES", None) is not None:
                 processor = BatchSpanProcessor(ConsoleSpanExporter())
                 provider.add_span_processor(processor)

{dbos-0.26.0a25 → dbos-0.27.0a2}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.26.0a25"
+version = "0.27.0a2"
 
 [project.license]
 text = "MIT"

{dbos-0.26.0a25 → dbos-0.27.0a2}/tests/test_config.py

@@ -1251,6 +1251,8 @@ def test_configured_pool_sizes():
     dbos.launch()
     assert dbos._app_db.engine.pool._pool.maxsize == 42
     assert dbos._sys_db.engine.pool._pool.maxsize == 43
+    assert dbos._app_db.engine.pool._pre_ping == False
+    assert dbos._sys_db.engine.pool._pre_ping == False
     dbos.destroy()
 
 
@@ -1326,3 +1328,21 @@ def test_get_dbos_database_url(mocker):
         database="some_db",
     ).render_as_string(hide_password=False)
     assert get_dbos_database_url() == expected_url
+
+
+def test_db_engine_kwargs():
+    config: DBOSConfig = {
+        "name": "test-app",
+        "db_engine_kwargs": {
+            "pool_pre_ping": True,
+        },
+    }
+
+    dbos = DBOS(config=config)
+    dbos.launch()
+    assert dbos._app_db.engine.pool._pre_ping == True
+    assert dbos._sys_db.engine.pool._pre_ping == True
+    # Default values should be set
+    assert dbos._app_db.engine.pool._pool.maxsize == 20
+    assert dbos._sys_db.engine.pool._pool.maxsize == 20
+    dbos.destroy()

{dbos-0.26.0a25 → dbos-0.27.0a2}/tests/test_spans.py

@@ -17,6 +17,10 @@ def test_spans(dbos: DBOS) -> None:
     @DBOS.workflow()
     def test_workflow() -> None:
         test_step()
+        current_span = DBOS.span
+        subspan = DBOS.tracer.start_span({"name": "a new span"}, parent=current_span)
+        subspan.add_event("greeting_event", {"name": "a new event"})
+        DBOS.tracer.end_span(subspan)
 
     @DBOS.step()
     def test_step() -> None:
@@ -33,20 +37,23 @@ def test_spans(dbos: DBOS) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 3
+    assert len(spans) == 4
 
     for span in spans:
         assert span.attributes is not None
         assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
 
     assert spans[0].name == test_step.__name__
-    assert spans[1].name == test_workflow.__name__
-    assert spans[2].name == test_step.__name__
+    assert spans[1].name == 'a new span'
+    assert spans[2].name == test_workflow.__name__
+    assert spans[3].name == test_step.__name__
 
-    assert spans[0].parent.span_id == spans[1].context.span_id  # type: ignore
-    assert spans[1].parent == None
+    assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
+    assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
+    assert spans[3].parent == None
 
 
 @pytest.mark.asyncio
@@ -55,6 +62,10 @@ async def test_spans_async(dbos: DBOS) -> None:
     @DBOS.workflow()
     async def test_workflow() -> None:
         await test_step()
+        current_span = DBOS.span
+        subspan = DBOS.tracer.start_span({"name": "a new span"}, parent=current_span)
+        subspan.add_event("greeting_event", {"name": "a new event"})
+        DBOS.tracer.end_span(subspan)
 
     @DBOS.step()
     async def test_step() -> None:
@@ -71,20 +82,23 @@ async def test_spans_async(dbos: DBOS) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 3
+    assert len(spans) == 4
 
     for span in spans:
         assert span.attributes is not None
         assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
 
     assert spans[0].name == test_step.__name__
-    assert spans[1].name == test_workflow.__name__
-    assert spans[2].name == test_step.__name__
+    assert spans[1].name == 'a new span'
+    assert spans[2].name == test_workflow.__name__
+    assert spans[3].name == test_step.__name__
 
-    assert spans[0].parent.span_id == spans[1].context.span_id  # type: ignore
-    assert spans[1].parent == None
+    assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
+    assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
+    assert spans[3].parent == None
 
 
 def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None: