2727from collections .abc import Callable , Iterable , Mapping , Sequence
2828from dataclasses import dataclass , field
2929from datetime import datetime , timezone
30- from typing import Any , TypeVar
30+ from typing import Any , TypeVar , cast
3131
3232from . import serializer
3333from .errors import (
@@ -1582,14 +1582,28 @@ class _RecordedStep:
15821582 details : dict [str , Any ]
15831583
15841584
1585+ def _validated_replay_payload_codec (
1586+ payload : Mapping [str , Any ],
1587+ fallback_codec : str | None ,
1588+ ) -> str | None :
1589+ explicit = "payload_codec" in payload
1590+ codec = cast (
1591+ str | None ,
1592+ payload ["payload_codec" ] if explicit else fallback_codec ,
1593+ )
1594+ if (explicit or codec is not None ) and codec != serializer .AVRO_CODEC :
1595+ serializer .decode ("" , codec = codec )
1596+ return codec
1597+
1598+
15851599def _decode_history_result (
15861600 payload : dict [str , Any ],
15871601 fallback_codec : str | None ,
15881602 * ,
15891603 external_storage : ExternalStorageDriver | None = None ,
15901604 external_storage_cache : ExternalPayloadCache | None = None ,
15911605) -> Any :
1592- codec = payload . get ( "payload_codec" ) or fallback_codec
1606+ codec = _validated_replay_payload_codec ( payload , fallback_codec )
15931607 value = payload ["result" ] if "result" in payload else payload .get ("output" )
15941608
15951609 return serializer .decode_envelope (
@@ -1615,7 +1629,7 @@ def _decode_signal_args(
16151629 external_storage : ExternalStorageDriver | None = None ,
16161630 external_storage_cache : ExternalPayloadCache | None = None ,
16171631) -> list [Any ]:
1618- codec = payload . get ( "payload_codec" ) or fallback_codec
1632+ codec = _validated_replay_payload_codec ( payload , fallback_codec )
16191633 raw = payload .get ("value" )
16201634 if raw is None :
16211635 raw = payload .get ("input" )
@@ -1641,7 +1655,7 @@ def _decode_update_args(
16411655 external_storage : ExternalStorageDriver | None = None ,
16421656 external_storage_cache : ExternalPayloadCache | None = None ,
16431657) -> list [Any ]:
1644- codec = payload . get ( "payload_codec" ) or fallback_codec
1658+ codec = _validated_replay_payload_codec ( payload , fallback_codec )
16451659 raw = payload .get ("arguments" )
16461660 if raw is None :
16471661 return []
@@ -1734,7 +1748,7 @@ def _start_input_from_history(
17341748 payload = event .get ("payload" ) or {}
17351749 if not isinstance (payload , Mapping ):
17361750 return []
1737- codec = payload . get ( "payload_codec" ) or payload_codec
1751+ codec = _validated_replay_payload_codec ( payload , payload_codec )
17381752 for key in ("input_envelope" , "input" , "arguments" ):
17391753 raw = payload .get (key )
17401754 if raw is None :
@@ -1772,7 +1786,10 @@ def _decode_receiver_args(
17721786 payload = event .get ("payload" ) or {}
17731787 if not isinstance (payload , Mapping ):
17741788 payload = {}
1775- codec = payload .get ("payload_codec" ) or payload_codec
1789+ codec = cast (
1790+ str | None ,
1791+ payload .get ("payload_codec" , payload_codec ),
1792+ )
17761793 try :
17771794 if receiver_kind == "signal" :
17781795 return _decode_signal_args (
0 commit comments