dbos 0.13.0a2__py3-none-any.whl → 0.14.0a5__py3-none-any.whl

dbos/_dbos.py

@@ -619,16 +619,24 @@ class DBOS:
         It is important to use `DBOS.sleep` (as opposed to any other sleep) within workflows,
         as the `DBOS.sleep`s are durable and completed sleeps will be skipped during recovery.
         """
-
-        attributes: TracedAttributes = {
-            "name": "sleep",
-        }
         if seconds <= 0:
             return
-        with EnterDBOSStep(attributes) as ctx:
-            _get_dbos_instance()._sys_db.sleep(
-                ctx.workflow_id, ctx.curr_step_function_id, seconds
-            )
+        cur_ctx = get_local_dbos_context()
+        if cur_ctx is not None:
+            # Must call it within a workflow
+            assert (
+                cur_ctx.is_workflow()
+            ), "sleep() must be called from within a workflow"
+            attributes: TracedAttributes = {
+                "name": "sleep",
+            }
+            with EnterDBOSStep(attributes) as ctx:
+                _get_dbos_instance()._sys_db.sleep(
+                    ctx.workflow_id, ctx.curr_step_function_id, seconds
+                )
+        else:
+            # Cannot call it from outside of a workflow
+            raise DBOSException("sleep() must be called from within a workflow")
 
     @classmethod
     def set_event(cls, key: str, value: Any) -> None:

dbos/_dbos_config.py

@@ -169,7 +169,7 @@ def load_config(config_file_path: str = "dbos-config.yaml") -> ConfigFile:
 
     if not _is_valid_app_name(data["name"]):
         raise DBOSInitializationError(
-            f'Invalid app name {data["name"]}.  App names must be between 3 and 30 characters and contain only alphanumeric characters, dashes, and underscores.'
+            f'Invalid app name {data["name"]}.  App names must be between 3 and 30 characters long and contain only lowercase letters, numbers, dashes, and underscores.'
         )
 
     if "app_db_name" not in data["database"]:
@@ -198,4 +198,4 @@ def _app_name_to_db_name(app_name: str) -> str:
 def _set_env_vars(config: ConfigFile) -> None:
     for env, value in config.get("env", {}).items():
         if value is not None:
-            os.environ[env] = value
+            os.environ[env] = str(value)

dbos/_sys_db.py

@@ -299,6 +299,12 @@ class SystemDatabase:
                 recovery_attempts: int = row[0]
                 if recovery_attempts > max_recovery_attempts:
                     with self.engine.begin() as c:
+                        c.execute(
+                            sa.delete(SystemSchema.workflow_queue).where(
+                                SystemSchema.workflow_queue.c.workflow_uuid
+                                == status["workflow_uuid"]
+                            )
+                        )
                         c.execute(
                             sa.update(SystemSchema.workflow_status)
                             .where(
@@ -311,6 +317,7 @@ class SystemDatabase:
                             )
                             .values(
                                 status=WorkflowStatusString.RETRIES_EXCEEDED.value,
+                                queue_name=None,
                             )
                         )
                     raise DBOSDeadLetterQueueError(

dbos/cli.py

@@ -1,6 +1,5 @@
 import os
 import platform
-import re
 import shutil
 import signal
 import subprocess
@@ -9,12 +8,15 @@ import typing
 from os import path
 from typing import Any
 
+import sqlalchemy as sa
 import tomlkit
 import typer
 from rich import print
 from rich.prompt import Prompt
 from typing_extensions import Annotated
 
+from dbos._schemas.system_database import SystemSchema
+
 from . import load_config
 from ._app_db import ApplicationDatabase
 from ._dbos_config import _is_valid_app_name
@@ -27,7 +29,9 @@ def _on_windows() -> bool:
     return platform.system() == "Windows"
 
 
-@app.command()
+@app.command(
+    help="Start your DBOS application using the start commands in 'dbos-config.yaml'"
+)
 def start() -> None:
     config = load_config()
     start_commands = config["runtimeConfig"]["start"]
@@ -166,7 +170,7 @@ def _get_project_name() -> typing.Union[str, None]:
     return name
 
 
-@app.command()
+@app.command(help="Initialize a new DBOS application from a template")
 def init(
     project_name: Annotated[
         typing.Optional[str], typer.Argument(help="Specify application name")
@@ -187,7 +191,9 @@ def init(
             )
 
         if not _is_valid_app_name(project_name):
-            raise Exception(f"{project_name} is an invalid DBOS app name")
+            raise Exception(
+                f"{project_name} is an invalid DBOS app name. App names must be between 3 and 30 characters long and contain only lowercase letters, numbers, dashes, and underscores."
+            )
 
         templates_dir = _get_templates_directory()
         templates = [x.name for x in os.scandir(templates_dir) if x.is_dir()]
@@ -212,7 +218,9 @@ def init(
         print(f"[red]{e}[/red]")
 
 
-@app.command()
+@app.command(
+    help="Run your database schema migrations using the migration commands in 'dbos-config.yaml'"
+)
 def migrate() -> None:
     config = load_config()
     if not config["database"]["password"]:
@@ -262,5 +270,68 @@ def migrate() -> None:
     typer.echo(f"Completed schema migration for database {app_db_name}")
 
 
+@app.command(help="Reset the DBOS system database")
+def reset(
+    yes: bool = typer.Option(False, "-y", "--yes", help="Skip confirmation prompt")
+) -> None:
+    if not yes:
+        confirm = typer.confirm(
+            "This command resets your DBOS system database, deleting metadata about past workflows and steps. Are you sure you want to proceed?"
+        )
+        if not confirm:
+            typer.echo("Operation cancelled.")
+            raise typer.Exit()
+    config = load_config()
+    sysdb_name = (
+        config["database"]["sys_db_name"]
+        if "sys_db_name" in config["database"] and config["database"]["sys_db_name"]
+        else config["database"]["app_db_name"] + SystemSchema.sysdb_suffix
+    )
+    postgres_db_url = sa.URL.create(
+        "postgresql+psycopg",
+        username=config["database"]["username"],
+        password=config["database"]["password"],
+        host=config["database"]["hostname"],
+        port=config["database"]["port"],
+        database="postgres",
+    )
+    try:
+        # Connect to postgres default database
+        engine = sa.create_engine(postgres_db_url)
+
+        with engine.connect() as conn:
+            # Set autocommit required for database dropping
+            conn.execution_options(isolation_level="AUTOCOMMIT")
+
+            # Terminate existing connections
+            conn.execute(
+                sa.text(
+                    """
+                SELECT pg_terminate_backend(pg_stat_activity.pid)
+                FROM pg_stat_activity
+                WHERE pg_stat_activity.datname = :db_name
+                AND pid <> pg_backend_pid()
+            """
+                ),
+                {"db_name": sysdb_name},
+            )
+
+            # Drop the database
+            conn.execute(sa.text(f"DROP DATABASE IF EXISTS {sysdb_name}"))
+
+    except sa.exc.SQLAlchemyError as e:
+        typer.echo(f"Error dropping database: {str(e)}")
+        return
+
+    sys_db = None
+    try:
+        sys_db = SystemDatabase(config)
+    except Exception as e:
+        typer.echo(f"DBOS system schema migration failed: {e}")
+    finally:
+        if sys_db:
+            sys_db.destroy()
+
+
 if __name__ == "__main__":
     app()

{dbos-0.13.0a2.dist-info → dbos-0.14.0a5.dist-info}/METADATA

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

{dbos-0.13.0a2.dist-info → dbos-0.14.0a5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.13.0a2.dist-info/METADATA,sha256=-AXltSoMvRNJb3Xam9bvGJruo5-hCEzW5e5rAlOnns4,4988
-dbos-0.13.0a2.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.13.0a2.dist-info/entry_points.txt,sha256=z6GcVANQV7Uw_82H9Ob2axJX6V3imftyZsljdh-M1HU,54
-dbos-0.13.0a2.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.14.0a5.dist-info/METADATA,sha256=MheaF6YtIDsmu4JH6xGlhdjqlhlMSdNE7LdxJc4PNSw,4988
+dbos-0.14.0a5.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.14.0a5.dist-info/entry_points.txt,sha256=z6GcVANQV7Uw_82H9Ob2axJX6V3imftyZsljdh-M1HU,54
+dbos-0.14.0a5.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=CxRHBHEthPL4PZoLbZhp3rdm44-KkRTT2-7DkK9d4QQ,724
 dbos/_admin_sever.py,sha256=DOgzVp9kmwiebQqmJB1LcrZnGTxSMbZiGXdenc1wZDg,3163
 dbos/_app_db.py,sha256=_tv2vmPjjiaikwgxH3mqxgJ4nUUcG2-0uMXKWCqVu1c,5509
@@ -9,8 +9,8 @@ dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
 dbos/_context.py,sha256=SJZTOB-saxCNNGT2LLop9LasqR-X2MQLTay3rjXRUCw,17748
 dbos/_core.py,sha256=HUteo2HP9C4UvB-y41xwUphLZyYRTdb0sW5XqZ6QPAY,31167
 dbos/_croniter.py,sha256=hbhgfsHBqclUS8VeLnJ9PSE9Z54z6mi4nnrr1aUXn0k,47561
-dbos/_dbos.py,sha256=Or5z_PLwuUOz2wcI4PrBwAQYv7EarGpRU44WbvSU9pw,30986
-dbos/_dbos_config.py,sha256=vUm3_1zMcbp-0D14wwJyt37sGiQP6yTIhxaTkRSnvFA,6362
+dbos/_dbos.py,sha256=Adjhv2CY-qNWRzCOXXkkN7_u1tFlMhjyg3RBeVvFShY,31406
+dbos/_dbos_config.py,sha256=6G-S-43XMtkB06WnQ_8dHX-Yf64NdDPLbOkS0qztORk,6375
 dbos/_error.py,sha256=UETk8CoZL-TO2Utn1-E7OSWelhShWmKM-fOlODMR9PE,3893
 dbos/_fastapi.py,sha256=iyefCZq-ZDKRUjN_rgYQmFmyvWf4gPrSlC6CLbfq4a8,3419
 dbos/_flask.py,sha256=z1cijbTi5Dpq6kqikPCx1LcR2YHHv2oc41NehOWjw74,2431
@@ -35,7 +35,7 @@ dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=KeyoPrF7hy_ODXV7QNike_VFSD74QBRfQ76D7QyE9HI,966
 dbos/_schemas/system_database.py,sha256=7iw7eHJzEvkatHMOaHORoSvtfisF73wW5j8hRt_Ph14,5126
 dbos/_serialization.py,sha256=YCYv0qKAwAZ1djZisBC7khvKqG-5OcIv9t9EC5PFIog,1743
-dbos/_sys_db.py,sha256=8bPWjrKM7MZSuxbGmC1M9yshG2LqymyedOXUtZedYX8,48538
+dbos/_sys_db.py,sha256=NyakKa8lGMJ4WHydwukB8QubyGV9A6feK_bVepknZr4,48887
 dbos/_templates/hello/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/hello/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_templates/hello/__package/main.py,sha256=eI0SS9Nwj-fldtiuSzIlIG6dC91GXXwdRsoHxv6S_WI,2719
@@ -47,8 +47,8 @@ dbos/_templates/hello/migrations/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1u
 dbos/_templates/hello/migrations/versions/2024_07_31_180642_init.py,sha256=U5thFWGqNN4QLrNXT7wUUqftIFDNE5eSdqD8JNW1mec,942
 dbos/_templates/hello/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
 dbos/_tracer.py,sha256=rvBY1RQU6DO7rL7EnaJJxGcmd4tP_PpGqUEE6imZnhY,2518
-dbos/cli.py,sha256=Ks1jzP0tWju5jIwbLfrJpLXmk5gkU3v18FLJiNi5p8Q,8304
+dbos/cli.py,sha256=em1uAxrp5yyg53V7ZpmHFtqD6OJp2cMJkG9vGJPoFTA,10904
 dbos/dbos-config.schema.json,sha256=tgtiirOTEdIRI27eI75UAER9sAV84CDnv5lRPt0qiuQ,5672
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.13.0a2.dist-info/RECORD,,
+dbos-0.14.0a5.dist-info/RECORD,,