dbos 0.20.0a5__tar.gz → 0.20.0a7__tar.gz

{dbos-0.20.0a5 → dbos-0.20.0a7}/PKG-INFO

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

{dbos-0.20.0a5 → dbos-0.20.0a7}/dbos/_dbos.py

@@ -245,7 +245,7 @@ class DBOS:
         return _dbos_global_instance
 
     @classmethod
-    def destroy(cls, *, destroy_registry: bool = True) -> None:
+    def destroy(cls, *, destroy_registry: bool = False) -> None:
         global _dbos_global_instance
         if _dbos_global_instance is not None:
             _dbos_global_instance._destroy()

{dbos-0.20.0a5 → dbos-0.20.0a7}/dbos/_sys_db.py

@@ -367,7 +367,7 @@ class SystemDatabase:
         with self.engine.begin() as c:
             stmt = (
                 sa.update(SystemSchema.workflow_status)
-                .where(SystemSchema.workflow_inputs.c.workflow_uuid == workflow_uuid)
+                .where(SystemSchema.workflow_status.c.workflow_uuid == workflow_uuid)
                 .values(
                     status=status,
                 )

{dbos-0.20.0a5 → dbos-0.20.0a7}/dbos/cli/cli.py

@@ -100,13 +100,15 @@ def init(
     ] = False,
 ) -> None:
     try:
+
         git_templates = ["dbos-app-starter", "dbos-cron-starter"]
         templates_dir = get_templates_directory()
         templates = git_templates + [
             x.name for x in os.scandir(templates_dir) if x.is_dir()
         ]
-        if len(templates) == 0:
-            raise Exception(f"no DBOS templates found in {templates_dir} ")
+
+        if config and template is None:
+            template = templates[-1]
 
         if template:
             if template not in templates:

{dbos-0.20.0a5 → dbos-0.20.0a7}/pyproject.toml

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

{dbos-0.20.0a5 → dbos-0.20.0a7}/tests/conftest.py

@@ -98,7 +98,7 @@ def cleanup_test_databases(config: ConfigFile, postgres_db_engine: sa.Engine) ->
 def dbos(
     config: ConfigFile, cleanup_test_databases: None
 ) -> Generator[DBOS, Any, None]:
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
 
     # This launches for test convenience.
     #    Tests add to running DBOS and then call stuff without adding
@@ -109,14 +109,14 @@ def dbos(
     DBOS.launch()
 
     yield dbos
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
 
 
 @pytest.fixture()
 def dbos_fastapi(
     config: ConfigFile, cleanup_test_databases: None
 ) -> Generator[Tuple[DBOS, FastAPI], Any, None]:
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
     app = FastAPI()
     dbos = DBOS(fastapi=app, config=config)
 
@@ -125,14 +125,14 @@ def dbos_fastapi(
     DBOS.launch()
 
     yield dbos, app
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
 
 
 @pytest.fixture()
 def dbos_flask(
     config: ConfigFile, cleanup_test_databases: None
 ) -> Generator[Tuple[DBOS, Flask], Any, None]:
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
     app = Flask(__name__)
 
     dbos = DBOS(flask=app, config=config)
@@ -142,7 +142,7 @@ def dbos_flask(
     DBOS.launch()
 
     yield dbos, app
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
 
 
 # Pretty-print test names

{dbos-0.20.0a5 → dbos-0.20.0a7}/tests/test_async.py

@@ -303,7 +303,7 @@ def test_async_tx_raises(config: ConfigFile) -> None:
             pass
 
     # destroy call needed to avoid "functions were registered but DBOS() was not called" warning
-    DBOS.destroy()
+    DBOS.destroy(destroy_registry=True)
 
 
 @pytest.mark.asyncio

{dbos-0.20.0a5 → dbos-0.20.0a7}/tests/test_dbos.py

@@ -1212,3 +1212,19 @@ def test_debug_logging(dbos: DBOS, caplog: pytest.LogCaptureFixture) -> None:
 
     # Reset logging
     logging.getLogger("dbos").propagate = original_propagate
+
+
+def test_destroy_semantics(dbos: DBOS, config: ConfigFile) -> None:
+
+    @DBOS.workflow()
+    def test_workflow(var: str) -> str:
+        return var
+
+    var = "test"
+    assert test_workflow(var) == var
+
+    DBOS.destroy()
+    DBOS(config=config)
+    DBOS.launch()
+
+    assert test_workflow(var) == var

{dbos-0.20.0a5 → dbos-0.20.0a7}/tests/test_package.py

@@ -9,6 +9,7 @@ import urllib.error
 import urllib.request
 
 import sqlalchemy as sa
+import yaml
 
 
 def test_package(build_wheel: str, postgres_db_engine: sa.Engine) -> None:
@@ -90,3 +91,27 @@ def test_package(build_wheel: str, postgres_db_engine: sa.Engine) -> None:
             finally:
                 os.kill(process.pid, signal.SIGINT)
                 process.wait()
+
+
+def test_init_config() -> None:
+    app_name = "example-name"
+    expected_yaml = {
+        "name": app_name,
+        "language": "python",
+        "runtimeConfig": {"start": ["fastapi run ./main.py"]},
+        "database": {"migrate": ["echo 'No migrations specified'"]},
+        "telemetry": {"logs": {"logLevel": "INFO"}},
+    }
+    with tempfile.TemporaryDirectory() as temp_path:
+        subprocess.check_call(
+            ["dbos", "init", app_name, "--config"],
+            cwd=temp_path,
+        )
+
+        config_path = os.path.join(temp_path, "dbos-config.yaml")
+        assert os.path.exists(config_path)
+
+        with open(config_path) as f:
+            actual_yaml = yaml.safe_load(f)
+
+        assert actual_yaml == expected_yaml