dbos 0.22.0a4__tar.gz → 0.22.0a5__tar.gz

{dbos-0.22.0a4 → dbos-0.22.0a5}/PKG-INFO

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

{dbos-0.22.0a4 → dbos-0.22.0a5}/dbos/_db_wizard.py

@@ -45,8 +45,16 @@ def db_wizard(config: "ConfigFile", config_file_path: str) -> "ConfigFile":
             f"Could not connect to Postgres: password authentication failed: {db_connection_error}"
         )
     db_config = config["database"]
+
+    # Read the config file and check if the database hostname/port/username are set. If so, skip the wizard.
+    with open(config_file_path, "r") as file:
+        content = file.read()
+        local_config = yaml.safe_load(content)
     if (
-        db_config["hostname"] != "localhost"
+        local_config["database"]["hostname"]
+        or local_config["database"]["port"]
+        or local_config["database"]["username"]
+        or db_config["hostname"] != "localhost"
         or db_config["port"] != 5432
         or db_config["username"] != "postgres"
     ):

{dbos-0.22.0a4 → dbos-0.22.0a5}/pyproject.toml

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

{dbos-0.22.0a4 → dbos-0.22.0a5}/tests/test_config.py

@@ -399,3 +399,26 @@ def test_db_connect_failed(mocker):
         load_config(mock_filename)
 
     assert "Could not connect to the database" in str(exc_info.value)
+
+
+def test_no_db_wizard(mocker):
+    mock_config = """
+        name: "some-app"
+        language: "python"
+        runtimeConfig:
+            start:
+                - "python3 main.py"
+        database:
+          hostname: 'localhost'
+          port: 5432
+          username: 'postgres'
+          password: 'somerandom'
+
+    """
+    mocker.patch(
+        "builtins.open", side_effect=generate_mock_open(mock_filename, mock_config)
+    )
+
+    with pytest.raises(DBOSInitializationError) as exc_info:
+        load_config(mock_filename)
+    assert "Could not connect" in str(exc_info.value)