dbos 1.9.0a4__py3-none-any.whl → 1.10.0__py3-none-any.whl

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/_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/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.dist-info → dbos-1.10.0.dist-info}/METADATA

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

{dbos-1.9.0a4.dist-info → dbos-1.10.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-1.9.0a4.dist-info/METADATA,sha256=10p1rBp6hwmtwGzPg6jwMbpVV9Ay9aCP37J8vdnCXtc,13267
-dbos-1.9.0a4.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-dbos-1.9.0a4.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-1.9.0a4.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-1.10.0.dist-info/METADATA,sha256=-pserGJ_dwh59IcFRCDiWgUH6TjoRXDGrhkEK4FIegY,13266
+dbos-1.10.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+dbos-1.10.0.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-1.10.0.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
@@ -13,8 +13,8 @@ dbos/_conductor/protocol.py,sha256=q3rgLxINFtWFigdOONc-4gX4vn66UmMlJQD6Kj8LnL4,7
 dbos/_context.py,sha256=0vFtLAk3WF5BQYIYNFImDRBppKO2CTKOSy51zQC-Cu8,25723
 dbos/_core.py,sha256=TA-UOSO_BhvM6L6j4__dwesK7x5Y93dk6mV1xx0WZBY,49593
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
-dbos/_dbos.py,sha256=LqE8ej317diZ5JjrXhndLwDr40E1Aw3SK1YPxC8-t3k,50902
-dbos/_dbos_config.py,sha256=TWIbGCWl_8o3l0Y2IzrL1q9mTYl_vVeZDjYJMDXCPVU,21676
+dbos/_dbos.py,sha256=0CDsUKvqfoX6i2Q74khU1hvJVpfy2tcGpQIDtEtWCAM,51469
+dbos/_dbos_config.py,sha256=er8oF3e9zGlEG9KntX7uBSXrDuVvROtkzVidzXjOwUU,21746
 dbos/_debug.py,sha256=99j2SChWmCPAlZoDmjsJGe77tpU2LEa8E2TtLAnnh7o,1831
 dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
 dbos/_error.py,sha256=2_2ve3qN0BLhFWMmd3aD9At54tIMCeh8TqHtVcEEVQo,8705
@@ -65,8 +65,8 @@ dbos/_utils.py,sha256=uywq1QrjMwy17btjxW4bES49povlQwYwYbvKwMT6C2U,1575
 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=oU2uvRF90eAydQ9FoQcgi8N_Cojzz8NLn1WE-vrA1p0,22155
+dbos/cli/cli.py,sha256=BaWqdMZbUsJkq0zEaS2Ez2FgRgD5nTD24hCsrAlitbA,22289
 dbos/dbos-config.schema.json,sha256=CjaspeYmOkx6Ip_pcxtmfXJTn_YGdSx_0pcPBF7KZmo,6060
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-1.9.0a4.dist-info/RECORD,,
+dbos-1.10.0.dist-info/RECORD,,