dbos 1.9.0a3__tar.gz → 1.10.0a1__tar.gz

{dbos-1.9.0a3 → dbos-1.10.0a1}/PKG-INFO

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

{dbos-1.9.0a3 → dbos-1.10.0a1}/dbos/_dbos.py

@@ -324,6 +324,17 @@ class DBOS:
         self.conductor_websocket: Optional[ConductorWebsocket] = None
         self._background_event_loop: BackgroundEventLoop = BackgroundEventLoop()
 
+        # Globally set the application version and executor ID.
+        # In DBOS Cloud, instead use the values supplied through environment variables.
+        if not os.environ.get("DBOS__CLOUD") == "true":
+            if (
+                "application_version" in config
+                and config["application_version"] is not None
+            ):
+                GlobalParams.app_version = config["application_version"]
+            if "executor_id" in config and config["executor_id"] is not None:
+                GlobalParams.executor_id = config["executor_id"]
+
         init_logger()
 
         # Translate user provided config to an internal format

{dbos-1.9.0a3 → dbos-1.10.0a1}/dbos/_dbos_config.py

@@ -47,6 +47,8 @@ class DBOSConfig(TypedDict, total=False):
     admin_port: Optional[int]
     run_admin_server: Optional[bool]
     otlp_attributes: Optional[dict[str, str]]
+    application_version: Optional[str]
+    executor_id: Optional[str]
 
 
 class RuntimeConfig(TypedDict, total=False):

{dbos-1.9.0a3 → dbos-1.10.0a1}/pyproject.toml

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

{dbos-1.9.0a3 → dbos-1.10.0a1}/tests/test_classdecorators.py

@@ -911,3 +911,30 @@ def test_class_step_without_dbos(dbos: DBOS, config: DBOSConfig) -> None:
     DBOS.launch()
 
     assert inst.step(input) == input + input
+
+
+def test_class_with_only_steps(dbos: DBOS) -> None:
+
+    class StepClass:
+        def __init__(self, x: int) -> None:
+            self.x = x
+
+        @DBOS.step()
+        def step(self, x: int, expr: Callable[[int, int], int]) -> int:
+            return expr(self.x, x)
+
+    input = 5
+    inst = StepClass(5)
+
+    l = lambda x, y: x + y
+
+    @DBOS.workflow()
+    def test_workflow() -> int:
+        return inst.step(input, l) + inst.step(input, l)
+
+    handle = DBOS.start_workflow(test_workflow)
+    assert handle.get_result() == input * 4
+
+    steps = DBOS.list_workflow_steps(handle.workflow_id)
+    assert len(steps) == 2
+    assert steps[1]["output"] == steps[1]["output"] == input * 2

{dbos-1.9.0a3 → dbos-1.10.0a1}/tests/test_dbos.py

@@ -1397,7 +1397,7 @@ def test_app_version(config: DBOSConfig) -> None:
     assert GlobalParams.app_version != app_version
 
     # Verify that version can be overriden with an environment variable
-    app_version = "12345"
+    app_version = str(uuid.uuid4())
     os.environ["DBOS__APPVERSION"] = app_version
 
     DBOS.destroy(destroy_registry=True)
@@ -1412,6 +1412,28 @@ def test_app_version(config: DBOSConfig) -> None:
 
     del os.environ["DBOS__APPVERSION"]
 
+    # Verify that version and executor ID can be overriden with a config parameter
+    app_version = str(uuid.uuid4())
+    executor_id = str(uuid.uuid4())
+
+    DBOS.destroy(destroy_registry=True)
+    config["application_version"] = app_version
+    config["executor_id"] = executor_id
+    DBOS(config=config)
+
+    @DBOS.workflow()
+    def test_workflow() -> str:
+        assert DBOS.workflow_id
+        return DBOS.workflow_id
+
+    DBOS.launch()
+    assert GlobalParams.app_version == app_version
+    assert GlobalParams.executor_id == executor_id
+    wfid = test_workflow()
+    handle: WorkflowHandle[str] = DBOS.retrieve_workflow(wfid)
+    assert handle.get_status().app_version == app_version
+    assert handle.get_status().executor_id == executor_id
+
 
 def test_recovery_appversion(config: DBOSConfig) -> None:
     input = 5