orchestrator-core 3.2.2__tar.gz → 3.2.3__tar.gz

{orchestrator_core-3.2.2 → orchestrator_core-3.2.3}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.2.2
+current_version = 3.2.3
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

{orchestrator_core-3.2.2 → orchestrator_core-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.2.2
+Version: 3.2.3
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology

{orchestrator_core-3.2.2 → orchestrator_core-3.2.3}/orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "3.2.2"
+__version__ = "3.2.3"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

{orchestrator_core-3.2.2 → orchestrator_core-3.2.3}/orchestrator/services/processes.py

@@ -682,7 +682,7 @@ def update_awaiting_process_progress(
     ensure_correct_callback_token(pstat, token=token)
 
     state = pstat.state.unwrap()
-    progress_key = state.get(DEFAULT_CALLBACK_PROGRESS_KEY, "callback_progress")
+    progress_key = DEFAULT_CALLBACK_PROGRESS_KEY
     state = {**state, progress_key: data} | {"__remove_keys": [progress_key]}
 
     replace_current_step_state(process, new_state=state)

{orchestrator_core-3.2.2 → orchestrator_core-3.2.3}/test/unit_tests/workflows/test_async_workflow.py

@@ -229,9 +229,12 @@ def test_wf_callback_progress_with_multiple_callback_steps(test_client):
         assert response_data["last_status"] == "awaiting_callback"
         state = response_data["current_state"]
 
-        # Update progress 1 using dict
+        # Update dry step progress with dict - update 1
         callback_route1 = state["callback_route"]
-        response = test_client.post(f"{callback_route1}/progress", json={"update": "123"})
+        response = test_client.post(
+            f"{callback_route1}/progress",
+            json={"update": 1},
+        )
         assert response.status_code == 200
         response_data = response.json()
 
@@ -239,9 +242,24 @@ def test_wf_callback_progress_with_multiple_callback_steps(test_client):
         response = test_client.get(f"api/processes/{process_id}")
         response_data = response.json()
         state = response_data["current_state"]
-        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == {"update": "123"}
+        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == {"update": 1}
 
-        # Continue workflow 1
+        # Update dry step progress with dict - update 2
+        callback_route1 = state["callback_route"]
+        response = test_client.post(
+            f"{callback_route1}/progress",
+            json={"update": 2},
+        )
+        assert response.status_code == 200
+        response_data = response.json()
+
+        # Check process status
+        response = test_client.get(f"api/processes/{process_id}")
+        response_data = response.json()
+        state = response_data["current_state"]
+        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == {"update": 2}
+
+        # Continue workflow dry step
         callback_route1 = state["callback_route"]
         response = test_client.post(callback_route1, json={"ext_data": "12345"})
         assert response.status_code == 200
@@ -254,10 +272,10 @@ def test_wf_callback_progress_with_multiple_callback_steps(test_client):
         assert state["dr_ext_data"] == "12345"
         assert DEFAULT_CALLBACK_PROGRESS_KEY not in state
 
-        # Update progress 2 using string
+        # Update real step progress with string - update 1
         callback_route2 = state["callback_route"]
         response = test_client.post(
-            f"{callback_route2}/progress", data="update 567", headers={"Content-Type": "text/plain; charset=utf-8"}
+            f"{callback_route2}/progress", data="update 1", headers={"Content-Type": "text/plain; charset=utf-8"}
         )
         assert response.status_code == 200
         response_data = response.json()
@@ -266,18 +284,48 @@ def test_wf_callback_progress_with_multiple_callback_steps(test_client):
         response = test_client.get(f"api/processes/{process_id}")
         response_data = response.json()
         state = response_data["current_state"]
-        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == "update 567"
+        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == "update 1"
 
-        # Continue workflow 2
+        # Update real step progress with string - update 2
+        callback_route2 = state["callback_route"]
+        response = test_client.post(
+            f"{callback_route2}/progress", data="update 2", headers={"Content-Type": "text/plain; charset=utf-8"}
+        )
+        assert response.status_code == 200
+        response_data = response.json()
+
+        # Check process status
+        response = test_client.get(f"api/processes/{process_id}")
+        response_data = response.json()
+        state = response_data["current_state"]
+        assert state[DEFAULT_CALLBACK_PROGRESS_KEY] == "update 2"
+
+        # Continue workflow real step
         response = test_client.post(callback_route2, json={"ext_data": "56789"})
         assert response.status_code == 200
 
         # Final check
         response = test_client.get(f"api/processes/{process_id}")
         response_data = response.json()
+        state = response_data["current_state"]
 
         assert response_data["last_status"] == "completed"
 
+        assert all(
+            key in state.keys()
+            for key in [
+                "phase",
+                "ext_data",
+                "reporter",
+                "process_id",
+                "dr_ext_data",
+                "workflow_name",
+                "callback_route",
+                "callback_result",
+                "workflow_target",
+            ]
+        )
+
         state = response_data["current_state"]
         assert state["ext_data"] == "56789"
         assert DEFAULT_CALLBACK_PROGRESS_KEY not in state