dbos 2.4.0a7__py3-none-any.whl → 2.6.0a8__py3-none-any.whl

dbos/_workflow_commands.py

@@ -4,10 +4,8 @@ from typing import TYPE_CHECKING, List, Optional, Union
 from dbos._context import get_local_dbos_context
 from dbos._utils import generate_uuid
 
-from ._app_db import ApplicationDatabase
 from ._sys_db import (
     GetWorkflowsInput,
-    StepInfo,
     SystemDatabase,
     WorkflowStatus,
     WorkflowStatusString,
@@ -101,19 +99,8 @@ def get_workflow(sys_db: SystemDatabase, workflow_id: str) -> Optional[WorkflowS
     return infos[0]
 
 
-def list_workflow_steps(
-    sys_db: SystemDatabase, app_db: Optional[ApplicationDatabase], workflow_id: str
-) -> List[StepInfo]:
-    steps = sys_db.get_workflow_steps(workflow_id)
-    transactions = app_db.get_transactions(workflow_id) if app_db else []
-    merged_steps = steps + transactions
-    merged_steps.sort(key=lambda step: step["function_id"])
-    return merged_steps
-
-
 def fork_workflow(
     sys_db: SystemDatabase,
-    app_db: Optional[ApplicationDatabase],
     workflow_id: str,
     start_step: int,
     *,
@@ -126,8 +113,6 @@ def fork_workflow(
         ctx.id_assigned_for_next_workflow = ""
     else:
         forked_workflow_id = generate_uuid()
-    if app_db:
-        app_db.clone_workflow_transactions(workflow_id, forked_workflow_id, start_step)
     sys_db.fork_workflow(
         workflow_id,
         forked_workflow_id,

dbos/cli/cli.py

@@ -1,9 +1,9 @@
 import json
+import logging
 import os
 import platform
 import signal
 import subprocess
-import time
 import typing
 from os import path
 from typing import Annotated, Any, List, Optional, Tuple
@@ -13,7 +13,7 @@ import typer
 
 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 dbos.cli.migration import run_dbos_database_migrations
 
 from .._client import DBOSClient
 from .._dbos_config import (
@@ -25,6 +25,7 @@ from .._dbos_config import (
     load_config,
 )
 from .._docker_pg_helper import start_docker_pg, stop_docker_pg
+from .._logger import dbos_logger
 from .._sys_db import SystemDatabase
 from .._utils import GlobalParams
 from ..cli._github_init import create_template_from_github
@@ -49,6 +50,7 @@ def _get_db_url(
     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.
     """
+    dbos_logger.setLevel(logging.WARNING)  # The CLI should not emit INFO logs
     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")
@@ -72,7 +74,7 @@ def _get_db_url(
                 _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
+                return default_url, None
         except (FileNotFoundError, OSError):
             typer.echo(
                 f"Error: Missing database URL: please set it using CLI flags or your dbos-config.yaml file.",
@@ -294,25 +296,13 @@ def migrate(
         schema = "dbos"
     typer.echo(f"DBOS system schema: {schema}")
 
-    # First, run DBOS migrations on the system database and the application database
-    migrate_dbos_databases(
-        app_database_url=application_database_url,
+    run_dbos_database_migrations(
         system_database_url=system_database_url,
+        app_database_url=application_database_url,
         schema=schema,
+        application_role=application_role,
     )
 
-    # Next, assign permissions on the DBOS schema to the application role, if any
-    if application_role:
-        if application_database_url:
-            grant_dbos_schema_permissions(
-                database_url=application_database_url,
-                role_name=application_role,
-                schema=schema,
-            )
-        grant_dbos_schema_permissions(
-            database_url=system_database_url, role_name=application_role, schema=schema
-        )
-
     # Next, run any custom migration commands specified in the configuration
     if os.path.exists("dbos-config.yaml"):
         config = load_config(silent=True)

dbos/cli/migration.py

@@ -8,8 +8,35 @@ from dbos._serialization import DefaultSerializer
 from dbos._sys_db import SystemDatabase
 
 
+def run_dbos_database_migrations(
+    system_database_url: str,
+    *,
+    app_database_url: Optional[str] = None,
+    schema: str = "dbos",
+    application_role: Optional[str] = None,
+) -> None:
+    # First, run DBOS migrations on the system database and (optionally) the application database
+    migrate_dbos_databases(
+        system_database_url=system_database_url,
+        app_database_url=app_database_url,
+        schema=schema,
+    )
+
+    # Then, assign permissions on the DBOS schema to the application role, if any
+    if application_role:
+        if app_database_url:
+            grant_dbos_schema_permissions(
+                database_url=app_database_url,
+                role_name=application_role,
+                schema=schema,
+            )
+        grant_dbos_schema_permissions(
+            database_url=system_database_url, role_name=application_role, schema=schema
+        )
+
+
 def migrate_dbos_databases(
-    app_database_url: Optional[str], system_database_url: str, schema: str
+    system_database_url: str, app_database_url: Optional[str], schema: str
 ) -> None:
     app_db = None
     sys_db = None

{dbos-2.4.0a7.dist-info → dbos-2.6.0a8.dist-info}/METADATA

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

{dbos-2.4.0a7.dist-info → dbos-2.6.0a8.dist-info}/RECORD

@@ -1,43 +1,43 @@
-dbos-2.4.0a7.dist-info/METADATA,sha256=QfQAxKiyjgeLossCW9-CWaqwuGYS0Oo3YXCqUMPybB4,14532
-dbos-2.4.0a7.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-dbos-2.4.0a7.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-2.4.0a7.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
-dbos/__init__.py,sha256=M7FdFSBGhcvaLIXrNw_0eR68ijwMWV7_UEyimHMP_F4,1039
+dbos-2.6.0a8.dist-info/METADATA,sha256=Q5YT8N3zg_HKf39l8yJ9eYkxjNatipzHYhay___kURw,14532
+dbos-2.6.0a8.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+dbos-2.6.0a8.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-2.6.0a8.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos/__init__.py,sha256=V6xIct0dCicUds9El1z4cHUPVlEWDqAtvrO0Uo2Tvxo,1131
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=Kce_Cv6JXZBABzfOcNJdVHOwEukmp7SvO24TSa-gLIM,16371
-dbos/_app_db.py,sha256=3XHvTePe1JaAI42rO3waWGoEeDyXkFKGzTFwJxQHUmo,16464
+dbos/_app_db.py,sha256=NpLnA1-WCMp7lOxyYVQ1iQMMleQ6FxUAhpJWcAQKtm8,14259
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=Upl9tqrMKWQKDv8L13zaGbI03uWF2Cw3c7W_Cg-Bsls,20018
-dbos/_conductor/conductor.py,sha256=8QNK2kXH2fG_YUg6E2fKGEhtIwFMcZIeelgP9b0kwrQ,24283
-dbos/_conductor/protocol.py,sha256=nVjpcSw_OPoCM7NBU_IRWnk9dFQjOgAkg0ufhj8lFzI,8901
+dbos/_client.py,sha256=sMm9biHRrpWt0HRlcdmcxwZFmudB2YRzV0o3QMxKBZQ,20186
+dbos/_conductor/conductor.py,sha256=Yp1K6Fqx4iFmftIyvV60Q50ZczMQU86luuLItTIRAVI,26540
+dbos/_conductor/protocol.py,sha256=mCQU5sjgUWYSbAt5QPUWd-Fq-R9AQASgzkgprBnQy78,9338
 dbos/_context.py,sha256=GOoSpv1BE4jAXtMzTvPfy2VR6Rr4fSqTb0IjgCR_ER4,28165
-dbos/_core.py,sha256=FCspRQFRMFyHpkl4vqR8IEw3aitD-VWB77CMVQrlyy8,50257
+dbos/_core.py,sha256=JVTqgtx0vR-xWNQAYqnhN3OWfnnacmlj6BLrPFzajE4,53656
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
-dbos/_dbos.py,sha256=KUD5YJUYhPasx0yLZHpqjLVqcnE8UYWIpK7OZJlNR6M,60050
-dbos/_dbos_config.py,sha256=eV8_jBRLotWwx0_aGO7VoqbeB0vyN9dmIgG4G22tIeE,24814
+dbos/_dbos.py,sha256=30XRfHCvg4fmgP6bwlgoOH2D44DEOvpKxs5dY-Gtae0,60218
+dbos/_dbos_config.py,sha256=-gLgDuWlooVfkiXF8IoQn2P4Q6yDqu1HfZoKD2BcUOo,23981
 dbos/_debouncer.py,sha256=G3QwqNCmdWC0zDy3LMV4kfK771aI-Kx8ULBgU7NXAwE,15294
 dbos/_debug.py,sha256=0MfgNqutCUhI4PEmmra9x7f3DiFE_0nscfUCHdLimEY,1415
 dbos/_docker_pg_helper.py,sha256=xySum4hTA8TVMBODoG19u4cXQAB1vCock-jwM2pnmSI,7791
 dbos/_error.py,sha256=GwO0Ng4d4iB52brY09-Ss6Cz_V28Xc0D0cRCzZ6XmNM,8688
 dbos/_event_loop.py,sha256=cvaFN9-II3MsHEOq8QoICc_8qSKrjikMlLfuhC3Y8Dk,2923
-dbos/_fastapi.py,sha256=2Dss2CpAbiGo2dNTrcfMHufUTdj_gUukJ_qZHbwBQao,3422
+dbos/_fastapi.py,sha256=OgYaLVaIljFliRt3LUJq6DCPOUkS1qmrTmB1-_JKV3A,3468
 dbos/_flask.py,sha256=_ST-eLLrg_KVj1eUvbeT2XeDIlECyvG9uOp3KCSjb2A,1653
 dbos/_kafka.py,sha256=cA3hXyT-FR4LQZnaBMVLTZn7oko76rcTUC_kOo6aSis,4352
 dbos/_kafka_message.py,sha256=NYvOXNG3Qn7bghn1pv3fg4Pbs86ILZGcK4IB-MLUNu0,409
-dbos/_logger.py,sha256=vJhmTltDGFSZCpfcnj5EGJJWYgf-b-7taV2thwM67Rc,5160
-dbos/_migration.py,sha256=GJdxHhMUnsr3pjrGwi1f4PT76ABnn9kFUyqWp4Hakmw,11701
+dbos/_logger.py,sha256=99z2NuLsPy9Z0c1XeV0D8bQE6lrFG60_m9m3FBN1XcM,5576
+dbos/_migration.py,sha256=KI_iH96SoMu6cMt4WRux0kgtgajJkrBrNvfFbQ1tGyg,12703
 dbos/_outcome.py,sha256=7HvosMfEHTh1U5P6xok7kFTGLwa2lPaul0YApb3UnN4,8191
-dbos/_queue.py,sha256=GmqZHl9smES1KSmpauhSdsnZFJHDyfvRArmC-jBibhw,6228
+dbos/_queue.py,sha256=WbTvaaj522kTxkoGGsGC405xCupsmMzU2UXiijJV2z4,8330
 dbos/_recovery.py,sha256=K-wlFhdf4yGRm6cUzyhcTjQUS0xp2T5rdNMLiiBErYg,2882
 dbos/_registrations.py,sha256=bEOntObnWaBylnebr5ZpcX2hk7OVLDd1z4BvW4_y3zA,7380
 dbos/_roles.py,sha256=kCuhhg8XLtrHCgKgm44I0abIRTGHltf88OwjEKAUggk,2317
 dbos/_scheduler.py,sha256=PLiCSUujlfEfojTnHwzY-P_AEOVEx7bvWvU5BuMgLPY,2708
 dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=SypAS9l9EsaBHFn9FR8jmnqt01M74d9AF1AMa4m2hhI,1040
-dbos/_schemas/system_database.py,sha256=tQAFCnEyZ7bEXZm3FbGIYk5SNGk-AHA3R_vuR0hfH8s,5717
+dbos/_schemas/system_database.py,sha256=i_ex-MxNobpwX4VThwIndI9igsfJ7DyICd3u7ytev7I,6549
 dbos/_serialization.py,sha256=ZGrkN5UclSLOqMVZgYpT72pw1l888ZXRoYuu3pIg3PA,2957
-dbos/_sys_db.py,sha256=nxxIgwtzoHCRWXydwQHQ65YOTMFmUVX_p8EDZftUXXg,86259
-dbos/_sys_db_postgres.py,sha256=_3m3hF6Pc23iZfUlIFYtDuC1Tw6KsjYqnDQE0HZpjt4,6965
+dbos/_sys_db.py,sha256=hEC_uoRuzhwVRnIkfBKZKLx-fqA57HXmzVbhyD6RfpM,95476
+dbos/_sys_db_postgres.py,sha256=oYrF1t5N7nMPx_taEVdveg729UYTnAw3zu0UcTHa3wA,7249
 dbos/_sys_db_sqlite.py,sha256=ifjKdy-Z9vlVIBf5L6XnSaNjiBdvqPE73asVHim4A5Q,6998
 dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,14 +46,14 @@ dbos/_templates/dbos-db-starter/__package/schema.py,sha256=7Z27JGC8yy7Z44cbVXIRE
 dbos/_templates/dbos-db-starter/dbos-config.yaml.dbos,sha256=0wPktElM7kMB3OPHTXw4xBk9bgGKMqOHrrr7x_R23Z8,446
 dbos/_templates/dbos-db-starter/migrations/create_table.py.dbos,sha256=pVm2Q0AsxS8pg85llbrXFD6jMccMqGjhGRjTEvS-hXk,942
 dbos/_templates/dbos-db-starter/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
-dbos/_tracer.py,sha256=jVCn4EiPl8Lo21oN39yELAhS79JQilqSDLLFhkFEPCc,3993
+dbos/_tracer.py,sha256=nD6a6LKMMfC0b3zCsy1ai6zk4bMCgNSaeHpE_tCsip0,4365
 dbos/_utils.py,sha256=OHFOQ1r5goT75eRRiddJd-s0-ik3zt3jSOIMUoElEhQ,2007
-dbos/_workflow_commands.py,sha256=qQFFb4iQ1qReC4iwCTipDBVff0pjxtmeHM9uDdNg9Xg,5184
+dbos/_workflow_commands.py,sha256=YV5hHwAwtU3NB4qSQ2j-YYOlMAJwXNkCyEJ5qkFmM_E,4602
 dbos/cli/_github_init.py,sha256=R_94Fnn40CAmPy-zM00lwHi0ndyfv57TmIooADjmag4,3378
 dbos/cli/_template_init.py,sha256=AltKk256VocgvxLpuTxpjJyACrdHFjbGoqYhHzeLae4,2649
-dbos/cli/cli.py,sha256=AHz_JJj_qWCTRV8yT1RSA-hISFVIJrE9eUalApw9sxg,27149
-dbos/cli/migration.py,sha256=jRAr4H7Bpf-PfmLoOA6qXk9i15Cl1TehUz-cphjvYJM,3805
+dbos/cli/cli.py,sha256=iSE6qQ7wVEDscDIlZlVgOAdpJI2EG7dNE04syFyc2Q0,26728
+dbos/cli/migration.py,sha256=oNgoMwrq_3L9McBlfMBZFjPkcfu_bW7_V6WhZJgXbDM,4703
 dbos/dbos-config.schema.json,sha256=47wofTZ5jlFynec7bG0L369tAXbRQQ2euBxBXvg4m9c,1730
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-2.4.0a7.dist-info/RECORD,,
+dbos-2.6.0a8.dist-info/RECORD,,