dbos 0.5.0a5__py3-none-any.whl → 0.5.0a11__py3-none-any.whl

dbos/context.py

@@ -8,13 +8,10 @@ from types import TracebackType
 from typing import TYPE_CHECKING, List, Literal, Optional, Type, TypedDict
 
 from opentelemetry.trace import Span, Status, StatusCode
-
-if TYPE_CHECKING:
-    from .fastapi import Request
-
 from sqlalchemy.orm import Session
 
 from .logger import dbos_logger
+from .request import Request
 from .tracer import dbos_tracer
 
 

dbos/dbos.py

@@ -52,7 +52,7 @@ from .tracer import dbos_tracer
 
 if TYPE_CHECKING:
     from fastapi import FastAPI
-    from .fastapi import Request
+    from .request import Request
 
 from sqlalchemy.orm import Session
 
@@ -72,7 +72,7 @@ from dbos.error import DBOSException, DBOSNonExistentWorkflowError
 
 from .application_database import ApplicationDatabase
 from .dbos_config import ConfigFile, load_config, set_env_vars
-from .logger import config_logger, dbos_logger, init_logger
+from .logger import add_otlp_to_all_loggers, config_logger, dbos_logger, init_logger
 from .system_database import SystemDatabase
 
 # Most DBOS functions are just any callable F, so decorators / wrappers work on F
@@ -202,9 +202,9 @@ class DBOS:
 
     def __new__(
         cls: Type[DBOS],
-        fastapi: Optional["FastAPI"] = None,
+        *,
         config: Optional[ConfigFile] = None,
-        launch: bool = True,
+        fastapi: Optional["FastAPI"] = None,
     ) -> DBOS:
         global _dbos_global_instance
         global _dbos_global_registry
@@ -219,7 +219,7 @@ class DBOS:
                     )
                 config = _dbos_global_registry.config
             _dbos_global_instance = super().__new__(cls)
-            _dbos_global_instance.__init__(fastapi=fastapi, config=config, launch=launch)  # type: ignore
+            _dbos_global_instance.__init__(fastapi=fastapi, config=config)  # type: ignore
         else:
             if (config is not None and _dbos_global_instance.config is not config) or (
                 _dbos_global_instance.fastapi is not fastapi
@@ -240,9 +240,9 @@ class DBOS:
 
     def __init__(
         self,
-        fastapi: Optional["FastAPI"] = None,
+        *,
         config: Optional[ConfigFile] = None,
-        launch: bool = True,
+        fastapi: Optional["FastAPI"] = None,
     ) -> None:
         if hasattr(self, "_initialized") and self._initialized:
             return
@@ -269,8 +269,8 @@ class DBOS:
             from dbos.fastapi import setup_fastapi_middleware
 
             setup_fastapi_middleware(self.fastapi)
-            self.fastapi.on_event("startup")(self.launch)
-            launch = False
+            self.fastapi.on_event("startup")(self._launch)
+            self.fastapi.on_event("shutdown")(self._destroy)
 
         # Register send_stub as a workflow
         def send_temp_workflow(
@@ -283,8 +283,8 @@ class DBOS:
         set_temp_workflow_type(send_temp_workflow, "send")
         self._registry.register_wf_function(TEMP_SEND_WF_NAME, temp_send_wf)
 
-        if launch:
-            self.launch()
+        for handler in dbos_logger.handlers:
+            handler.flush()
 
     @property
     def executor(self) -> ThreadPoolExecutor:
@@ -316,7 +316,12 @@ class DBOS:
         rv: AdminServer = self._admin_server
         return rv
 
-    def launch(self) -> None:
+    @classmethod
+    def launch(cls) -> None:
+        if _dbos_global_instance is not None:
+            _dbos_global_instance._launch()
+
+    def _launch(self) -> None:
         if self._launched:
             dbos_logger.warning(f"DBOS was already launched")
             return
@@ -342,9 +347,13 @@ class DBOS:
             self.executor.submit(func, *args, **kwargs)
         self._registry.pollers = []
 
-        dbos_logger.info("DBOS initialized")
+        dbos_logger.info("DBOS launched")
+
+        # Flush handlers and add OTLP to all loggers if enabled
+        # to enable their export in DBOS Cloud
         for handler in dbos_logger.handlers:
             handler.flush()
+        add_otlp_to_all_loggers()
 
     def _destroy(self) -> None:
         self._initialized = False
@@ -650,7 +659,7 @@ class DBOS:
 
     @classproperty
     def request(cls) -> Optional["Request"]:
-        """Return the FastAPI `Request`, if any, associated with the current context."""
+        """Return the HTTP `Request`, if any, associated with the current context."""
         ctx = assert_current_dbos_context()
         return ctx.request
 

dbos/fastapi.py

@@ -11,6 +11,7 @@ from .context import (
     TracedAttributes,
     assert_current_dbos_context,
 )
+from .request import Address, Request
 
 request_id_header = "x-request-id"
 
@@ -23,31 +24,17 @@ def get_or_generate_request_id(request: FastAPIRequest) -> str:
         return str(uuid.uuid4())
 
 
-class Request:
-    """
-    Serializable subset of the FastAPI Request object.
-
-    Attributes:
-        base_url(URL): Base of URL requested, as in application code
-        client(Address): HTTP Client
-        cookies(Dict[str, str]): HTTP Cookies
-        headers(Headers): HTTP headers
-        method(str): HTTP verb
-        path_params(Dict[str,Any]): Parameters extracted from URL path sections
-        query_params(QueryParams): URL query string parameters
-        url(URL): Full URL accessed
-
-    """
-
-    def __init__(self, req: FastAPIRequest):
-        self.headers = req.headers
-        self.path_params = req.path_params
-        self.query_params = req.query_params
-        self.url = req.url
-        self.base_url = req.base_url
-        self.client = req.client
-        self.cookies = req.cookies
-        self.method = req.method
+def make_request(request: FastAPIRequest) -> Request:
+    return Request(
+        headers=request.headers,
+        path_params=request.path_params,
+        query_params=request.query_params,
+        url=str(request.url),
+        base_url=str(request.base_url),
+        client=Address(*request.client) if request.client is not None else None,
+        cookies=request.cookies,
+        method=request.method,
+    )
 
 
 def setup_fastapi_middleware(app: FastAPI) -> None:
@@ -65,7 +52,7 @@ def setup_fastapi_middleware(app: FastAPI) -> None:
         }
         with EnterDBOSHandler(attributes):
             ctx = assert_current_dbos_context()
-            ctx.request = Request(request)
+            ctx.request = make_request(request)
             workflow_id = request.headers.get("dbos-idempotency-key", "")
             with SetWorkflowID(workflow_id):
                 response = await call_next(request)

dbos/logger.py

@@ -12,6 +12,7 @@ if TYPE_CHECKING:
     from dbos.dbos_config import ConfigFile
 
 dbos_logger = logging.getLogger("dbos")
+otlp_handler, otlp_transformer = None, None
 
 
 class DBOSLogTransformer(logging.Filter):
@@ -73,25 +74,28 @@ def config_logger(config: "ConfigFile") -> None:
                 export_timeout_millis=5000,
             )
         )
+        global otlp_handler
         otlp_handler = LoggingHandler(logger_provider=log_provider)
 
         # Attach DBOS-specific attributes to all log entries.
+        global otlp_transformer
         otlp_transformer = DBOSLogTransformer()
 
-        # Direct all logs to OTLP
-        add_otlp_to_all_loggers(otlp_handler, otlp_transformer)
+        # Direct DBOS logs to OTLP
+        dbos_logger.addHandler(otlp_handler)
+        dbos_logger.addFilter(otlp_transformer)
 
 
-def add_otlp_to_all_loggers(
-    otlp_handler: LoggingHandler, otlp_transformer: DBOSLogTransformer
-) -> None:
-    root = logging.root
+def add_otlp_to_all_loggers() -> None:
+    if otlp_handler is not None and otlp_transformer is not None:
+        root = logging.root
 
-    root.addHandler(otlp_handler)
-    root.addFilter(otlp_transformer)
+        root.addHandler(otlp_handler)
+        root.addFilter(otlp_transformer)
 
-    for logger_name in root.manager.loggerDict:
-        logger = logging.getLogger(logger_name)
-        if not logger.propagate:
-            logger.addHandler(otlp_handler)
-        logger.addFilter(otlp_transformer)
+        for logger_name in root.manager.loggerDict:
+            if logger_name != dbos_logger.name:
+                logger = logging.getLogger(logger_name)
+                if not logger.propagate:
+                    logger.addHandler(otlp_handler)
+                logger.addFilter(otlp_transformer)

dbos/request.py

@@ -0,0 +1,32 @@
+from dataclasses import dataclass
+from typing import Any, Mapping, NamedTuple, Optional
+
+
+class Address(NamedTuple):
+    hostname: str
+    port: int
+
+
+@dataclass
+class Request:
+    """
+    Serializable HTTP Request object.
+    Attributes:
+        base_url(str): Base of URL requested, as in application code
+        client(Optional[Address]): HTTP Client
+        cookies(Mapping[str, str]): HTTP Cookies
+        headers(Mapping[str, str]): HTTP headers
+        method(str): HTTP verb
+        path_params(Mapping[str, Any]): Parameters extracted from URL path sections
+        query_params(Mapping[str, str]): URL query string parameters
+        url(str): Full URL accessed
+    """
+
+    headers: Mapping[str, str]
+    path_params: Mapping[str, Any]
+    query_params: Mapping[str, str]
+    url: str
+    base_url: str
+    client: Optional[Address]
+    cookies: Mapping[str, str]
+    method: str

dbos/system_database.py

@@ -734,7 +734,6 @@ class SystemDatabase:
                 )
                 notification_cursor = self.notification_conn.cursor()
 
-                dbos_logger.info("Listening to notifications")
                 notification_cursor.execute("LISTEN dbos_notifications_channel")
                 notification_cursor.execute("LISTEN dbos_workflow_events_channel")
                 while self._run_background_processes:

dbos/templates/hello/__package/main.py

@@ -15,7 +15,7 @@ from dbos import DBOS
 from .schema import dbos_hello
 
 app = FastAPI()
-DBOS(app)
+DBOS(fastapi=app)
 
 # Next, let's write a function that greets visitors.
 # To make it more interesting, we'll keep track of how

{dbos-0.5.0a5.dist-info → dbos-0.5.0a11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 0.5.0a5
+Version: 0.5.0a11
 Summary: A Python framework for backends that scale
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-0.5.0a5.dist-info → dbos-0.5.0a11.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dbos-0.5.0a5.dist-info/METADATA,sha256=WRKFIucNawLOnizlrKNBp1cTcYW2BcuIcaYaQjXq1FU,5420
-dbos-0.5.0a5.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-dbos-0.5.0a5.dist-info/entry_points.txt,sha256=3PmOPbM4FYxEmggRRdJw0oAsiBzKR8U0yx7bmwUmMOM,39
-dbos-0.5.0a5.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.5.0a11.dist-info/METADATA,sha256=zWq1cPyLlyR1-qJrUhSwbURRvDUOI9LfxIg3M0kVFC0,5421
+dbos-0.5.0a11.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+dbos-0.5.0a11.dist-info/entry_points.txt,sha256=3PmOPbM4FYxEmggRRdJw0oAsiBzKR8U0yx7bmwUmMOM,39
+dbos-0.5.0a11.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=X1LdP36NomDtvPfFwoMNtgXf81TO05jj7vltsp79UUw,787
 dbos/admin_sever.py,sha256=KtzH6aKyskCm4h3yulpy9jb5PIqRlYI2sjctw5mvaKY,3395
 dbos/application_database.py,sha256=1K3kE96BgGi_QWOd2heXluyNTwFAwlUVuAR6JKKUqf0,5659
 dbos/cli.py,sha256=QnbGtZ8S963q3iyFvXNBcL4DB35r4SFMarlb5DRqN6M,7915
-dbos/context.py,sha256=JZMV2RtSpTK7lnyyWxeBmGPwrZSB00XZEP6R6MT9ygQ,15690
+dbos/context.py,sha256=qAVj_pAIV4YBOAbI0WCv-Roq7aNwPzAoj3CeQaVqlrU,15666
 dbos/core.py,sha256=HfKnPpIaQqIBAHzP2hD67aSIchTHp87NgD21CcujKkE,28300
 dbos/dbos-config.schema.json,sha256=azpfmoDZg7WfSy3kvIsk9iEiKB_-VZt03VEOoXJAkqE,5331
-dbos/dbos.py,sha256=HngS2BUWSbWPmloXGr-KE81BQ8dpZtlvOXM4tx4_Qhg,26246
+dbos/dbos.py,sha256=bDp-m25V_CkaR4hsr4VmCFCZbDQ4V99Um9bDUxahpag,26561
 dbos/dbos_config.py,sha256=EkO0c0xaIM7_vAAqqnvNNEAKG5fOJbmmalqnZvaKYZA,5312
 dbos/decorators.py,sha256=lbPefsLK6Cya4cb7TrOcLglOpGT3pc6qjZdsQKlfZLg,629
 dbos/error.py,sha256=nBdLC4hxGO_K9V26YbDGOo7xi1CKuN4PsE_cBv7K8Cc,3798
-dbos/fastapi.py,sha256=ZFcMizyv3pizo5zf0sSF6U4GoR3rQH8LxGipkQIGHfU,2282
-dbos/logger.py,sha256=cfybbu6F1zsgYLEPW8D8V6h033u-YedLXnGMnQQM6-4,3341
+dbos/fastapi.py,sha256=LkARLITiN_NuQh4g2QL7sfK0oG1GvJjj2tvU7WWO8f8,1898
+dbos/logger.py,sha256=D-aFSZUCHBP34J1IZ5YNkTrJW-rDiH3py_v9jLU4Yrk,3565
 dbos/migrations/env.py,sha256=38SIGVbmn_VV2x2u1aHLcPOoWgZ84eCymf3g_NljmbU,1626
 dbos/migrations/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 dbos/migrations/versions/5c361fc04708_added_system_tables.py,sha256=QMgFMb0aLgC25YicsvPSr6AHRCA6Zd66hyaRUhwKzrQ,6404
@@ -22,16 +22,17 @@ dbos/migrations/versions/a3b18ad34abe_added_triggers.py,sha256=Rv0ZsZYZ_WdgGEULY
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 dbos/recovery.py,sha256=xfwQFWNuD8DXg5HD5_-3tG7Neo9j-x1lrqiwtn5FSh8,2015
 dbos/registrations.py,sha256=gMI-u05tv5bpvyddQGtoUgCsqARx51aOY7p0JXPafQo,6539
+dbos/request.py,sha256=FTjmgzqWwKKTSf6PKPdlQ4Ssp39PATQukYmMOW_xP7k,892
 dbos/roles.py,sha256=9u0z4CWmXPeqIKzQWEzaOKIlzOuaagBtMiB-swqjX_U,2291
 dbos/scheduler/croniter.py,sha256=hbhgfsHBqclUS8VeLnJ9PSE9Z54z6mi4nnrr1aUXn0k,47561
 dbos/scheduler/scheduler.py,sha256=uO4_9jmWW2rLv1ODL3lc1cE_37ZaVTgnvmFx_FAlN50,1472
 dbos/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/schemas/application_database.py,sha256=q_Wr2XbiZNBYFkOtu7uKavo1T_cSOBblxKGHThYGGsY,962
 dbos/schemas/system_database.py,sha256=5V3vqnEzry0Hn7ZbVS9Gs_dJKia8uX8p7mGC82Ru8rk,4303
-dbos/system_database.py,sha256=SK24Avj10rbbWFilVUexdPX6VvOL8zC-CoWDhNQj6QM,39698
+dbos/system_database.py,sha256=84c53iAel113SRb7DcgFJ8XQNWBhD4VrCRCb0s5Oe8Y,39635
 dbos/templates/hello/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/templates/hello/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbos/templates/hello/__package/main.py,sha256=hJgp3S14cseT7zWIZsPwjqdzwTCw1aLo8kPKsTvYz0Y,2976
+dbos/templates/hello/__package/main.py,sha256=LFN48qBWt-xsf21Cg1llf5Grr0e7Il_7lcyi60sK4ec,2984
 dbos/templates/hello/__package/schema.py,sha256=XOSeq_vFG0vN1LxWPob-L9K65jq9OMCz2qOmvw5CKN8,235
 dbos/templates/hello/alembic.ini,sha256=VKBn4Gy8mMuCdY7Hip1jmo3wEUJ1VG1aW7EqY0_n-as,3695
 dbos/templates/hello/dbos-config.yaml.dbos,sha256=8wxCf_MIEFNWqMXj0nAHUwg1U3YaKz4xcUN6g51WkDE,603
@@ -42,4 +43,4 @@ dbos/templates/hello/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKs
 dbos/tracer.py,sha256=RPW9oxmX9tSc0Yq7O-FAhpQWBg1QT7Ni1Q06uwhtNDk,2237
 dbos/utils.py,sha256=hWj9iWDrby2cVEhb0pG-IdnrxLqP64NhkaWUXiLc8bA,402
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.5.0a5.dist-info/RECORD,,
+dbos-0.5.0a11.dist-info/RECORD,,