dbos 0.9.0a2__tar.gz → 0.10.0a1__tar.gz

{dbos-0.9.0a2 → dbos-0.10.0a1}/PKG-INFO

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

{dbos-0.9.0a2 → dbos-0.10.0a1}/dbos/dbos-config.schema.json

@@ -59,6 +59,10 @@
             "type": "string",
             "description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file"
           },
+          "local_suffix": {
+            "type": "boolean",
+            "description": "Whether to suffix app_db_name with '_local'. Set to true when doing local development using a DBOS Cloud database."
+          },
           "app_db_client": {
             "type": "string",
             "description": "Specify the database client to use to connect to the application database",

{dbos-0.9.0a2 → dbos-0.10.0a1}/dbos/dbos_config.py

@@ -2,7 +2,7 @@ import json
 import os
 import re
 from importlib import resources
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, Dict, List, Optional, TypedDict, cast
 
 import yaml
 from jsonschema import ValidationError, validate
@@ -27,6 +27,7 @@ class DatabaseConfig(TypedDict, total=False):
     sys_db_name: Optional[str]
     ssl: Optional[bool]
     ssl_ca: Optional[str]
+    local_suffix: Optional[bool]
     app_db_client: Optional[str]
     migrate: Optional[List[str]]
     rollback: Optional[List[str]]
@@ -164,6 +165,11 @@ def load_config(config_file_path: str = "dbos-config.yaml") -> ConfigFile:
     if "runtimeConfig" not in data or "start" not in data["runtimeConfig"]:
         raise DBOSInitializationError(f"dbos-config.yaml must specify a start command")
 
+    data = cast(ConfigFile, data)
+
+    if "local_suffix" in data["database"] and data["database"]["local_suffix"]:
+        data["database"]["app_db_name"] = f"{data['database']['app_db_name']}_local"
+
     # Return data as ConfigFile type
     return data  # type: ignore
 

{dbos-0.9.0a2 → dbos-0.10.0a1}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.9.0a2"
+version = "0.10.0a1"
 
 [project.license]
 text = "MIT"

{dbos-0.9.0a2 → dbos-0.10.0a1}/tests/test_config.py

@@ -197,3 +197,37 @@ def test_config_no_start(mocker):
         load_config(mock_filename)
 
     assert "start command" in str(exc_info.value)
+
+
+def test_local_config(mocker):
+    mock_config = """
+        name: "some app"
+        language: "python"
+        runtimeConfig:
+            start:
+                - "python3 main.py"
+            admin_port: 8001
+        database:
+          hostname: 'some host'
+          port: 1234
+          username: 'some user'
+          password: ${PGPASSWORD}
+          app_db_name: 'some_db'
+          connectionTimeoutMillis: 3000
+          local_suffix: true
+    """
+    os.environ["BARBAR"] = "FOOFOO"
+    mocker.patch(
+        "builtins.open", side_effect=generate_mock_open(mock_filename, mock_config)
+    )
+
+    configFile = load_config(mock_filename)
+    assert configFile["name"] == "some app"
+    assert configFile["database"]["local_suffix"] == True
+    assert configFile["language"] == "python"
+    assert configFile["database"]["hostname"] == "some host"
+    assert configFile["database"]["port"] == 1234
+    assert configFile["database"]["username"] == "some user"
+    assert configFile["database"]["password"] == os.environ["PGPASSWORD"]
+    assert configFile["database"]["app_db_name"] == "some_db_local"
+    assert configFile["database"]["connectionTimeoutMillis"] == 3000