durable-workflow 2.13.1__tar.gz → 2.13.2__tar.gz

{durable_workflow-2.13.1/src/durable_workflow.egg-info → durable_workflow-2.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 2.13.1
+Version: 2.13.2
 Summary: Python client and worker SDK for Durable Workflow Cloud and self-hosted Server
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "durable-workflow"
-version = "2.13.1"
+version = "2.13.2"
 description = "Python client and worker SDK for Durable Workflow Cloud and self-hosted Server"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -79,8 +79,8 @@ durable-workflow-replay-conformance = "durable_workflow.replay_conformance:main"
 durable-workflow-workflow-updates-conformance = "durable_workflow.workflow_updates_conformance:main"
 
 [tool.durable-workflow]
-product-train = "2.13.1"
-registry-version = "2.13.1"
+product-train = "2.13.2"
+registry-version = "2.13.2"
 supported-server-versions = "2.8.0"
 supported-server-release-baselines = { "2" = "2.8.0", "3" = "3.0.0" }
 worker-protocol-version = "1.20"

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/src/durable_workflow/_cancellation_scope_history.py

@@ -122,10 +122,15 @@ def _cleanup_operation(event: dict[str, Any], prefix: Sequence[dict[str, Any]],
         "authority_deadline_at": _canonical_time(authority),
     }
     sequence = payload.get("sequence")
+    # Only an explicit null reads as one call, as in Core; any other value
+    # that is not a positive integer is refused, never narrowed.
+    span = 1 if recorded.get("sequence_span") is None else recorded["sequence_span"]
+    if not _positive(span) or not _positive(recorded.get("sequence")):
+        raise _invalid(operation + " follows a delivery without a canonical sequence span")
     deadline = scope_timestamp(expected["authority_deadline_at"])
     timestamp = scope_timestamp(event.get("timestamp", event.get("recorded_at")))
     if (snapshot != expected or scope_id != context.scope_id
-        or not _positive(sequence) or sequence < recorded["sequence"] + recorded["sequence_span"]
+        or not _positive(sequence) or sequence < recorded["sequence"] + span
         or not _positive(event.get("sequence")) or delivery["sequence"] >= event["sequence"]
         or timestamp < scope_timestamp(delivery.get("timestamp", delivery.get("recorded_at")))
         or timestamp >= deadline or not local and (

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/src/durable_workflow/_cooperative_cancellation.py

@@ -112,7 +112,9 @@ class CancellationDelivery:
         request_id = _text(payload.get("workflow_command_id"), "workflow_command_id")
         sequence = _positive(payload.get("sequence"), "sequence")
         kind = _text(payload.get("call_kind"), "call_kind")
-        span = _positive(payload.get("sequence_span", 1), "sequence_span", maximum=1000)
+        # Absent and null both mean one call, as Core's WorkflowStepHistory reads it.
+        recorded_span = payload.get("sequence_span")
+        span = _positive(1 if recorded_span is None else recorded_span, "sequence_span", maximum=1000)
         operation = payload.get("operation_sequence")
         operation_span = _positive(payload.get("operation_sequence_span", 1), "operation_sequence_span", maximum=1000)
         if kind not in _CALL_KINDS or (kind != "parallel" and span != 1):

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/src/durable_workflow/testing.py

@@ -400,8 +400,19 @@ class WorkflowEnvironment:
                     }
                 )
             elif isinstance(cmd, UpsertSearchAttributes):
+                # Record the JSON wire form, as the Server does; replay
+                # checks the workflow's update against it.
                 history.append(
-                    {"event_type": "SearchAttributesUpserted", "payload": {}}
+                    {
+                        "event_type": "SearchAttributesUpserted",
+                        "payload": {
+                            # Every recorded event but a signal is a step.
+                            "sequence": 1 + sum(
+                                event["event_type"] != "SignalReceived" for event in history
+                            ),
+                            "attributes": json.loads(json.dumps(cmd.attributes)),
+                        },
+                    }
                 )
             elif isinstance(cmd, RecordVersionMarker):
                 history.append(

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/src/durable_workflow/workflow.py

@@ -1393,6 +1393,130 @@ def _memo_replay_identity(value: Mapping[str, Any]) -> str:
     return serializer.encode(_canonical_memo_entries(value), size_warning=None)
 
 
+# Core's UpsertSearchAttributesCall, which the Server applies before storing
+# SearchAttributesUpserted. Replay compares the canonical forms exactly and
+# refuses anything outside this portable value domain.
+_SEARCH_ATTRIBUTE_KEY_PATTERN = re.compile(r"[A-Za-z0-9_.:-]{1,64}")
+_SEARCH_ATTRIBUTE_TRIM = " \t\n\r\0\x0b"
+_SEARCH_ATTRIBUTE_MAX_STRING_LENGTH = 2048
+_SEARCH_ATTRIBUTE_MAX_KEYWORD_LENGTH = 255
+_SEARCH_ATTRIBUTE_TYPES = frozenset({"string", "keyword", "keyword_list", "int", "float", "bool", "datetime"})
+_INT64_MIN, _INT64_MAX = -(2**63), 2**63 - 1
+
+
+def _json_type_name(value: Any) -> str:
+    """A diagnostic-safe name for a value's JSON type; never the value itself."""
+    if value is None:
+        return "null"
+    if isinstance(value, bool):
+        return "boolean"
+    if isinstance(value, int):
+        return "integer"
+    if isinstance(value, float):
+        return "number"
+    if isinstance(value, str):
+        return "string"
+    if isinstance(value, list | tuple):
+        return "array"
+    if isinstance(value, Mapping):
+        return "object"
+    return "unsupported value"
+
+
+def _canonical_search_attributes(attributes: Any, *, authored: bool = False) -> dict[str, tuple[str, Any]]:
+    """Return the type-tagged canonical form of a search-attribute update.
+
+    Raises ValueError for any value Core's UpsertSearchAttributesCall rejects.
+    The type tag keeps distinct values distinct (1, 1.0, True and "1"). An
+    authored tuple is sent as the same JSON list, so it is checked as a list.
+    """
+    if not isinstance(attributes, Mapping) or not attributes:
+        raise ValueError("search attributes must be a non-empty object")
+    canonical: dict[str, tuple[str, Any]] = {}
+    for key, value in attributes.items():
+        if not isinstance(key, str) or _SEARCH_ATTRIBUTE_KEY_PATTERN.fullmatch(key) is None:
+            # Name only the type: an invalid key may carry arbitrary data.
+            raise ValueError(f"a search attribute key ({_json_type_name(key)}) is not 1-64 URL-safe characters")
+        if authored and type(value) is tuple:
+            value = list(value)
+        if value is None:
+            canonical[key] = ("null", None)
+        elif isinstance(value, bool):
+            canonical[key] = ("bool", value)
+        elif isinstance(value, int):
+            if not _INT64_MIN <= value <= _INT64_MAX:
+                raise ValueError(f"search attribute [{key}] integer is outside the 64-bit range")
+            canonical[key] = ("int", value)
+        elif isinstance(value, float):
+            if not math.isfinite(value):
+                raise ValueError(f"search attribute [{key}] must be a finite number")
+            canonical[key] = ("float", value)
+        elif isinstance(value, str):
+            trimmed = value.strip(_SEARCH_ATTRIBUTE_TRIM)
+            if len(trimmed) > _SEARCH_ATTRIBUTE_MAX_STRING_LENGTH:
+                raise ValueError(f"search attribute [{key}] exceeds {_SEARCH_ATTRIBUTE_MAX_STRING_LENGTH} characters")
+            canonical[key] = ("string", trimmed) if trimmed else ("null", None)
+        elif type(value) is list or isinstance(value, Mapping) and not value:
+            # PHP decodes an empty JSON object as an empty list.
+            items: list[str] = []
+            for item in value:
+                if not isinstance(item, str):
+                    raise ValueError(f"search attribute [{key}] list values must contain only strings")
+                trimmed = item.strip(_SEARCH_ATTRIBUTE_TRIM)
+                if len(trimmed) > _SEARCH_ATTRIBUTE_MAX_KEYWORD_LENGTH:
+                    raise ValueError(
+                        f"search attribute [{key}] list values exceed {_SEARCH_ATTRIBUTE_MAX_KEYWORD_LENGTH} characters"
+                    )
+                items.append(trimmed)
+            canonical[key] = ("list", tuple(items))
+        else:
+            raise ValueError(f"search attribute [{key}] must be a string, number, boolean, string list or null")
+    return canonical
+
+
+def _search_attribute_type_choices(value: Any) -> frozenset[str]:
+    """Every type a Server can record for one value of this SDK's untyped upsert.
+
+    The SDK declares no types, but native Server 3.0.x resolves each key as
+    registered, then declared, then inferred from the raw value
+    (rust/src/runtime/search_attribute_upserts.rs:254-289, recorded at :856),
+    and the PHP Server fills registered types into the command the same way
+    (SearchAttributeValueValidator.php:93, WorkerController.php:2734). The SDK
+    cannot see the namespace registry, so this returns the union of the
+    inferred type and every registered type the Server accepts for the value.
+    Any string is treated as possibly registered datetime. The check refuses
+    only a recorded type that cannot hold the value at all.
+    """
+    if isinstance(value, bool):
+        return frozenset({"bool"})
+    if isinstance(value, int):
+        return frozenset({"int", "float"})
+    if isinstance(value, float):
+        return frozenset({"float"})
+    if isinstance(value, str):
+        return frozenset({"keyword", "string", "datetime"})
+    return frozenset({"keyword_list"})
+
+
+def _search_attribute_types_mismatch(recorded: Any, authored: Mapping[str, Any]) -> str | None:
+    if isinstance(recorded, list) and not recorded:
+        recorded = {}  # PHP serializes an empty map as a JSON list.
+    if not isinstance(recorded, Mapping):
+        return "recorded attribute_types is not an object"
+    # A null value has no type. Both Servers type every other raw value,
+    # including a blank string that is stored as null.
+    typed = {key for key, value in authored.items() if value is not None}
+    if not all(isinstance(key, str) for key in recorded) or set(recorded) != typed:
+        return "recorded attribute_types names different keys from the current update"
+    for key in sorted(recorded):
+        kind = recorded[key]
+        if not isinstance(kind, str) or kind not in _SEARCH_ATTRIBUTE_TYPES:
+            return f"recorded attribute type for [{key}] is not a search attribute type"
+        if kind not in _search_attribute_type_choices(authored[key]):
+            return f"recorded attribute type {kind!r} for [{key}] cannot hold the current value"
+    return None
+
+
 def _canonical_memo_entries(entries: Mapping[str, Any], *, require_entries: bool = True) -> dict[str, Any]:
     if require_entries and not entries:
         raise ValueError("workflow memo updates require at least one entry")
@@ -2339,6 +2463,10 @@ class WorkflowContext:
         ``False`` (otherwise ``True``). The fractional ``timeout`` is rounded
         up to the next whole second to match the server's integer-second
         timer resolution.
+
+        The deadline is fixed when the wait first opens. A signal that leaves
+        the predicate false re-drives the workflow, and the wait reopens with
+        only the time left before that deadline, so signals never extend it.
         """
         timeout_seconds: int | None = None
         if timeout is not None:
@@ -2958,6 +3086,20 @@ def _validated_replay_payload_codec(
     return codec
 
 
+def _history_event_time(event: Mapping[str, Any]) -> datetime | None:
+    """The recorded time of a history event, or None if it has none."""
+    value = event.get("timestamp")
+    if value is None:
+        value = event.get("recorded_at")
+    if not isinstance(value, str):
+        return None
+    try:
+        parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
+    except ValueError:
+        return None
+    return parsed if parsed.tzinfo is not None and parsed.utcoffset() is not None else None
+
+
 def _decode_history_result(
     payload: dict[str, Any],
     fallback_codec: str | None,
@@ -3719,6 +3861,16 @@ def _workflow_sequence(payload: Mapping[str, Any]) -> int | None:
     return None
 
 
+def _durable_command_sequence_problem(payload: Mapping[str, Any]) -> str | None:
+    """The sdk-rust reason when a durable command record has no usable sequence."""
+    value = payload.get("sequence")
+    if value is None:
+        return "durable_command_sequence_missing"
+    if type(value) is not int or value <= 0:
+        return "durable_command_sequence_invalid"
+    return None
+
+
 def _parallel_group_integer(payload: Mapping[str, Any], key: str) -> int | None:
     value = payload.get(key)
     if isinstance(value, bool):
@@ -3873,6 +4025,93 @@ def _reorder_completed_parallel_groups(
     return ordered_results, ordered_steps
 
 
+# The events that claim a workflow sequence, by durable command kind: Core's
+# WorkflowStepHistory step events and cancellation deliveries, plus each
+# command's other lifecycle rows, which carry the same sequence. Events that
+# only point at a step's sequence claim nothing and are not listed: signal
+# receipts, update records, failure handling, selection records, and
+# cooperative or scope cancellation requests and preparations. As in sdk-php,
+# a collision is refused when it involves an upsert: an upsert is the only
+# command at its sequence.
+_DURABLE_COMMAND_KINDS: dict[str, str] = {
+    **dict.fromkeys(("ActivityScheduled", "ActivityStarted", "ActivityHeartbeatRecorded", "ActivityRetryScheduled",
+                     "ActivityCompleted", "ActivityFailed", "ActivityTimedOut", "ActivityCancelled",
+                     "ActivityCancellationAcknowledged"), "activity"),
+    **dict.fromkeys(("TimerScheduled", "TimerFired", "TimerCancelled"), "timer"),
+    **dict.fromkeys(("ChildWorkflowScheduled", "ChildRunStarted", "ChildRunCompleted", "ChildRunFailed",
+                     "ChildRunCancelled", "ChildRunTerminated", "ChildCancellationRequested",
+                     "ChildCancellationResolved"), "child"),
+    **dict.fromkeys(("ConditionWaitOpened", "ConditionWaitSatisfied", "ConditionWaitTimedOut",
+                     "ConditionWaitCancelled"), "condition"),
+    **dict.fromkeys(("SignalWaitOpened", "SignalApplied", "SignalWaitReceived", "SignalWaitTimedOut",
+                     "SignalWaitCancelled"), "signal"),
+    **dict.fromkeys(("ServiceOperationScheduled", "ServiceCallStarted", "ServiceCallCompleted", "ServiceCallFailed",
+                     "ServiceCallCancelled"), "service_call"),
+    "CancellationScopeOpened": "cancellation_scope",
+    # A delivered cancellation consumes the call it interrupts, scheduled or
+    # not, and its sequence_span reserves the whole interrupted range.
+    **dict.fromkeys(("CooperativeCancellationDelivered", "CancellationScopeDelivered"), "cancellation_delivery"),
+    "WorkflowContinuedAsNew": "continue_as_new",
+    "SideEffectRecorded": "side_effect",
+    "VersionMarkerRecorded": "version_marker",
+    "MemoUpserted": "memo",
+    "SearchAttributesUpserted": "search_attributes",
+}
+_UPSERT_COMMAND_KINDS = frozenset({"memo", "search_attributes"})
+
+
+def _delivery_sequence_span(payload: Mapping[str, Any]) -> int:
+    """A cancellation delivery's sequence_span under the producer contract.
+
+    Absent or null means 1, as Core reads it
+    (WorkflowStepHistory.php:270, `intValue($payload['sequence_span'] ?? null) ?? 1`).
+    Otherwise it must be a positive JSON integer; zero, negative, bool,
+    float, string and every other value are malformed and raise ValueError,
+    so a malformed span never shrinks the claimed range.
+    """
+    span = payload.get("sequence_span")
+    if span is None:
+        return 1
+    if type(span) is not int or span <= 0:
+        # Name only the JSON type: the span may carry arbitrary history data.
+        raise ValueError(f"sequence_span must be a positive integer (got {_json_type_name(span)})")
+    return span
+
+
+def _assert_delivery_spans(events: Iterable[Mapping[str, Any]]) -> None:
+    for event in events:
+        if _DURABLE_COMMAND_KINDS.get(_history_event_type(event) or "") != "cancellation_delivery":
+            continue
+        raw = event.get("payload")
+        payload: Mapping[str, Any] = raw if isinstance(raw, Mapping) else {}
+        try:
+            _delivery_sequence_span(payload)
+        except ValueError as error:
+            raise NonDeterministicReplayError(
+                _workflow_sequence(payload) or 0,
+                "cancellation delivery with a canonical sequence span",
+                [str(_history_event_type(event))],
+                detail=f"durable_command_sequence_invalid: {error}.",
+            ) from error
+
+
+def _durable_command_claimed_range(event_type: str | None, payload: Mapping[str, Any], sequence: int) -> range:
+    """The workflow sequences one recorded event claims.
+
+    A cancellation delivery claims sequence through sequence + sequence_span
+    - 1, inclusive, as Core's WorkflowStepHistory::nextSequenceFromEvents
+    extends it. Its span follows the producer contract
+    (_delivery_sequence_span), which replay checks before any parsing.
+    """
+    if _DURABLE_COMMAND_KINDS.get(event_type or "") != "cancellation_delivery":
+        return range(sequence, sequence + 1)
+    return range(sequence, sequence + _delivery_sequence_span(payload))
+
+
+def _durable_command_kinds_compatible(kinds: frozenset[str]) -> bool:
+    return len(kinds) == 1 or not kinds & _UPSERT_COMMAND_KINDS
+
+
 def _internal_timeout_timer_kind(
     payload: Mapping[str, Any],
     condition_wait_ids_by_sequence: Mapping[int, str] | None = None,
@@ -4309,6 +4548,28 @@ def _recorded_detail_mismatch(command: Any, step: _RecordedStep) -> str | None:
         recorded = step.details.get("entries_identity")
         if isinstance(recorded, str) and recorded != _memo_replay_identity(command.entries):
             return "Recorded memo entries differ from the current workflow memo update."
+    elif isinstance(command, UpsertSearchAttributes):
+        if "search_attributes" not in step.details:
+            return "search_attribute_update_missing: SearchAttributesUpserted history is missing its attributes."
+        try:
+            authored_attributes = _canonical_search_attributes(command.attributes, authored=True)
+        except ValueError as exc:
+            return f"search_attribute_value_mismatch: the current search attribute update is invalid: {exc}"
+        try:
+            recorded_attributes = _canonical_search_attributes(step.details["search_attributes"])
+        except ValueError as exc:
+            return f"search_attribute_value_mismatch: SearchAttributesUpserted history has invalid attributes: {exc}"
+        if recorded_attributes != authored_attributes:
+            return (
+                "search_attribute_value_mismatch: Recorded search attributes differ from the current "
+                "workflow search attribute update."
+            )
+        # Events recorded before attribute_types existed keep value-only
+        # compatibility, as in Core's SearchAttributeReplayIdentity.
+        if "search_attribute_types" in step.details:
+            problem = _search_attribute_types_mismatch(step.details["search_attribute_types"], command.attributes)
+            if problem is not None:
+                return f"search_attribute_type_mismatch: {problem}."
     return None
 
 
@@ -4501,6 +4762,9 @@ def _replay_state(
             ) from exception
 
     events = list(history_events)
+    # A malformed delivery span refuses replay before any history parser can
+    # read it more permissively.
+    _assert_delivery_spans(events)
     _assert_cancellation_scope_replay_supported(
         events, allow_authoring=allow_cancellation_scope_authoring, allow_delivery=allow_cancellation_scope_delivery,
     )
@@ -4583,6 +4847,10 @@ def _replay_state(
     resolved_sequences: set[int] = set()
     condition_wait_ids_by_sequence: dict[int, str] = {}
     selected_condition_wait_ids_by_sequence: dict[int, str] = {}
+    command_kinds_by_sequence: dict[int, frozenset[str]] = {}
+    search_attribute_sequences: set[int] = set()
+    upsert_sequences: set[int] = set()
+    delivery_ranges: list[range] = []
 
     for event in events:
         event_type = _history_event_type(event)
@@ -4590,8 +4858,62 @@ def _replay_state(
         if not isinstance(payload, Mapping):
             payload = {}
         sequence = _workflow_sequence(payload)
+        if event_type == "SearchAttributesUpserted":
+            # Never bind an upsert to a guessed step.
+            sequence_problem = _durable_command_sequence_problem(payload)
+            if sequence_problem is not None:
+                raise NonDeterministicReplayError(
+                    len(event_types_by_sequence) + 1,
+                    "search attributes upsert with its workflow sequence",
+                    ["SearchAttributesUpserted"],
+                    detail=f"{sequence_problem}: SearchAttributesUpserted history needs a positive integer "
+                    "workflow sequence.",
+                )
         if sequence is None:
             continue
+        if event_type == "SearchAttributesUpserted":
+            if sequence in search_attribute_sequences:
+                raise NonDeterministicReplayError(
+                    sequence,
+                    "one SearchAttributesUpserted event",
+                    ["SearchAttributesUpserted", "SearchAttributesUpserted"],
+                    detail="duplicate_search_attribute_update: a workflow sequence records two search "
+                    "attribute updates.",
+                )
+            search_attribute_sequences.add(sequence)
+        command_kind = _DURABLE_COMMAND_KINDS.get(event_type or "")
+        if command_kind is not None:
+            claimed = _durable_command_claimed_range(event_type, payload, sequence)
+            # A delivery span claims its whole range; an upsert anywhere inside
+            # it collides, whichever of the two was recorded first.
+            if command_kind in _UPSERT_COMMAND_KINDS:
+                inside = next((sequence for delivery in delivery_ranges if sequence in delivery), None)
+            elif command_kind == "cancellation_delivery":
+                inside = next((upsert for upsert in sorted(upsert_sequences) if upsert in claimed), None)
+            else:
+                inside = None
+            if inside is not None:
+                raise NonDeterministicReplayError(
+                    inside,
+                    "one durable command per workflow sequence",
+                    [*event_types_by_sequence.get(inside, []), event_type or "<unknown>"],
+                    detail=f"durable_command_sequence_collision: {event_type} and an upsert claim workflow "
+                    f"sequence {inside} inside a cancellation delivery span.",
+                )
+            kinds = command_kinds_by_sequence.get(sequence, frozenset()) | {command_kind}
+            if not _durable_command_kinds_compatible(kinds):
+                raise NonDeterministicReplayError(
+                    sequence,
+                    "one durable command per workflow sequence",
+                    [*event_types_by_sequence.get(sequence, []), event_type or "<unknown>"],
+                    detail=f"durable_command_sequence_collision: {event_type} claims a workflow sequence "
+                    f"already recorded by a {', '.join(sorted(kinds - {command_kind}))} command.",
+                )
+            command_kinds_by_sequence[sequence] = kinds
+            if command_kind in _UPSERT_COMMAND_KINDS:
+                upsert_sequences.add(sequence)
+            elif command_kind == "cancellation_delivery":
+                delivery_ranges.append(claimed)
         if event_type is not None:
             event_types_by_sequence.setdefault(sequence, []).append(event_type)
         try:
@@ -4675,6 +4997,10 @@ def _replay_state(
         ):
             resolved_sequences.add(sequence)
 
+    # The latest recorded time in this history: when a re-driven wait reopens.
+    history_time = max(
+        (time for time in (_history_event_time(ev) for ev in events) if time is not None), default=None,
+    )
     workflow_start_time: datetime | None = None
     replay_clock_error = "Workflow replay clock unavailable: missing WorkflowStarted persisted start time"
     for ev in events:
@@ -4797,6 +5123,9 @@ def _replay_state(
     # to match against their corresponding opened wait in history
     # (Nth yield ↔ Nth opened).
     wait_opened: list[dict[str, Any]] = []
+    # The recorded time of each ``wait_opened`` row, or None when history
+    # carries no parseable time. A reopened wait keeps its first open's deadline.
+    wait_opened_times: list[datetime | None] = []
     # Map condition_wait_id → resolution: 'satisfied' (from ConditionWaitSatisfied
     # in history, future server-recorded) or 'timed_out' (from a matching
     # condition_timeout TimerFired event).
@@ -5344,6 +5673,7 @@ def _replay_state(
                 else:
                     recorded_wait_steps.append(_recorded_step("condition wait", ev))
                     wait_opened.append(dict(payload))
+                    wait_opened_times.append(_history_event_time(ev))
         elif etype == "ConditionWaitSatisfied":
             wait_id = payload.get("condition_wait_id")
             if isinstance(wait_id, str) and wait_id:
@@ -5460,6 +5790,32 @@ def _replay_state(
             memo_sequences_added.add(sequence)
             _append_resolved_result(None, "memo upsert", ev)
         elif etype == "SearchAttributesUpserted":
+            # The recorded values are this step's replay identity; without
+            # them the step cannot be checked, so replay is refused.
+            # The first pass refused an upsert without a positive integer sequence.
+            upsert_sequence = cast(int, _workflow_sequence(payload))
+            if "attributes" not in payload:
+                raise NonDeterministicReplayError(
+                    upsert_sequence,
+                    "search attributes upsert with recorded attributes",
+                    ["SearchAttributesUpserted"],
+                    detail="search_attribute_update_missing: SearchAttributesUpserted history is missing its "
+                    "attributes.",
+                )
+            try:
+                _canonical_search_attributes(payload["attributes"])
+            except ValueError as exc:
+                raise NonDeterministicReplayError(
+                    upsert_sequence,
+                    "search attributes upsert with canonical attributes",
+                    ["SearchAttributesUpserted"],
+                    detail=f"search_attribute_value_mismatch: SearchAttributesUpserted history has invalid "
+                    f"attributes: {exc}",
+                ) from exc
+            upsert_details = details_by_sequence.setdefault(upsert_sequence, {})
+            upsert_details["search_attributes"] = payload["attributes"]
+            if "attribute_types" in payload:
+                upsert_details["search_attribute_types"] = payload["attribute_types"]
             _append_resolved_result(None, "search attributes upsert", ev)
         elif etype == "SignalReceived":
             signal_name = payload.get("signal_name")
@@ -6629,6 +6985,27 @@ def _replay_state(
         except StopIteration as stop:
             return _terminal_state(stop.value, include_pending=True)
 
+    def _reopened_with_remaining_timeout(command: WaitCondition, first_index: int) -> WaitCondition:
+        """Reopen a logical wait with the time left before its first deadline.
+
+        The deadline is fixed when the wait first opens, as in embedded
+        Workflow: the first ConditionWaitOpened time plus the authored
+        timeout. A non-satisfying signal re-drives the wait, and the reopen
+        carries the remaining whole seconds measured at the latest recorded
+        history time, rounded up and clamped to 0..authored (the sdk-php#269
+        rule). Without recorded times the authored timeout is kept.
+        """
+        authored = command.timeout_seconds
+        if authored is None or first_index >= len(wait_opened):
+            return command
+        opened_at = wait_opened_times[first_index]
+        if opened_at is None or history_time is None:
+            return command
+        remaining = math.ceil(authored - (history_time - opened_at).total_seconds())
+        reopened = copy(command)
+        reopened.timeout_seconds = min(authored, max(0, remaining))
+        return reopened
+
     def _advance_cancellation_clock(indexes: Iterable[int | None]) -> None:
         if ctx._cancellation_context is None and not consumed_scope_deliveries:
             return
@@ -7211,6 +7588,7 @@ def _replay_state(
                 # Terminal cleanup may only skip a later open after this
                 # yielded wait has already replayed at least one false reopen.
                 consumed_reopen_for_current_wait = False
+                first_open_index = wait_yield_count
                 while True:
                     resolution: str | None = None
                     opened: dict[str, Any] | None = None
@@ -7313,7 +7691,10 @@ def _replay_state(
                         continue
 
                     _set_replaying(False)
-                    pending.append(cmd)
+                    pending.append(
+                        _reopened_with_remaining_timeout(cmd, first_open_index)
+                        if opened is not None else cmd
+                    )
                     wait_yield_count = next_wait_index
                     return _state(pending)
                 continue

{durable_workflow-2.13.1 → durable_workflow-2.13.2/src/durable_workflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 2.13.1
+Version: 2.13.2
 Summary: Python client and worker SDK for Durable Workflow Cloud and self-hosted Server
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-2.13.1 → durable_workflow-2.13.2}/src/durable_workflow.egg-info/SOURCES.txt

@@ -117,6 +117,7 @@ tests/test_prepared_local_activity_groups.py
 tests/test_prepared_local_activity_policies.py
 tests/test_prepared_local_activity_worker.py
 tests/test_public_boundary_scanner.py
+tests/test_publish_workflow_isolation.py
 tests/test_pypi_project_surface.py
 tests/test_python_conformance.py
 tests/test_queries.py
@@ -124,6 +125,7 @@ tests/test_query_task_authority.py
 tests/test_query_timeout_retry.py
 tests/test_readme_quickstart.py
 tests/test_redrive_replay.py
+tests/test_redrive_successor_evidence.py
 tests/test_registration_ambiguity.py
 tests/test_release_metadata.py
 tests/test_replay.py
@@ -137,6 +139,7 @@ tests/test_runtime_external_payload_transport.py
 tests/test_schedules.py
 tests/test_scoped_run_cancellation_context.py
 tests/test_sdk_metrics_contract.py
+tests/test_search_attribute_replay_identity.py
 tests/test_serializer.py
 tests/test_signals.py
 tests/test_sleep.py