python-saga-orchestrator 0.7.0__tar.gz → 0.7.1__tar.gz

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/Makefile

@@ -13,4 +13,4 @@ tests:
 		--build \
 		--abort-on-container-exit \
 		--exit-code-from tests
-	docker compose down -v
+	docker compose down -v --rmi local

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-saga-orchestrator
-Version: 0.7.0
+Version: 0.7.1
 Summary: Lightweight embedded saga orchestrator for asyncio Python services
 Author-email: Maxim Vasilyev <mayxis@inbox.ru>
 License-Expression: MIT

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/python_saga_orchestrator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-saga-orchestrator
-Version: 0.7.0
+Version: 0.7.1
 Summary: Lightweight embedded saga orchestrator for asyncio Python services
 Author-email: Maxim Vasilyev <mayxis@inbox.ru>
 License-Expression: MIT

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/saga_orchestrator/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.7.0'
-__version_tuple__ = version_tuple = (0, 7, 0)
+__version__ = version = '0.7.1'
+__version_tuple__ = version_tuple = (0, 7, 1)
 
 __commit_id__ = commit_id = None

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/saga_orchestrator/core/engine.py

@@ -1046,6 +1046,7 @@ class SagaEngine(Generic[ModelT, HistoryModelT]):
                 )
 
                 saga.last_error = repr(error)
+                context.clear_latest_event()
                 next_attempt = saga.retry_counter + 1
                 delay = step_def.retry_policy.next_delay(next_attempt)
                 saga.retry_counter = next_attempt

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/tests/integration/helpers.py

@@ -471,6 +471,66 @@ class RetryWaitStep(BaseStep[RetryWaitInput, StartOutput]):
         return StartOutput(value=inp.value + 1)
 
 
+class LeakTrackInput(BaseModel):
+    value: str
+
+
+class LeakTrackOutput(BaseModel):
+    value: str
+
+
+class CompensateEventTrackerStep(BaseStep[LeakTrackInput, LeakTrackOutput]):
+    """Шаг 1: Успешно выполняется, а при компенсации запоминает, какой ивент ему прислали."""
+
+    def __init__(self) -> None:
+        self.compensate_event_type: str | None = "NOT_CALLED"
+
+    async def execute(
+        self,
+        inp: LeakTrackInput,
+        event_type: str | None = None,
+        event_payload: Any | None = None,
+    ) -> LeakTrackOutput:
+        return LeakTrackOutput(value=inp.value)
+
+    async def compensate(
+        self,
+        inp: LeakTrackInput,
+        out: LeakTrackOutput,
+        event_type: str | None = None,
+        event_payload: Any | None = None,
+    ) -> None:
+        self.compensate_event_type = event_type
+
+
+class AsyncFailInput(BaseModel):
+    value: str
+
+
+class AsyncFailOutput(BaseModel):
+    value: str
+
+
+class AsyncFailStep(BaseStep[AsyncFailInput, AsyncFailOutput]):
+    """Шаг 2: Засыпает, а при получении события - кидает ошибку."""
+
+    async def execute(
+        self,
+        inp: AsyncFailInput,
+        event_type: str | None = None,
+        event_payload: Any | None = None,
+    ) -> AsyncFailOutput | StepAwaitEvent:
+        if event_type is None:
+            return StepAwaitEvent(
+                event_types=("fail.event",),
+                correlation_id=inp.value,
+            )
+        if event_type == "fail.event":
+            raise RuntimeError("Step failed due to incoming event")
+
+        return AsyncFailOutput(value=inp.value)
+
+
 class SagaStartedEvent(BaseModel):
     saga_id: uuid.UUID
     initial_value: int

{python_saga_orchestrator-0.7.0 → python_saga_orchestrator-0.7.1}/tests/integration/test_core_flow.py

@@ -23,11 +23,15 @@ from tests.integration.helpers import (
     ActivateQueueStep,
     AddOneStep,
     AlwaysFailStep,
+    AsyncFailInput,
+    AsyncFailStep,
+    CompensateEventTrackerStep,
     CompensatingStep,
     FailsOnceStep,
     FlakyStep,
     HttpInput,
     HttpStep,
+    LeakTrackInput,
     NextInput,
     RecoverableStep,
     ReserveQueueInput,
@@ -560,3 +564,62 @@ async def test_retry_after_timeout_processes_successfully(session_maker):
 
     final_state = await admin.get_saga(saga_id)
     assert final_state.status == SagaStatus.COMPLETED
+
+
+@pytest.mark.asyncio
+async def test_event_does_not_leak_into_compensation_after_failure(session_maker):
+    """
+    Проверяет, что если шаг упал после пробуждения от события,
+    это событие очищается и не 'протекает' в компенсацию предыдущих шагов.
+    """
+    tracker_step = CompensateEventTrackerStep()
+    fail_step = AsyncFailStep()
+
+    builder = SagaBuilder()
+    step1_ref = builder.add_step(
+        step=tracker_step,
+        input_map=lambda ctx: LeakTrackInput(value=ctx.initial_data["correlation"]),
+    )
+    builder.add_step(
+        step=fail_step,
+        depends_on=step1_ref,
+        input_map=lambda out: AsyncFailInput(value=out.value),
+    )
+
+    orchestrator = SagaOrchestrator[IntegrationSagaState, IntegrationSagaHistory](
+        model_class=IntegrationSagaState,
+        history_model_class=IntegrationSagaHistory,
+        session_maker=session_maker,
+    )
+    admin = SagaAdmin[IntegrationSagaState, IntegrationSagaHistory](
+        engine=orchestrator.engine
+    )
+    orchestrator.register("leak_test_saga", builder.build())
+
+    saga_id = await orchestrator.start(
+        saga_name="leak_test_saga",
+        initial_data={"correlation": "corr-leak-123"},
+        aggregation_id="agg-leak-test",
+    )
+
+    state1 = await admin.get_saga(saga_id)
+    assert state1.status == SagaStatus.SUSPENDED
+    assert state1.current_step_index == 1
+
+    await orchestrator.notify(
+        saga_id=saga_id,
+        token=state1.step_execution_token,
+        event=NotifyEvent(
+            event_id="evt-leak",
+            event_type="fail.event",
+            correlation_id="corr-leak-123",
+            payload={"reason": "fatal error"},
+        ),
+    )
+
+    final_state = await admin.get_saga(saga_id)
+    assert final_state.status == SagaStatus.COMPENSATED
+
+    assert tracker_step.compensate_event_type is None, (
+        f"Event leaked into compensation! Expected None, got: {tracker_step.compensate_event_type}"
+    )