dbos 0.24.0a15__tar.gz → 0.25.0a3__tar.gz

{dbos-0.24.0a15 → dbos-0.25.0a3}/PKG-INFO

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

{dbos-0.24.0a15 → dbos-0.25.0a3}/dbos/_db_wizard.py

@@ -49,6 +49,7 @@ def db_wizard(config: "ConfigFile") -> "ConfigFile":
 
     # 2. If the error is due to password authentication or the configuration is non-default, surface the error and exit.
     error_str = str(db_connection_error)
+    dbos_logger.debug(f"Error connecting to Postgres: {error_str}")
     if (
         "password authentication failed" in error_str
         or "28P01" in error_str
@@ -182,17 +183,12 @@ def _check_db_connectivity(config: "ConfigFile") -> Optional[Exception]:
         host=config["database"]["hostname"],
         port=config["database"]["port"],
         database="postgres",
-        query={"connect_timeout": "1"},
+        query={"connect_timeout": "2"},
     )
     postgres_db_engine = create_engine(postgres_db_url)
     try:
         with postgres_db_engine.connect() as conn:
-            val = conn.execute(text("SELECT 1")).scalar()
-            if val != 1:
-                dbos_logger.error(
-                    f"Unexpected value returned from database: expected 1, received {val}"
-                )
-                return Exception()
+            conn.execute(text("SELECT 1")).scalar()
     except Exception as e:
         return e
     finally:

{dbos-0.24.0a15 → dbos-0.25.0a3}/dbos/_dbos.py

@@ -981,6 +981,15 @@ class DBOS:
         ), "workflow_id is only available within a DBOS operation."
         return ctx.workflow_id
 
+    @classproperty
+    def step_id(cls) -> int:
+        """Return the step ID for the current context. This is a unique identifier of the current step within the workflow."""
+        ctx = assert_current_dbos_context()
+        assert (
+            ctx.is_within_workflow()
+        ), "step_id is only available within a DBOS workflow."
+        return ctx.function_id
+
     @classproperty
     def parent_workflow_id(cls) -> str:
         """

{dbos-0.24.0a15 → dbos-0.25.0a3}/dbos/_dbos_config.py

@@ -512,7 +512,8 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
         "sys_db_name"
     ]
     provided_config["database"]["ssl"] = config_from_file["database"]["ssl"]
-    provided_config["database"]["ssl_ca"] = config_from_file["database"]["ssl_ca"]
+    if "ssl_ca" in config_from_file["database"]:
+        provided_config["database"]["ssl_ca"] = config_from_file["database"]["ssl_ca"]
 
     # Telemetry config
     if "telemetry" not in provided_config or provided_config["telemetry"] is None:

{dbos-0.24.0a15 → dbos-0.25.0a3}/pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.24.0a15"
+version = "0.25.0a3"
 
 [project.license]
 text = "MIT"

{dbos-0.24.0a15 → dbos-0.25.0a3}/tests/test_config.py

@@ -1049,7 +1049,6 @@ def test_overwrite_config_minimal(mocker):
         app_db_name: appdbname
         sys_db_name: sysdbname
         ssl: true
-        ssl_ca: cert.pem
         migrate:
             - alembic upgrade head
     telemetry:
@@ -1079,7 +1078,7 @@ def test_overwrite_config_minimal(mocker):
     assert config["database"]["app_db_name"] == "appdbname"
     assert config["database"]["sys_db_name"] == "sysdbname"
     assert config["database"]["ssl"] == True
-    assert config["database"]["ssl_ca"] == "cert.pem"
+    assert "ssl_ca" not in config["database"]
     assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == [
         "thetracesendpoint"
     ]

{dbos-0.24.0a15 → dbos-0.25.0a3}/tests/test_dbos.py

@@ -38,6 +38,7 @@ def test_simple_workflow(dbos: DBOS) -> None:
 
     @DBOS.transaction(isolation_level="REPEATABLE READ")
     def test_transaction(var2: str) -> str:
+        assert DBOS.step_id == 1
         rows = DBOS.sql_session.execute(sa.text("SELECT 1")).fetchall()
         nonlocal txn_counter
         txn_counter += 1
@@ -46,6 +47,7 @@ def test_simple_workflow(dbos: DBOS) -> None:
 
     @DBOS.step()
     def test_step(var: str) -> str:
+        assert DBOS.step_id == 2
         nonlocal step_counter
         step_counter += 1
         DBOS.logger.info("I'm test_step")