dbos 0.9.0a1__py3-none-any.whl → 0.10.0__py3-none-any.whl

dbos/dbos-config.schema.json

@@ -59,6 +59,10 @@
             "type": "string",
             "description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file"
           },
+          "local_suffix": {
+            "type": "boolean",
+            "description": "Whether to suffix app_db_name with '_local'. Set to true when doing local development using a DBOS Cloud database."
+          },
           "app_db_client": {
             "type": "string",
             "description": "Specify the database client to use to connect to the application database",
@@ -140,6 +144,10 @@
           "start": {
             "type": "array",
             "description": "Specify commands to run to start your application (Python only)"
+          },
+          "admin_port": {
+            "type": "number",
+            "description": "The port number of the admin server (Default: 3001)"
           }
         }
       },

dbos/dbos.py

@@ -277,6 +277,7 @@ class DBOS:
         self.fastapi: Optional["FastAPI"] = fastapi
         self.flask: Optional["Flask"] = flask
         self._executor_field: Optional[ThreadPoolExecutor] = None
+        self._background_threads: List[threading.Thread] = []
 
         # If using FastAPI, set up middleware and lifecycle events
         if self.fastapi is not None:
@@ -348,27 +349,48 @@ class DBOS:
             self._executor_field = ThreadPoolExecutor(max_workers=64)
             self._sys_db_field = SystemDatabase(self.config)
             self._app_db_field = ApplicationDatabase(self.config)
-            self._admin_server_field = AdminServer(dbos=self)
+            admin_port = self.config["runtimeConfig"].get("admin_port")
+            if admin_port is None:
+                admin_port = 3001
+            self._admin_server_field = AdminServer(dbos=self, port=admin_port)
 
             if not os.environ.get("DBOS__VMID"):
                 workflow_ids = self._sys_db.get_pending_workflows("local")
                 self._executor.submit(_startup_recovery_thread, self, workflow_ids)
 
             # Listen to notifications
-            self._executor.submit(self._sys_db._notification_listener)
+            notification_listener_thread = threading.Thread(
+                target=self._sys_db._notification_listener,
+                daemon=True,
+            )
+            notification_listener_thread.start()
+            self._background_threads.append(notification_listener_thread)
 
             # Start flush workflow buffers thread
-            self._executor.submit(self._sys_db.flush_workflow_buffers)
+            flush_workflow_buffers_thread = threading.Thread(
+                target=self._sys_db.flush_workflow_buffers,
+                daemon=True,
+            )
+            flush_workflow_buffers_thread.start()
+            self._background_threads.append(flush_workflow_buffers_thread)
 
             # Start the queue thread
             evt = threading.Event()
             self.stop_events.append(evt)
-            self._executor.submit(queue_thread, evt, self)
+            bg_queue_thread = threading.Thread(
+                target=queue_thread, args=(evt, self), daemon=True
+            )
+            bg_queue_thread.start()
+            self._background_threads.append(bg_queue_thread)
 
             # Grab any pollers that were deferred and start them
             for evt, func, args, kwargs in self._registry.pollers:
                 self.stop_events.append(evt)
-                self._executor.submit(func, *args, **kwargs)
+                poller_thread = threading.Thread(
+                    target=func, args=args, kwargs=kwargs, daemon=True
+                )
+                poller_thread.start()
+                self._background_threads.append(poller_thread)
             self._registry.pollers = []
 
             dbos_logger.info("DBOS launched")
@@ -400,6 +422,8 @@ class DBOS:
         if self._executor_field is not None:
             self._executor_field.shutdown(cancel_futures=True)
             self._executor_field = None
+        for bg_thread in self._background_threads:
+            bg_thread.join()
 
     @classmethod
     def register_instance(cls, inst: object) -> None:
@@ -829,7 +853,7 @@ class DBOSConfiguredInstance:
 
 # Apps that import DBOS probably don't exit.  If they do, let's see if
 #   it looks like startup was abandoned or a call was forgotten...
-def log_exit_info() -> None:
+def dbos_exit_hook() -> None:
     if _dbos_global_registry is None:
         # Probably used as or for a support module
         return
@@ -843,7 +867,9 @@ def log_exit_info() -> None:
         print("DBOS exiting; DBOS exists but launch() was not called")
         dbos_logger.warning("DBOS exiting; DBOS exists but launch() was not called")
         return
+    # If we get here, we're exiting normally
+    _dbos_global_instance.destroy()
 
 
 # Register the exit hook
-atexit.register(log_exit_info)
+atexit.register(dbos_exit_hook)

dbos/dbos_config.py

@@ -2,7 +2,7 @@ import json
 import os
 import re
 from importlib import resources
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, Dict, List, Optional, TypedDict, cast
 
 import yaml
 from jsonschema import ValidationError, validate
@@ -14,6 +14,7 @@ from dbos.logger import dbos_logger
 
 class RuntimeConfig(TypedDict, total=False):
     start: List[str]
+    admin_port: Optional[int]
 
 
 class DatabaseConfig(TypedDict, total=False):
@@ -26,6 +27,7 @@ class DatabaseConfig(TypedDict, total=False):
     sys_db_name: Optional[str]
     ssl: Optional[bool]
     ssl_ca: Optional[str]
+    local_suffix: Optional[bool]
     app_db_client: Optional[str]
     migrate: Optional[List[str]]
     rollback: Optional[List[str]]
@@ -163,6 +165,11 @@ def load_config(config_file_path: str = "dbos-config.yaml") -> ConfigFile:
     if "runtimeConfig" not in data or "start" not in data["runtimeConfig"]:
         raise DBOSInitializationError(f"dbos-config.yaml must specify a start command")
 
+    data = cast(ConfigFile, data)
+
+    if "local_suffix" in data["database"] and data["database"]["local_suffix"]:
+        data["database"]["app_db_name"] = f"{data['database']['app_db_name']}_local"
+
     # Return data as ConfigFile type
     return data  # type: ignore
 

{dbos-0.9.0a1.dist-info → dbos-0.10.0.dist-info}/METADATA

@@ -1,24 +1,24 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 0.9.0a1
+Version: 0.10.0
 Summary: Ultra-lightweight durable execution in Python
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT
 Requires-Python: >=3.9
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: jsonschema>=4.23.0
-Requires-Dist: alembic>=1.13.2
+Requires-Dist: alembic>=1.13.3
 Requires-Dist: typing-extensions>=4.12.2; python_version < "3.10"
-Requires-Dist: typer>=0.12.3
-Requires-Dist: jsonpickle>=3.2.2
-Requires-Dist: opentelemetry-api>=1.26.0
-Requires-Dist: opentelemetry-sdk>=1.26.0
-Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.26.0
+Requires-Dist: typer>=0.12.5
+Requires-Dist: jsonpickle>=3.3.0
+Requires-Dist: opentelemetry-api>=1.27.0
+Requires-Dist: opentelemetry-sdk>=1.27.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.27.0
 Requires-Dist: python-dateutil>=2.9.0.post0
-Requires-Dist: fastapi[standard]>=0.112.1
+Requires-Dist: fastapi[standard]>=0.115.2
 Requires-Dist: psutil>=6.0.0
 Requires-Dist: tomlkit>=0.13.2
-Requires-Dist: psycopg>=3.2.1
+Requires-Dist: psycopg>=3.2.3
 Description-Content-Type: text/markdown
 
 

{dbos-0.9.0a1.dist-info → dbos-0.10.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-dbos-0.9.0a1.dist-info/METADATA,sha256=cTVI8Ycq1xzitja99TcUvA2hqjjl6T7nmZs9GUpeVF8,5010
-dbos-0.9.0a1.dist-info/WHEEL,sha256=Vza3XR51HW1KmFP0iIMUVYIvz0uQuKJpIXKYOBGQyFQ,90
-dbos-0.9.0a1.dist-info/entry_points.txt,sha256=z6GcVANQV7Uw_82H9Ob2axJX6V3imftyZsljdh-M1HU,54
-dbos-0.9.0a1.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.10.0.dist-info/METADATA,sha256=NhI4MeQSyGupnlrGBEkpP3vvUnaZZPW-UAoe33zufp0,5009
+dbos-0.10.0.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
+dbos-0.10.0.dist-info/entry_points.txt,sha256=z6GcVANQV7Uw_82H9Ob2axJX6V3imftyZsljdh-M1HU,54
+dbos-0.10.0.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=-h1QgWNL11CiLlHEKa2ycAJVJw5SXYZ4BGNNWBAiE9k,726
 dbos/admin_sever.py,sha256=Qg5T3YRrbPW05PR_99yAaxgo1ugQrAp_uTeTqSfjm_k,3397
 dbos/application_database.py,sha256=knFK8We8y6WrIpnFCKvFq5hvSuFQqUuJqOqDpSVMCPI,5521
 dbos/cli.py,sha256=z5dXbbnGWzSC3E1rfS8Lp1_OIImzcDKM7jP-iu_Q4aI,8602
 dbos/context.py,sha256=4MsxZdoh1WIsgoUsaxo0B6caGN6xq2WC60MzbBppzGk,17738
 dbos/core.py,sha256=ggsRC2XicvNI1qqruEFoqxoTU5oSSnhMZvDih3AG_3A,30879
-dbos/dbos-config.schema.json,sha256=azpfmoDZg7WfSy3kvIsk9iEiKB_-VZt03VEOoXJAkqE,5331
-dbos/dbos.py,sha256=qQOHcgaT4rru1gZJy1nFrIvz8YzEhDfMJmN9eCskPZ4,29857
-dbos/dbos_config.py,sha256=NJVze2GkKgYUmcPP31Unb-QpsA0TzImEeQGJgVq6W6k,5352
+dbos/dbos-config.schema.json,sha256=GQAxrtERczP-ANpzJJJbhCp_CUtQ8pUcH87AqlyC02A,5697
+dbos/dbos.py,sha256=4_jOtcjoJdIF27wjs_jpsrl-LsyhZ22rod8J1UgKo1E,31021
+dbos/dbos_config.py,sha256=N48Ll-57lKVuh4SF3sLD4W4VnuELAGYA71j3oZPc6Sw,5622
 dbos/decorators.py,sha256=lbPefsLK6Cya4cb7TrOcLglOpGT3pc6qjZdsQKlfZLg,629
 dbos/error.py,sha256=UETk8CoZL-TO2Utn1-E7OSWelhShWmKM-fOlODMR9PE,3893
 dbos/fastapi.py,sha256=gx9hlpxYOiwbuhSlbY9bn5C-F_FsCbrJvkX9ZAvDG6U,3418
@@ -51,4 +51,4 @@ dbos/templates/hello/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKs
 dbos/tracer.py,sha256=GaXDhdKKF_IQp5SAMipGXiDVwteRKjNbrXyYCH1mor0,2520
 dbos/utils.py,sha256=lwRymY-y7GprAS8pKmbICQvOJd5eGxKGTxCMFn0OwaQ,1739
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.9.0a1.dist-info/RECORD,,
+dbos-0.10.0.dist-info/RECORD,,

{dbos-0.9.0a1.dist-info → dbos-0.10.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.1)
+Generator: pdm-backend (2.4.2)
 Root-Is-Purelib: true
 Tag: py3-none-any