dbos 1.13.0a5__py3-none-any.whl → 1.13.0a7__py3-none-any.whl

dbos/_app_db.py

@@ -383,7 +383,6 @@ class SQLiteApplicationDatabase(ApplicationDatabase):
             ).fetchone()
 
             if result is None:
-                # Create the table with proper SQLite syntax
                 conn.execute(
                     sa.text(
                         f"""
@@ -402,7 +401,6 @@ class SQLiteApplicationDatabase(ApplicationDatabase):
                         """
                     )
                 )
-                # Create the index
                 conn.execute(
                     sa.text(
                         "CREATE INDEX transaction_outputs_created_at_index ON transaction_outputs (created_at)"

dbos/_client.py

@@ -25,7 +25,11 @@ else:
 
 from dbos import _serialization
 from dbos._dbos import WorkflowHandle, WorkflowHandleAsync
-from dbos._dbos_config import get_system_database_url, is_valid_database_url
+from dbos._dbos_config import (
+    get_application_database_url,
+    get_system_database_url,
+    is_valid_database_url,
+)
 from dbos._error import DBOSException, DBOSNonExistentWorkflowError
 from dbos._registrations import DEFAULT_MAX_RECOVERY_ATTEMPTS
 from dbos._serialization import WorkflowInputs
@@ -113,21 +117,32 @@ class WorkflowHandleClientAsyncPolling(Generic[R]):
 class DBOSClient:
     def __init__(
         self,
-        database_url: str,
+        database_url: Optional[str] = None,  # DEPRECATED
         *,
         system_database_url: Optional[str] = None,
-        system_database: Optional[str] = None,
+        application_database_url: Optional[str] = None,
+        system_database: Optional[str] = None,  # DEPRECATED
     ):
-        assert is_valid_database_url(database_url)
+        application_database_url = get_application_database_url(
+            {
+                "system_database_url": system_database_url,
+                "database_url": (
+                    database_url if database_url else application_database_url
+                ),
+            }
+        )
+        system_database_url = get_system_database_url(
+            {
+                "system_database_url": system_database_url,
+                "database_url": application_database_url,
+                "database": {"sys_db_name": system_database},
+            }
+        )
+        assert is_valid_database_url(system_database_url)
+        assert is_valid_database_url(application_database_url)
         # We only create database connections but do not run migrations
         self._sys_db = SystemDatabase.create(
-            system_database_url=get_system_database_url(
-                {
-                    "system_database_url": system_database_url,
-                    "database_url": database_url,
-                    "database": {"sys_db_name": system_database},
-                }
-            ),
+            system_database_url=system_database_url,
             engine_kwargs={
                 "pool_timeout": 30,
                 "max_overflow": 0,
@@ -136,14 +151,13 @@ class DBOSClient:
         )
         self._sys_db.check_connection()
         self._app_db = ApplicationDatabase.create(
-            database_url=database_url,
+            database_url=application_database_url,
             engine_kwargs={
                 "pool_timeout": 30,
                 "max_overflow": 0,
                 "pool_size": 2,
             },
         )
-        self._db_url = database_url
 
     def destroy(self) -> None:
         self._sys_db.destroy()

dbos/_dbos_config.py

@@ -22,9 +22,10 @@ class DBOSConfig(TypedDict, total=False):
 
     Attributes:
         name (str): Application name
-        database_url (str): Database connection string
-        system_database_url (str): Connection string for the system database (if different from the application database)
-        sys_db_name (str): System database name (deprecated)
+        system_database_url (str): Connection string for the DBOS system database. Defaults to sqlite:///{name} if not provided.
+        application_database_url (str): Connection string for the DBOS application database, in which DBOS @Transaction functions run. Optional. Should be the same type of database (SQLite or Postgres) as the system database.
+        database_url (str): (DEPRECATED) Database connection string
+        sys_db_name (str): (DEPRECATED) 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
@@ -39,8 +40,9 @@ class DBOSConfig(TypedDict, total=False):
     """
 
     name: str
-    database_url: Optional[str]
     system_database_url: Optional[str]
+    application_database_url: Optional[str]
+    database_url: Optional[str]
     sys_db_name: Optional[str]
     sys_db_pool_size: Optional[int]
     db_engine_kwargs: Optional[Dict[str, Any]]
@@ -107,12 +109,12 @@ class ConfigFile(TypedDict, total=False):
 
     Attributes:
         name (str): Application name
-        runtimeConfig (RuntimeConfig): Configuration for request serving
+        runtimeConfig (RuntimeConfig): Configuration for DBOS Cloud
         database (DatabaseConfig): Configure pool sizes, migrate commands
-        database_url (str): Database connection string
+        database_url (str): Application database URL
+        system_database_url (str): System database URL
         telemetry (TelemetryConfig): Configuration for tracing / logging
-        env (Dict[str,str]): Environment varialbes
-        application (Dict[str, Any]): Application-specific configuration section
+        env (Dict[str,str]): Environment variables
 
     """
 
@@ -144,8 +146,12 @@ def translate_dbos_config_to_config_file(config: DBOSConfig) -> ConfigFile:
     if db_config:
         translated_config["database"] = db_config
 
+    # Use application_database_url instead of the deprecated database_url if provided
     if "database_url" in config:
         translated_config["database_url"] = config.get("database_url")
+    elif "application_database_url" in config:
+        translated_config["database_url"] = config.get("application_database_url")
+
     if "system_database_url" in config:
         translated_config["system_database_url"] = config.get("system_database_url")
 
@@ -233,7 +239,6 @@ def _substitute_env_vars(content: str, silent: bool = False) -> str:
 def load_config(
     config_file_path: str = DBOS_CONFIG_PATH,
     *,
-    run_process_config: bool = True,
     silent: bool = False,
 ) -> ConfigFile:
     """
@@ -283,8 +288,6 @@ def load_config(
             ]
 
     data = cast(ConfigFile, data)
-    if run_process_config:
-        data = process_config(data=data, silent=silent)
     return data  # type: ignore
 
 
@@ -333,25 +336,16 @@ def process_config(
 
     # Ensure database dict exists
     data.setdefault("database", {})
-
-    # Database URL resolution
     connect_timeout = None
-    if data.get("database_url") is not None and data["database_url"] != "":
+
+    # Process the application database URL, if provided
+    if data.get("database_url"):
         # Parse the db string and check required fields
         assert data["database_url"] is not None
         assert is_valid_database_url(data["database_url"])
 
         url = make_url(data["database_url"])
 
-        if data["database_url"].startswith("sqlite"):
-            data["system_database_url"] = data["database_url"]
-        else:
-            assert url.database is not None
-            if not data["database"].get("sys_db_name"):
-                data["database"]["sys_db_name"] = (
-                    url.database + SystemSchema.sysdb_suffix
-                )
-
         # Gather connect_timeout from the URL if provided. It should be used in engine kwargs if not provided there (instead of our default)
         connect_timeout_str = url.query.get("connect_timeout")
         if connect_timeout_str is not None:
@@ -376,18 +370,80 @@ def process_config(
                 host=os.getenv("DBOS_DBHOST", url.host),
                 port=port,
             ).render_as_string(hide_password=False)
-    else:
+
+    # Process the system database URL, if provided
+    if data.get("system_database_url"):
+        # Parse the db string and check required fields
+        assert data["system_database_url"]
+        assert is_valid_database_url(data["system_database_url"])
+
+        url = make_url(data["system_database_url"])
+
+        # Gather connect_timeout from the URL if provided. It should be used in engine kwargs if not provided there (instead of our default). This overrides a timeout from the application database, if any.
+        connect_timeout_str = url.query.get("connect_timeout")
+        if connect_timeout_str is not None:
+            assert isinstance(
+                connect_timeout_str, str
+            ), "connect_timeout must be a string and defined once in the URL"
+            if connect_timeout_str.isdigit():
+                connect_timeout = int(connect_timeout_str)
+
+        # In debug mode perform env vars overrides
+        if isDebugMode:
+            # Override the username, password, host, and port
+            port_str = os.getenv("DBOS_DBPORT")
+            port = (
+                int(port_str)
+                if port_str is not None and port_str.isdigit()
+                else url.port
+            )
+            data["system_database_url"] = url.set(
+                username=os.getenv("DBOS_DBUSER", url.username),
+                password=os.getenv("DBOS_DBPASSWORD", url.password),
+                host=os.getenv("DBOS_DBHOST", url.host),
+                port=port,
+            ).render_as_string(hide_password=False)
+
+    # If an application database URL is provided but not the system database URL,
+    # construct the system database URL.
+    if data.get("database_url") and not data.get("system_database_url"):
+        assert data["database_url"]
+        if data["database_url"].startswith("sqlite"):
+            data["system_database_url"] = data["database_url"]
+        else:
+            url = make_url(data["database_url"])
+            assert url.database
+            if data["database"].get("sys_db_name"):
+                url = url.set(database=data["database"]["sys_db_name"])
+            else:
+                url = url.set(database=f"{url.database}{SystemSchema.sysdb_suffix}")
+            data["system_database_url"] = url.render_as_string(hide_password=False)
+
+    # If a system database URL is provided but not an application database URL, set the
+    # application database URL to the system database URL.
+    if data.get("system_database_url") and not data.get("database_url"):
+        assert data["system_database_url"]
+        data["database_url"] = data["system_database_url"]
+
+    # If neither URL is provided, use a default SQLite database URL.
+    if not data.get("database_url") and not data.get("system_database_url"):
         _app_db_name = _app_name_to_db_name(data["name"])
-        data["database_url"] = f"sqlite:///{_app_db_name}.sqlite"
-        data["system_database_url"] = data["database_url"]
+        data["system_database_url"] = data["database_url"] = (
+            f"sqlite:///{_app_db_name}.sqlite"
+        )
 
     configure_db_engine_parameters(data["database"], connect_timeout=connect_timeout)
 
-    # Pretty-print where we've loaded database connection information from, respecting the log level
     assert data["database_url"] is not None
+    assert data["system_database_url"] is not None
+    # Pretty-print connection information, respecting log level
     if not silent and logs["logLevel"] == "INFO" or logs["logLevel"] == "DEBUG":
-        log_url = make_url(data["database_url"]).render_as_string(hide_password=True)
-        print(f"[bold blue]Using database connection string: {log_url}[/bold blue]")
+        printable_sys_db_url = make_url(data["system_database_url"]).render_as_string(
+            hide_password=True
+        )
+        print(
+            f"[bold blue]DBOS system database URL: {printable_sys_db_url}[/bold blue]"
+        )
         if data["database_url"].startswith("sqlite"):
             print(
                 f"[bold blue]Using SQLite as a system database. The SQLite system database is for development and testing. PostgreSQL is recommended for production use.[/bold blue]"
@@ -474,36 +530,34 @@ def _app_name_to_db_name(app_name: str) -> str:
 
 def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
     # Load the DBOS configuration file and force the use of:
-    # 1. The database url provided by DBOS_DATABASE_URL
+    # 1. The application and system database url provided by DBOS_DATABASE_URL and DBOS_SYSTEM_DATABASE_URL
     # 2. OTLP traces endpoints (add the config data to the provided config)
     # 3. Use the application name from the file. This is a defensive measure to ensure the application name is whatever it was registered with in the cloud
     # 4. Remove admin_port is provided in code
     # 5. Remove env vars if provided in code
     # Optimistically assume that expected fields in config_from_file are present
 
-    config_from_file = load_config(run_process_config=False)
+    config_from_file = load_config()
     # Be defensive
     if config_from_file is None:
         return provided_config
 
-    # Name
+    # Set the application name to the cloud app name
     provided_config["name"] = config_from_file["name"]
 
-    # Database config. Expects DBOS_DATABASE_URL to be set
-    if "database" not in provided_config:
-        provided_config["database"] = {}
-    provided_config["database"]["sys_db_name"] = config_from_file["database"][
-        "sys_db_name"
-    ]
-
+    # Use the DBOS Cloud application and system database URLs
     db_url = os.environ.get("DBOS_DATABASE_URL")
     if db_url is None:
         raise DBOSInitializationError(
             "DBOS_DATABASE_URL environment variable is not set. This is required to connect to the database."
         )
     provided_config["database_url"] = db_url
-    if "system_database_url" in provided_config:
-        del provided_config["system_database_url"]
+    system_db_url = os.environ.get("DBOS_SYSTEM_DATABASE_URL")
+    if system_db_url is None:
+        raise DBOSInitializationError(
+            "DBOS_SYSTEM_DATABASE_URL environment variable is not set. This is required to connect to the database."
+        )
+    provided_config["system_database_url"] = system_db_url
 
     # Telemetry config
     if "telemetry" not in provided_config or provided_config["telemetry"] is None:
@@ -563,7 +617,7 @@ def get_system_database_url(config: ConfigFile) -> str:
         if config["database_url"].startswith("sqlite"):
             return config["database_url"]
         app_db_url = make_url(config["database_url"])
-        if config["database"].get("sys_db_name") is not None:
+        if config.get("database") and config["database"].get("sys_db_name") is not None:
             sys_db_name = config["database"]["sys_db_name"]
         else:
             assert app_db_url.database is not None
@@ -571,3 +625,14 @@ def get_system_database_url(config: ConfigFile) -> str:
         return app_db_url.set(database=sys_db_name).render_as_string(
             hide_password=False
         )
+
+
+def get_application_database_url(config: ConfigFile) -> str:
+    # For backwards compatibility, the application database URL is "database_url"
+    if config.get("database_url"):
+        assert config["database_url"]
+        return config["database_url"]
+    else:
+        # If the application database URL is not specified, set it to the system database URL
+        assert config["system_database_url"]
+        return config["system_database_url"]

dbos/_sys_db.py

@@ -1422,7 +1422,6 @@ class SystemDatabase(ABC):
                 debug_mode=debug_mode,
             )
         else:
-            # Default to PostgreSQL for postgresql://, postgres://, or other URLs
             from ._sys_db_postgres import PostgresSystemDatabase
 
             return PostgresSystemDatabase(

dbos/_sys_db_sqlite.py

@@ -92,18 +92,15 @@ class SQLiteSystemDatabase(SystemDatabase):
                 last_applied = i
 
     def _cleanup_connections(self) -> None:
-        """Clean up SQLite-specific connections."""
         # SQLite doesn't require special connection cleanup
         pass
 
     def _is_unique_constraint_violation(self, dbapi_error: DBAPIError) -> bool:
         """Check if the error is a unique constraint violation in SQLite."""
-        # SQLite UNIQUE constraint error
         return "UNIQUE constraint failed" in str(dbapi_error.orig)
 
     def _is_foreign_key_violation(self, dbapi_error: DBAPIError) -> bool:
         """Check if the error is a foreign key violation in SQLite."""
-        # SQLite FOREIGN KEY constraint error
         return "FOREIGN KEY constraint failed" in str(dbapi_error.orig)
 
     @staticmethod

dbos/cli/cli.py

@@ -5,7 +5,7 @@ import subprocess
 import time
 import typing
 from os import path
-from typing import Any, Optional
+from typing import Any, Optional, Tuple
 
 import jsonpickle  # type: ignore
 import sqlalchemy as sa
@@ -18,62 +18,65 @@ from dbos._context import SetWorkflowID
 from dbos._debug import debug_workflow, parse_start_command
 from dbos.cli.migration import grant_dbos_schema_permissions, migrate_dbos_databases
 
-from .._app_db import ApplicationDatabase
 from .._client import DBOSClient
 from .._dbos_config import (
+    ConfigFile,
     _app_name_to_db_name,
     _is_valid_app_name,
+    get_application_database_url,
     get_system_database_url,
-    is_valid_database_url,
     load_config,
 )
 from .._docker_pg_helper import start_docker_pg, stop_docker_pg
-from .._schemas.system_database import SystemSchema
 from .._sys_db import SystemDatabase
 from .._utils import GlobalParams
 from ..cli._github_init import create_template_from_github
 from ._template_init import copy_template, get_project_name, get_templates_directory
 
 
-def _get_db_url(db_url: Optional[str]) -> str:
+def _get_db_url(
+    *, system_database_url: Optional[str], application_database_url: Optional[str]
+) -> Tuple[str, str]:
     """
     Get the database URL to use for the DBOS application.
     Order of precedence:
-    - If the `db_url` argument is provided, use it.
-    - If the `dbos-config.yaml` file is present, use the `database_url` from it.
-    - If the `DBOS_DATABASE_URL` environment variable is set, use it.
+    - In DBOS Cloud, use the environment variables provided.
+    - Use database URL arguments if provided.
+    - If the `dbos-config.yaml` file is present, use the database URLs from it.
 
-    Otherwise fallback to the same default Postgres URL than the DBOS library.
+    Otherwise fallback to the same SQLite Postgres URL than the DBOS library.
     Note that for the latter to be possible, a configuration file must have been found, with an application name set.
     """
-    database_url = db_url
-    _app_db_name = None
-    if database_url is None:
+    if os.environ.get("DBOS__CLOUD") == "true":
+        system_database_url = os.environ.get("DBOS_SYSTEM_DATABASE_URL")
+        application_database_url = os.environ.get("DBOS_DATABASE_URL")
+        assert system_database_url and application_database_url
+        return system_database_url, application_database_url
+    if system_database_url or application_database_url:
+        cfg: ConfigFile = {
+            "system_database_url": system_database_url,
+            "database_url": application_database_url,
+        }
+        return get_system_database_url(cfg), get_application_database_url(cfg)
+    else:
         # Load from config file if present
         try:
-            config = load_config(run_process_config=False, silent=True)
-            database_url = config.get("database_url")
-            _app_db_name = _app_name_to_db_name(config["name"])
+            config = load_config(silent=True)
+            if config.get("database_url") or config.get("system_database_url"):
+                return get_system_database_url(config), get_application_database_url(
+                    config
+                )
+            else:
+                _app_db_name = _app_name_to_db_name(config["name"])
+                # Fallback on the same defaults than the DBOS library
+                default_url = f"sqlite:///{_app_db_name}.sqlite"
+                return default_url, default_url
         except (FileNotFoundError, OSError):
-            # Config file doesn't exist, continue with other fallbacks
-            pass
-    if database_url is None:
-        database_url = os.getenv("DBOS_DATABASE_URL")
-    if database_url is None and _app_db_name is not None:
-        # Fallback on the same defaults than the DBOS library
-        _password = os.environ.get("PGPASSWORD", "dbos")
-        database_url = f"postgres://postgres:{_password}@localhost:5432/{_app_db_name}?connect_timeout=10&sslmode=prefer"
-    if database_url is None:
-        raise ValueError(
-            "Missing database URL: please set it using the --db-url flag, the DBOS_DATABASE_URL environment variable, or in your dbos-config.yaml file."
-        )
-    assert is_valid_database_url(database_url)
-    return database_url
-
-
-def start_client(db_url: Optional[str] = None) -> DBOSClient:
-    database_url = _get_db_url(db_url)
-    return DBOSClient(database_url=database_url)
+            typer.echo(
+                f"Error: Missing database URL: please set it using CLI flags or your dbos-config.yaml file.",
+                err=True,
+            )
+            raise typer.Exit(code=1)
 
 
 app = typer.Typer()
@@ -115,7 +118,7 @@ def _on_windows() -> bool:
     help="Start your DBOS application using the start commands in 'dbos-config.yaml'"
 )
 def start() -> None:
-    config = load_config(run_process_config=False, silent=True)
+    config = load_config(silent=True)
     start_commands = config["runtimeConfig"]["start"]
     typer.echo("Executing start commands from 'dbos-config.yaml'")
     for command in start_commands:
@@ -264,7 +267,7 @@ def _resolve_project_name_and_template(
 
 @app.command(help="Create DBOS system tables.")
 def migrate(
-    app_database_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -289,28 +292,25 @@ def migrate(
         ),
     ] = None,
 ) -> None:
-    app_database_url = _get_db_url(app_database_url)
-    system_database_url = get_system_database_url(
-        {
-            "system_database_url": system_database_url,
-            "database_url": app_database_url,
-            "database": {},
-        }
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
     )
 
     typer.echo(f"Starting DBOS migrations")
-    typer.echo(f"Application database: {sa.make_url(app_database_url)}")
+    typer.echo(f"Application database: {sa.make_url(application_database_url)}")
     typer.echo(f"System database: {sa.make_url(system_database_url)}")
 
     # First, run DBOS migrations on the system database and the application database
     migrate_dbos_databases(
-        app_database_url=app_database_url, system_database_url=system_database_url
+        app_database_url=application_database_url,
+        system_database_url=system_database_url,
     )
 
     # Next, assign permissions on the DBOS schema to the application role, if any
     if application_role:
         grant_dbos_schema_permissions(
-            database_url=app_database_url, role_name=application_role
+            database_url=application_database_url, role_name=application_role
         )
         grant_dbos_schema_permissions(
             database_url=system_database_url, role_name=application_role
@@ -318,7 +318,7 @@ def migrate(
 
     # Next, run any custom migration commands specified in the configuration
     if os.path.exists("dbos-config.yaml"):
-        config = load_config(run_process_config=False, silent=True)
+        config = load_config(silent=True)
         if "database" not in config:
             config["database"] = {}
         migrate_commands = (
@@ -346,20 +346,20 @@ def migrate(
 @app.command(help="Reset the DBOS system database")
 def reset(
     yes: bool = typer.Option(False, "-y", "--yes", help="Skip confirmation prompt"),
-    sys_db_name: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
-            "--sys-db-name",
-            "-s",
-            help="Specify the name of the system database to reset",
+            "--db-url",
+            "-D",
+            help="Your DBOS application database URL",
         ),
     ] = None,
-    db_url: Annotated[
+    system_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
-            "--db-url",
-            "-D",
-            help="Your DBOS application database URL",
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
         ),
     ] = None,
 ) -> None:
@@ -371,9 +371,9 @@ def reset(
             typer.echo("Operation cancelled.")
             raise typer.Exit()
     try:
-        database_url = _get_db_url(db_url)
-        system_database_url = get_system_database_url(
-            {"database_url": database_url, "database": {"sys_db_name": sys_db_name}}
+        system_database_url, application_database_url = _get_db_url(
+            system_database_url=system_database_url,
+            application_database_url=application_database_url,
         )
         SystemDatabase.reset_system_database(system_database_url)
     except Exception as e:
@@ -399,7 +399,7 @@ def debug(
 
 @workflow.command(help="List workflows for your application")
 def list(
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -407,6 +407,14 @@ def list(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
     limit: Annotated[
         int,
         typer.Option("--limit", "-l", help="Limit the results returned"),
@@ -419,7 +427,7 @@ def list(
         typing.Optional[str],
         typer.Option(
             "--start-time",
-            "-s",
+            "-t",
             help="Retrieve workflows starting after this timestamp (ISO 8601 format)",
         ),
     ] = None,
@@ -472,7 +480,15 @@ def list(
         ),
     ] = None,
 ) -> None:
-    workflows = start_client(db_url=db_url).list_workflows(
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    workflows = client.list_workflows(
         limit=limit,
         offset=offset,
         sort_desc=sort_desc,
@@ -489,7 +505,7 @@ def list(
 @workflow.command(help="Retrieve the status of a workflow")
 def get(
     workflow_id: Annotated[str, typer.Argument()],
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -497,19 +513,31 @@ def get(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
-    status = (
-        start_client(db_url=db_url)
-        .retrieve_workflow(workflow_id=workflow_id)
-        .get_status()
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
     )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    status = client.retrieve_workflow(workflow_id=workflow_id).get_status()
     print(jsonpickle.encode(status, unpicklable=False))
 
 
 @workflow.command(help="List the steps of a workflow")
 def steps(
     workflow_id: Annotated[str, typer.Argument()],
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -517,10 +545,26 @@ def steps(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
     print(
         jsonpickle.encode(
-            start_client(db_url=db_url).list_workflow_steps(workflow_id=workflow_id),
+            client.list_workflow_steps(workflow_id=workflow_id),
             unpicklable=False,
         )
     )
@@ -531,7 +575,7 @@ def steps(
 )
 def cancel(
     workflow_id: Annotated[str, typer.Argument()],
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -539,14 +583,30 @@ def cancel(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
-    start_client(db_url=db_url).cancel_workflow(workflow_id=workflow_id)
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    client.cancel_workflow(workflow_id=workflow_id)
 
 
 @workflow.command(help="Resume a workflow that has been cancelled")
 def resume(
     workflow_id: Annotated[str, typer.Argument()],
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -554,8 +614,24 @@ def resume(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
-    start_client(db_url=db_url).resume_workflow(workflow_id=workflow_id)
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    client.resume_workflow(workflow_id=workflow_id)
 
 
 @workflow.command(
@@ -563,7 +639,7 @@ def resume(
 )
 def restart(
     workflow_id: Annotated[str, typer.Argument()],
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -571,12 +647,24 @@ def restart(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
-    status = (
-        start_client(db_url=db_url)
-        .fork_workflow(workflow_id=workflow_id, start_step=1)
-        .get_status()
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
     )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    status = client.fork_workflow(workflow_id=workflow_id, start_step=1).get_status()
     print(jsonpickle.encode(status, unpicklable=False))
 
 
@@ -589,7 +677,7 @@ def fork(
         int,
         typer.Option(
             "--step",
-            "-s",
+            "-S",
             help="Restart from this step",
         ),
     ] = 1,
@@ -609,7 +697,7 @@ def fork(
             help="Custom application version for the forked workflow",
         ),
     ] = None,
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -617,8 +705,23 @@ def fork(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
 ) -> None:
-    client = start_client(db_url=db_url)
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
 
     if forked_workflow_id is not None:
         with SetWorkflowID(forked_workflow_id):
@@ -638,7 +741,7 @@ def fork(
 
 @queue.command(name="list", help="List enqueued functions for your application")
 def list_queue(
-    db_url: Annotated[
+    application_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -646,6 +749,14 @@ def list_queue(
             help="Your DBOS application database URL",
         ),
     ] = None,
+    system_database_url: Annotated[
+        typing.Optional[str],
+        typer.Option(
+            "--sys-db-url",
+            "-s",
+            help="Your DBOS system database URL",
+        ),
+    ] = None,
     limit: Annotated[
         typing.Optional[int],
         typer.Option("--limit", "-l", help="Limit the results returned"),
@@ -654,7 +765,7 @@ def list_queue(
         typing.Optional[str],
         typer.Option(
             "--start-time",
-            "-s",
+            "-t",
             help="Retrieve functions starting after this timestamp (ISO 8601 format)",
         ),
     ] = None,
@@ -707,7 +818,15 @@ def list_queue(
         ),
     ] = None,
 ) -> None:
-    workflows = start_client(db_url=db_url).list_queued_workflows(
+    system_database_url, application_database_url = _get_db_url(
+        system_database_url=system_database_url,
+        application_database_url=application_database_url,
+    )
+    client = DBOSClient(
+        application_database_url=application_database_url,
+        system_database_url=system_database_url,
+    )
+    workflows = client.list_queued_workflows(
         limit=limit,
         offset=offset,
         sort_desc=sort_desc,

dbos/dbos-config.schema.json

@@ -19,6 +19,10 @@
         "type": ["string", "null"],
         "description": "The URL of the application database"
       },
+      "system_database_url": {
+        "type": ["string", "null"],
+        "description": "The URL of the system database"
+      },
       "database": {
         "type": "object",
         "additionalProperties": false,

{dbos-1.13.0a5.dist-info → dbos-1.13.0a7.dist-info}/METADATA

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

{dbos-1.13.0a5.dist-info → dbos-1.13.0a7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-1.13.0a5.dist-info/METADATA,sha256=obXcr7i8Wu_nO0bUihx40pr-fopo32nU3rqFBBe3D0o,13268
-dbos-1.13.0a5.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-dbos-1.13.0a5.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-1.13.0a5.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-1.13.0a7.dist-info/METADATA,sha256=cqQQNrFsEmPBW7VJC40n6ieoNOd2Amm3CbDsM_Og2is,13268
+dbos-1.13.0a7.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+dbos-1.13.0a7.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-1.13.0a7.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=NssPCubaBxdiKarOWa-wViz1hdJSkmBGcpLX_gQ4NeA,891
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=e8ELhcDWqR3_PNobnNgUvLGh5lzZq0yFSF6dvtzoQRI,16267
@@ -22,16 +22,16 @@ dbos/_alembic_migrations/versions/d76646551a6c_workflow_queue.py,sha256=G942noph
 dbos/_alembic_migrations/versions/d994145b47b6_consolidate_inputs.py,sha256=_J0jP247fuo66fzOmLlKFO9FJ_CRBXlqa2lnLrcXugQ,672
 dbos/_alembic_migrations/versions/eab0cc1d9a14_job_queue.py,sha256=uvhFOtqbBreCePhAxZfIT0qCAI7BiZTou9wt6QnbY7c,1412
 dbos/_alembic_migrations/versions/f4b9b32ba814_functionname_childid_op_outputs.py,sha256=m90Lc5YH0ZISSq1MyxND6oq3RZrZKrIqEsZtwJ1jWxA,1049
-dbos/_app_db.py,sha256=e8mASnDX_tyE9DWf_yAZgIi7ZWeyVWWTrhCZK_Jy50g,16190
+dbos/_app_db.py,sha256=GsV-uYU0QsChWwQDxnrh8_iiZ_zMQB-bsP2jPGIe2aM,16094
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=hSSIqWZEbGVAyRy80rS4Sywaf_biQOF17ThW3Eyaaso,18267
+dbos/_client.py,sha256=n6Wk_8sG5qtqJw3vAkBTh4qsl7q_t6nnRukGjTJbwqg,18794
 dbos/_conductor/conductor.py,sha256=3E_hL3c9g9yWqKZkvI6KA0-ZzPMPRo06TOzT1esMiek,24114
 dbos/_conductor/protocol.py,sha256=q3rgLxINFtWFigdOONc-4gX4vn66UmMlJQD6Kj8LnL4,7420
 dbos/_context.py,sha256=IMboNgbCqTxfIORqeifE3da-Ce5siMz7MYMLPk5M-AQ,26851
 dbos/_core.py,sha256=2IWEkewiYL3d3MrhMfqj0JDWNyNM54rpW7CRGjBTPfk,48788
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
 dbos/_dbos.py,sha256=wKLN7W1ej6cyEOHnCtt3-awnU6SR6MQAlOvTTt5_N-E,58219
-dbos/_dbos_config.py,sha256=jv-k2WyXgfoR3R0NaPxAFx5OzZYjr0rjH2npsbokGRM,22321
+dbos/_dbos_config.py,sha256=_26ktif8qAZW4Ujg6dZfLkYO7dE4CI8b3IQbw_5YkpA,25710
 dbos/_debug.py,sha256=99j2SChWmCPAlZoDmjsJGe77tpU2LEa8E2TtLAnnh7o,1831
 dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
 dbos/_error.py,sha256=GwO0Ng4d4iB52brY09-Ss6Cz_V28Xc0D0cRCzZ6XmNM,8688
@@ -52,9 +52,9 @@ dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=SypAS9l9EsaBHFn9FR8jmnqt01M74d9AF1AMa4m2hhI,1040
 dbos/_schemas/system_database.py,sha256=-dAKk-_Y3vzbpLT4ei-sIrBQgFyQiwPj1enZb1TYc8I,4943
 dbos/_serialization.py,sha256=bWuwhXSQcGmiazvhJHA5gwhrRWxtmFmcCFQSDJnqqkU,3666
-dbos/_sys_db.py,sha256=zlAJ3YPLuzN8Ju32_lfhsq3-MxnH4V45Rf6X9Imxqf0,81838
+dbos/_sys_db.py,sha256=DhpthOe2hbG7Cp8CxJd5tRUyqgKJ7HWbgEySpt6GTwY,81756
 dbos/_sys_db_postgres.py,sha256=WcG-f1CUzUNBGEOjqKEp6DDraN63jTnJ6CAfieCcxOs,7555
-dbos/_sys_db_sqlite.py,sha256=58Fv7paGloCmpXdWZVCEpcZFvHWLuEkw4XBKCWprGsA,7500
+dbos/_sys_db_sqlite.py,sha256=xT9l-czMhLmfuu5UcnBzAyUxSFgzt3XtEWx9t_D8mZs,7361
 dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_templates/dbos-db-starter/__package/main.py.dbos,sha256=aQnBPSSQpkB8ERfhf7gB7P9tsU6OPKhZscfeh0yiaD8,2702
@@ -64,15 +64,14 @@ dbos/_templates/dbos-db-starter/dbos-config.yaml.dbos,sha256=0wPktElM7kMB3OPHTXw
 dbos/_templates/dbos-db-starter/migrations/env.py.dbos,sha256=IBB_gz9RjC20HPfOTGZzS6kTbv3jXhiOrnWpbJNk1Gk,2509
 dbos/_templates/dbos-db-starter/migrations/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 dbos/_templates/dbos-db-starter/migrations/versions/2024_07_31_180642_init.py,sha256=MpS7LGaJS0CpvsjhfDkp9EJqvMvVCjRPfUp4c0aE2ys,941
-dbos/_templates/dbos-db-starter/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
 dbos/_tracer.py,sha256=8aOAVTBnj2q9DcOb5KJCfo56CVZ1ZvsWBscaNlIX-7k,3150
 dbos/_utils.py,sha256=ZdoM1MDbHnlJrh31zfhp3iX62bAxK1kyvMwXnltC_84,1779
 dbos/_workflow_commands.py,sha256=EmmAaQfRWeOZm_WPTznuU-O3he3jiSzzT9VpYrhxugE,4835
 dbos/cli/_github_init.py,sha256=Y_bDF9gfO2jB1id4FV5h1oIxEJRWyqVjhb7bNEa5nQ0,3224
 dbos/cli/_template_init.py,sha256=7JBcpMqP1r2mfCnvWatu33z8ctEGHJarlZYKgB83cXE,2972
-dbos/cli/cli.py,sha256=basgruBuvOMIb5nrsa1cVKOOYvSx_Lqx3M51P0d6NEU,22698
+dbos/cli/cli.py,sha256=ypaDSJq8HMDDiTsXqoxKw7B5n2wBT2ujjHjzkuh1AsY,26879
 dbos/cli/migration.py,sha256=5GiyagLZkyVvDz3StYxtFdkFoKFCmh6eSXjzsIGhZ_A,3330
-dbos/dbos-config.schema.json,sha256=CjaspeYmOkx6Ip_pcxtmfXJTn_YGdSx_0pcPBF7KZmo,6060
+dbos/dbos-config.schema.json,sha256=LyUT1DOTaAwOP6suxQGS5KemVIqXGPyu_q7Hbo0neA8,6192
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-1.13.0a5.dist-info/RECORD,,
+dbos-1.13.0a7.dist-info/RECORD,,

dbos/_templates/dbos-db-starter/start_postgres_docker.py

@@ -1,67 +0,0 @@
-import os
-import subprocess
-import sys
-import time
-
-# Default PostgreSQL port
-port = "5432"
-
-# Set the host PostgreSQL port with the -p/--port flag
-for i, arg in enumerate(sys.argv):
-    if arg in ["-p", "--port"]:
-        if i + 1 < len(sys.argv):
-            port = sys.argv[i + 1]
-
-if "PGPASSWORD" not in os.environ:
-    print("Error: PGPASSWORD is not set.")
-    sys.exit(1)
-
-try:
-    subprocess.run(
-        [
-            "docker",
-            "run",
-            "--rm",
-            "--name=dbos-db",
-            f'--env=POSTGRES_PASSWORD={os.environ["PGPASSWORD"]}',
-            "--env=PGDATA=/var/lib/postgresql/data",
-            "--volume=/var/lib/postgresql/data",
-            "-p",
-            f"{port}:5432",
-            "-d",
-            "pgvector/pgvector:pg16",
-        ],
-        check=True,
-    )
-
-    print("Waiting for PostgreSQL to start...")
-    attempts = 30
-
-    while attempts > 0:
-        try:
-            subprocess.run(
-                [
-                    "docker",
-                    "exec",
-                    "dbos-db",
-                    "psql",
-                    "-U",
-                    "postgres",
-                    "-c",
-                    "SELECT 1;",
-                ],
-                check=True,
-                capture_output=True,
-            )
-            print("PostgreSQL started!")
-            print("Database started successfully!")
-            break
-        except subprocess.CalledProcessError:
-            attempts -= 1
-            time.sleep(1)
-
-    if attempts == 0:
-        print("Failed to start PostgreSQL.")
-
-except subprocess.CalledProcessError as error:
-    print(f"Error starting PostgreSQL in Docker: {error}")