dbos 1.9.0a4__tar.gz → 1.10.0a2__tar.gz

{dbos-1.9.0a4 → dbos-1.10.0a2}/PKG-INFO

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

{dbos-1.9.0a4 → dbos-1.10.0a2}/dbos/_dbos.py

@@ -324,6 +324,17 @@ class DBOS:
         self.conductor_websocket: Optional[ConductorWebsocket] = None
         self._background_event_loop: BackgroundEventLoop = BackgroundEventLoop()
 
+        # Globally set the application version and executor ID.
+        # In DBOS Cloud, instead use the values supplied through environment variables.
+        if not os.environ.get("DBOS__CLOUD") == "true":
+            if (
+                "application_version" in config
+                and config["application_version"] is not None
+            ):
+                GlobalParams.app_version = config["application_version"]
+            if "executor_id" in config and config["executor_id"] is not None:
+                GlobalParams.executor_id = config["executor_id"]
+
         init_logger()
 
         # Translate user provided config to an internal format

{dbos-1.9.0a4 → dbos-1.10.0a2}/dbos/_dbos_config.py

@@ -47,6 +47,8 @@ class DBOSConfig(TypedDict, total=False):
     admin_port: Optional[int]
     run_admin_server: Optional[bool]
     otlp_attributes: Optional[dict[str, str]]
+    application_version: Optional[str]
+    executor_id: Optional[str]
 
 
 class RuntimeConfig(TypedDict, total=False):

{dbos-1.9.0a4 → dbos-1.10.0a2}/dbos/cli/cli.py

@@ -260,11 +260,9 @@ def _resolve_project_name_and_template(
     return project_name, template
 
 
-@app.command(
-    help="Run your database schema migrations using the migration commands in 'dbos-config.yaml'"
-)
+@app.command(help="Create DBOS system tables.")
 def migrate(
-    db_url: Annotated[
+    app_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
             "--db-url",
@@ -272,30 +270,34 @@ def migrate(
             help="Your DBOS application database URL",
         ),
     ] = None,
-    sys_db_name: Annotated[
+    system_database_url: Annotated[
         typing.Optional[str],
         typer.Option(
-            "--sys-db-name",
+            "--sys-db-url",
             "-s",
-            help="Specify the name of the system database to reset",
+            help="Your DBOS system database URL",
         ),
     ] = None,
 ) -> None:
-    config = load_config(run_process_config=False, silent=True)
-    connection_string = _get_db_url(db_url)
-    app_db_name = sa.make_url(connection_string).database
-    assert app_db_name is not None, "Database name is required in URL"
-    if sys_db_name is None:
-        sys_db_name = app_db_name + SystemSchema.sysdb_suffix
+    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": {},
+        }
+    )
 
-    typer.echo(f"Starting schema migration for database {app_db_name}")
+    typer.echo(f"Starting DBOS migrations")
+    typer.echo(f"Application database: {sa.make_url(app_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
     app_db = None
     sys_db = None
     try:
         sys_db = SystemDatabase(
-            system_database_url=get_system_database_url(config),
+            system_database_url=system_database_url,
             engine_kwargs={
                 "pool_timeout": 30,
                 "max_overflow": 0,
@@ -303,7 +305,7 @@ def migrate(
             },
         )
         app_db = ApplicationDatabase(
-            database_url=connection_string,
+            database_url=app_database_url,
             engine_kwargs={
                 "pool_timeout": 30,
                 "max_overflow": 0,
@@ -313,17 +315,19 @@ def migrate(
         sys_db.run_migrations()
         app_db.run_migrations()
     except Exception as e:
-        typer.echo(f"DBOS system schema migration failed: {e}")
+        typer.echo(f"DBOS migrations failed: {e}")
+        raise typer.Exit(code=1)
     finally:
         if sys_db:
             sys_db.destroy()
         if app_db:
             app_db.destroy()
 
+    typer.echo(f"DBOS migrations successful")
+
     # Next, run any custom migration commands specified in the configuration
-    typer.echo("Executing migration commands from 'dbos-config.yaml'")
-    try:
-        # handle the case where the user has not specified migrations commands
+    if os.path.exists("dbos-config.yaml"):
+        config = load_config(run_process_config=False, silent=True)
         if "database" not in config:
             config["database"] = {}
         migrate_commands = (
@@ -331,20 +335,21 @@ def migrate(
             if "migrate" in config["database"] and config["database"]["migrate"]
             else []
         )
-        for command in migrate_commands:
-            typer.echo(f"Executing migration command: {command}")
-            result = subprocess.run(command, shell=True, text=True)
-            if result.returncode != 0:
-                typer.echo(f"Migration command failed: {command}")
-                typer.echo(result.stderr)
-                raise typer.Exit(1)
-            if result.stdout:
-                typer.echo(result.stdout.rstrip())
-    except Exception as e:
-        typer.echo(f"An error occurred during schema migration: {e}")
-        raise typer.Exit(code=1)
-
-    typer.echo(f"Completed schema migration for database {app_db_name}")
+        if migrate_commands:
+            typer.echo("Executing migration commands from 'dbos-config.yaml'")
+            try:
+                for command in migrate_commands:
+                    typer.echo(f"Executing migration command: {command}")
+                    result = subprocess.run(command, shell=True, text=True)
+                    if result.returncode != 0:
+                        typer.echo(f"Migration command failed: {command}")
+                        typer.echo(result.stderr)
+                        raise typer.Exit(1)
+                    if result.stdout:
+                        typer.echo(result.stdout.rstrip())
+            except Exception as e:
+                typer.echo(f"An error occurred during schema migration: {e}")
+                raise typer.Exit(code=1)
 
 
 @app.command(help="Reset the DBOS system database")

{dbos-1.9.0a4 → dbos-1.10.0a2}/pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "1.9.0a4"
+version = "1.10.0a2"
 
 [project.license]
 text = "MIT"

{dbos-1.9.0a4 → dbos-1.10.0a2}/tests/test_dbos.py

@@ -1397,7 +1397,7 @@ def test_app_version(config: DBOSConfig) -> None:
     assert GlobalParams.app_version != app_version
 
     # Verify that version can be overriden with an environment variable
-    app_version = "12345"
+    app_version = str(uuid.uuid4())
     os.environ["DBOS__APPVERSION"] = app_version
 
     DBOS.destroy(destroy_registry=True)
@@ -1412,6 +1412,28 @@ def test_app_version(config: DBOSConfig) -> None:
 
     del os.environ["DBOS__APPVERSION"]
 
+    # Verify that version and executor ID can be overriden with a config parameter
+    app_version = str(uuid.uuid4())
+    executor_id = str(uuid.uuid4())
+
+    DBOS.destroy(destroy_registry=True)
+    config["application_version"] = app_version
+    config["executor_id"] = executor_id
+    DBOS(config=config)
+
+    @DBOS.workflow()
+    def test_workflow() -> str:
+        assert DBOS.workflow_id
+        return DBOS.workflow_id
+
+    DBOS.launch()
+    assert GlobalParams.app_version == app_version
+    assert GlobalParams.executor_id == executor_id
+    wfid = test_workflow()
+    handle: WorkflowHandle[str] = DBOS.retrieve_workflow(wfid)
+    assert handle.get_status().app_version == app_version
+    assert handle.get_status().executor_id == executor_id
+
 
 def test_recovery_appversion(config: DBOSConfig) -> None:
     input = 5